aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2000-06-13 12:53:48 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2000-06-13 12:53:48 +0800
commit7ba831860dfa5e96d9d19a0b5907d5237e60596a (patch)
tree50cc600ccb20b0f5204d559e3ab31f189ad718c8 /calendar
parentcc240fcffe0ecf84e83428b2f05bc08259396ffe (diff)
downloadgsoc2013-evolution-7ba831860dfa5e96d9d19a0b5907d5237e60596a.tar.gz
gsoc2013-evolution-7ba831860dfa5e96d9d19a0b5907d5237e60596a.tar.zst
gsoc2013-evolution-7ba831860dfa5e96d9d19a0b5907d5237e60596a.zip
Build a `libeshell.a' library in `shell/' so that we don't need to
link to the shell's object files directly from the components anymore. (That was really gross.) svn path=/trunk/; revision=3546
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 \