aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog4
-rw-r--r--mail/Makefile.am5
2 files changed, 7 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 0d1c0c9236..86a22f7439 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-18 Tor Lillqvist <tml@novell.com>
+
+ * Makefile.am: Use THREADS_CFLAGS and _LIBS. Don't need CAMEL_LIBS.
+
2005-12-17 Tor Lillqvist <tml@novell.com>
* mail-mt.c: Add copyright blurb. Use separate flag field to
diff --git a/mail/Makefile.am b/mail/Makefile.am
index a086afd211..0a7bd980fc 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -16,6 +16,7 @@ INCLUDES = \
-I$(top_srcdir)/smime/gui \
$(EVOLUTION_MAIL_CFLAGS) \
$(CERT_UI_CFLAGS) \
+ $(THREADS_CFLAGS) \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
@@ -228,8 +229,8 @@ libevolution_mail_la_LIBADD = \
$(SMIME_LIBS) \
$(EVOLUTION_MAIL_LIBS) \
$(GTKHTML_LIBS) \
- $(CAMEL_LIBS) \
- $(REGEX_LIBS)
+ $(REGEX_LIBS) \
+ $(THREADS_LIBS)
libevolution_mail_la_LDFLAGS = \
-avoid-version -module $(NO_UNDEFINED)