aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/gui/Makefile.am9
2 files changed, 7 insertions, 8 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index bae6a3c3cc..62233a4eb9 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2000-06-13 Ettore Perazzoli <ettore@helixcode.com>
+
+ * gui/Makefile.am (SHELL_OBJS): Removed.
+ (evolution_calendar_LDADD): Link with
+ `$(top_builddir)/shell/libeshell.a'.
+
2000-06-09 Ettore Perazzoli <ettore@helixcode.com>
* gui/component-factory.c (factory_fn): Pass NULL for the new args
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 7a126b79ef..7da994c995 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -88,15 +88,8 @@ evolution_calendar_SOURCES = \
print.h \
prop.c
-# FIXME We should make a libeshell library instead of this gross hack.
-SHELL_OBJS = \
- $(top_builddir)/shell/Evolution-common.o \
- $(top_builddir)/shell/Evolution-stubs.o \
- $(top_builddir)/shell/Evolution-skels.o \
- $(top_builddir)/shell/evolution-shell-component.o
-
evolution_calendar_LDADD = \
- $(SHELL_OBJS) \
+ $(top_builddir)/shell/libeshell.a \
$(EXTRA_GNOME_LIBS) \
$(BONOBO_HTML_GNOME_LIBS) \
$(top_builddir)/widgets/e-text/libetext.a \