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.

3 files changed, 50 insertions, 41 deletions

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)
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)
diff --git a/src/ephy-main.c b/src/ephy-main.c
index 98d71f1c6..da9907fad 100644
--- a/src/ephy-main.c
+++ b/src/ephy-main.c
@@ -34,7 +34,6 @@
 #include <libgnome/gnome-program.h>
 #include <bonobo/bonobo-main.h>
 #include <glib/gi18n.h>
-#include <glade/glade-init.h>
 #include <libgnomevfs/gnome-vfs-init.h>
 #include <libxml/xmlversion.h>
 
@@ -160,7 +159,6 @@ main (int argc, char *argv[])
 	}
 
 	gnome_vfs_init ();
-	glade_gnome_init ();
 	ephy_debug_init ();
 	ephy_file_helpers_init ();
 	ephy_stock_icons_init ();