From cde1dbc2942cf146c01774b76ba0466e775ab761 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Tue, 30 Nov 2004 23:35:15 +0000 Subject: Add deprecated defines to AM_CPPFLAGS in maintainer-mode. 2004-12-01 Christian Persch * configure.ac: Add deprecated defines to AM_CPPFLAGS in maintainer-mode. * doc/reference/Makefile.am: * embed/Makefile.am: * embed/mozilla/Makefile.am: * lib/Makefile.am: * lib/egg/Makefile.am: * lib/egg/eggintl.h: * lib/widgets/Makefile.am: * src/Makefile.am: * src/bookmarks/Makefile.am: INCLUDES is deprecated, use AM_CPPFLAGS and AM_CFLAGS instead. * lib/eel-gconf-extensions.c: (eel_gconf_client_get_global): Removed usage of deprecated gconf API. * src/ephy-main.c: (main): Removed usage of deprecated glade API. --- src/bookmarks/Makefile.am | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) (limited to 'src/bookmarks') diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am index df7a90e51..0644de0b8 100644 --- a/src/bookmarks/Makefile.am +++ b/src/bookmarks/Makefile.am @@ -1,27 +1,9 @@ -INCLUDES = \ - -I$(top_srcdir)/lib \ - -I$(top_builddir)/lib \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/embed \ - -I$(top_srcdir)/lib/widgets \ - -I$(top_srcdir)/lib/egg \ - $(WARN_CFLAGS) \ - $(EPIPHANY_DEPENDENCY_CFLAGS) \ - -DSHARE_DIR=\"$(pkgdatadir)\" \ - -DDATADIR=\""$(datadir)"\" \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" - -if MAINTAINER_MODE -INCLUDES += -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \ - -DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED $(WARN_CFLAGS) -endif - noinst_LTLIBRARIES = libephybookmarks.la headerdir = $(prefix)/include/epiphany-@EPIPHANY_MAJOR@/epiphany header_DATA = $(INST_H_FILES) -INST_H_FILES = \ +INST_H_FILES = \ ephy-bookmarks.h NOINST_H_FILES = \ @@ -54,3 +36,16 @@ libephybookmarks_la_SOURCES = \ ephy-topics-selector.c \ $(NOINST_H_FILES) \ $(INST_H_FILES) + +libephybookmarks_la_CPPFLAGS = \ + -I$(top_builddir)/lib \ + -I$(top_srcdir)/lib \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/embed \ + -I$(top_srcdir)/lib/widgets \ + -I$(top_srcdir)/lib/egg \ + $(AM_CPPFLAGS) + +libephybookmarks_la_CFLAGS = \ + $(EPIPHANY_DEPENDENCY_CFLAGS) \ + $(AM_CFLAGS) -- cgit v1.2.3