Clean up some of the Makefiles so we dont' link every library multiple

times, causing big libtool 1.4 pain.

svn path=/trunk/; revision=15461

7 files changed, 95 insertions, 129 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 4ae0f80939..d1be6e5907 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,16 @@
+2002-01-24  Ettore Perazzoli  <ettore@ximian.com>
+
+	* conduit/Makefile.am: Use EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS
+	and EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS and remove unused flags
+
+	* gui/component/Makefile.am: Use EVOLUTION_ADDRESSBOOK_CFLAGS and
+	EVOLUTION_ADDRESSBOOK_LIBS and remove unused flags.
+	* backend/pas/Makefile.am: Likewise.
+	* backend/ebook/Makefile.am: Likewise.
+	* printing/Makefile.am: Likewise.
+	* backend/ebook/Makefile.am: Likewise.
+	* gui/widgets/Makefile.am (INCLUDES): Likewise.
+
 2002-01-23  Ettore Perazzoli  <ettore@ximian.com>
 
 	* gui/component/addressbook-component.c (create_component): Pass a
diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am
index ea49ad47f3..f137cd24ab 100644
--- a/addressbook/backend/ebook/Makefile.am
+++ b/addressbook/backend/ebook/Makefile.am
@@ -1,22 +1,22 @@
 noinst_PROGRAMS = test-card test-client test-client-list
 
-bin_PROGRAMS =	evolution-vcard-importer 		\
-		evolution-ldif-importer			\
-		load-pine-addressbook			\
+bin_PROGRAMS =	evolution-vcard-importer 	\
+		evolution-ldif-importer		\
+		load-pine-addressbook		\
 		load-gnomecard-addressbook
 
-CORBA_SOURCE =						\
-	addressbook.h					\
-	addressbook-common.c				\
-	addressbook-stubs.c				\
-	addressbook-skels.c				\
-        Evolution-Composer.h              \
-        Evolution-Composer-common.c       \
-        Evolution-Composer-skels.c        \
+CORBA_SOURCE =				\
+	addressbook.h			\
+	addressbook-common.c		\
+	addressbook-stubs.c		\
+	addressbook-skels.c		\
+        Evolution-Composer.h            \
+        Evolution-Composer-common.c     \
+        Evolution-Composer-skels.c      \
         Evolution-Composer-stubs.c
 
-idls =							\
-	$(srcdir)/../idl/addressbook.idl		\
+idls =								\
+	$(srcdir)/../idl/addressbook.idl			\
 	$(srcdir)/../../../composer/Evolution-Composer.idl
 
 idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl
@@ -25,7 +25,7 @@ $(CORBA_SOURCE): $(idls)
 	$(ORBIT_IDL) -I $(srcdir) $(idls) $(idl_flags)
 
 INCLUDES =						\
-        -DGNOMELOCALEDIR=\""$(localedir)"\"        \
+        -DGNOMELOCALEDIR=\""$(localedir)"\"        	\
 	-DG_LOG_DOMAIN=\"EBook\"			\
 	-I$(top_srcdir) 				\
 	-I$(top_srcdir)/camel				\
@@ -35,8 +35,7 @@ INCLUDES =						\
 	-I$(top_builddir)/addressbook/ename		\
 	-I$(top_builddir)/shell				\
 	-I$(top_srcdir)/shell				\
-        $(BONOBO_GNOME_CFLAGS)				\
-	$(EXTRA_GNOME_CFLAGS)
+        $(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
 lib_LTLIBRARIES = libebook.la
 
@@ -83,9 +82,7 @@ test_client_SOURCES =					\
 
 test_client_LDADD =					\
 	libebook.la					\
-	$(BONOBO_CONF_LIBS)				\
-	$(BONOBO_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)				\
+	$(EVOLUTION_ADDRESSBOOK_LIBS)			\
 	$(top_builddir)/camel/libcamel.la		\
 	$(top_builddir)/libibex/libibex.la		\
 	$(top_builddir)/libversit/libversit.la		\
@@ -97,9 +94,7 @@ test_client_list_SOURCES =				\
 
 test_client_list_LDADD =				\
 	libebook.la					\
-	$(BONOBO_CONF_LIBS)				\
-	$(BONOBO_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)				\
+	$(EVOLUTION_ADDRESSBOOK_LIBS)			\
 	$(top_builddir)/camel/libcamel.la		\
 	$(top_builddir)/libibex/libibex.la		\
 	$(top_builddir)/e-util/ename/libename.la	\
@@ -111,39 +106,35 @@ test_card_SOURCES =					\
 
 test_card_LDADD =					\
 	libebook.la					\
-	$(BONOBO_CONF_LIBS)				\
-	$(BONOBO_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)				\
+	$(EVOLUTION_ADDRESSBOOK_LIBS)			\
 	$(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_vcard_importer_SOURCES =			\
+evolution_vcard_importer_SOURCES = \
 	evolution-vcard-importer.c
+
 evolution_vcard_importer_LDADD =				\
 	libebook.la						\
-	$(BONOBO_CONF_LIBS)					\
-	$(BONOBO_GNOME_LIBS)					\
-	$(EXTRA_GNOME_LIBS)					\
+	$(EVOLUTION_ADDRESSBOOK_LIBS)				\
 	$(top_builddir)/camel/libcamel.la			\
-	$(top_builddir)/libibex/libibex.la		\
+	$(top_builddir)/libibex/libibex.la			\
 	$(top_builddir)/shell/importer/libevolution-importer.la \
 	$(DB3_LDADD)						\
 	$(top_builddir)/e-util/ename/libename.la		\
 	$(top_builddir)/libversit/libversit.la			\
 	$(top_builddir)/e-util/libeutil.la
 
-evolution_ldif_importer_SOURCES =			\
+evolution_ldif_importer_SOURCES = \
 	evolution-ldif-importer.c
-evolution_ldif_importer_LDADD =				\
+
+evolution_ldif_importer_LDADD =					\
 	libebook.la						\
-	$(BONOBO_CONF_LIBS)					\
-	$(BONOBO_GNOME_LIBS)					\
-	$(EXTRA_GNOME_LIBS)					\
+	$(EVOLUTION_ADDRESSBOOK_LIBS)				\
 	$(top_builddir)/camel/libcamel.la			\
-	$(top_builddir)/libibex/libibex.la		\
+	$(top_builddir)/libibex/libibex.la			\
 	$(top_builddir)/shell/importer/libevolution-importer.la \
 	$(DB3_LDADD)						\
 	$(top_builddir)/e-util/ename/libename.la		\
@@ -155,9 +146,7 @@ load_pine_addressbook_SOURCES =				\
 
 load_pine_addressbook_LDADD =				\
 	libebook.la					\
-	$(BONOBO_CONF_LIBS)				\
-	$(BONOBO_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)				\
+	$(EVOLUTION_ADDRESSBOOK_LIBS)			\
 	$(top_builddir)/camel/libcamel.la		\
 	$(top_builddir)/libibex/libibex.la		\
 	$(top_builddir)/e-util/ename/libename.la	\
@@ -170,9 +159,7 @@ load_gnomecard_addressbook_SOURCES =			\
 
 load_gnomecard_addressbook_LDADD =			\
 	libebook.la					\
-	$(BONOBO_CONF_LIBS)				\
-	$(BONOBO_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)				\
+	$(EVOLUTION_ADDRESSBOOK_LIBS)			\
 	$(top_builddir)/camel/libcamel.la		\
 	$(top_builddir)/libibex/libibex.la		\
 	$(top_builddir)/e-util/ename/libename.la	\
@@ -197,7 +184,3 @@ oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
 #	GNOME_Evolution_Addressbook_Pine_Importer.oafinfo
 
 EXTRA_DIST = $(oaf_in_files) $(oaf_DATA)
-
-
-
-
diff --git a/addressbook/backend/pas/Makefile.am b/addressbook/backend/pas/Makefile.am
index ea150597c9..3f9a2627cd 100644
--- a/addressbook/backend/pas/Makefile.am
+++ b/addressbook/backend/pas/Makefile.am
@@ -20,8 +20,7 @@ INCLUDES =						\
 	-I$(top_srcdir) 				\
 	-I$(top_srcdir)/addressbook/backend		\
 	-I$(top_builddir)/addressbook/backend		\
-        $(BONOBO_GNOME_CFLAGS)				\
-	$(EXTRA_GNOME_CFLAGS)
+        $(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
 LDAP_SCHEMA =						\
 	evolutionperson.schema
diff --git a/addressbook/conduit/Makefile.am b/addressbook/conduit/Makefile.am
index 7d07d6bc96..86c52dd5c9 100644
--- a/addressbook/conduit/Makefile.am
+++ b/addressbook/conduit/Makefile.am
@@ -5,8 +5,7 @@ INCLUDES = 					\
 	-I$(top_srcdir)/e-util			\
 	-I$(top_builddir)/e-util		\
 	$(PISOCK_CFLAGS)			\
-	$(GNOME_PILOT_CFLAGS)			\
-	$(BONOBO_GNOME_CFLAGS)			\
+	$(EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS)	\
 	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"
 
 # Address Conduit
@@ -24,12 +23,7 @@ libeaddress_conduit_la_LIBADD = 					\
 	$(top_builddir)/e-util/libeconduit-static.la	 		\
 	$(top_builddir)/camel/libcamel-static.la	 		\
 	$(top_builddir)/libibex/libibex.la				\
-	$(PISOCK_LIBS) 							\
-	$(GNOME_PILOT_LIBS) 						\
-	$(BONOBO_CONF_LIBS)						\
-	$(BONOBO_GNOME_LIBS)						\
-	$(GNOME_LIBDIR) 						\
-	$(GNOME_LIBS)
+	$(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS)
 
 e-address.conduit: e-address.conduit.in Makefile
 	sed -e 's^\@prefix\@^$(prefix)^g' 				\
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index 8d8c7198bc..0916f75f98 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -2,8 +2,6 @@ SUBDIRS	= select-names
 
 INCLUDES =							\
 	-DG_LOG_DOMAIN=\"evolution-addressbook\"		\
-	$(EXTRA_GNOME_CFLAGS)					\
-	$(GNOME_INCLUDEDIR)					\
 	-I$(top_srcdir)						\
 	-I$(top_builddir)					\
 	-I$(top_srcdir)/shell					\
@@ -15,14 +13,13 @@ INCLUDES =							\
 	-I$(top_srcdir)/addressbook/gui/widgets			\
 	-I$(top_srcdir)/addressbook/backend			\
 	-I$(top_builddir)/addressbook/backend			\
-	$(BONOBO_HTML_GNOME_CFLAGS)				\
-	$(GNOME_VFS_CFLAGS)					\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"			\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			\
 	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"			\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"		\
 	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"		\
-	-DEVOLUTION_IMAGESDIR=\""$(datadir)"/images/evolution\"
+	-DEVOLUTION_IMAGESDIR=\""$(datadir)"/images/evolution\" \
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
 
 bin_PROGRAMS =	\
@@ -45,28 +42,25 @@ evolution_addressbook_SOURCES = 	\
 	e-address-popup.h		\
 	e-address-popup.c
 
-evolution_addressbook_LDADD =						\
-	select-names/libeselectnames.la					\
-	$(top_builddir)/shell/libeshell.la				\
-	$(EXTRA_GNOME_LIBS)						\
-	$(BONOBO_HTML_GNOME_LIBS)					\
-	$(GNOME_VFS_LIBS)						\
-	$(BONOBO_CONF_LIBS)						\
-	$(top_builddir)/addressbook/gui/widgets/libeminicard.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			\
+evolution_addressbook_LDADD =								\
+	select-names/libeselectnames.la							\
+	$(top_builddir)/shell/libeshell.la						\
+	$(top_builddir)/addressbook/gui/widgets/libeminicard.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)/addressbook/gui/contact-list-editor/libecontactlisteditor.a	\
-	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.a	\
-	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/widgets/misc/libemiscwidgets.a 			\
-	$(top_builddir)/addressbook/printing/libecontactprint.a		\
-	$(top_builddir)/addressbook/gui/search/libeaddressbooksearch.a	\
-	$(top_builddir)/addressbook/gui/merging/libecardmerging.a	\
-	$(top_builddir)/filter/libfilter.la				\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/widgets/menus/libmenus.la
+	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.a		\
+	$(top_builddir)/libversit/libversit.la						\
+	$(top_builddir)/widgets/misc/libemiscwidgets.a 					\
+	$(top_builddir)/addressbook/printing/libecontactprint.a				\
+	$(top_builddir)/addressbook/gui/search/libeaddressbooksearch.a			\
+	$(top_builddir)/addressbook/gui/merging/libecardmerging.a			\
+	$(top_builddir)/filter/libfilter.la						\
+	$(top_builddir)/e-util/libeutil.la						\
+	$(top_builddir)/widgets/menus/libmenus.la					\
+	$(EVOLUTION_ADDRESSBOOK_LIBS)
 
 evolution_addressbook_LDFLAGS = `gnome-config --libs gdk_pixbuf` -export-dynamic
 
@@ -79,10 +73,10 @@ oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
 gladedir   = $(datadir)/evolution/glade
 glade_DATA = addressbook-config.glade
 
-EXTRA_DIST = 			\
-	$(glade_DATA)		\
-	$(oaf_DATA)		\
-	addressbook-config.glade\
+EXTRA_DIST = 				\
+	$(glade_DATA)			\
+	$(oaf_DATA)			\
+	addressbook-config.glade	\
 	$(oaf_in_files)
 
 if ENABLE_PURIFY
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index 7e1a72e56e..fe1b29d7c6 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -10,8 +10,7 @@ INCLUDES =						\
 	-I$(top_srcdir)/addressbook/gui/component	\
 	-I$(top_srcdir)/widgets/misc			\
 	-I$(top_builddir)/shell				\
-	$(BONOBO_GNOME_CFLAGS)				\
-	$(EXTRA_GNOME_CFLAGS)
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
 noinst_LIBRARIES =				\
 	libeminicard.a
@@ -56,8 +55,7 @@ libeminicard_a_SOURCES =			\
 #
 #minicard_label_test_LDADD =				\
 #	 libeminicard.a					\
-#	 $(EXTRA_GNOME_LIBS)				\
-#	 $(BONOBO_GNOME_LIBS)				\
+#	 $(EVOLUTION_ADDRESSBOOK_LIBS)			\
 #	 $(top_builddir)/e-util/libeutil.la
 #
 #minicard_test_SOURCES = 	\
@@ -76,9 +74,7 @@ libeminicard_a_SOURCES =			\
 #	 $(top_builddir)/widgets/misc/libemiscwidgets.a 			\
 #	 $(top_builddir)/addressbook/gui/component/select-names/libeselectnames.la	\
 #	 $(top_builddir)/e-util/libeutil.la				\
-#	 $(EXTRA_GNOME_LIBS)						\
-#	 $(BONOBO_GNOME_LIBS)						\
-#	 $(GNOME_PRINT_LIBS)						\
+#	$(EVOLUTION_ADDRESSBOOK_LIBS)					\
 #	 libeminicard.a
 #
 #reflow_test_SOURCES = 	\
@@ -94,16 +90,13 @@ libeminicard_a_SOURCES =			\
 #	 $(top_builddir)/addressbook/printing/libecontactprint.a		\
 #	 $(top_builddir)/widgets/misc/libemiscwidgets.a 			\
 #	 $(top_builddir)/e-util/libeutil.la				\
-#	 $(EXTRA_GNOME_LIBS)						\
-#	 $(BONOBO_GNOME_LIBS)						\
-#	 $(GNOME_PRINT_LIBS)
+#	$(EVOLUTION_ADDRESSBOOK_LIBS)
 
 #minicard_view_test_SOURCES = 	\
 #	test-minicard-view.c
 
 #minicard_view_test_LDADD =						\
-#	$(EXTRA_GNOME_LIBS)						\
-#	$(BONOBO_GNOME_LIBS)						\
+#	$(EVOLUTION_ADDRESSBOOK_LIBS)
 #	libeminicard.a							\
 #	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
 #	$(top_builddir)/e-util/libeutil.la				\
@@ -130,9 +123,7 @@ libeminicard_a_SOURCES =			\
 #	 $(top_builddir)/widgets/misc/libemiscwidgets.a 			\
 #	 $(top_builddir)/e-util/libeutil.la				\
 #	 $(top_builddir)/addressbook/gui/merging/libecardmerging.a	\
-#	 $(EXTRA_GNOME_LIBS)						\
-#	 $(BONOBO_GNOME_LIBS)						\
-#	 $(GNOME_PRINT_LIBS)
+#	$(EVOLUTION_ADDRESSBOOK_LIBS)
 
 gladedir   = $(datadir)/evolution/glade
 glade_DATA = 
diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am
index dc1fb510a7..877fd3b92a 100644
--- a/addressbook/printing/Makefile.am
+++ b/addressbook/printing/Makefile.am
@@ -18,9 +18,7 @@ INCLUDES =					\
         -DEVOLUTION_GLADEDIR=\""$(gladedir)"\"	\
 	-DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\"	\
 	-DDATADIR=\""$(datadir)"\"		\
-	$(GNOME_PRINT_CFLAGS)			\
-        $(BONOBO_GNOME_CFLAGS)			\
-	$(EXTRA_GNOME_CFLAGS)
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
 noinst_LIBRARIES =				\
 	libecontactprint.a
@@ -34,42 +32,36 @@ libecontactprint_a_SOURCES = 			\
 	e-contact-print.c			\
 	e-contact-print.h
 
-noinst_PROGRAMS =	\
-	contact-print-test	\
+noinst_PROGRAMS =			\
+	contact-print-test		\
 	contact-print-style-editor-test
 
 contact_print_test_SOURCES = 	\
 	test-print.c
 
 contact_print_test_LDADD =	\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
-	$(top_builddir)/camel/libcamel.la				\
-	$(top_builddir)/libibex/libibex.la				\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/e-util/ename/libename.la			\
-	libecontactprint.a	\
-	$(BONOBO_CONF_LIBS)	\
-	$(EXTRA_GNOME_LIBS)	\
-	$(BONOBO_GNOME_LIBS)    \
-	$(GNOME_PRINT_LIBS) 
+	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
+	$(top_builddir)/camel/libcamel.la			\
+	$(top_builddir)/libibex/libibex.la			\
+	$(top_builddir)/e-util/libeutil.la			\
+	$(top_builddir)/libversit/libversit.la			\
+	$(top_builddir)/e-util/ename/libename.la		\
+	libecontactprint.a					\
+	$(EVOLUTION_ADDRESSBOOK_LIBS)
 
 contact_print_style_editor_test_SOURCES = 	\
 	test-contact-print-style-editor.c
 
 contact_print_style_editor_test_LDADD =	\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
-	$(top_builddir)/camel/libcamel.la				\
-	$(top_builddir)/libibex/libibex.la				\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/e-util/ename/libename.la			\
-	libecontactprint.a	\
-	$(BONOBO_CONF_LIBS)	\
-	$(EXTRA_GNOME_LIBS)	\
-	$(BONOBO_GNOME_LIBS)    \
-	$(GNOME_PRINT_LIBS)
+	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
+	$(top_builddir)/camel/libcamel.la			\
+	$(top_builddir)/libibex/libibex.la			\
+	$(top_builddir)/e-util/libeutil.la			\
+	$(top_builddir)/libversit/libversit.la			\
+	$(top_builddir)/e-util/ename/libename.la		\
+	libecontactprint.a					\
+	$(EVOLUTION_ADDRESSBOOK_LIBS)
 
-EXTRA_DIST = \
+EXTRA_DIST = 		\
 	$(glade_DATA)	\
 	$(ecps_DATA)