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 --- ChangeLog | 7 ++++ addressbook/ChangeLog | 21 ++++++++++ addressbook/backend/ebook/Makefile.am | 47 ++++++---------------- addressbook/gui/component/Makefile.am | 4 -- addressbook/gui/component/select-names/Makefile.am | 4 ++ addressbook/gui/widgets/Makefile.am | 18 +-------- addressbook/printing/Makefile.am | 9 ----- calendar/ChangeLog | 16 ++++++++ calendar/cal-client/Makefile.am | 16 ++++---- calendar/cal-util/Makefile.am | 5 ++- calendar/gui/Makefile.am | 7 ---- calendar/gui/alarm-notify/Makefile.am | 3 -- importers/ChangeLog | 6 +++ importers/Makefile.am | 8 ---- libversit/Makefile.am | 6 +-- mail/ChangeLog | 8 ++++ mail/Makefile.am | 2 - mail/importers/Makefile.am | 6 --- my-evolution/ChangeLog | 4 ++ my-evolution/Makefile.am | 3 -- tools/Makefile.am | 4 -- wombat/ChangeLog | 4 ++ wombat/Makefile.am | 4 -- 23 files changed, 97 insertions(+), 115 deletions(-) diff --git a/ChangeLog b/ChangeLog index ae1addf0a3..55fe904648 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-02-21 Dan Winship + + * libversit/Makefile.am: Make this a shared library to prevent + linking portability problems + + * tools/Makefile.am (evolution_addressbook_import_LDADD): cleanup + 2003-02-19 Jeffrey Stedfast * configure.in (ENABLE_IPv6): AC_DEFINE() ENABLE_IPv6 if it should 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 + + * 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 * 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) diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 558c3d7f01..e33e63aa2b 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,19 @@ +2003-02-21 Dan Winship + + * cal-client/Makefile.am (libcal_client_la_LIBADD): depend on + libcal-util, libwombat, and libeutil + (client_test_LDADD): Remove those deps from here + + * cal-util/Makefile.am (libcal_util_la_LIBADD): depend on + libical-evolution.la + (test_recur_LDADD): Remove that dependency here (and an ancient + libversit dependency). + + * gui/alarm-notify/Makefile.am (evolution_alarm_notify_LDADD): + remove some deps + + * gui/Makefile.am (libevolution_calendar_la_LIBADD): Likewise. + 2003-02-20 Hans Petter Jansson * gui/apps_evolution_calendar.schemas: Add GConf schemas. diff --git a/calendar/cal-client/Makefile.am b/calendar/cal-client/Makefile.am index b7ffe15af7..9efc3f13e7 100644 --- a/calendar/cal-client/Makefile.am +++ b/calendar/cal-client/Makefile.am @@ -49,6 +49,11 @@ libcal_client_la_SOURCES = \ query-listener.c \ query-listener.h +libcal_client_la_LIBADD = \ + $(top_builddir)/calendar/cal-util/libcal-util.la \ + $(top_builddir)/libwombat/libwombat.la \ + $(top_builddir)/e-util/libeutil.la + libcal_clientinclude_HEADERS = \ $(CORBA_GENERATED_H) \ cal-client-multi.h \ @@ -77,14 +82,9 @@ client_test_INCLUDES = \ $(INCLUDES) \ -DG_LOG_DOMAIN=\"client-test\" -client_test_LDADD = \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/calendar/cal-util/libcal-util.la \ - $(top_builddir)/libversit/libversit.a \ - $(top_builddir)/libical/src/libical/libical-evolution.la \ - $(top_builddir)/libwombat/libwombat.la \ - libcal-client.la +client_test_LDADD = \ + libcal-client.la \ + $(EVOLUTION_CALENDAR_LIBS) BUILT_SOURCES = $(CORBA_GENERATED) CLEANFILES = $(BUILT_SOURCES) diff --git a/calendar/cal-util/Makefile.am b/calendar/cal-util/Makefile.am index 963dee5d1f..3047d2b010 100644 --- a/calendar/cal-util/Makefile.am +++ b/calendar/cal-util/Makefile.am @@ -25,6 +25,9 @@ libcal_util_la_SOURCES = \ cal-util.c \ timeutil.c +libcal_util_la_LIBADD = \ + $(top_builddir)/libical/src/libical/libical-evolution.la + libcal_utilincludedir = $(privincludedir)/cal-util libcal_utilinclude_HEADERS = \ @@ -61,8 +64,6 @@ test_recur_SOURCES = \ test_recur_LDADD = \ libcal-util.la \ - $(top_builddir)/libversit/libversit.a \ - $(top_builddir)/libical/src/libical/libical-evolution.la \ $(EVOLUTION_CALENDAR_LIBS) EXTRA_DIST = \ diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 8c0a6ff561..f873078395 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -186,14 +186,7 @@ libevolution_calendar_la_LIBADD = \ $(top_builddir)/widgets/menus/libmenus.la \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/calendar/cal-client/libcal-client.la \ - $(top_builddir)/calendar/cal-util/libcal-util.la \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/libical/src/libical/libical-evolution.la \ - $(top_builddir)/libwombat/libwombat.la \ $(top_builddir)/addressbook/backend/ebook/libebook.la \ - $(top_builddir)/camel/libcamel.la \ - $(top_builddir)/libversit/libversit.a \ - $(top_builddir)/e-util/ename/libename.la \ dialogs/libcal-dialogs.a \ $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am index d772d88030..5824895710 100644 --- a/calendar/gui/alarm-notify/Makefile.am +++ b/calendar/gui/alarm-notify/Makefile.am @@ -56,9 +56,6 @@ evolution_alarm_notify_LDADD = \ libalarm.a \ $(top_builddir)/calendar/cal-client/libcal-client.la \ $(top_builddir)/calendar/cal-util/libcal-util.la \ - $(top_builddir)/libical/src/libical/libical-evolution.la \ - $(top_builddir)/libwombat/libwombat.la \ - $(top_builddir)/e-util/libeutil.la \ $(EVOLUTION_CALENDAR_LIBS) server_in_files = \ diff --git a/importers/ChangeLog b/importers/ChangeLog index 38c24d73d3..45a72eea95 100644 --- a/importers/ChangeLog +++ b/importers/ChangeLog @@ -1,3 +1,9 @@ +2003-02-21 Dan Winship + + * Makefile.am (evolution_pine_importer_LDADD): Remove libebook's + dependencies. It will pull them in. + (evolution_gnomecard_importer_LDADD): Likewise. + 2003-02-06 Dan Winship * elm-importer.c (main): s/PACKAGE/GETTEXT_PACKAGE/ in gettext init diff --git a/importers/Makefile.am b/importers/Makefile.am index 99187f3210..194746bee8 100644 --- a/importers/Makefile.am +++ b/importers/Makefile.am @@ -52,10 +52,6 @@ evolution_pine_importer_SOURCES = \ evolution_pine_importer_LDADD = \ $(top_builddir)/shell/importer/libevolution-importer.la \ $(top_builddir)/addressbook/backend/ebook/libebook.la \ - $(top_builddir)/camel/libcamel.la \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/e-util/ename/libename.la \ - $(top_builddir)/libversit/libversit.a \ $(IMPORTERS_LIBS) evolution_gnomecard_importer_SOURCES = \ @@ -64,10 +60,6 @@ evolution_gnomecard_importer_SOURCES = \ evolution_gnomecard_importer_LDADD = \ $(top_builddir)/shell/importer/libevolution-importer.la \ $(top_builddir)/addressbook/backend/ebook/libebook.la \ - $(top_builddir)/camel/libcamel.la \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/e-util/ename/libename.la \ - $(top_builddir)/libversit/libversit.a \ $(IMPORTERS_LIBS) oafdir = $(datadir)/oaf diff --git a/libversit/Makefile.am b/libversit/Makefile.am index 40bdc48f36..809eeaed80 100644 --- a/libversit/Makefile.am +++ b/libversit/Makefile.am @@ -1,6 +1,6 @@ # Makefile for libversit.a -# $Id: Makefile.am,v 1.12 2002/07/22 15:35:36 danw Exp $ +# $Id: Makefile.am,v 1.13 2003/02/21 21:24:27 danw Exp $ VERSIT_SRC = \ vcc.y \ @@ -11,9 +11,9 @@ VERSIT_SRC = \ vcaltmp.c \ vcaltmp.h -privlib_LIBRARIES = libversit.a +privlib_LTLIBRARIES = libversit.la -libversit_a_SOURCES = $(VERSIT_SRC) +libversit_la_SOURCES = $(VERSIT_SRC) EXTRA_DIST = README.TXT vcaltest.c vctest.c diff --git a/mail/ChangeLog b/mail/ChangeLog index 18f733a239..778f0e26c1 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,11 @@ +2003-02-21 Dan Winship + + * Makefile.am (libevolution_mail_la_LIBADD): Remove libebook's + dependencies. + + * importers/Makefile.am (libevolution_pine_importer_la_LIBADD): + Likewise. + 2003-02-21 Dan Winship * mail-account-gui.c (mail_account_gui_build_extra_conf): Use diff --git a/mail/Makefile.am b/mail/Makefile.am index c748e0557e..b7d41b1982 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -160,8 +160,6 @@ libevolution_mail_la_LIBADD = \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/widgets/misc/libefilterbar.la \ $(top_builddir)/addressbook/backend/ebook/libebook.la \ - $(top_builddir)/libversit/libversit.a \ - $(top_builddir)/e-util/ename/libename.la \ $(top_builddir)/filter/libfilter.la \ $(top_builddir)/widgets/menus/libmenus.la \ $(EVOLUTION_MAIL_LIBS) diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am index 87f9f6657d..4bd2bf82de 100644 --- a/mail/importers/Makefile.am +++ b/mail/importers/Makefile.am @@ -72,9 +72,6 @@ libevolution_pine_importer_la_LIBADD = \ $(top_builddir)/shell/importer/libevolution-importer.la \ $(top_builddir)/addressbook/backend/ebook/libebook.la \ $(top_builddir)/camel/libcamel.la \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/e-util/ename/libename.la \ - $(top_builddir)/libversit/libversit.a \ $(IMPORTERS_LIBS) # evolution_gnomecard_importer_SOURCES = \ @@ -84,9 +81,6 @@ libevolution_pine_importer_la_LIBADD = \ # $(top_builddir)/shell/importer/libevolution-importer.la \ # $(top_builddir)/addressbook/backend/ebook/libebook.la \ # $(top_builddir)/camel/libcamel.la \ -# $(top_builddir)/e-util/libeutil.la \ -# $(top_builddir)/e-util/ename/libename.la \ -# $(top_builddir)/libversit/libversit.a \ # $(IMPORTERS_LIBS) diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog index b87b0d9dc1..88bffcd366 100644 --- a/my-evolution/ChangeLog +++ b/my-evolution/ChangeLog @@ -1,3 +1,7 @@ +2003-02-21 Dan Winship + + * Makefile.am (summary_libs): clean up + 2003-02-20 Dan Winship * Makefile.am (summary_libs): diff --git a/my-evolution/Makefile.am b/my-evolution/Makefile.am index 8dbc4bdff6..db1a59f9c4 100644 --- a/my-evolution/Makefile.am +++ b/my-evolution/Makefile.am @@ -71,9 +71,6 @@ summary_libs = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/calendar/cal-client/libcal-client.la \ $(top_builddir)/calendar/cal-util/libcal-util.la \ - $(top_builddir)/libversit/libversit.a \ - $(top_builddir)/libical/src/libical/libical-evolution.la \ - $(top_builddir)/libwombat/libwombat.la \ $(EVOLUTION_EXECUTIVE_SUMMARY_LIBS) component_LTLIBRARIES = libevolution-executive-summary.la diff --git a/tools/Makefile.am b/tools/Makefile.am index e002d53d5a..dd73df96f6 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -33,10 +33,6 @@ EXTRA_DIST = $(tools_SCRIPTS) verify-evolution-install.sh \ evolution_addressbook_import_LDADD = \ $(GNOME_FULL_LIBS) \ $(top_builddir)/addressbook/backend/ebook/libebook.la \ - $(top_builddir)/camel/libcamel.la \ - $(top_builddir)/e-util/ename/libename.la \ - $(top_builddir)/libversit/libversit.a \ - $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/menus/libmenus.la evolution_addressbook_export_LDADD = \ diff --git a/wombat/ChangeLog b/wombat/ChangeLog index ee9432cf88..4f8f93cd0b 100644 --- a/wombat/ChangeLog +++ b/wombat/ChangeLog @@ -1,3 +1,7 @@ +2003-02-21 Dan Winship + + * Makefile.am (evolution_wombat_LDADD): cleanup + 2003-02-19 Chris Toshok * wombat.c (termination_handler): gtk_main_quit => diff --git a/wombat/Makefile.am b/wombat/Makefile.am index af1ffb4073..10dcf6696a 100644 --- a/wombat/Makefile.am +++ b/wombat/Makefile.am @@ -34,13 +34,9 @@ evolution_wombat_LDADD = \ $(LDAP_STUFF) \ $(top_builddir)/addressbook/backend/pas/libpas.a \ $(top_builddir)/addressbook/backend/ebook/libebook.la \ - $(top_builddir)/camel/libcamel.la \ - $(top_builddir)/e-util/ename/libename.la \ $(top_builddir)/calendar/pcs/libpcsfile.a \ $(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.a \ $(top_builddir)/e-util/libedb3util.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/libwombat/libwombat.la \ -- cgit v1.2.3