diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | embed/Makefile.am | 7 | ||||
| -rw-r--r-- | embed/mozilla/Makefile.am | 5 | ||||
| -rw-r--r-- | lib/Makefile.am | 7 | ||||
| -rw-r--r-- | lib/egg/Makefile.am | 5 | ||||
| -rw-r--r-- | lib/widgets/Makefile.am | 7 | ||||
| -rw-r--r-- | plugins/sample/Makefile.am | 7 | ||||
| -rw-r--r-- | src/Makefile.am | 7 | ||||
| -rw-r--r-- | src/bookmarks/Makefile.am | 7 |
9 files changed, 20 insertions, 45 deletions
@@ -1,5 +1,18 @@ 2003-10-03 Christian Persch <chpe@cvs.gnome.org> + * embed/Makefile.am: + * embed/mozilla/Makefile.am: + * lib/Makefile.am: + * lib/egg/Makefile.am: + * lib/widgets/Makefile.am: + * plugins/sample/Makefile.am: + * src/Makefile.am: + * src/bookmarks/Makefile.am: + + Remove -D*_DISABLE_DEPRECATED to allow building with gtk+ HEAD. + +2003-10-03 Christian Persch <chpe@cvs.gnome.org> + * lib/egg/egg-toolbars-model.c: (safe_save_xml), (egg_toolbars_model_load): diff --git a/embed/Makefile.am b/embed/Makefile.am index c4998b8bb..9f8f7e1da 100644 --- a/embed/Makefile.am +++ b/embed/Makefile.am @@ -7,12 +7,7 @@ INCLUDES = \ -I$(MOZILLA_INCLUDE_ROOT)/gtkembedmoz \ $(WARN_CFLAGS) \ $(EPIPHANY_DEPENDENCY_CFLAGS) \ - -DSHARE_DIR=\"$(pkgdatadir)\" \ - -DG_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ - -DGNOME_DISABLE_DEPRECATED + -DSHARE_DIR=\"$(pkgdatadir)\" noinst_LTLIBRARIES = libephyembed.la diff --git a/embed/mozilla/Makefile.am b/embed/mozilla/Makefile.am index a27b3e54a..b68a0bb3e 100644 --- a/embed/mozilla/Makefile.am +++ b/embed/mozilla/Makefile.am @@ -34,11 +34,6 @@ INCLUDES = \ -I$(MOZILLA_INCLUDE_ROOT)/windowwatcher \ $(GCONF_CFLAGS) \ $(EPIPHANY_DEPENDENCY_CFLAGS) \ - -DG_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ - -DGNOME_DISABLE_DEPRECATED \ -DSHARE_DIR=\"$(pkgdatadir)\" \ -include $(MOZILLA_INCLUDE_ROOT)/mozilla-config.h diff --git a/lib/Makefile.am b/lib/Makefile.am index f70c0c170..226f2ad22 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -3,12 +3,7 @@ SUBDIRS = widgets egg INCLUDES = \ $(WARN_CFLAGS) \ $(EPIPHANY_DEPENDENCY_CFLAGS) \ - -DSHARE_DIR=\"$(pkgdatadir)\" \ - -DG_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ - -DGNOME_DISABLE_DEPRECATED + -DSHARE_DIR=\"$(pkgdatadir)\" noinst_LTLIBRARIES = libephy.la diff --git a/lib/egg/Makefile.am b/lib/egg/Makefile.am index eca7c0b14..8daf65505 100644 --- a/lib/egg/Makefile.am +++ b/lib/egg/Makefile.am @@ -1,8 +1,5 @@ INCLUDES = \ - $(EPIPHANY_DEPENDENCY_CFLAGS) \ - -DGTK_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ - -DG_DISABLE_DEPRECATED + $(EPIPHANY_DEPENDENCY_CFLAGS) noinst_LTLIBRARIES = libegg.la diff --git a/lib/widgets/Makefile.am b/lib/widgets/Makefile.am index b7e1bdc23..c639740c7 100644 --- a/lib/widgets/Makefile.am +++ b/lib/widgets/Makefile.am @@ -3,12 +3,7 @@ INCLUDES = \ -I$(top_srcdir)/lib/egg \ $(WARN_CFLAGS) \ $(EPIPHANY_DEPENDENCY_CFLAGS) \ - -DSHARE_DIR=\"$(pkgdatadir)\" \ - -DG_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ - -DGNOME_DISABLE_DEPRECATED + -DSHARE_DIR=\"$(pkgdatadir)\" noinst_LTLIBRARIES = libephywidgets.la diff --git a/plugins/sample/Makefile.am b/plugins/sample/Makefile.am index 2c735e923..d100580fe 100644 --- a/plugins/sample/Makefile.am +++ b/plugins/sample/Makefile.am @@ -6,12 +6,7 @@ INCLUDES = \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/src/bookmarks \ $(EPIPHANY_DEPENDENCY_CFLAGS) \ - -DSHARE_DIR=\"$(pkgdatadir)\" \ - -DG_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ - -DGNOME_DISABLE_DEPRECATED + -DSHARE_DIR=\"$(pkgdatadir)\" plugin_LTLIBRARIES = libsample.la diff --git a/src/Makefile.am b/src/Makefile.am index 268d6e34f..d0f6aa705 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,12 +12,7 @@ INCLUDES = \ -DPLUGINS_DIR=\""$(libdir)/epiphany/plugins"\" \ -DDATADIR=\""$(datadir)"\" \ -DPIXMAP_DIR=\""$(datadir)/pixmaps"\" \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -DG_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ - -DGNOME_DISABLE_DEPRECATED + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" bin_PROGRAMS = epiphany-bin bin_SCRIPTS = epiphany diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am index 5b1865d31..8fca70d57 100644 --- a/src/bookmarks/Makefile.am +++ b/src/bookmarks/Makefile.am @@ -8,12 +8,7 @@ INCLUDES = \ $(EPIPHANY_DEPENDENCY_CFLAGS) \ -DSHARE_DIR=\"$(pkgdatadir)\" \ -DDATADIR=\""$(datadir)"\" \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -DG_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ - -DGNOME_DISABLE_DEPRECATED + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" noinst_LTLIBRARIES = libephybookmarks.la |