aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog15
-rw-r--r--calendar/cal-client/Makefile.am1
-rw-r--r--calendar/cal-util/Makefile.am1
-rw-r--r--calendar/gui/Makefile.am4
-rw-r--r--calendar/gui/alarm-notify/Makefile.am6
-rw-r--r--calendar/gui/dialogs/Makefile.am4
6 files changed, 22 insertions, 9 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 827cd63501..2ec5b93c20 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,18 @@
+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 b7ffe15af7..627b7f19e5 100644
--- a/calendar/cal-client/Makefile.am
+++ b/calendar/cal-client/Makefile.am
@@ -81,7 +81,6 @@ 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 963dee5d1f..b8cb867244 100644
--- a/calendar/cal-util/Makefile.am
+++ b/calendar/cal-util/Makefile.am
@@ -61,7 +61,6 @@ 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 5836bb69ae..320e452464 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.a \
+ alarm-notify/libalarm.la \
$(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 \
- dialogs/libcal-dialogs.a \
+ $(top_builddir)/calendar/gui/dialogs/libcal-dialogs.la \
$(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 d772d88030..7cc779f680 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_LIBRARIES = libalarm.a
+noinst_LTLIBRARIES = libalarm.la
-libalarm_a_SOURCES = \
+libalarm_la_SOURCES = \
alarm.c \
alarm.h
@@ -53,7 +53,7 @@ evolution_alarm_notify_SOURCES = \
save.h
evolution_alarm_notify_LDADD = \
- libalarm.a \
+ libalarm.la \
$(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 a4ffff5f17..32a6a8bf9f 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_LIBRARIES = libcal-dialogs.a
+noinst_LTLIBRARIES = libcal-dialogs.la
-libcal_dialogs_a_SOURCES = \
+libcal_dialogs_la_SOURCES = \
$(IDL_GENERATED) \
alarm-options.c \
alarm-options.h \