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

some LDADDs in the process

svn path=/trunk/; revision=19994

5 files changed, 27 insertions, 20 deletions

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  <danw@ximian.com>
+
+	* 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  <hpj@ximian.com>
 
 	* 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 = \