diff options
| -rw-r--r-- | calendar/ChangeLog | 8 | ||||
| -rw-r--r-- | calendar/conduits/calendar/Makefile.am | 2 | ||||
| -rw-r--r-- | calendar/conduits/todo/Makefile.am | 2 |
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) \ |