revert previous change

svn path=/trunk/; revision=19968

6 files changed, 9 insertions, 22 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 2ec5b93c20..827cd63501 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,18 +1,3 @@
-2003-02-19  Dan Winship  <danw@ximian.com>
-
-	* cal-client/Makefile.am (client_test_LDADD): Remove libversit. We
-	haven't depended on that in forever.
-
-	* cal-util/Makefile.am (test_recur_LDADD): Likewise
-
-	* gui/alarm-notify/Makefile.am: build libalarm as a shared library
-	instead of static.
-
-	* gui/dialogs/Makefile.am: likewise for libcal-dialogs
-
-	* gui/Makefile.am (libevolution_calendar_la_LIBADD): update for
-	that.
-
 2003-02-19  Ettore Perazzoli  <ettore@ximian.com>
 
 	* pcs/Makefile.am: Split $(CORBA_GENERATED_H) rule from the
diff --git a/calendar/cal-client/Makefile.am b/calendar/cal-client/Makefile.am
index 627b7f19e5..b7ffe15af7 100644
--- a/calendar/cal-client/Makefile.am
+++ b/calendar/cal-client/Makefile.am
@@ -81,6 +81,7 @@ 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
diff --git a/calendar/cal-util/Makefile.am b/calendar/cal-util/Makefile.am
index b8cb867244..963dee5d1f 100644
--- a/calendar/cal-util/Makefile.am
+++ b/calendar/cal-util/Makefile.am
@@ -61,6 +61,7 @@ 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)
 
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 320e452464..5836bb69ae 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -181,7 +181,7 @@ libevolution_calendar_la_SOURCES =		\
 	weekday-picker.h
 
 libevolution_calendar_la_LIBADD =							\
-	alarm-notify/libalarm.la								\
+	alarm-notify/libalarm.a								\
 	$(DB3_LDADD)									\
 	$(top_builddir)/widgets/menus/libmenus.la					\
 	$(top_builddir)/shell/libeshell.la						\
@@ -194,7 +194,7 @@ libevolution_calendar_la_LIBADD =							\
 	$(top_builddir)/camel/libcamel.la						\
 	$(top_builddir)/libversit/libversit.a						\
 	$(top_builddir)/e-util/ename/libename.la					\
-	$(top_builddir)/calendar/gui/dialogs/libcal-dialogs.la				\
+	dialogs/libcal-dialogs.a							\
 	$(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.a			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.a					\
 	$(EVOLUTION_CALENDAR_LIBS)
diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am
index 7cc779f680..d772d88030 100644
--- a/calendar/gui/alarm-notify/Makefile.am
+++ b/calendar/gui/alarm-notify/Makefile.am
@@ -16,9 +16,9 @@ $(CORBA_GENERATED_C): $(CORBA_GENERATED_H)
 
 privlibexec_PROGRAMS = evolution-alarm-notify
 
-noinst_LTLIBRARIES = libalarm.la
+noinst_LIBRARIES = libalarm.a
 
-libalarm_la_SOURCES =	\
+libalarm_a_SOURCES =	\
 	alarm.c		\
 	alarm.h
 
@@ -53,7 +53,7 @@ evolution_alarm_notify_SOURCES =	\
 	save.h
 
 evolution_alarm_notify_LDADD =						\
-	libalarm.la							\
+	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	\
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
index 32a6a8bf9f..a4ffff5f17 100644
--- a/calendar/gui/dialogs/Makefile.am
+++ b/calendar/gui/dialogs/Makefile.am
@@ -34,9 +34,9 @@ INCLUDES = 								\
 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"			\
 	$(EVOLUTION_CALENDAR_CFLAGS)
 
-noinst_LTLIBRARIES = libcal-dialogs.la
+noinst_LIBRARIES = libcal-dialogs.a
 
-libcal_dialogs_la_SOURCES =	\
+libcal_dialogs_a_SOURCES =	\
 	$(IDL_GENERATED)	\
 	alarm-options.c		\
 	alarm-options.h		\