diff --git a/.gitignore b/.gitignore index 7c0e878e..7fe1870d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,33 +1,9 @@ -*.la -*.lo -*.o -.deps -.libs -aclocal.m4 -autom4te.cache -config.* -depcomp -install-sh -libtool -ltmain.sh Makefile -Makefile.in -Makefile.in.in -missing -mkinstalldirs -stamp-h1 .waf-* .lock-wscript _build_ -intltool-extract.in -intltool-extract -intltool-merge.in -intltool-merge -intltool-update.in -intltool-update - po/.intltool-merge-cache po/POTFILES po/stamp-it diff --git a/INSTALL b/INSTALL index 649fe430..89dd7340 100644 --- a/INSTALL +++ b/INSTALL @@ -39,22 +39,3 @@ function names and line numbers. For further information a tutorial for gdb and reading up on how you can install debugging symbols for libraries used by Midori are recommended. - -+++ Legacy support +++ - -There are also autotools build files available. This -is not recommended except when waf for any reason won't work. - -Make sure you have *libtool* and *intltool* installed. - -Run './legacy.sh'. - -Run './configure' - -Run 'make' - -The usual autotools way works here, please refer to -according documentation in case of questions. - -Note that the autotools based build is not a -full replacement for the recommended system. diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 9e2ee96e..00000000 --- a/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -# This file is licensed under the terms of the expat license, see the file EXPAT. - -AUTOMAKE_OPTIONS = gnu - -SUBDIRS = katze midori po icons - -desktopdir = $(datadir)/applications -desktop_in_files = midori.desktop -desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) -@INTLTOOL_DESKTOP_RULE@ - -DISTCLEANFILES = \ - midori.desktop \ - intltool-extract \ - intltool-merge \ - intltool-update - -EXTRA_DIST = \ - HACKING \ - TODO \ - midori.desktop.in \ - intltool-extract.in \ - intltool-merge.in \ - intltool-update.in diff --git a/NEWS b/NEWS deleted file mode 100644 index e69de29b..00000000 diff --git a/configure.in b/configure.in deleted file mode 100644 index 9c4a7605..00000000 --- a/configure.in +++ /dev/null @@ -1,103 +0,0 @@ -# This file is licensed under the terms of the expat license, see the file EXPAT. -# Register ourselves to autoconf -AC_INIT([midori], [0.1.1], [http://www.twotoasts.de/bugs]) -AC_CONFIG_SRCDIR([midori/midori-stock.h]) -AC_CONFIG_HEADER([config.h]) - -AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()]) -AM_PROG_LIBTOOL - -# Checks for programs -AC_PROG_CC -AC_PROG_INSTALL -AC_PROG_MAKE_SET -AC_PROG_INTLTOOL - -# Checks for header files -AC_HEADER_STDC - -# Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST - -# Checks if we want debugging support -AC_ARG_ENABLE([debug], -AC_HELP_STRING([--enable-debug=@<:@no/yes@:>@] - , [Enable debugging @<:@default=yes@:>@]) - , [], [enable_debug=yes]) -AC_MSG_CHECKING([whether to enable debugging support]) -AC_MSG_RESULT([$enable_debug]) -if test x"$enable_debug" = x"yes"; then - # Check whether the compiler accepts -Wall - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Wall" - AC_MSG_CHECKING([whether $CC accepts -Wall]) - AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [ - AC_MSG_RESULT([yes]) - ], [ - AC_MSG_RESULT([no]) - CFLAGS="$save_CFLAGS" - ]) -fi - -# Checks for Unique -PKG_CHECK_MODULES(UNIQUE, unique-1.0 >= 0.9, have_unique=1, have_unique=0) -AC_SUBST(UNIQUE_CFLAGS) -AC_SUBST(UNIQUE_LIBS) -AC_DEFINE_UNQUOTED(HAVE_UNIQUE,$have_unique, [Whether Unique is available]) - -# Checks for Gtk+2 -PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.10, have_gtk=1, have_gtk=0) -if test "x${have_gtk}" = "xfalse" ; then - AC_MSG_ERROR([No Gtk+2 package information found]) -fi -AC_SUBST(GTK_CFLAGS) -AC_SUBST(GTK_LIBS) -AC_DEFINE_UNQUOTED(HAVE_GTK,$have_gtk, [Whether Gtk is available]) - -# Checks for WebKit -PKG_CHECK_MODULES(WEBKIT, webkit-1.0, have_webkit=1, have_webkit=0) -if test "x${have_webkit}" = "xfalse" ; then - AC_MSG_ERROR([No WebKit package information found]) -fi -AC_SUBST(WEBKIT_CFLAGS) -AC_SUBST(WEBKIT_LIBS) -AC_DEFINE_UNQUOTED(HAVE_WEBKIT,$have_webkit, [Whether WebKit is available]) - -# Checks for LibXML2 -PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= 2.6, have_libxml=1, have_libxml=0) -if test "x${have_libxml}" = "xfalse" ; then - AC_MSG_ERROR([No libXML2 package information found]) -fi -AC_SUBST(LIBXML_CFLAGS) -AC_SUBST(LIBXML_LIBS) -AC_DEFINE_UNQUOTED(HAVE_LIBXML,$have_libxml, [Whether LibXML is available]) - -# Check for sqlite 3 -PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= 3.0], have_sqlite3=1, have_sqlite3=0) -AC_SUBST([SQLITE3_CFLAGS]) -AC_SUBST([SQLITE3_LIBS]) -AC_DEFINE_UNQUOTED(HAVE_SQLITE,$have_sqlite3, [Whether sqlite3 is available]) - -# i18n -GETTEXT_PACKAGE=midori -AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) - -# take all languages found in file po/LINGUAS -ALL_LINGUAS="`sed -e '/^#/d' $srcdir/po/LINGUAS`" - -AM_GLIB_GNU_GETTEXT -# workaround for intltool bug (http://bugzilla.gnome.org/show_bug.cgi?id=490845) -if test "x$MSGFMT" = "xno"; then - AC_MSG_ERROR([msgfmt not found. Please install the gettext package.]) -fi - -# Here we tell the configure script which files to *create* -AC_CONFIG_FILES([ - Makefile \ - katze/Makefile \ - midori/Makefile \ - po/Makefile.in \ - icons/Makefile -]) -AC_OUTPUT diff --git a/icons/Makefile.am b/icons/Makefile.am deleted file mode 100644 index 1ca619c3..00000000 --- a/icons/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -# This file is licensed under the terms of the expat license, see the file EXPAT. - -iconsdir = $(datadir)/icons/hicolor/scalable/apps -icons_DATA = scalable/midori.svg - -EXTRA_DIST = $(icons_DATA) - -gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor - -install-data-hook: update-icon-cache -uninstall-hook: update-icon-cache -update-icon-cache: - @-if test -z "$(DESTDIR)"; then \ - echo "Updating Gtk icon cache."; \ - $(gtk_update_icon_cache); \ - else \ - echo "*** Icon cache not updated. After (un)install, run this:"; \ - echo "*** $(gtk_update_icon_cache)"; \ - fi diff --git a/katze/Makefile.am b/katze/Makefile.am deleted file mode 100644 index 7729d067..00000000 --- a/katze/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -# This file is licensed under the terms of the expat license, see the file EXPAT. - -INCLUDES = \ - $(GTK_CFLAGS) \ - $(LIBXML_CFLAGS) - -noinst_LTLIBRARIES = \ - libkatze.la - -libkatze_la_LIBADD = \ - $(GTK_LIBS) \ - $(INTLLIBS) \ - $(LIBXML_LIBS) - -libkatze_la_SOURCES = \ - katze.h \ - katze-throbber.c katze-throbber.h \ - katze-utils.c katze-utils.h \ - katze-item.c katze-item.h \ - katze-list.c katze-list.h \ - katze-array.c katze-array.h \ - katze-arrayaction.c katze-arrayaction.h \ - katze-net.c katze-net.h diff --git a/legacy.sh b/legacy.sh deleted file mode 100755 index 70867688..00000000 --- a/legacy.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# This file is licensed under the terms of the expat license, see the file EXPAT. - -echo "no" | glib-gettextize --force --copy -intltoolize --copy --force --automake -libtoolize --copy --force || glibtoolize --copy --force -aclocal -autoheader -autoconf -automake --add-missing --copy - -echo "Now running the configure script" -./configure $* diff --git a/midori/Makefile.am b/midori/Makefile.am deleted file mode 100644 index e7cf7228..00000000 --- a/midori/Makefile.am +++ /dev/null @@ -1,42 +0,0 @@ -# This file is licensed under the terms of the expat license, see the file EXPAT. - -INCLUDES = \ - $(UNIQUE_CFLAGS) \ - $(LIBXML_CFLAGS) \ - $(SQLITE3_CFLAGS) \ - $(GTK_CFLAGS) \ - $(WEBKIT_CFLAGS) \ - -I../katze - -AM_CFLAGS = -DLOCALEDIR=\""$(localedir)"\" -DDATADIR=\""$(datadir)"\" - -LDADD = \ - $(UNIQUE_LIBS) \ - $(LIBXML_LIBS) \ - $(SQLITE3_LIBS) \ - $(GTK_LIBS) \ - $(WEBKIT_LIBS) \ - $(INTLLIBS) \ - ../katze/libkatze.la - -bin_PROGRAMS = \ - midori - -midori_SOURCES = \ - main.c midori-stock.h \ - gtkiconentry.c gtkiconentry.h \ - midori-app.c midori-app.h \ - midori-browser.c midori-browser.h \ - midori-panel.c midori-panel.h \ - midori-addons.c midori-addons.h \ - midori-console.c midori-console.h \ - midori-view.c midori-view.h \ - midori-source.c midori-source.h \ - midori-websettings.c midori-websettings.h \ - midori-preferences.c midori-preferences.h \ - midori-searchaction.c midori-searchaction.h \ - midori-locationentry.c midori-locationentry.h \ - midori-locationaction.c midori-locationaction.h \ - gjs.c gjs.h \ - sokoke.c sokoke.h \ - compat.c compat.h