aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/Makefile.am24
2 files changed, 14 insertions, 16 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 5a05b40867..af315d8c1c 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2000-06-13 Ettore Perazzoli <ettore@helixcode.com>
+
+ * Makefile.am (SHELL_OBJS): Removed.
+ (evolution_mail_LDADD): Use `libeshell.a'. Also use
+ `top_builddir' consistently.
+
2000-06-12 Jeffrey Stedfast <fejj@helixcode.com>
* mail-config.c: Got rid of sources_max_row and identities_max_row
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 81724fc04e..51c7aa3150 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -28,14 +28,6 @@ EVOLUTION_MAIL_CORBA_GENERATED = \
Mail-skels.c \
Mail-stubs.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 \
- $(top_builddir)/shell/evolution-storage.o
-
# FIXME Is there any way around having to do this?
CAMEL_OBJS_EXTRA = \
$(top_builddir)/camel/providers/vee/libcamelvee.la
@@ -63,17 +55,17 @@ evolution_mail_SOURCES = \
evolution_mail_LDADD = \
- $(SHELL_OBJS) \
- ../composer/libcomposer.la \
+ $(top_builddir)/shell/libeshell.a \
+ $(top_builddir)/composer/libcomposer.la \
$(top_builddir)/widgets/e-paned/libepaned.a \
$(top_builddir)/widgets/misc/libemiscwidgets.a \
- ../widgets/e-table/libetable.a \
- ../widgets/e-text/libetext.a \
+ $(top_builddir)/widgets/e-table/libetable.a \
+ $(top_builddir)/widgets/e-text/libetext.a \
$(CAMEL_OBJS_EXTRA) \
- ../camel/libcamel.la \
- ../e-util/libeutil.la \
- ../libibex/libibex.la \
- ../filter/libfilter.la \
+ $(top_builddir)/camel/libcamel.la \
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/libibex/libibex.la \
+ $(top_builddir)/filter/libfilter.la \
$(BONOBO_HTML_GNOME_LIBS) \
$(UNICODE_LIBS)