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.

5 files changed, 56 insertions, 66 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 1a7dd3d65..aef41faca 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,15 +1,5 @@
 SUBDIRS = widgets egg
 
-INCLUDES = \
-	-I$(top_builddir)/lib \
-        $(EPIPHANY_DEPENDENCY_CFLAGS)	\
-	-DSHARE_DIR=\"$(pkgdatadir)\"
-
-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 = libephymisc.la
 
 headerdir = $(prefix)/include/epiphany-@EPIPHANY_MAJOR@/epiphany
@@ -68,6 +58,15 @@ libephymisc_la_SOURCES = \
 	$(INST_H_FILES)				\
 	$(NOINST_H_FILES)
 
+libephymisc_la_CPPFLAGS = \
+	-I$(top_builddir)/lib			\
+	-DSHARE_DIR=\"$(pkgdatadir)\" 		\
+	$(AM_CPPFLAGS)
+
+libephymisc_la_CFLAGS = \
+        $(EPIPHANY_DEPENDENCY_CFLAGS)	\
+	$(AM_CFLAGS)
+
 BUILT_SOURCES=ephy-marshal.c ephy-marshal.h
 
 CLEAN_FILES = $(BUILT_SOURCES)
diff --git a/lib/eel-gconf-extensions.c b/lib/eel-gconf-extensions.c
index c3c489702..7f616084d 100644
--- a/lib/eel-gconf-extensions.c
+++ b/lib/eel-gconf-extensions.c
@@ -29,6 +29,7 @@
 #include "eel-gconf-extensions.h"
 
 #include <glib/gi18n.h>
+
 #include <gconf/gconf-client.h>
 #include <gconf/gconf.h>
 #include <string.h>
@@ -50,18 +51,6 @@ global_client_free (void)
 GConfClient *
 eel_gconf_client_get_global (void)
 {
-	/* Initialize gconf if needed */
-	if (!gconf_is_initialized ()) {
-		char *argv[] = { "eel-preferences", NULL };
-		GError *error = NULL;
-		
-		if (!gconf_init (1, argv, &error)) {
-			if (eel_gconf_handle_error (&error)) {
-				return NULL;
-			}
-		}
-	}
-	
 	if (global_gconf_client == NULL) {
 		global_gconf_client = gconf_client_get_default ();
 		g_atexit (global_client_free);
diff --git a/lib/egg/Makefile.am b/lib/egg/Makefile.am
index 4920ffbba..dc2f0c6e3 100644
--- a/lib/egg/Makefile.am
+++ b/lib/egg/Makefile.am
@@ -1,39 +1,40 @@
-INCLUDES = \
-  -I$(top_builddir)/lib/egg \
-  $(EPIPHANY_DEPENDENCY_CFLAGS) \
-  -DCURSOR_DIR=\"$(pkgdatadir)/art\" \
-  -DGTK_DISABLE_DEPRECATED \
-  -DGDK_DISABLE_DEPRECATED \
-  -DG_DISABLE_DEPRECATED
+EGGSOURCES = \
+	eggtreemultidnd.c \
+	egg-editable-toolbar.c \
+	egg-toolbars-model.c \
+	egg-toolbar-editor.c \
+	eggstatusicon.c \
+	eggtrayicon.c \
+	eggtraymanager.c
 
-noinst_LTLIBRARIES = libegg.la
+EGGHEADERS = \
+	eggtreemultidnd.h \
+	egg-editable-toolbar.h \
+	egg-toolbars-model.h \
+	egg-toolbar-editor.h \
+	eggstatusicon.h \
+	eggtrayicon.h \
+	eggtraymanager.h
 
-EGGSOURCES = \
-  eggtreemultidnd.c \
-  egg-editable-toolbar.c \
-  egg-toolbars-model.c \
-  egg-toolbar-editor.c \
-  eggstatusicon.c \
-  eggtrayicon.c \
-  eggtraymanager.c
+noinst_HEADERS = \
+	$(EGGHEADERS) \
+	eggmarshalers.h \
+	eggintl.h
+
+noinst_LTLIBRARIES = libegg.la
 
 libegg_la_SOURCES = \
-  $(EGGSOURCES) \
-  eggmarshalers.c
+	$(EGGSOURCES) \
+	eggmarshalers.c
 
-EGGHEADERS = \
-  eggtreemultidnd.h \
-  egg-editable-toolbar.h \
-  egg-toolbars-model.h \
-  egg-toolbar-editor.h \
-  eggstatusicon.h \
-  eggtrayicon.h \
-  eggtraymanager.h
+libegg_la_CPPFLAGS = \
+	-I$(top_builddir)/lib/egg		\
+	-DCURSOR_DIR=\"$(pkgdatadir)/art\"	\
+	$(AM_CPPFLAGS)
 
-noinst_HEADERS = \
-  $(EGGHEADERS) \
-  eggmarshalers.h \
-  eggintl.h
+libegg_la_CFLAGS = \
+	$(EPIPHANY_DEPENDENCY_CFLAGS)		\
+	$(AM_CFLAGS)
 
 BUILT_SOURCES = eggmarshalers.h eggmarshalers.c
 
@@ -41,7 +42,7 @@ eggmarshalers.h: eggmarshalers.list
 	$(GLIB_GENMARSHAL) --prefix=_egg_marshal $(srcdir)/eggmarshalers.list --header > eggmarshalers.h
 
 eggmarshalers.c: eggmarshalers.list
-	$(GLIB_GENMARSHAL) --prefix=_egg_marshal $(srcdir)/eggmarshalers.list --body > eggmarshalers.c
+	$(GLIB_GENMARSHAL) --prefix=_egg_marshal $(srcdir)/eggmarshalers.list --header --body > eggmarshalers.c
 
 EXTRA_DIST=			\
 	eggmarshalers.list
@@ -52,3 +53,5 @@ EGGDIR=$(srcdir)/../../../libegg/libegg
 regenerate-built-sources:
 	EGGFILES="$(EGGFILES) eggmarshalers.list" EGGDIR="$(EGGDIR)" $(srcdir)/update-from-egg.sh
 
+CLEANFILES = $(BUILT_SOURCES)
+DISTCLEAN_FILES = $(BUILT_SOURCES)
diff --git a/lib/egg/eggintl.h b/lib/egg/eggintl.h
index 41d2b3d43..2b144c670 100644
--- a/lib/egg/eggintl.h
+++ b/lib/egg/eggintl.h
@@ -5,6 +5,6 @@
 #include <config.h>
 #endif
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #endif /* __EGG_INTL_H__ */
diff --git a/lib/widgets/Makefile.am b/lib/widgets/Makefile.am
index 020d3e0b9..92c20183d 100644
--- a/lib/widgets/Makefile.am
+++ b/lib/widgets/Makefile.am
@@ -1,15 +1,3 @@
-INCLUDES = \
-	-I$(top_builddir)/lib		\
-	-I$(top_srcdir)/lib		\
-	-I$(top_srcdir)/lib/egg		\
-	$(EPIPHANY_DEPENDENCY_CFLAGS)	\
-	-DSHARE_DIR=\"$(pkgdatadir)\"
-
-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 = libephywidgets.la
 
 libephywidgets_la_SOURCES = \
@@ -29,3 +17,14 @@ libephywidgets_la_SOURCES = \
 	ephy-zoom-action.c			\
 	ephy-zoom-control.c			\
 	ephy-zoom-control.h
+
+libephywidgets_la_CPPFLAGS = \
+	-I$(top_builddir)/lib		\
+	-I$(top_srcdir)/lib		\
+	-I$(top_srcdir)/lib/egg		\
+	-DSHARE_DIR=\"$(pkgdatadir)\"	\
+	$(AM_CPPFLAGS)
+
+libephywidgets_la_CFLAGS = \
+	$(EPIPHANY_DEPENDENCY_CFLAGS)	\
+	$(AM_CFLAGS)