aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-01-25 07:16:18 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2002-01-25 07:16:18 +0800
commit4ba09274d6d393568a06c483bf4934ea4707a604 (patch)
tree8bb9f22fe18024c733e233f963c621c39ed460f4 /mail
parentd656b69c9bd1de52d6991e1694fd4dcf9856951c (diff)
downloadgsoc2013-evolution-4ba09274d6d393568a06c483bf4934ea4707a604.tar.gz
gsoc2013-evolution-4ba09274d6d393568a06c483bf4934ea4707a604.tar.zst
gsoc2013-evolution-4ba09274d6d393568a06c483bf4934ea4707a604.zip
Clean up some of the Makefiles so we dont' link every library multiple
times, causing big libtool 1.4 pain. svn path=/trunk/; revision=15461
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/Makefile.am4
2 files changed, 7 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 142b22d7c2..72301c1d74 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-24 Ettore Perazzoli <ettore@ximian.com>
+
+ * Makefile.am: s/MAILER_CFLAGS/EVOLUTION_MAIL_CFLAGS/,
+ s/MAILER_LIBS/EVOLUTION_MAIL_LIBS/.
+
2002-01-24 Jeffrey Stedfast <fejj@ximian.com>
* mail-session.c (session_system_beep): This wrapper for gdk_beep().
diff --git a/mail/Makefile.am b/mail/Makefile.am
index fe9eb71142..cfe5da505c 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -16,7 +16,7 @@ INCLUDES = \
-I$(top_srcdir)/shell \
-I$(top_srcdir)/shell/importer \
-I$(top_builddir)/shell/importer \
- $(MAILER_CFLAGS) \
+ $(EVOLUTION_MAIL_CFLAGS) \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
@@ -123,7 +123,7 @@ evolution_mail_LDADD = \
$(top_builddir)/filter/libfilter.la \
$(top_builddir)/shell/importer/libevolution-importer.la \
$(top_builddir)/widgets/menus/libmenus.la \
- $(MAILER_LIBS)
+ $(EVOLUTION_MAIL_LIBS)
evolution_mail_LDFLAGS = \
-export-dynamic