Final cleanup for the CFLAGS and LIBS in the Makefiles.

svn path=/trunk/; revision=15486

36 files changed, 326 insertions, 346 deletions

diff --git a/ChangeLog b/ChangeLog
index 10f3d8b135..76ec722f0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
-2002-01-25  Ettore Perazzoli  <ettore@ximian.com>
+2002-01-27  Ettore Perazzoli  <ettore@ximian.com>
+
+	* tools/Makefile.am: Use GNOME_FULL_LIBS and GNOME_FULL_CFLAGS.
+
+	* configure.in: Define the CAMEL_{CFLAGS,LIBS} using
+	EVO_SET_COMPILE_FLAGS.  Likewise define E_UTIL_{CFLAGS,LIBS},
+	E_NAME_{CFLAGS,LIBS}, SHELL_{CFLAGS,LIBS},
+	IMPORTERS_{CFLAGS,LIBS}, WOMBAT_{CFLAGS,LIBS} and
+	E_WIDGETS_{CFLAGS,LIBS}, LIBFILTER_{CFLAGS,LIBS}.  Remove
+	GAL_{LIBS,CFLAGS}.  Add GNOME_FULL_{CFLAGS,LIBS}.  Also, move all
+	this stuff after OpenSSL check so they benefit from all the
+	cflags/ldflags discoveries for the support libraries.
 
+2002-01-25  Ettore Perazzoli  <ettore@ximian.com>
+ 
 	* configure.in: Require gal 0.19.99.1.
 
 2002-01-24  Ettore Perazzoli  <ettore@ximian.com>
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index e1bcea47fc..992a69f6f0 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,11 @@
+2002-01-27  Ettore Perazzoli  <ettore@ximian.com>
+
+	* gui/contact-editor/Makefile.am: Use EVOLUTION_ADDRESSBOOK_CFLAGS.
+	* gui/contact-list-editor/Makefile.am: Likewise.
+	* gui/merging/Makefile.am: Likewise.
+	* gui/search/Makefile.am: Likewise.
+	* gui/component/select-names/Makefile.am: Likewise.
+
 2002-01-25  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* backend/ebook/e-destination.c (e_destination_is_valid): Don't
diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am
index 6c3ed1674e..0f6789dd11 100644
--- a/addressbook/gui/component/select-names/Makefile.am
+++ b/addressbook/gui/component/select-names/Makefile.am
@@ -25,8 +25,6 @@ oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
 
 INCLUDES =						\
 	-DG_LOG_DOMAIN=\"evolution-addressbook\"	\
-	$(EXTRA_GNOME_CFLAGS)				\
-	$(GNOME_INCLUDEDIR)				\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
 	-I$(top_srcdir)/shell				\
@@ -38,11 +36,11 @@ INCLUDES =						\
 	-I$(top_srcdir)/addressbook/contact-editor	\
 	-I$(top_srcdir)/addressbook/backend		\
 	-I$(top_builddir)/addressbook/backend		\
-	$(BONOBO_HTML_GNOME_CFLAGS)			\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
 	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
-	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"
+	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"	\
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
 lib_LTLIBRARIES = libeselectnames.la
 
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index 19598eeb7b..c6dd88415d 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -1,6 +1,4 @@
 INCLUDES =					\
-	$(BONOBO_GNOME_CFLAGS)			\
-	$(EXTRA_GNOME_CFLAGS)			\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/addressbook/		\
 	-I$(top_srcdir)/addressbook/backend	\
@@ -11,7 +9,8 @@ INCLUDES =					\
 	-DDATADIR=\""$(datadir)"\"		\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"	\
 	-DEVOLUTIONDIR=\""$(evolutiondir)"\"	\
-	-DG_LOG_DOMAIN=\"contact-editor\"
+	-DG_LOG_DOMAIN=\"contact-editor\"	\
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
 noinst_LIBRARIES =				\
 	libecontacteditor.a
@@ -28,26 +27,6 @@ libecontacteditor_a_SOURCES = 			\
 	e-contact-quick-add.c			\
 	e-contact-quick-add.h
 
-# noinst_PROGRAMS =		\
-# 	contact-editor-test
-
-# contact_editor_test_SOURCES = 	\
-# 	test-editor.c
-
-# contact_editor_test_LDADD =					\
-# 	libecontacteditor.a					\
-# 	$(top_builddir)/e-util/libeutil.la			\
-# 	$(top_builddir)/addressbook/printing/libecontactprint.a	\
-# 	$(top_builddir)/addressbook/backend/ebook/libebook.la   \
-# 	$(top_builddir)/e-util/ename/libename.la		\
-# 	$(top_builddir)/libversit/libversit.la			\
-# 	$(GNOMEGNORBA_LIBS)					\
-# 	$(BONOBO_GNOME_LIBS)				\
-# 	$(top_builddir)/widgets/misc/libemiscwidgets.a \
-# 	$(top_builddir)/e-util/libeutil.la			\
-# 	$(GNOME_PRINT_LIBS)					\
-#	$(EXTRA_GNOME_LIBS)
-
 evolutiondir = $(datadir)/evolution
 
 evolution_DATA = arrow.png
diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am
index 1164f2c594..f710729826 100644
--- a/addressbook/gui/contact-list-editor/Makefile.am
+++ b/addressbook/gui/contact-list-editor/Makefile.am
@@ -1,6 +1,4 @@
 INCLUDES =					\
-	$(BONOBO_GNOME_CFLAGS)			\
-	$(EXTRA_GNOME_CFLAGS)			\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/addressbook/		\
 	-I$(top_srcdir)/addressbook/backend	\
@@ -11,7 +9,8 @@ INCLUDES =					\
 	-DDATADIR=\""$(datadir)"\"		\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"	\
 	-DEVOLUTIONDIR=\""$(evolutiondir)"\"	\
-	-DG_LOG_DOMAIN=\"contact-list-editor\"
+	-DG_LOG_DOMAIN=\"contact-list-editor\"	\
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
 noinst_LIBRARIES =				\
 	libecontactlisteditor.a
diff --git a/addressbook/gui/merging/Makefile.am b/addressbook/gui/merging/Makefile.am
index 5a00726f26..7df0ac4fcc 100644
--- a/addressbook/gui/merging/Makefile.am
+++ b/addressbook/gui/merging/Makefile.am
@@ -4,8 +4,7 @@ INCLUDES =						\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/addressbook/backend/ebook	\
-	$(BONOBO_GNOME_CFLAGS)				\
-	$(EXTRA_GNOME_CFLAGS)
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
 noinst_LIBRARIES =				\
 	libecardmerging.a
diff --git a/addressbook/gui/search/Makefile.am b/addressbook/gui/search/Makefile.am
index d5f3602bbb..db4117c785 100644
--- a/addressbook/gui/search/Makefile.am
+++ b/addressbook/gui/search/Makefile.am
@@ -13,8 +13,7 @@ INCLUDES =						\
 	-I$(top_srcdir)/widgets/misc			\
 	-I$(top_builddir)/shell				\
 	-DSEARCH_RULE_DIR=\"$(ruledir)\"		\
-	$(BONOBO_GNOME_CFLAGS)				\
-	$(EXTRA_GNOME_CFLAGS)
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
 noinst_LIBRARIES =				\
 	libeaddressbooksearch.a
diff --git a/camel/Makefile.am b/camel/Makefile.am
index 58ce2c0c7f..751f293709 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -9,18 +9,13 @@ sbin_PROGRAMS =	camel-lock-helper
 lib_LTLIBRARIES = libcamel.la
 noinst_LTLIBRARIES = libcamel-static.la
 
-INCLUDES = -I.. -I$(srcdir)/.. 			 \
-	-I$(top_srcdir)/intl			 \
-	-I$(top_srcdir)/e-util			 \
-	$(CAMEL_CFLAGS)				 \
-	$(GNOME_INCLUDEDIR)			 \
-	$(KRB4_CFLAGS)				 \
-	$(NSPR_CFLAGS)				 \
-	$(NSS_CFLAGS)				 \
-	$(OPENSSL_CFLAGS)			 \
-	-DCAMEL_SBINDIR=\""$(sbindir)"\"	 \
-	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \
-	-DG_LOG_DOMAIN=\"camel\"
+INCLUDES = -I.. -I$(srcdir)/.. 			 	\
+	-I$(top_srcdir)/intl			 	\
+	-I$(top_srcdir)/e-util			 	\
+	-DCAMEL_SBINDIR=\""$(sbindir)"\"	 	\
+	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" 	\
+	-DG_LOG_DOMAIN=\"camel\"			\
+	$(CAMEL_CFLAGS)
 
 libcamel_la_SOURCES = 				\
 	broken-date-parser.c			\
@@ -198,12 +193,9 @@ libcamelinclude_HEADERS =			\
 
 libcamel_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
 
-libcamel_la_LIBADD = $(top_builddir)/e-util/libeutil.la \
-	$(CAMEL_LIBS)				\
-	$(KRB4_LDFLAGS)				\
-	$(NSPR_LDFLAGS)				\
-	$(NSS_LDFLAGS)				\
-	$(OPENSSL_LDFLAGS)
+libcamel_la_LIBADD =				\
+	$(top_builddir)/e-util/libeutil.la 	\
+	$(CAMEL_LIBS)
 
 libcamel_static_la_SOURCES = $(libcamel_la_SOURCES)
 libcamel_static_la_LIBADD  = $(libcamel_la_LIBADD)
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 3472df06aa..ce392901ab 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-27  Ettore Perazzoli  <ettore@ximian.com>
+
+	* Makefile.am: Use GNOME_FULL_CFLAGS.
+
 2002-01-10  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* e-msg-composer.c (get_file_content): Rewrote to use CamelStreams
diff --git a/composer/Makefile.am b/composer/Makefile.am
index 9d0fe90ffc..2ee4ec5510 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -53,16 +53,10 @@ INCLUDES =								\
 	-I$(top_builddir)/addressbook/gui/component/select-names	\
 	-I$(top_builddir)/shell						\
 	-I$(top_srcdir)/shell						\
-	$(EXTRA_GNOME_CFLAGS)						\
-	$(GNOME_INCLUDEDIR)						\
-	$(BONOBO_GNOME_CFLAGS)						\
-	$(BONOBO_CONF_CFLAGS)						\
-	$(GTKHTML_CFLAGS)						\
-	$(BONOBO_CONF_CFLAGS)						\
-	$(GNOME_VFS_CFLAGS)						\
 	-DEVOLUTION_DATADIR=\"$(datadir)\"				\
 	-DE_GLADEDIR=\"$(gladedir)\"					\
-	-DG_LOG_DOMAIN=\"composer\"
+	-DG_LOG_DOMAIN=\"composer\"					\
+	$(GNOME_FULL_CFLAGS)
 
 libcomposer_a_SOURCES = 			\
 	$(IDL_GENERATED)			\
diff --git a/configure.in b/configure.in
index b2326603e8..010d5d77ba 100644
--- a/configure.in
+++ b/configure.in
@@ -583,122 +583,6 @@ EVO_CHECK_LIB(GAL, gal, 0.19.99.1)
 EVO_CHECK_LIB(GtkHTML, gtkhtml, 1.0)
 EVO_CHECK_LIB(Libsoup, soup, 0.6)
 
-dnl *************************
-dnl CFLAGS and LIBS and stuff
-dnl *************************
-GLIB_CFLAGS="`$GLIB_CONFIG --cflags`"
-GLIB_LIBS="`$GLIB_CONFIG --libs`"
-AC_SUBST(GLIB_CFLAGS)
-AC_SUBST(GLIB_LIBS)
-
-GAL_CFLAGS="`gnome-config --cflags gal`"
-GAL_LIBS="`gnome-config --libs gal`"
-AC_SUBST(GAL_CFLAGS)
-AC_SUBST(GAL_LIBS)
-
-BONOBO_CONF_CFLAGS="`gnome-config --cflags bonobo_conf`"
-BONOBO_CONF_LIBS="`gnome-config --libs bonobo_conf`"
-AC_SUBST(BONOBO_CONF_CFLAGS)
-AC_SUBST(BONOBO_CONF_LIBS)
-
-EXTRA_GNOME_LIBS="`gnome-config --libs libglade gdk_pixbuf libart gnomecanvaspixbuf gnomeui gal` $THREADS_LIBS"
-EXTRA_GNOME_CFLAGS="`gnome-config --cflags libglade gdk_pixbuf libart gnomecanvaspixbuf gnomeui gal` $THREADS_CFLAGS"
-
-AC_SUBST(EXTRA_GNOME_LIBS)
-AC_SUBST(EXTRA_GNOME_CFLAGS)
-
-BONOBO_GNOME_LIBS="`gnome-config --libs oaf bonobox_print libglade gdk_pixbuf gnomecanvaspixbuf gnomeui` $OAF_LIBS"
-BONOBO_GNOME_CFLAGS="`gnome-config --cflags oaf bonobox_print libglade gdk_pixbuf gnomecanvaspixbuf gnomeui` $OAF_CFLAGS"
-AC_SUBST(BONOBO_GNOME_LIBS)
-AC_SUBST(BONOBO_GNOME_CFLAGS)
-
-BONOBO_HTML_GNOME_LIBS="`gnome-config --libs oaf bonobox_print libglade gdk_pixbuf gtkhtml gnomecanvaspixbuf gnomeui ` $THREAD_LIBS"
-BONOBO_HTML_GNOME_CFLAGS="`gnome-config --cflags oaf bonobox_print libglade gdk_pixbuf gtkhtml gnomecanvaspixbuf gnomeui ` $THREAD_CFLAGS"
-AC_SUBST(BONOBO_HTML_GNOME_LIBS)
-AC_SUBST(BONOBO_HTML_GNOME_CFLAGS)
-
-GNOME_PRINT_LIBS=`gnome-config --libs print`
-GNOME_PRINT_CFLAGS=`gnome-config --cflags print`
-AC_SUBST(GNOME_PRINT_LIBS)
-AC_SUBST(GNOME_PRINT_CFLAGS)
-
-BONOBO_CONF_CFLAGS="`gnome-config --cflags bonobo_conf`"
-BONOBO_CONF_LIBS="`gnome-config --libs bonobo_conf`"
-AC_SUBST(BONOBO_CONF_CFLAGS)
-AC_SUBST(BONOBO_CONF_LIBS)
-
-GTKHTML_CFLAGS="`gnome-config --cflags gtkhtml`"
-GTKHTML_LIBS="`gnome-config --libs gtkhtml`"
-GTKHTML_DATADIR=`gnome-config --moddatadir gtkhtml`
-AC_SUBST(GTKHTML_CFLAGS)
-AC_SUBST(GTKHTML_LIBS)
-AC_SUBST(GTKHTML_DATADIR)
-
-GNOME_VFS_LIBS="`gnome-config --libs vfs`"
-GNOME_VFS_CFLAGS="`gnome-config --cflags vfs`"
-AC_SUBST(GNOME_VFS_LIBS)
-AC_SUBST(GNOME_VFS_CFLAGS)
-
-BONOBO_VFS_GNOME_LIBS="`gnome-config --libs oaf bonobox libglade gdk_pixbuf gnomecanvaspixbuf vfs gnomeui `"
-BONOBO_VFS_GNOME_CFLAGS="`gnome-config --cflags oaf bonobox libglade gdk_pixbuf gnomecanvaspixbuf vfs gnomeui `"
-AC_SUBST(BONOBO_VFS_GNOME_LIBS)
-AC_SUBST(BONOBO_VFS_GNOME_CFLAGS)
-
-CAMEL_CFLAGS="`gnome-config --cflags gal xml` $THREADS_CFLAGS"
-CAMEL_LIBS="`gnome-config --libs gal xml` $THREADS_LIBS"
-AC_SUBST(CAMEL_CFLAGS)
-AC_SUBST(CAMEL_LIBS)
-
-AC_DEFUN(EVO_SET_COMPILE_FLAGS, [
-	deps="$2"
-	extra_cflags="$3"
-	extra_libs="$4"
-	$1_CFLAGS="`gnome-config --cflags $deps` $extra_cflags"
-	$1_LIBS="`gnome-config --libs $deps` $extra_libs"
-])
-
-dnl --- evolution-addressbook flags
-
-EVOLUTION_ADDRESSBOOK_DEPS="bonobo_conf bonobox_print gdk_pixbuf gnomecanvaspixbuf gnomeui gtkhtml libglade oaf vfs"
-
-EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS)
-AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
-AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS)
-
-EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK_CONDUIT, gpilot $EVOLUTION_ADDRESSBOOK_DEPS)
-AC_SUBST(EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS)
-AC_SUBST(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS)
-
-dnl -- evolution-executive-summary flags
-
-EVO_SET_COMPILE_FLAGS(EVOLUTION_EXECUTIVE_SUMMARY,
-                      bonobo_conf bonobox bonobox_print gal gdk_pixbuf gnomecanvaspixbuf gnomeui gtkhtml libglade oaf soup vfs)
-AC_SUBST(EVOLUTION_EXECUTIVE_SUMMARY_CFLAGS)
-AC_SUBST(EVOLUTION_EXECUTIVE_SUMMARY_LIBS)
-
-dnl --- evolution-calendar flags
-
-EVOLUTION_CALENDAR_DEPS="bonobo_conf bonobox bonobox_print gal gdk_pixbuf gnomecanvaspixbuf gnomeui gtkhtml libglade oaf vfs"
-
-EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, $EVOLUTION_CALENDAR_DEPS)
-AC_SUBST(EVOLUTION_CALENDAR_CFLAGS)
-AC_SUBST(EVOLUTION_CALENDAR_LIBS)
-
-EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR_CONDUIT, gpilot $EVOLUTION_CALENDAR_DEPS)
-AC_SUBST(EVOLUTION_CALENDAR_CONDUIT_CFLAGS)
-AC_SUBST(EVOLUTION_CALENDAR_CONDUIT_LIBS)
-
-dnl --- evolution-mail flags
-
-camel_providerdir='$(libdir)/evolution/camel-providers/'$EVOLUTION_MAJOR_VERSION.$EVOLUTION_MINOR_VERSION
-AC_SUBST(camel_providerdir)
-
-EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL,
-		      bonobo_conf bonobox_print gal gdk_pixbuf gnomecanvaspixbuf gnomeui gtkhtml libglade oaf vfs,
-                      $THREADS_CFLAGS, $THREADS_LIBS)
-AC_SUBST(EVOLUTION_MAIL_CFLAGS)
-AC_SUBST(EVOLUTION_MAIL_LIBS)
-
 dnl ******************************
 dnl Pilot checking
 dnl ******************************
@@ -1043,6 +927,116 @@ fi
 AC_SUBST(OPENSSL_CFLAGS)
 AC_SUBST(OPENSSL_LDFLAGS)
 
+dnl *************************
+dnl CFLAGS and LIBS and stuff
+dnl *************************
+
+AC_DEFUN(EVO_SET_COMPILE_FLAGS, [
+	deps="$2"
+	extra_cflags="$3"
+	extra_libs="$4"
+	$1_CFLAGS="`gnome-config --cflags $deps` $extra_cflags"
+	$1_LIBS="`gnome-config --libs $deps` $extra_libs"
+])
+
+dnl --- Flags to get all the GNOME stuff
+
+FULL_GNOME_DEPS="bonobo_conf bonobox_print gal gdk_pixbuf gnomecanvaspixbuf gnomeui gtkhtml libglade oaf vfs"
+
+EVO_SET_COMPILE_FLAGS(GNOME_FULL, $FULL_GNOME_DEPS)
+AC_SUBST(GNOME_FULL_CFLAGS)
+AC_SUBST(GNOME_FULL_LIBS)
+
+dnl -- Find the directory where the GtkHTML editing component has its
+dnl    IDL files
+
+GTKHTML_DATADIR=`gnome-config --moddatadir gtkhtml`
+AC_SUBST(GTKHTML_DATADIR)
+
+dnl --- Flags for the various libraries we build
+
+EVO_SET_COMPILE_FLAGS(CAMEL, gal xml,
+		      $THREADS_CFLAGS $KRB4_CFLAGS $NSPR_CFLAGS $NSS_CFLAGS $OPENSSL_CFLAGS,
+	              $THREADS_LIBS $KRB4_LDFLAGS $NSPR_LDFLAGS $NSS_LDFLAGS $OPENSSL_LDFLAGS)
+AC_SUBST(CAMEL_CFLAGS)
+AC_SUBST(CAMEL_LIBS)
+
+EVO_SET_COMPILE_FLAGS(E_NAME, bonobox gal oaf)
+AC_SUBST(E_NAME_CFLAGS)
+AC_SUBST(E_NAME_LIBS)
+
+EVO_SET_COMPILE_FLAGS(E_UTIL, bonobox gal oaf)
+AC_SUBST(E_UTIL_CFLAGS)
+AC_SUBST(E_UTIL_LIBS)
+
+EVO_SET_COMPILE_FLAGS(E_WIDGETS, bonobo_conf bonobox_print gdk_pixbuf gnomecanvaspixbuf gnomeui libglade oaf vfs)
+AC_SUBST(E_WIDGETS_CFLAGS)
+AC_SUBST(E_WIDGETS_LIBS)
+
+EVO_SET_COMPILE_FLAGS(IMPORTERS, bonobo_conf bonobox_print gdk_pixbuf gnomecanvaspixbuf gnomeui libglade oaf vfs)
+AC_SUBST(IMPORTERS_CFLAGS)
+AC_SUBST(IMPORTERS_LIBS)
+
+EVO_SET_COMPILE_FLAGS(LIBIBEX, bonobo_conf bonobox_print gal gdk_pixbuf gnomecanvaspixbuf gnomeui libglade oaf vfs)
+AC_SUBST(LIBIBEX_CFLAGS)
+AC_SUBST(LIBIBEX_LIBS)
+
+EVO_SET_COMPILE_FLAGS(LIBFILTER, gal gdk_pixbuf gnomecanvaspixbuf gnomeui libglade)
+AC_SUBST(LIBFILTER_CFLAGS)
+AC_SUBST(LIBFILTER_LIBS)
+
+dnl --- evolution (shell) flags
+
+EVO_SET_COMPILE_FLAGS(SHELL, bonobo_conf bonobox_print gal gdk_pixbuf gnomecanvaspixbuf gnomeui gtkhtml libglade oaf vfs)
+AC_SUBST(SHELL_CFLAGS)
+AC_SUBST(SHELL_LIBS)
+
+dnl --- evolution-addressbook flags
+
+EVOLUTION_ADDRESSBOOK_DEPS="bonobo_conf bonobox_print gdk_pixbuf gnomecanvaspixbuf gnomeui gtkhtml libglade oaf vfs"
+
+EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS)
+AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
+AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS)
+
+EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK_CONDUIT, gpilot $EVOLUTION_ADDRESSBOOK_DEPS)
+AC_SUBST(EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS)
+AC_SUBST(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS)
+
+dnl -- evolution-executive-summary flags
+
+EVO_SET_COMPILE_FLAGS(EVOLUTION_EXECUTIVE_SUMMARY,
+                      bonobo_conf bonobox bonobox_print gal gdk_pixbuf gnomecanvaspixbuf gnomeui gtkhtml libglade oaf soup vfs)
+AC_SUBST(EVOLUTION_EXECUTIVE_SUMMARY_CFLAGS)
+AC_SUBST(EVOLUTION_EXECUTIVE_SUMMARY_LIBS)
+
+dnl --- evolution-calendar flags
+
+EVOLUTION_CALENDAR_DEPS="bonobo_conf bonobox bonobox_print gal gdk_pixbuf gnomecanvaspixbuf gnomeui gtkhtml libglade oaf vfs"
+
+EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, $EVOLUTION_CALENDAR_DEPS)
+AC_SUBST(EVOLUTION_CALENDAR_CFLAGS)
+AC_SUBST(EVOLUTION_CALENDAR_LIBS)
+
+EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR_CONDUIT, gpilot $EVOLUTION_CALENDAR_DEPS)
+AC_SUBST(EVOLUTION_CALENDAR_CONDUIT_CFLAGS)
+AC_SUBST(EVOLUTION_CALENDAR_CONDUIT_LIBS)
+
+dnl --- evolution-mail flags
+
+camel_providerdir='$(libdir)/evolution/camel-providers/'$EVOLUTION_MAJOR_VERSION.$EVOLUTION_MINOR_VERSION
+AC_SUBST(camel_providerdir)
+
+EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, $FULL_GNOME_DEPS, $THREADS_CFLAGS, $THREADS_LIBS)
+AC_SUBST(EVOLUTION_MAIL_CFLAGS)
+AC_SUBST(EVOLUTION_MAIL_LIBS)
+
+dnl -- wombat flags
+
+EVO_SET_COMPILE_FLAGS(WOMBAT, $FULL_GNOME_DEPS, $LDAP_CFLAGS, $LDAP_LIBS)
+AC_SUBST(WOMBAT_CFLAGS)
+AC_SUBST(WOMBAT_LIBS)
+
 ##################################################
 # Check for gtk-doc.
 ##################################################
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 175d81e314..2987654442 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-27  Ettore Perazzoli  <ettore@ximian.com>
+
+	* ename/Makefile.am: Use E_NAME_CFLAGS and E_NAME_LIBS.
+
+	* Makefile.am: Use E_UTIL_CFLAGS and E_UTIL_LIBS.
+
 2002-01-14  JP Rosevear  <jpr@ximian.com>
 
 	* Makefile.am: compile new files
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 805ae03ea9..2eb4436515 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -3,16 +3,13 @@ SUBDIRS = . ename
 imagesdir = $(datadir)/images/evolution
 
 INCLUDES =								\
-	$(DB3_CFLAGS)							\
 	-I$(top_srcdir)							\
-	$(GNOME_INCLUDEDIR)						\
-	$(EXTRA_GNOME_CFLAGS)						\
-	$(BONOBO_GNOME_CFLAGS)						\
-	$(BONOBO_CONF_CFLAGS)						\
-	$(PISOCK_CFLAGS)						\
 	-DEVOLUTION_IMAGES=\""$(imagesdir)"\"				\
 	-DEVOLUTION_CATEGORY_ICONS=\""$(imagesdir)/categories"\"	\
-	-DG_LOG_DOMAIN=\"e-utils\"
+	-DG_LOG_DOMAIN=\"e-utils\"					\
+	$(DB3_CFLAGS)							\
+	$(PISOCK_CFLAGS)						\
+	$(E_UTIL_CFLAGS)
 
 noinst_LTLIBRARIES = libeutil.la libeutil-static.la \
 	libeconduit.la libeconduit-static.la \
@@ -66,7 +63,7 @@ libeutil_la_SOURCES =				\
 	md5-utils.c				\
 	md5-utils.h
 
-libeutil_la_LIBADD = $(GAL_LIBS)
+libeutil_la_LIBADD = $(E_UTIL_LIBS)
 
 libeutil_static_la_SOURCES = $(libeutil_la_SOURCES)
 libeutil_static_la_LIBADD  = $(libeutil_la_LIBADD)
diff --git a/e-util/ename/Makefile.am b/e-util/ename/Makefile.am
index b3abe633df..551399bc9f 100644
--- a/e-util/ename/Makefile.am
+++ b/e-util/ename/Makefile.am
@@ -7,17 +7,11 @@ INCLUDES =						\
 	-I.. 						\
 	-I$(top_builddir)				\
         -I$(includedir)                                 \
-        $(GNOME_INCLUDEDIR)				\
-	$(EXTRA_GNOME_CFLAGS)
-
-gnome_libs =						\
-	$(BONOBO_GNOME_LIBS)				\
-	$(INTLLIBS)					\
-	$(EXTRA_GNOME_LIBS)
+	$(E_NAME_CFLAGS)
 
 ename_libs = 						\
 	libename.la 					\
-	$(gnome_libs)
+	$(E_NAME_LIBS)
 
 lib_LTLIBRARIES = libename.la
 
@@ -38,20 +32,19 @@ libename_static_la_SOURCES = $(libename_la_SOURCES)
 libename_static_la_LDFLAGS = --all-static
 
 
-noinst_PROGRAMS =					\
-	test-ename-western				\
+noinst_PROGRAMS =		\
+	test-ename-western	\
 	test-ename-western-gtk
 
-test_ename_western_SOURCES =				\
+test_ename_western_SOURCES =	\
 	test-ename-western.c
 
-test_ename_western_LDADD = $(ename_libs)		\
-	$(EXTRA_GNOME_LIBS)
+test_ename_western_LDADD =	\
+	$(ename_libs)
 
 test_ename_western_gtk_SOURCES =				\
 	test-ename-western-gtk.c
 
 test_ename_western_gtk_LDADD = 			\
 	$(ename_libs) 				\
-	$(top_builddir)/e-util/libeutil.la	\
-	$(gnome_libs)
+	$(top_builddir)/e-util/libeutil.la
diff --git a/filter/ChangeLog b/filter/ChangeLog
index 7e008b8d71..081b517d6d 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-27  Ettore Perazzoli  <ettore@ximian.com>
+
+	* Makefile.am: Use LIBFILTER_CFLAGS.
+
 2002-01-26  Mikael Hallendal  <micke@codefactory.se>
 
 	* rule-editor.c (add_editor_clicked): check if re->edit != NULL
diff --git a/filter/Makefile.am b/filter/Makefile.am
index 17b150baa9..02499cd8d5 100644
--- a/filter/Makefile.am
+++ b/filter/Makefile.am
@@ -11,12 +11,9 @@ INCLUDES = 					\
 	-I $(top_srcdir)/camel/providers/mbox	\
 	-I $(top_builddir)/shell		\
 	-I $(GNOME_INCLUDEDIR)			\
-	$(GTKHTML_CFLAGS)			\
-	$(BONOBO_GNOME_CFLAGS)			\
-	$(EXTRA_GNOME_CFLAGS)			\
 	-DFILTER_GLADEDIR=\"$(gladedir)\"	\
-	-DG_LOG_DOMAIN=\"filter\"
-##
+	-DG_LOG_DOMAIN=\"filter\"		\
+	$(LIBFILTER_CFLAGS)
 
 noinst_LTLIBRARIES =				\
 	libfilter.la
diff --git a/importers/ChangeLog b/importers/ChangeLog
index e5e6900b40..bdb883850f 100644
--- a/importers/ChangeLog
+++ b/importers/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-27  Ettore Perazzoli  <ettore@ximian.com>
+
+	* Makefile.am: Use IMPORTERS_CFLAGS and IMPORTERS_LIBS. 
+
 2001-11-09  Iain Holmes  <iain@ximian.com>
 
 	* netscape-importer.c (netscape_create_structure): Don't open the 
diff --git a/importers/Makefile.am b/importers/Makefile.am
index 4c22c5e20b..d9061dd9bb 100644
--- a/importers/Makefile.am
+++ b/importers/Makefile.am
@@ -3,16 +3,14 @@ bin_PROGRAMS = evolution-netscape-importer 	\
 	evolution-pine-importer			\
 	evolution-gnomecard-importer
 
-INCLUDES = 				\
+INCLUDES = 						\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
-	-DG_LOG_DOMAIN=\"Evolution-Importer\"	\
-	-I$(top_srcdir)			\
-	-I$(top_builddir)/shell			\
-	-I$(top_srcdir)/shell			\
+	-DG_LOG_DOMAIN=\"Evolution-Importer\"		\
+	-I$(top_srcdir)					\
+	-I$(top_builddir)/shell				\
+	-I$(top_srcdir)/shell				\
 	-I$(top_srcdir)/addressbook/backend/ebook	\
-	$(BONOBO_GNOME_CFLAGS)			\
-	$(BONOBO_CONF_CFLAGS)			\
-	$(EXTRA_GNOME_CFLAGS)
+	$(IMPORTERS_CFLAGS)
 
 IDLS = 			\
 	$(top_srcdir)/mail/Mail.idl
@@ -33,9 +31,7 @@ evolution_netscape_importer_SOURCES =	\
 evolution_netscape_importer_LDADD =				\
 	$(top_builddir)/shell/importer/libevolution-importer.la \
 	$(top_builddir)/e-util/libeutil.la			\
-	$(BONOBO_CONF_LIBS)					\
-	$(BONOBO_GNOME_LIBS)					\
-	$(EXTRA_GNOME_LIBS)
+	$(IMPORTERS_LIBS)
 
 evolution_elm_importer_SOURCES =	\
 	elm-importer.c
@@ -43,9 +39,7 @@ evolution_elm_importer_SOURCES =	\
 evolution_elm_importer_LDADD =					\
 	$(top_builddir)/shell/importer/libevolution-importer.la \
 	$(top_builddir)/e-util/libeutil.la			\
-	$(BONOBO_CONF_LIBS)					\
-	$(BONOBO_GNOME_LIBS)					\
-	$(EXTRA_GNOME_LIBS)
+	$(IMPORTERS_LIBS)
 
 evolution_pine_importer_SOURCES =	\
 	pine-importer.c
@@ -58,9 +52,7 @@ evolution_pine_importer_LDADD =					\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/e-util/ename/libename.la		\
 	$(top_builddir)/libversit/libversit.la			\
-	$(BONOBO_CONF_LIBS)					\
-	$(BONOBO_GNOME_LIBS)					\
-	$(EXTRA_GNOME_LIBS)
+	$(IMPORTERS_LIBS)
 
 evolution_gnomecard_importer_SOURCES =	\
 	evolution-gnomecard-importer.c
@@ -73,9 +65,7 @@ evolution_gnomecard_importer_LDADD =				\
         $(top_builddir)/e-util/libeutil.la      		\
         $(top_builddir)/e-util/ename/libename.la        	\
         $(top_builddir)/libversit/libversit.la  		\
-	$(BONOBO_CONF_LIBS)					\
-        $(BONOBO_GNOME_LIBS)            			\
-        $(EXTRA_GNOME_LIBS)
+	$(IMPORTERS_LIBS)
 
 oafdir = $(datadir)/oaf
 oaf_in_files = GNOME_Evolution_Netscape_Intelligent_Importer.oaf.in	\
diff --git a/libibex/ChangeLog b/libibex/ChangeLog
index 1b4a146585..3c12acd3c3 100644
--- a/libibex/ChangeLog
+++ b/libibex/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-27  Ettore Perazzoli  <ettore@ximian.com>
+
+	* Makefile.am: Use LIBIBEX_{CFLAGS,LIBS}.
+
 2001-11-01    <NotZed@Ximian.com>
 
 	* ibex_block.c (ibex_open): Change to use pthread_mutex directly.
diff --git a/libibex/Makefile.am b/libibex/Makefile.am
index 52dc07fb54..77fb172071 100644
--- a/libibex/Makefile.am
+++ b/libibex/Makefile.am
@@ -12,7 +12,7 @@ libibex_la_SOURCES = \
 libibex_la_LDFLAGS = -static
 
 libibex_la_LIBADD = \
-	$(GAL_LIBS)
+	$(LIBIBEX_LIBS)
 
 noinst_HEADERS = \
 	ibex_internal.h \
@@ -21,14 +21,13 @@ noinst_HEADERS = \
 	index.h
 
 INCLUDES = \
-	$(EXTRA_GNOME_CFLAGS) \
+	$(LIBIBEX_CFLAGS) \
 	-DG_LOG_DOMAIN=\"libibex\"
 
-
 noinst_PROGRAMS = dumpindex testindex
 
 dumpindex_SOURCES = dumpindex.c
-dumpindex_LDADD = libibex.la $(GAL_LIBS) $(THREADS_LIBS)
+dumpindex_LDADD = libibex.la $(LIBIBEX_LIBS)
 
 testindex_SOURCES = testindex.c
-testindex_LDADD = libibex.la $(GAL_LIBS) $(THREADS_LIBS) -lm
+testindex_LDADD = libibex.la $(LIBIBEX_LIBS) -lm
diff --git a/libwombat/ChangeLog b/libwombat/ChangeLog
index 6919fda2a9..0792438860 100644
--- a/libwombat/ChangeLog
+++ b/libwombat/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-27  Ettore Perazzoli  <ettore@ximian.com>
+
+	* Makefile.am: Use WOMBAT_CFLAGS.
+
 2001-06-25  Peter Williams  <peterw@ximian.com>
 
 	* Makefile.am (libwombat_static_la_SOURCES): Create a static
diff --git a/libwombat/Makefile.am b/libwombat/Makefile.am
index 9fa5bd9c70..5d532f9f59 100644
--- a/libwombat/Makefile.am
+++ b/libwombat/Makefile.am
@@ -1,6 +1,4 @@
-INCLUDES =						\
-	$(BONOBO_VFS_GNOME_CFLAGS)			\
-	$(GNOME_INCLUDEDIR)
+INCLUDES = $(WOMBAT_CFLAGS)
 
 # CORBA stuff
 
diff --git a/mail/ChangeLog b/mail/ChangeLog
index bfb7ea2ee5..c164337dba 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-27  Ettore Perazzoli  <ettore@ximian.com>
+
+	* importers/Makefile.am: Use IMPORTERS_CFLAGS. 
+
 2002-01-25  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* mail-account-gui.c (delete_event_cb): We need to return a value
diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am
index aa6049ca45..84307a3727 100644
--- a/mail/importers/Makefile.am
+++ b/mail/importers/Makefile.am
@@ -2,15 +2,14 @@ importersdir = $(pkglibdir)/evolution-mail-importers/$(VERSION)
 
 importers_LTLIBRARIES = liboutlook.la libmbox.la
 
-INCLUDES = -I.. \
-	-I$(srcdir)/..				\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/shell			\
-	-I$(top_builddir)/shell			\
-	-I$(includedir)				\
-	$(EXTRA_GNOME_CFLAGS)			\
-	$(BONOBO_GNOME_CFLAGS)			\
-	-DG_LOG_DOMAIN=\"evolution-mail-importer\"
+INCLUDES = -I.. 					\
+	-I$(srcdir)/..					\
+	-I$(top_srcdir)					\
+	-I$(top_srcdir)/shell				\
+	-I$(top_builddir)/shell				\
+	-I$(includedir)					\
+	-DG_LOG_DOMAIN=\"evolution-mail-importer\"	\
+	$(IMPORTERS_CFLAGS)
 
 liboutlook_la_SOURCES =				\
 	evolution-outlook-importer.c
diff --git a/notes/component-factory.c b/notes/component-factory.c
index 48b81f4071..54c1f91e94 100644
--- a/notes/component-factory.c
+++ b/notes/component-factory.c
@@ -13,7 +13,7 @@
 #define COMPONENT_FACTORY_ID "OAFIID:GNOME_Evolution_Notes_shellComponentFactory"
 
 static const EvolutionShellComponentFolderType folder_types[] = {
-	{ "notes", "evolution-notes.png" },
+	{ "notes", "evolution-notes.png", TRUE, NULL, NULL },
 	{ NULL, NULL }
 };
 
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 87f1931eb6..966a2ff1a3 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-27  Ettore Perazzoli  <ettore@ximian.com>
+
+	* Makefile.am: Use SHELL_CFLAGS and SHELL_LIBS.
+	* importer/Makefile.am: Likewise.
+
 2002-01-24  Ettore Perazzoli  <ettore@ximian.com>
 
 	* Makefile.am: Just use BONOBO_HTML_GNOME_CFLAGS and
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 0658e4a4df..84cf6e59ec 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,17 +1,17 @@
 SUBDIRS = glade importer
 
-INCLUDES = -O								\
-	-I$(top_srcdir)/widgets						\
-	-I$(top_srcdir)/widgets/misc					\
-	-I$(top_srcdir)/libical/src/libical				\
-	-I$(top_srcdir)							\
-	$(BONOBO_HTML_GNOME_CFLAGS)					\
-	-DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"   			\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"            		\
-	-DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\"		\
-	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"			\
-	-DG_LOG_DOMAIN=\"evolution-shell\"
+INCLUDES = -O							\
+	-I$(top_srcdir)/widgets					\
+	-I$(top_srcdir)/widgets/misc				\
+	-I$(top_srcdir)/libical/src/libical			\
+	-I$(top_srcdir)						\
+	-DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\"	\
+	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"   		\
+	-DEVOLUTION_DATADIR=\""$(datadir)"\"            	\
+	-DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\"	\
+	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"		\
+	-DG_LOG_DOMAIN=\"evolution-shell\"			\
+	$(SHELL_CFLAGS)
 
 # CORBA stuff
 
@@ -179,7 +179,7 @@ evolution_LDADD =							\
 	$(top_builddir)/widgets/misc/libemiscwidgets.a			\
 	$(top_builddir)/e-util/libeutil.la				\
 	$(top_builddir)/libical/src/libical/libical-evolution.la	\
-	$(BONOBO_HTML_GNOME_LIBS)
+	$(SHELL_LIBS)
 
 # Test component
 
@@ -191,7 +191,7 @@ evolution_test_component_SOURCES =	\
 
 evolution_test_component_LDADD = 	\
 	libeshell.la			\
-	$(BONOBO_HTML_GNOME_LIBS)
+	$(SHELL_LIBS)
 
 install-test-component: evolution-test-component
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
diff --git a/shell/importer/Makefile.am b/shell/importer/Makefile.am
index c50bc0262b..6e08187e34 100644
--- a/shell/importer/Makefile.am
+++ b/shell/importer/Makefile.am
@@ -1,17 +1,15 @@
-INCLUDES =					\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/shell			\
-	-I$(top_builddir)/shell			\
-	-I$(includedir)				\
-	$(EXTRA_GNOME_CFLAGS)			\
-	$(BONOBO_GNOME_CFLAGS)			\
-	-DG_LOG_DOMAIN=\"Evolution-Importer\" 	\
-	-DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\"
+INCLUDES =							\
+	-I$(top_srcdir)						\
+	-I$(top_srcdir)/shell					\
+	-I$(top_builddir)/shell					\
+	-I$(includedir)						\
+	-DG_LOG_DOMAIN=\"Evolution-Importer\" 			\
+	-DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\" 	\
+	$(SHELL_CFLAGS)
 
 lib_LTLIBRARIES = libevolution-importer.la
 
-IDLS = \
-	GNOME_Evolution_Importer.idl
+IDLS = GNOME_Evolution_Importer.idl
 
 IDL_GENERATED = 	\
 	GNOME_Evolution_Importer.h	\
@@ -29,27 +27,25 @@ idldir = $(datadir)/idl
 idl_DATA = $(IDLS)
 
 libevolution_importerincludedir = $(includedir)/evolution/importer
-libevolution_importer_la_SOURCES = 	\
-	$(IDL_GENERATED)		\
+libevolution_importer_la_SOURCES = 		\
+	$(IDL_GENERATED)			\
 	evolution-intelligent-importer.c	\
-	evolution-importer-client.c	\
-	evolution-importer-listener.c	\
-	evolution-importer.c		\
-	intelligent.c			\
+	evolution-importer-client.c		\
+	evolution-importer-listener.c		\
+	evolution-importer.c			\
+	intelligent.c				\
 	intelligent.h
 
-libevolution_importerinclude_HEADERS = 	\
-	GNOME_Evolution_Importer.h	\
+libevolution_importerinclude_HEADERS = 		\
+	GNOME_Evolution_Importer.h		\
 	evolution-intelligent-importer.h	\
-	evolution-importer-client.h	\
-	evolution-importer-listener.h	\
+	evolution-importer-client.h		\
+	evolution-importer-listener.h		\
 	evolution-importer.h
 
-libevolution_importer_la_LIBADD =	\
-	$(top_builddir)/e-util/libeutil.la	\
-	$(BONOBO_CONF_LIBS)			\
-	$(EXTRA_GNOME_LIBS)		\
-	$(GTKHTML_LIBS)
+libevolution_importer_la_LIBADD =		\
+	$(top_builddir)/e-util/libeutil.la 	\
+	$(SHELL_LIBS)
 
 gladedir = $(datadir)/evolution/glade
 glade_DATA = import.glade
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 347e45f454..143790f87d 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -10,30 +10,26 @@ bin_PROGRAMS =				\
 
 noinst_PROGRAMS = evolution-addressbook-abuse
 
-INCLUDES =							\
-	-DG_LOG_DOMAIN=\"evolution-tools\"			\
-	$(EXTRA_GNOME_CFLAGS)					\
-	$(GNOME_INCLUDEDIR)					\
-	-I$(top_srcdir)						\
-	-I$(top_builddir)					\
-	$(BONOBO_HTML_GNOME_CFLAGS)				\
-	-DEVOLUTION_BINDIR=\""$(bindir)"\"			\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"		\
-	-I$(top_srcdir)/addressbook
+INCLUDES =						\
+	-DG_LOG_DOMAIN=\"evolution-tools\"		\
+	-I$(top_srcdir)					\
+	-I$(top_builddir)				\
+	-DEVOLUTION_BINDIR=\""$(bindir)"\"		\
+	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
+	-I$(top_srcdir)/addressbook			\
+	$(GNOME_FULL_CFLAGS)
 
 EXTRA_DIST = $(bin_SCRIPTS) verify-evolution-install.sh \
 	evolution-addressbook-clean.in
 
-evolution_addressbook_import_LDADD =					\
-	$(EXTRA_GNOME_LIBS)						\
-	$(BONOBO_HTML_GNOME_LIBS)					\
-	$(BONOBO_CONF_LIBS)						\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
-	$(top_builddir)/camel/libcamel.la				\
-	$(top_builddir)/libibex/libibex.la				\
-	$(top_builddir)/e-util/ename/libename.la			\
-	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/e-util/libeutil.la				\
+evolution_addressbook_import_LDADD =				\
+	$(GNOME_FULL_LIBS)					\
+	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
+	$(top_builddir)/camel/libcamel.la			\
+	$(top_builddir)/libibex/libibex.la			\
+	$(top_builddir)/e-util/ename/libename.la		\
+	$(top_builddir)/libversit/libversit.la			\
+	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/widgets/menus/libmenus.la
 
 evolution_addressbook_export_LDADD =					\
diff --git a/widgets/ChangeLog b/widgets/ChangeLog
index 6277c00d5e..b80cf50880 100644
--- a/widgets/ChangeLog
+++ b/widgets/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-27  Ettore Perazzoli  <ettore@ximian.com>
+
+	* menus/Makefile.am: Use `GNOME_FULL_CFLAGS'.
+
 2002-01-11  Damon Chaplin  <damon@ximian.com>
 
 	* e-timezone-dialog/e-timezone-dialog.[hc]: translate timezone names,
diff --git a/widgets/e-timezone-dialog/Makefile.am b/widgets/e-timezone-dialog/Makefile.am
index 86b2548fc3..3c8c46fd07 100644
--- a/widgets/e-timezone-dialog/Makefile.am
+++ b/widgets/e-timezone-dialog/Makefile.am
@@ -1,10 +1,10 @@
-INCLUDES =					\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/libical/src/libical	\
-	$(EXTRA_GNOME_CFLAGS)			\
+INCLUDES =						\
+	-I$(top_srcdir)					\
+	-I$(top_srcdir)/libical/src/libical		\
 	-DMAP_DIR=\""$(datadir)/images/evolution"\"	\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DG_LOG_DOMAIN=__FILE__
+	-DG_LOG_DOMAIN=__FILE__				\
+	$(GNOME_FULL_CFLAGS)
 
 noinst_LIBRARIES =	\
 	libetimezonedialog.a
diff --git a/widgets/menus/Makefile.am b/widgets/menus/Makefile.am
index 7aeb243f52..3a1ca3450b 100644
--- a/widgets/menus/Makefile.am
+++ b/widgets/menus/Makefile.am
@@ -3,9 +3,8 @@ noinst_LTLIBRARIES = libmenus.la
 INCLUDES =					\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/widgets/menus		\
-	$(EXTRA_GNOME_CFLAGS)			\
-	$(BONOBO_GNOME_CFLAGS)			\
-	-DG_LOG_DOMAIN=\"menus\"
+	-DG_LOG_DOMAIN=\"menus\"		\
+	$(GNOME_FULL_CFLAGS)
 
 libmenus_la_SOURCES = 		\
 	gal-view-menus.c	\
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index f59af32bcf..31af3e00c6 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-27  Ettore Perazzoli  <ettore@ximian.com>
+
+	* Makefile.am: Use GNOME_FULL_CFLAGS and GNOME_FULL_LIBS.
+
 2002-01-23  Ettore Perazzoli  <ettore@ximian.com>
 
 	* e-combo-button.c: Remove member `separator' from
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index 90ffb2961f..3c77c98aa4 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -1,14 +1,13 @@
 # FIXME we use the EClippedLabel widget from EShortcutBar.  Probably
 # it should be moved somewhere else.
 
-INCLUDES =					\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/widgets/shortcut-bar	\
-	$(EXTRA_GNOME_CFLAGS)			\
-	$(BONOBO_GNOME_CFLAGS)			\
+INCLUDES =						\
+	-I$(top_srcdir)					\
+	-I$(top_srcdir)/widgets/shortcut-bar		\
 	-DMAP_DIR=\""$(datadir)/images/evolution"\"	\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DG_LOG_DOMAIN=__FILE__
+	-DG_LOG_DOMAIN=__FILE__				\
+	$(GNOME_FULL_CFLAGS)
 
 noinst_LIBRARIES =	\
 	libemiscwidgets.a
@@ -59,17 +58,17 @@ test_calendar_SOURCES = 	\
 test_calendar_LDADD = 						\
 	./libemiscwidgets.a					\
 	../../e-util/libeutil.la				\
-	$(EXTRA_GNOME_LIBS)
+	$(GNOME_FULL_LIBS)
 
 # test-dateedit
 
 test_dateedit_SOURCES = 	\
 	test-dateedit.c
 
-test_dateedit_LDADD = 						\
-	./libemiscwidgets.a					\
-	../../e-util/libeutil.la				\
-	$(EXTRA_GNOME_LIBS)
+test_dateedit_LDADD = 			\
+	./libemiscwidgets.a		\
+	../../e-util/libeutil.la	\
+	$(GNOME_FULL_LIBS)
 
 # test-dropdown-button
 
@@ -78,14 +77,14 @@ test_dropdown_button_SOURCES = 	\
 
 test_dropdown_button_LDADD =	\
 	./libemiscwidgets.a	\
-	$(EXTRA_GNOME_LIBS)
+	$(GNOME_FULL_LIBS)
 
 # test-title-bar
 
 test_title_bar_SOURCES = 	\
 	test-title-bar.c
 
-test_title_bar_LDADD = 						\
-	./libemiscwidgets.a					\
-	$(EXTRA_GNOME_LIBS)
+test_title_bar_LDADD = 		\
+	./libemiscwidgets.a	\
+	$(GNOME_FULL_LIBS)
 
diff --git a/wombat/ChangeLog b/wombat/ChangeLog
index 1b735d4820..9e6069a254 100644
--- a/wombat/ChangeLog
+++ b/wombat/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-27  Ettore Perazzoli  <ettore@ximian.com>
+
+	* Makefile.am: Use WOMBAT_LIBS and WOMBAT_CFLAGS.
+
 2001-10-29  Damon Chaplin  <damon@ximian.com>
 
 	* Makefile.am (wombat_LDADD): use libical-evolution.la
diff --git a/wombat/Makefile.am b/wombat/Makefile.am
index d92dacadb4..68017e81eb 100644
--- a/wombat/Makefile.am
+++ b/wombat/Makefile.am
@@ -9,10 +9,9 @@ INCLUDES =						\
 	-I$(top_builddir)/calendar/pcs			\
 	-I$(top_srcdir)/libical/src/libical		\
 	-I$(top_builddir)/libical/src/libical		\
-	$(GNOME_INCLUDEDIR)				\
-	$(BONOBO_VFS_GNOME_CFLAGS)			\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"            \
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"
+	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
+	$(WOMBAT_CFLAGS)
 
 bin_PROGRAMS =	\
 	wombat
@@ -24,24 +23,20 @@ wombat_SOURCES = 			\
 	wombat-private-moniker.h	\
 	wombat.c
 
-wombat_LDADD =							\
-	$(top_builddir)/addressbook/backend/pas/libpas.a	\
-	$(DB3_LDADD)						\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
-	$(top_builddir)/camel/libcamel.la			\
-	$(top_builddir)/libibex/libibex.la			\
-	$(top_builddir)/e-util/ename/libename.la		\
-	$(top_builddir)/calendar/pcs/libpcs.a			\
-	$(top_builddir)/calendar/cal-util/libcal-util.la	\
+wombat_LDADD =								\
+	$(top_builddir)/addressbook/backend/pas/libpas.a		\
+	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
+	$(top_builddir)/camel/libcamel.la				\
+	$(top_builddir)/libibex/libibex.la				\
+	$(top_builddir)/e-util/ename/libename.la			\
+	$(top_builddir)/calendar/pcs/libpcs.a				\
+	$(top_builddir)/calendar/cal-util/libcal-util.la		\
 	$(top_builddir)/libical/src/libical/libical-evolution.la	\
-	$(top_builddir)/libversit/libversit.la			\
-	$(top_builddir)/e-util/libedb3util.la			\
-	$(top_builddir)/e-util/libeutil.la			\
-	$(top_builddir)/libwombat/libwombat.la			\
-	$(BONOBO_CONF_LIBS)					\
-	$(LDAP_LIBS)						\
-	$(EXTRA_GNOME_LIBS)					\
-	$(BONOBO_VFS_GNOME_LIBS)
+	$(top_builddir)/libversit/libversit.la				\
+	$(top_builddir)/e-util/libedb3util.la				\
+	$(top_builddir)/e-util/libeutil.la				\
+	$(top_builddir)/libwombat/libwombat.la				\
+	$(WOMBAT_LIBS)
 
 oafdir = $(datadir)/oaf