diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | configure.ac | 24 | ||||
| -rw-r--r-- | doc/reference/Makefile.am | 10 | ||||
| -rw-r--r-- | embed/Makefile.am | 4 | ||||
| -rw-r--r-- | embed/mozilla/Makefile.am | 6 | ||||
| -rw-r--r-- | plugins/desktop-file/Makefile.am | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 6 |
7 files changed, 38 insertions, 27 deletions
@@ -1,3 +1,14 @@ +2007-07-16 Christian Persch <chpe@gnome.org> + + * configure.ac: + * doc/reference/Makefile.am: + * embed/Makefile.am: + * embed/mozilla/Makefile.am: + * plugins/desktop-file/Makefile.am: + * src/Makefile.am: + + s/MOZILLA/GECKO/g for consistency with gge. + 2007-07-15 Christian Persch <chpe@gnome.org> * embed/mozilla/EphyBrowser.cpp: diff --git a/configure.ac b/configure.ac index c711e016d..ce89be190 100644 --- a/configure.ac +++ b/configure.ac @@ -64,14 +64,14 @@ GNOME_MAINTAINER_MODE_DEFINES MORE_WARN_FLAGS= DEPRECATION_FLAGS= -MOZILLA_WARN_CXXFLAGS="-Wno-ctor-dtor-privacy -Wno-non-virtual-dtor" +GECKO_WARN_CXXFLAGS="-Wno-ctor-dtor-privacy -Wno-non-virtual-dtor" if test "x$enable_maintainer_mode" = "xyes"; then AC_DEFINE([MAINTAINER_MODE],[1],[Define to enable 'maintainer-only' behaviour]) enable_debug=yes # -DGTK_DISABLE_DEPRECATED DEPRECATION_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED" - MOZILLA_WARN_CXXFLAGS="-Wall -Wconversion -Wpointer-arith -Wcast-align -Woverloaded-virtual -Wsynth $MOZILLA_WARN_CXXFLAGS" + GECKO_WARN_CXXFLAGS="-Wall -Wconversion -Wpointer-arith -Wcast-align -Woverloaded-virtual -Wsynth $GECKO_WARN_CXXFLAGS" fi GLIB_REQUIRED=2.13.4 @@ -168,15 +168,15 @@ fi # Mozilla # ******* -GECKO_INIT([MOZILLA]) +GECKO_INIT([GECKO]) -AC_SUBST([MOZILLA]) -AC_SUBST([MOZILLA_FLAVOUR]) -AC_SUBST([MOZILLA_INCLUDE_ROOT]) -AC_SUBST([MOZILLA_HOME]) -AC_SUBST([MOZILLA_PREFIX]) -AC_SUBST([MOZILLA_EXTRA_LIBS]) -AC_SUBST([MOZILLA_GLUE_LIBS]) +AC_SUBST([GECKO]) +AC_SUBST([GECKO_FLAVOUR]) +AC_SUBST([GECKO_INCLUDE_ROOT]) +AC_SUBST([GECKO_HOME]) +AC_SUBST([GECKO_PREFIX]) +AC_SUBST([GECKO_EXTRA_LIBS]) +AC_SUBST([GECKO_GLUE_LIBS]) if test "$gecko_cv_gecko_version_int" -lt "1008000"; then AC_MSG_ERROR([Gecko version $gecko_cv_gecko_version is not supported!]) @@ -479,7 +479,7 @@ AC_MSG_RESULT([$enable_desktop_file_plugin]) AM_CONDITIONAL([ENABLE_DESKTOP_FILE_PLUGIN],[test "x$enable_desktop_file_plugin" = "xyes"]) if test "x$enable_desktop_file_plugin" = "xyes"; then - PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[$MOZILLA-xpcom $MOZILLA-plugin gtk+-2.0 >= 2.6.0]) + PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[${gecko_cv_gecko}-xpcom ${gecko_cv_gecko}-plugin gtk+-2.0 >= 2.6.0]) AC_SUBST([DESKTOP_FILE_PLUGIN_DEP_CFLAGS]) AC_SUBST([DESKTOP_FILE_PLUGIN_DEP_LIBS]) fi @@ -595,7 +595,7 @@ AC_DEFINE_UNQUOTED([SHARE_UNINSTALLED_DIR], ["`pwd`/data"], [path to source data AM_CPPFLAGS="$AM_CPPFLAGS $DEPRECATION_FLAGS" AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS $MORE_WARN_FLAGS" -AM_CXXFLAGS="$AM_CXXFLAGS $WARN_CXXFLAGS $MOZILLA_WARN_CXXFLAGS" +AM_CXXFLAGS="$AM_CXXFLAGS $WARN_CXXFLAGS $GECKO_WARN_CXXFLAGS" AC_SUBST([AM_CPPFLAGS]) AC_SUBST([AM_CFLAGS]) AC_SUBST([AM_CXXFLAGS]) diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am index 5806ab3a7..ba985e0e6 100644 --- a/doc/reference/Makefile.am +++ b/doc/reference/Makefile.am @@ -146,8 +146,8 @@ GTKDOC_CFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/src/bookmarks \ -I$(top_srcdir)/lib/egg \ -I$(top_builddir)/lib/egg \ - -I$(MOZILLA_INCLUDE_ROOT) \ - -I$(MOZILLA_INCLUDE_ROOT)/gtkembedmoz \ + -I$(GECKO_INCLUDE_ROOT) \ + -I$(GECKO_INCLUDE_ROOT)/gtkembedmoz \ $(DEPENDENCIES_CFLAGS) \ $(GECKO_CFLAGS) \ $(DBUS_CFLAGS) \ @@ -163,8 +163,8 @@ GTKDOC_LIBS = \ $(top_builddir)/lib/libephymisc.la \ $(top_builddir)/lib/egg/libegg.la \ $(GECKO_LIBS) \ - $(MOZILLA_EXTRA_LIBS) \ - $(MOZILLA_GLUE_LIBS) \ + $(GECKO_EXTRA_LIBS) \ + $(GECKO_GLUE_LIBS) \ $(DBUS_LIBS) \ $(LIBINTL) @@ -230,7 +230,7 @@ scan-build.stamp: $(HFILE_GLOB) @echo '*** Scanning header files ***' @-chmod -R u+w $(srcdir) if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \ - LD_LIBRARY_PATH=$(MOZILLA_HOME):$$LD_LIBRARY_PATH CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + LD_LIBRARY_PATH=$(GECKO_HOME):$$LD_LIBRARY_PATH CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ else \ cd $(srcdir) ; \ for i in $(SCANOBJ_FILES) ; do \ diff --git a/embed/Makefile.am b/embed/Makefile.am index b0e648ecd..68859851f 100644 --- a/embed/Makefile.am +++ b/embed/Makefile.am @@ -79,7 +79,7 @@ libephyembed_la_CPPFLAGS = \ $(AM_CPPFLAGS) libephyembed_la_CFLAGS = \ - -I$(MOZILLA_INCLUDE_ROOT)/gtkembedmoz \ + -I$(GECKO_INCLUDE_ROOT)/gtkembedmoz \ -DSHARE_DIR=\"$(pkgdatadir)\" \ $(DEPENDENCIES_CFLAGS) \ $(AM_CFLAGS) @@ -90,7 +90,7 @@ libephyembedfactory_la_SOURCES = \ libephyembedfactory_la_CPPFLAGS = \ -I$(top_srcdir)/embed/mozilla \ - -I$(MOZILLA_INCLUDE_ROOT)/gtkembedmoz \ + -I$(GECKO_INCLUDE_ROOT)/gtkembedmoz \ $(AM_CPPFLAGS) libephyembedfactory_la_CFLAGS = \ diff --git a/embed/mozilla/Makefile.am b/embed/mozilla/Makefile.am index 8636d88a9..9810de2f1 100644 --- a/embed/mozilla/Makefile.am +++ b/embed/mozilla/Makefile.am @@ -139,11 +139,11 @@ libephymozillaembed_la_CPPFLAGS = \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/embed \ -I$(top_srcdir) \ - $(addprefix -I$(MOZILLA_INCLUDE_ROOT)/,$(mozilla_include_subdirs)) \ + $(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs)) \ -DSHARE_DIR=\"$(pkgdatadir)\" \ -DPLUGINDIR=\"$(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins\" \ - -DMOZILLA_HOME=\"$(MOZILLA_HOME)\" \ - -DMOZILLA_PREFIX=\"$(MOZILLA_PREFIX)\" \ + -DMOZILLA_HOME=\"$(GECKO_HOME)\" \ + -DMOZILLA_PREFIX=\"$(GECKO_PREFIX)\" \ -DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \ -DUA_VERSION=\"$(EPIPHANY_UA_VERSION)\" \ -DALLOW_PRIVATE_API \ diff --git a/plugins/desktop-file/Makefile.am b/plugins/desktop-file/Makefile.am index b991b9a48..6c6c22303 100644 --- a/plugins/desktop-file/Makefile.am +++ b/plugins/desktop-file/Makefile.am @@ -12,7 +12,7 @@ gecko_include_subdirs = \ libdesktopfileplugin_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"ephy-desktop-file-plugin\" \ -I$(top_srcdir)/lib \ - $(addprefix -I$(MOZILLA_INCLUDE_ROOT)/,$(gecko_include_subdirs)) \ + $(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(gecko_include_subdirs)) \ $(AM_CPPFLAGS) libdesktopfileplugin_la_CXXFLAGS = \ @@ -25,7 +25,7 @@ libdesktopfileplugin_la_LIBADD = \ libdesktopfileplugin_la_LDFLAGS = \ -module -avoid-version \ -export-symbols $(srcdir)/plugin.symbols \ - -R$(MOZILLA_HOME) \ + -R$(GECKO_HOME) \ $(AM_LDFLAGS) EXTRA_DIST = \ diff --git a/src/Makefile.am b/src/Makefile.am index 24054a417..ff3bdfdfb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -203,7 +203,7 @@ epiphany_CFLAGS = \ $(DBUS_CFLAGS) \ $(AM_CFLAGS) -epiphany_LDFLAGS = -R$(MOZILLA_HOME) -dlopen self +epiphany_LDFLAGS = -R$(GECKO_HOME) -dlopen self epiphany_LDADD = \ libephymain.la \ @@ -215,8 +215,8 @@ epiphany_LDADD = \ $(top_builddir)/lib/libephymisc.la \ $(top_builddir)/lib/egg/libegg.la \ $(GECKO_LIBS) \ - $(MOZILLA_EXTRA_LIBS) \ - $(MOZILLA_GLUE_LIBS) \ + $(GECKO_EXTRA_LIBS) \ + $(GECKO_GLUE_LIBS) \ $(DEPENDENCIES_LIBS) \ $(DBUS_LIBS) \ $(LIBINTL) |