aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJP Rosevear <jpr@helixcode.com>2000-12-13 15:21:59 +0800
committerJP Rosevear <jpr@src.gnome.org>2000-12-13 15:21:59 +0800
commit956c2d74d40da95c42d82807e7f57e9379cffd4b (patch)
treeab141477798f0c36941ce7c71710e5bf3ccac4ba
parent7b07f1342a80551d76bc0f2f26f0cf4cda394d6c (diff)
downloadgsoc2013-evolution-956c2d74d40da95c42d82807e7f57e9379cffd4b.tar
gsoc2013-evolution-956c2d74d40da95c42d82807e7f57e9379cffd4b.tar.gz
gsoc2013-evolution-956c2d74d40da95c42d82807e7f57e9379cffd4b.tar.bz2
gsoc2013-evolution-956c2d74d40da95c42d82807e7f57e9379cffd4b.tar.lz
gsoc2013-evolution-956c2d74d40da95c42d82807e7f57e9379cffd4b.tar.xz
gsoc2013-evolution-956c2d74d40da95c42d82807e7f57e9379cffd4b.tar.zst
gsoc2013-evolution-956c2d74d40da95c42d82807e7f57e9379cffd4b.zip
Revert federico's change for now because of libtool limitations with
2000-12-13 JP Rosevear <jpr@helixcode.com> * conduits/todo/Makefile.am: Revert federico's change for now because of libtool limitations with ldadding shared libtool libs * conduits/calendar/Makefile.am: ditto svn path=/trunk/; revision=6963
-rw-r--r--calendar/ChangeLog8
-rw-r--r--calendar/conduits/calendar/Makefile.am2
-rw-r--r--calendar/conduits/todo/Makefile.am2
3 files changed, 10 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index a48cbbb973..3d7c05ffa1 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,11 @@
+2000-12-13 JP Rosevear <jpr@helixcode.com>
+
+ * conduits/todo/Makefile.am: Revert federico's change for now
+ because of libtool limitations with ldadding shared libtool
+ libs
+
+ * conduits/calendar/Makefile.am: ditto
+
2000-12-12 JP Rosevear <jpr@helixcode.com>
* gui/dialogs/task-editor.c (task_editor_set_todo_object): Use
diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am
index 26fb3bee2d..0acb102db1 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.la \
+ $(top_builddir)/libical/src/libical/libical-static.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 730eca729a..b0df8e91a4 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.la \
+ $(top_builddir)/libical/src/libical/libical-static.la \
$(top_builddir)/e-util/libeconduit-static.la \
$(BONOBO_VFS_GNOME_LIBS) \
$(PISOCK_LIBDIR) $(PISOCK_LIBS) \