aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/conduits
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2003-09-01 14:15:35 +0800
committerDan Winship <danw@src.gnome.org>2003-09-01 14:15:35 +0800
commit9a763746ccd9f51e37fba2ee8e68eec17622534d (patch)
treef03002e1ab4c812bdd8e28ec2086cc517210520e /calendar/conduits
parent1537b6f23ccbdc036fef37b94936e989cde4b797 (diff)
downloadgsoc2013-evolution-9a763746ccd9f51e37fba2ee8e68eec17622534d.tar
gsoc2013-evolution-9a763746ccd9f51e37fba2ee8e68eec17622534d.tar.gz
gsoc2013-evolution-9a763746ccd9f51e37fba2ee8e68eec17622534d.tar.bz2
gsoc2013-evolution-9a763746ccd9f51e37fba2ee8e68eec17622534d.tar.lz
gsoc2013-evolution-9a763746ccd9f51e37fba2ee8e68eec17622534d.tar.xz
gsoc2013-evolution-9a763746ccd9f51e37fba2ee8e68eec17622534d.tar.zst
gsoc2013-evolution-9a763746ccd9f51e37fba2ee8e68eec17622534d.zip
Remove libcal-util-static.la
* cal-util/Makefile.am (privlib_LTLIBRARIES): Remove libcal-util-static.la * cal-client/Makefile.am (noinst_LTLIBRARIES): Remove libcal-client-static.la * conduits/calendar/Makefile.am (libecalendar_conduit_la_LIBADD): use non-static libraries. The static ones were only needed for libtool 1.3. * conduits/todo/Makefile.am (libetodo_conduit_la_LIBADD): Likewise * gui/Makefile.am (IDL_GENERATED): Don't compile the calendar idl here. It's already in libcal-client. svn path=/trunk/; revision=22430
Diffstat (limited to 'calendar/conduits')
-rw-r--r--calendar/conduits/calendar/Makefile.am6
-rw-r--r--calendar/conduits/todo/Makefile.am8
2 files changed, 7 insertions, 7 deletions
diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am
index 1ba960c896..7254b6d866 100644
--- a/calendar/conduits/calendar/Makefile.am
+++ b/calendar/conduits/calendar/Makefile.am
@@ -18,10 +18,10 @@ libecalendar_conduit_la_SOURCES = \
libecalendar_conduit_la_LDFLAGS = -module -avoid-version
libecalendar_conduit_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/calendar/cal-client/libcal-client-static.la \
- $(top_builddir)/calendar/cal-util/libcal-util-static.la \
+ $(top_builddir)/calendar/cal-client/libcal-client.la \
+ $(top_builddir)/calendar/cal-util/libcal-util.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.la \
$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
diff --git a/calendar/conduits/todo/Makefile.am b/calendar/conduits/todo/Makefile.am
index 83164b37b8..3ffe0c9d05 100644
--- a/calendar/conduits/todo/Makefile.am
+++ b/calendar/conduits/todo/Makefile.am
@@ -18,11 +18,11 @@ libetodo_conduit_la_SOURCES = \
libetodo_conduit_la_LDFLAGS = -module -avoid-version
libetodo_conduit_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/calendar/cal-client/libcal-client-static.la \
- $(top_builddir)/calendar/cal-util/libcal-util-static.la \
+ $(top_builddir)/calendar/cal-client/libcal-client.la \
+ $(top_builddir)/calendar/cal-util/libcal-util.la \
$(top_builddir)/libversit/libversit.la \
- $(top_builddir)/libical/src/libical/libical-static.la \
- $(top_builddir)/libwombat/libwombat-static.la \
+ $(top_builddir)/libical/src/libical/libical.la \
+ $(top_builddir)/libwombat/libwombat.la \
$(top_builddir)/e-util/libeconduit.la \
$(EVOLUTION_CALENDAR_CONDUIT_LIBS)