From d40f089a706484364ceb499d6bb4f6d823b92b09 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Fri, 21 Feb 2003 21:24:34 +0000 Subject: Make libversit a shared library, update stuff for that, and clean up some LDADDs in the process svn path=/trunk/; revision=19994 --- addressbook/backend/ebook/Makefile.am | 47 +++++++++-------------------------- 1 file changed, 12 insertions(+), 35 deletions(-) (limited to 'addressbook/backend/ebook') 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) -- cgit