From 79a377ddf20574b03d02f93fc85f542455b12744 Mon Sep 17 00:00:00 2001
From: Ettore Perazzoli <ettore@src.gnome.org>
Date: Sun, 27 Jan 2002 17:21:36 +0000
Subject: Final cleanup for the CFLAGS and LIBS in the Makefiles.

svn path=/trunk/; revision=15486
---
 camel/Makefile.am | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

(limited to 'camel')

diff --git a/camel/Makefile.am b/camel/Makefile.am
index 58ce2c0c7f..751f293709 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -9,18 +9,13 @@ sbin_PROGRAMS =	camel-lock-helper
 lib_LTLIBRARIES = libcamel.la
 noinst_LTLIBRARIES = libcamel-static.la
 
-INCLUDES = -I.. -I$(srcdir)/.. 			 \
-	-I$(top_srcdir)/intl			 \
-	-I$(top_srcdir)/e-util			 \
-	$(CAMEL_CFLAGS)				 \
-	$(GNOME_INCLUDEDIR)			 \
-	$(KRB4_CFLAGS)				 \
-	$(NSPR_CFLAGS)				 \
-	$(NSS_CFLAGS)				 \
-	$(OPENSSL_CFLAGS)			 \
-	-DCAMEL_SBINDIR=\""$(sbindir)"\"	 \
-	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \
-	-DG_LOG_DOMAIN=\"camel\"
+INCLUDES = -I.. -I$(srcdir)/.. 			 	\
+	-I$(top_srcdir)/intl			 	\
+	-I$(top_srcdir)/e-util			 	\
+	-DCAMEL_SBINDIR=\""$(sbindir)"\"	 	\
+	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" 	\
+	-DG_LOG_DOMAIN=\"camel\"			\
+	$(CAMEL_CFLAGS)
 
 libcamel_la_SOURCES = 				\
 	broken-date-parser.c			\
@@ -198,12 +193,9 @@ libcamelinclude_HEADERS =			\
 
 libcamel_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
 
-libcamel_la_LIBADD = $(top_builddir)/e-util/libeutil.la \
-	$(CAMEL_LIBS)				\
-	$(KRB4_LDFLAGS)				\
-	$(NSPR_LDFLAGS)				\
-	$(NSS_LDFLAGS)				\
-	$(OPENSSL_LDFLAGS)
+libcamel_la_LIBADD =				\
+	$(top_builddir)/e-util/libeutil.la 	\
+	$(CAMEL_LIBS)
 
 libcamel_static_la_SOURCES = $(libcamel_la_SOURCES)
 libcamel_static_la_LIBADD  = $(libcamel_la_LIBADD)
-- 
cgit v1.2.3