diff options
| -rw-r--r-- | calendar/ChangeLog | 12 | ||||
| -rw-r--r-- | calendar/gui/Makefile.am | 19 | ||||
| -rw-r--r-- | calendar/gui/alarm-notify/Makefile.am | 8 | ||||
| -rw-r--r-- | calendar/gui/main.c | 1 |
4 files changed, 23 insertions, 17 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 925fe6b67b..c31495dd9f 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,15 @@ +2003-02-28 Dan Winship <danw@ximian.com> + + * gui/Makefile.am (libevolution_calendar_la_LIBADD): Remove + libalarm.a, which was not being used by the calendar. + + * gui/main.c: Remove unneeded alarm.h include. + + * gui/alarm-notify/Makefile.am (noinst_LIBRARIES): Stop building + libalarm.a + (evolution_alarm_notify_SOURCES): Add alarm.c, alarm.h + (evolution_alarm_notify_LDADD): Remove libalarm.a + 2003-02-27 JP Rosevear <jpr@ximian.com> * conduits/todo/Makefile.am: link to versist libtool object diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index f873078395..a750c1321e 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -180,16 +180,15 @@ libevolution_calendar_la_SOURCES = \ weekday-picker.c \ weekday-picker.h -libevolution_calendar_la_LIBADD = \ - alarm-notify/libalarm.a \ - $(DB3_LDADD) \ - $(top_builddir)/widgets/menus/libmenus.la \ - $(top_builddir)/shell/libeshell.la \ - $(top_builddir)/calendar/cal-client/libcal-client.la \ - $(top_builddir)/addressbook/backend/ebook/libebook.la \ - dialogs/libcal-dialogs.a \ - $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ +libevolution_calendar_la_LIBADD = \ + $(DB3_LDADD) \ + $(top_builddir)/widgets/menus/libmenus.la \ + $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/calendar/cal-client/libcal-client.la \ + $(top_builddir)/addressbook/backend/ebook/libebook.la \ + dialogs/libcal-dialogs.a \ + $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(EVOLUTION_CALENDAR_LIBS) libevolution_calendar_la_LDFLAGS = -avoid-version -module diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am index 5824895710..a85e99a9cf 100644 --- a/calendar/gui/alarm-notify/Makefile.am +++ b/calendar/gui/alarm-notify/Makefile.am @@ -16,11 +16,6 @@ $(CORBA_GENERATED_C): $(CORBA_GENERATED_H) privlibexec_PROGRAMS = evolution-alarm-notify -noinst_LIBRARIES = libalarm.a - -libalarm_a_SOURCES = \ - alarm.c \ - alarm.h INCLUDES = \ -DG_LOG_DOMAIN=\"evolution-alarm-notify\" \ @@ -40,6 +35,8 @@ glade_DATA = \ evolution_alarm_notify_SOURCES = \ $(CORBA_GENERATED) \ + alarm.c \ + alarm.h \ alarm-notify.c \ alarm-notify.h \ alarm-notify-dialog.c \ @@ -53,7 +50,6 @@ evolution_alarm_notify_SOURCES = \ save.h evolution_alarm_notify_LDADD = \ - libalarm.a \ $(top_builddir)/calendar/cal-client/libcal-client.la \ $(top_builddir)/calendar/cal-util/libcal-util.la \ $(EVOLUTION_CALENDAR_LIBS) diff --git a/calendar/gui/main.c b/calendar/gui/main.c index 11837a37b3..f0534adbd1 100644 --- a/calendar/gui/main.c +++ b/calendar/gui/main.c @@ -39,7 +39,6 @@ #include <evolution-shell-client.h> #include "dialogs/cal-prefs-dialog.h" -#include "alarm-notify/alarm.h" #include "calendar-commands.h" #include "calendar-config.h" #include "calendar-component.h" |