aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/Makefile.am4
2 files changed, 6 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 5c1c173425..d88aa8b219 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-11 Martha Burke <martha@ximian.com>
+
+ * gui/Makefile.am: sanitize LD_ADDS and CFLAGS so the libtool
+ lines are shorter (fixes problem on solaries due to sed)
+
2001-05-11 Jeffrey Stedfast <fejj@ximian.com>
* mail-vfolder.c (vfolder_edit): Don't allow multiple copies of
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 0f65ef3f3a..2b66e3573c 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -117,10 +117,8 @@ evolution_mail_LDADD = \
$(top_builddir)/libibex/libibex.la \
$(top_builddir)/filter/libfilter.la \
$(top_builddir)/executive-summary/evolution-services/libevolution-services.la \
- $(top_builddir)/shell/importer/libevolution-importer.la \
$(top_builddir)/widgets/menus/libmenus.la \
- $(BONOBO_VFS_GNOME_LIBS) \
- $(GTKHTML_LIBS)
+ $(BONOBO_HTML_GNOME_LIBS)
evolution_mail_LDFLAGS = \
-export-dynamic