Make libversit a shared library, update stuff for that, and clean up

some LDADDs in the process

svn path=/trunk/; revision=19994

6 files changed, 38 insertions, 65 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 128f0395a7..005266a9db 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,24 @@
+2003-02-21  Dan Winship  <danw@ximian.com>
+
+	* backend/ebook/Makefile.am (libebook_la_LIBADD): depend on
+	libversit.la, libcamel.la, libename.la, and libeutil.la.
+	(test_client_LDADD, test_client_list_LDADD, test_card_LDADD,
+	evolution_vcard_importer_LDADD, evolution_ldif_importer_LDADD,
+	load_pine_addressbook_LDADD, load_gnomecard_addressbook_LDADD):
+	Remove those dependencies from here, since they're pulled in by
+	libebook.
+
+	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
+	Remove libebook's dependencies
+
+	* gui/component/select-names/Makefile.am
+	(libeselectnames_la_LIBADD): add this
+
+	* gui/widgets/Makefile.am (various disabled *_test_LDADD): cleanup
+
+	* printing/Makefile.am (contact_print_test_LDADD,
+	contact_print_style_editor_test_LDADD): cleanup
+
 2003-02-20  Dan Winship  <danw@ximian.com>
 
 	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am
index 0342715622..d12aa9a6d6 100644
--- a/addressbook/backend/ebook/Makefile.am
+++ b/addressbook/backend/ebook/Makefile.am
@@ -83,6 +83,11 @@ libebook_la_SOURCES =					\
 	e-card-compare.c				\
 	e-destination.c
 
+libebook_la_LIBADD =					\
+	$(top_builddir)/libversit/libversit.la		\
+	$(top_builddir)/camel/libcamel.la		\
+	$(top_builddir)/e-util/ename/libename.la	\
+	$(top_builddir)/e-util/libeutil.la
 
 libebookincludedir = $(privincludedir)/ebook
 
@@ -127,33 +132,21 @@ test_client_SOURCES =					\
 
 test_client_LDADD =					\
 	libebook.la					\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)			\
-	$(top_builddir)/camel/libcamel.la		\
-	$(top_builddir)/libversit/libversit.a		\
-	$(top_builddir)/e-util/ename/libename.la	\
-	$(top_builddir)/e-util/libeutil.la
+	$(EVOLUTION_ADDRESSBOOK_LIBS)
 
 test_client_list_SOURCES =				\
 	test-client-list.c
 
 test_client_list_LDADD =				\
 	libebook.la					\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)			\
-	$(top_builddir)/camel/libcamel.la		\
-	$(top_builddir)/e-util/ename/libename.la	\
-	$(top_builddir)/libversit/libversit.a		\
-	$(top_builddir)/e-util/libeutil.la
+	$(EVOLUTION_ADDRESSBOOK_LIBS)
 
 test_card_SOURCES =					\
 	test-card.c
 
 test_card_LDADD =					\
 	libebook.la					\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)			\
-	$(top_builddir)/camel/libcamel.la		\
-	$(top_builddir)/e-util/ename/libename.la	\
-	$(top_builddir)/libversit/libversit.a		\
-	$(top_builddir)/e-util/libeutil.la
+	$(EVOLUTION_ADDRESSBOOK_LIBS)
 
 evolution_vcard_importer_SOURCES = \
 	evolution-vcard-importer.c
@@ -161,12 +154,8 @@ evolution_vcard_importer_SOURCES = \
 evolution_vcard_importer_LDADD =				\
 	libebook.la						\
 	$(EVOLUTION_ADDRESSBOOK_LIBS)				\
-	$(top_builddir)/camel/libcamel.la			\
 	$(top_builddir)/shell/importer/libevolution-importer.la \
-	$(DB3_LDADD)						\
-	$(top_builddir)/e-util/ename/libename.la		\
-	$(top_builddir)/libversit/libversit.a			\
-	$(top_builddir)/e-util/libeutil.la
+	$(DB3_LDADD)
 
 evolution_ldif_importer_SOURCES = \
 	evolution-ldif-importer.c
@@ -174,34 +163,22 @@ evolution_ldif_importer_SOURCES = \
 evolution_ldif_importer_LDADD =					\
 	libebook.la						\
 	$(EVOLUTION_ADDRESSBOOK_LIBS)				\
-	$(top_builddir)/camel/libcamel.la			\
 	$(top_builddir)/shell/importer/libevolution-importer.la \
-	$(DB3_LDADD)						\
-	$(top_builddir)/e-util/ename/libename.la		\
-	$(top_builddir)/libversit/libversit.a			\
-	$(top_builddir)/e-util/libeutil.la
+	$(DB3_LDADD)
 
 load_pine_addressbook_SOURCES =				\
 	load-pine-addressbook.c
 
 load_pine_addressbook_LDADD =				\
 	libebook.la					\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)			\
-	$(top_builddir)/camel/libcamel.la		\
-	$(top_builddir)/e-util/ename/libename.la	\
-	$(top_builddir)/libversit/libversit.a		\
-	$(top_builddir)/e-util/libeutil.la
+	$(EVOLUTION_ADDRESSBOOK_LIBS)
 
 load_gnomecard_addressbook_SOURCES =			\
 	load-gnomecard-addressbook.c
 
 load_gnomecard_addressbook_LDADD =			\
 	libebook.la					\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)			\
-	$(top_builddir)/camel/libcamel.la		\
-	$(top_builddir)/e-util/ename/libename.la	\
-	$(top_builddir)/libversit/libversit.a		\
-	$(top_builddir)/e-util/libeutil.la
+	$(EVOLUTION_ADDRESSBOOK_LIBS)
 
 
 BUILT_SOURCES = $(CORBA_SOURCE) $(MARSHAL_GENERATED)
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index c5e22211e2..8d50c74ee6 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -53,14 +53,10 @@ libevolution_addressbook_la_LIBADD =							\
 	$(top_builddir)/addressbook/gui/search/libeaddressbooksearch.a			\
 	$(top_builddir)/filter/libfilter.la						\
 	$(top_builddir)/addressbook/backend/ebook/libebook.la				\
-	$(top_builddir)/camel/libcamel.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.a						\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la					\
 	$(top_builddir)/addressbook/gui/merging/libecardmerging.a			\
-	$(top_builddir)/e-util/libeutil.la						\
 	$(top_builddir)/widgets/menus/libmenus.la					\
 	$(EVOLUTION_ADDRESSBOOK_LIBS) $(LDAP_LIBS)
 
diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am
index d9e9887a26..0ccc838d37 100644
--- a/addressbook/gui/component/select-names/Makefile.am
+++ b/addressbook/gui/component/select-names/Makefile.am
@@ -69,6 +69,10 @@ libeselectnames_la_SOURCES = 			\
 	e-simple-card-bonobo.c			\
 	e-simple-card-bonobo.h
 
+libeselectnames_la_LIBADD =					\
+	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
+	$(EVOLUTION_ADDRESSBOOK_LIBS)
+
 # We'll need these again when we split out the select names control
 # into its own shlib factory, but for now they're redundant.
 #
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index 2b9d7c88f2..dbc38f62e2 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -91,16 +91,12 @@ MARSHAL_GENERATED = e-addressbook-marshal.c e-addressbook-marshal.h
 #minicard_test_LDADD =							\
 #	 libeminicard.a							\
 #	 $(top_builddir)/addressbook/backend/ebook/libebook.la		\
-#	 $(top_builddir)/e-util/libeutil.la				\
-#	 $(top_builddir)/libversit/libversit.la				\
-#	 $(top_builddir)/e-util/ename/libename.la			\
 #	 $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.a \
 #	 $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.a \
 #	 $(top_builddir)/addressbook/printing/libecontactprint.a		\
 #	 $(top_builddir)/addressbook/gui/merging/libecardmerging.a	\
 #	 $(top_builddir)/widgets/misc/libemiscwidgets.la 			\
 #	 $(top_builddir)/addressbook/gui/component/select-names/libeselectnames.la	\
-#	 $(top_builddir)/e-util/libeutil.la				\
 #	$(EVOLUTION_ADDRESSBOOK_LIBS)					\
 #	 libeminicard.a
 #
@@ -110,13 +106,9 @@ MARSHAL_GENERATED = e-addressbook-marshal.c e-addressbook-marshal.h
 #reflow_test_LDADD =							\
 #	 libeminicard.a							\
 #	 $(top_builddir)/addressbook/backend/ebook/libebook.la		\
-#	 $(top_builddir)/e-util/libeutil.la				\
-#	 $(top_builddir)/libversit/libversit.la				\
-#	 $(top_builddir)/e-util/ename/libename.la			\
 #	 $(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\
 #	 $(top_builddir)/addressbook/printing/libecontactprint.a		\
 #	 $(top_builddir)/widgets/misc/libemiscwidgets.la 			\
-#	 $(top_builddir)/e-util/libeutil.la				\
 #	$(EVOLUTION_ADDRESSBOOK_LIBS)
 
 #minicard_view_test_SOURCES = 	\
@@ -126,13 +118,9 @@ MARSHAL_GENERATED = e-addressbook-marshal.c e-addressbook-marshal.h
 #	$(EVOLUTION_ADDRESSBOOK_LIBS)
 #	libeminicard.a							\
 #	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
-#	$(top_builddir)/e-util/libeutil.la				\
-#	$(top_builddir)/libversit/libversit.la				\
-#	$(top_builddir)/addressbook/ename/libename.la			\
 #	$(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\
 #	$(top_builddir)/addressbook/printing/libecontactprint.a		\
-#	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
-#	$(top_builddir)/e-util/libeutil.la
+#	$(top_builddir)/widgets/misc/libemiscwidgets.la
 #
 #minicard_widget_test_SOURCES = 	\
 #	 e-minicard-widget-test.c
@@ -140,15 +128,11 @@ MARSHAL_GENERATED = e-addressbook-marshal.c e-addressbook-marshal.h
 #minicard_widget_test_LDADD =						\
 #	 libeminicard.a							\
 #	 $(top_builddir)/addressbook/backend/ebook/libebook.la		\
-#	 $(top_builddir)/e-util/libeutil.la				\
-#	 $(top_builddir)/libversit/libversit.la				\
-#	 $(top_builddir)/e-util/ename/libename.la			\
 #	 $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.a \
 #	 $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.a \
 #	 $(top_builddir)/addressbook/gui/component/select-names/libeselectnames.la	\
 #	 $(top_builddir)/addressbook/printing/libecontactprint.a		\
 #	 $(top_builddir)/widgets/misc/libemiscwidgets.la 			\
-#	 $(top_builddir)/e-util/libeutil.la				\
 #	 $(top_builddir)/addressbook/gui/merging/libecardmerging.a	\
 #	$(EVOLUTION_ADDRESSBOOK_LIBS)
 
diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am
index 67868ac237..15871b005b 100644
--- a/addressbook/printing/Makefile.am
+++ b/addressbook/printing/Makefile.am
@@ -39,11 +39,6 @@ contact_print_test_SOURCES = 	\
 
 contact_print_test_LDADD =	\
 	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
-	$(top_builddir)/camel/libcamel.la			\
-	$(top_builddir)/e-util/libeutil.la			\
-	$(top_builddir)/libversit/libversit.a			\
-	$(top_builddir)/e-util/ename/libename.la		\
-	$(top_builddir)/camel/libcamel.la			\
 	libecontactprint.a					\
 	$(EVOLUTION_ADDRESSBOOK_LIBS)
 
@@ -52,10 +47,6 @@ contact_print_style_editor_test_SOURCES = 	\
 
 contact_print_style_editor_test_LDADD =	\
 	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
-	$(top_builddir)/camel/libcamel.la			\
-	$(top_builddir)/e-util/libeutil.la			\
-	$(top_builddir)/libversit/libversit.a			\
-	$(top_builddir)/e-util/ename/libename.la		\
 	libecontactprint.a					\
 	$(EVOLUTION_ADDRESSBOOK_LIBS)