aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
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 /addressbook
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 'addressbook')
-rw-r--r--addressbook/ChangeLog6
-rw-r--r--addressbook/gui/component/Makefile.am10
2 files changed, 7 insertions, 9 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index ea0932cfc4..c68c398062 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,9 @@
+2000-06-13 Ettore Perazzoli <ettore@helixcode.com>
+
+ * gui/component/Makefile.am (SHELL_OBJS): Removed.
+ (evolution_addressbook_LDADD): Link with
+ `$(top_builddir)/shell/libeshell.a'.
+
2000-06-12 Federico Mena Quintero <federico@helixcode.com>
* contact-editor/e-contact-editor-categories.c: Removed the
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index 56dedae772..ade764904b 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -40,16 +40,8 @@ evolution_addressbook_SOURCES = \
addressbook.c \
addressbook.h
-# 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 \
- $(top_builddir)/shell/evolution-storage.o
-
evolution_addressbook_LDADD = \
- $(SHELL_OBJS) \
+ $(top_builddir)/shell/libeshell.a \
$(EXTRA_GNOME_LIBS) \
$(BONOBO_HTML_GNOME_LIBS) \
$(top_builddir)/addressbook/gui/minicard/libeminicard.a \