From cde1dbc2942cf146c01774b76ba0466e775ab761 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@cvs.gnome.org>
Date: Tue, 30 Nov 2004 23:35:15 +0000
Subject: Add deprecated defines to AM_CPPFLAGS in maintainer-mode.

2004-12-01  Christian Persch  <chpe@cvs.gnome.org>

	* 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/Makefile.am | 56 ++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 36 insertions(+), 20 deletions(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index f61728381..a35aacfed 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,23 +1,5 @@
 SUBDIRS = bookmarks
 
-INCLUDES = \
-	-I$(top_builddir)/lib		\
-	-I$(top_srcdir)/embed 		\
-	-I$(top_srcdir)/lib   		\
-	-I$(top_srcdir)/lib/egg		\
-	-I$(top_srcdir)/lib/widgets   	\
-	-I$(top_srcdir)/src/bookmarks   \
-	$(EPIPHANY_DEPENDENCY_CFLAGS) 	\
-	-DSHARE_DIR=\"$(pkgdatadir)\" 	\
-	-DEXTENSIONS_DIR=\""$(libdir)/epiphany-$(EPIPHANY_MAJOR)/extensions"\" 	\
-	-DDATADIR=\""$(datadir)"\" 	\
-	-DPIXMAP_DIR=\""$(datadir)/pixmaps"\" 
-
-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 = libephymain.la
 
 bin_PROGRAMS = epiphany
@@ -101,8 +83,44 @@ libephymain_la_SOURCES =				\
 	$(INST_H_FILES)					\
 	$(NOINST_H_FILES)
 
+libephymain_la_CPPFLAGS = \
+	-I$(top_builddir)/lib		\
+	-I$(top_srcdir)/embed 		\
+	-I$(top_srcdir)/lib   		\
+	-I$(top_srcdir)/lib/egg		\
+	-I$(top_srcdir)/lib/widgets   	\
+	-I$(top_srcdir)/src/bookmarks   \
+	-DSHARE_DIR=\"$(pkgdatadir)\" 	\
+	-DEXTENSIONS_DIR=\""$(libdir)/epiphany-$(EPIPHANY_MAJOR)/extensions"\" 	\
+	-DDATADIR=\""$(datadir)"\" 	\
+	-DPIXMAP_DIR=\""$(datadir)/pixmaps"\"	\
+	$(AM_CPPFLAGS)
+
+libephymain_la_CFLAGS = \
+	$(EPIPHANY_DEPENDENCY_CFLAGS) 	\
+	$(AM_CFLAGS)
+
 epiphany_SOURCES = ephy-main.c
 
+epiphany_CPPFLAGS = \
+	-I$(top_builddir)/lib		\
+	-I$(top_srcdir)/embed 		\
+	-I$(top_srcdir)/lib   		\
+	-I$(top_srcdir)/lib/egg		\
+	-I$(top_srcdir)/lib/widgets   	\
+	-I$(top_srcdir)/src/bookmarks   \
+	-DSHARE_DIR=\"$(pkgdatadir)\" 	\
+	-DEXTENSIONS_DIR=\""$(libdir)/epiphany-$(EPIPHANY_MAJOR)/extensions"\" 	\
+	-DDATADIR=\""$(datadir)"\" 	\
+	-DPIXMAP_DIR=\""$(datadir)/pixmaps"\"	\
+	$(AM_CPPFLAGS)
+
+epiphany_CFLAGS = \
+	$(EPIPHANY_DEPENDENCY_CFLAGS) 	\
+	$(AM_CFLAGS)
+
+epiphany_LDFLAGS = -R$(MOZILLA_HOME) -dlopen self
+
 epiphany_LDADD = \
 	$(top_builddir)/src/libephymain.la \
 	$(top_builddir)/src/bookmarks/libephybookmarks.la \
@@ -116,8 +134,6 @@ epiphany_LDADD = \
 	$(EPIPHANY_DEPENDENCY_LIBS) \
 	$(INTLLIBS)
 
-epiphany_LDFLAGS = -R$(MOZILLA_HOME) -dlopen self
-
 BUILT_SOURCES = $(CORBA_SOURCE)
 
 CLEANFILES = $(CORBA_SOURCE)
-- 
cgit