aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/ChangeLog4
-rw-r--r--camel/Makefile.am5
-rw-r--r--camel/tests/smime/Makefile.am2
3 files changed, 7 insertions, 4 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index faad71f47c..ee85fe9f8f 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,5 +1,9 @@
2001-05-15 Jeffrey Stedfast <fejj@ximian.com>
+ * Makefile.am: Don't use EXTRA_GNOME_*, use the new CAMEL_*
+ variables so we don't link in tons of extra cruft that we don't
+ need.
+
* tests/smime/pkcs7.c: Added t the test suite - tests the S/MIME
pkcs7 functions.
diff --git a/camel/Makefile.am b/camel/Makefile.am
index 8e59e8b190..ad0688f8cb 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -10,8 +10,7 @@ lib_LTLIBRARIES = libcamel.la
INCLUDES = -I.. -I$(srcdir)/.. \
-I$(top_srcdir)/intl \
-I$(top_srcdir)/e-util \
- $(GNOME_XML_CFLAGS) \
- $(EXTRA_GNOME_CFLAGS) \
+ $(CAMEL_CFLAGS) \
$(KRB4_CFLAGS) \
$(NSPR_CFLAGS) \
$(NSS_CFLAGS) \
@@ -181,7 +180,7 @@ libcamelinclude_HEADERS = \
libcamel_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
libcamel_la_LIBADD = $(top_builddir)/e-util/libeutil.la \
- $(GAL_LIBS) \
+ $(CAMEL_LIBS) \
$(KRB4_LDFLAGS) \
$(NSPR_LDFLAGS) \
$(NSS_LDFLAGS) \
diff --git a/camel/tests/smime/Makefile.am b/camel/tests/smime/Makefile.am
index cdc9c9b8b7..a85d875a65 100644
--- a/camel/tests/smime/Makefile.am
+++ b/camel/tests/smime/Makefile.am
@@ -16,6 +16,6 @@ LDADD = \
check_PROGRAMS = \
pgp \
pgp-mime \
- pkcs7 \
+ pkcs7
TESTS = pgp pgp-mime pkcs7