More fixage - Federico

svn path=/trunk/; revision=6939

6 files changed, 27 insertions, 15 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 7d66a7730d..30bd2bbd5c 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,17 @@
 2000-12-11  Federico Mena Quintero  <federico@helixcode.com>
 
+	* cal-util/Makefile.am (test_recur_LDADD): Link to the libical
+	shared library.
+
+	* cal-client/Makefile.am (client_test_LDADD): Likewise.
+
+	* conduits/calendar/Makefile.am (libecalendar_conduit_la_LIBADD):
+	Likewise.
+
+	* gui/Makefile.am (LINK_FLAGS): Likewise.
+
+2000-12-11  Federico Mena Quintero  <federico@helixcode.com>
+
 	This is to make things work with libical 0.21helix1 and later.
 	Warnings remain because at last libical was constified; will take
 	care of those tomorrow.
diff --git a/calendar/cal-client/Makefile.am b/calendar/cal-client/Makefile.am
index 2bcaa89797..f241bf6ce1 100644
--- a/calendar/cal-client/Makefile.am
+++ b/calendar/cal-client/Makefile.am
@@ -71,7 +71,7 @@ client_test_LDADD =						\
 	-lunicode						\
 	$(top_builddir)/calendar/cal-util/libcal-util.la	\
 	$(top_builddir)/libversit/libversit.la			\
-	$(top_builddir)/libical/src/libical/libical.a		\
+	$(top_builddir)/libical/src/libical/libical.la		\
 	libcal-client.la
 
 BUILT_SOURCES = $(CORBA_GENERATED)
diff --git a/calendar/cal-util/Makefile.am b/calendar/cal-util/Makefile.am
index 9a1b677e9b..80c8da2662 100644
--- a/calendar/cal-util/Makefile.am
+++ b/calendar/cal-util/Makefile.am
@@ -45,5 +45,5 @@ test_recur_SOURCES = 	\
 test_recur_LDADD = 	\
 	 libcal-util.la	\
 	 $(top_builddir)/libversit/libversit.la		\
-	 $(top_builddir)/libical/src/libical/libical.a	\
+	 $(top_builddir)/libical/src/libical/libical.la	\
 	 $(EXTRA_GNOME_LIBS)
diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am
index 0acb102db1..26fb3bee2d 100644
--- a/calendar/conduits/calendar/Makefile.am
+++ b/calendar/conduits/calendar/Makefile.am
@@ -37,7 +37,7 @@ libecalendar_conduit_la_LIBADD = 					\
 	$(top_builddir)/calendar/cal-client/libcal-client-static.la	\
 	$(top_builddir)/calendar/cal-util/libcal-util-static.la		\
 	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/libical/src/libical/libical-static.la		\
+	$(top_builddir)/libical/src/libical/libical.la			\
 	$(top_builddir)/e-util/libeconduit-static.la	 		\
 	$(BONOBO_VFS_GNOME_LIBS)					\
 	$(PISOCK_LIBDIR) $(PISOCK_LIBS) 				\
diff --git a/calendar/conduits/todo/Makefile.am b/calendar/conduits/todo/Makefile.am
index b0df8e91a4..730eca729a 100644
--- a/calendar/conduits/todo/Makefile.am
+++ b/calendar/conduits/todo/Makefile.am
@@ -37,7 +37,7 @@ libetodo_conduit_la_LIBADD = 					\
 	$(top_builddir)/calendar/cal-client/libcal-client-static.la	\
 	$(top_builddir)/calendar/cal-util/libcal-util-static.la		\
 	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/libical/src/libical/libical-static.la		\
+	$(top_builddir)/libical/src/libical/libical.la			\
 	$(top_builddir)/e-util/libeconduit-static.la	 		\
 	$(BONOBO_VFS_GNOME_LIBS)					\
 	$(PISOCK_LIBDIR) $(PISOCK_LIBS) 				\
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index df422d6b96..2268fa2b3c 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -35,17 +35,17 @@ INCLUDES = 						\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"
 
-LINK_FLAGS =							\
-	$(BONOBO_VFS_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)					\
-	$(INTLLIBS)						\
-	dialogs/libcal-dialogs.a				\
-	$(top_builddir)/calendar/cal-client/libcal-client.la	\
-	$(top_builddir)/calendar/cal-util/libcal-util.la	\
-	$(top_builddir)/widgets/misc/libemiscwidgets.a		\
-	$(top_builddir)/e-util/libeutil.la			\
-	$(top_builddir)/libversit/libversit.la			\
-	$(top_builddir)/libical/src/libical/libical.a		\
+LINK_FLAGS =								\
+	$(BONOBO_VFS_GNOME_LIBS)					\
+	$(EXTRA_GNOME_LIBS)						\
+	$(INTLLIBS)							\
+	dialogs/libcal-dialogs.a					\
+	$(top_builddir)/calendar/cal-client/libcal-client.la		\
+	$(top_builddir)/calendar/cal-util/libcal-util.la		\
+	$(top_builddir)/widgets/misc/libemiscwidgets.a			\
+	$(top_builddir)/e-util/libeutil.la				\
+	$(top_builddir)/libversit/libversit.la				\
+	$(top_builddir)/libical/src/libical/libical.la			\
 	$(top_builddir)/widgets/meeting-time-sel/libevolutionmtsel.a
 
 gladedir   = $(datadir)/evolution/glade