Camel build fixes: don't build the tests for now (they don't work withEVOLUTION_0_9evolution-0-9-branch

srcdir != builddir), add `$(EXTRA_GNOME_CFLAGS)' so that they build
when GAL is in a different prefix.

Also fix the makefile for the tests so that they at least build with
srcdir != buildir (even if they still won't work).

10 files changed, 25 insertions, 3 deletions

diff --git a/camel/ChangeLog b/camel/ChangeLog
index cc35066c4..b7c3be342 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,5 +1,19 @@
 2001-03-13  Ettore Perazzoli  <ettore@ximian.com>
 
+	* Makefile.am (SUBDIRS): Remove `tests'.
+
+	* tests/lib/Makefile.am (INCLUDES): Add `-I$(top_srcdir)'.
+
+	* providers/vee/Makefile.am (INCLUDES): Add
+	`$(EXTRA_GNOME_CFLAGS)'.
+	* providers/sendmail/Makefile.am (INCLUDES): Likewise.
+	* providers/pop3/Makefile.am (INCLUDES): Likewise.
+	* providers/local/Makefile.am (INCLUDES): Likewise.
+	* providers/imap/Makefile.am (INCLUDES): Likewise.
+	* providers/cache/Makefile.am (INCLUDES): Likewise.
+
+2001-03-13  Ettore Perazzoli  <ettore@ximian.com>
+
 	* providers/smtp/Makefile.am (INCLUDES): Add
 	`$(EXTRA_GNOME_CFLAGS)'.
 
diff --git a/camel/Makefile.am b/camel/Makefile.am
index 063ec03f0..cdc8fa589 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = providers tests
+SUBDIRS = providers
 
 libcamelincludedir = $(includedir)/camel
 providerdir = $(libdir)/evolution/camel-providers/$(VERSION)
diff --git a/camel/providers/cache/Makefile.am b/camel/providers/cache/Makefile.am
index 7f9f6a9df..542758460 100644
--- a/camel/providers/cache/Makefile.am
+++ b/camel/providers/cache/Makefile.am
@@ -15,6 +15,7 @@ INCLUDES =					\
 	-I$(srcdir)/../../..			\
         -I$(includedir)				\
 	-I$(top_srcdir)/intl			\
+	$(EXTRA_GNOME_CFLAGS)			\
 	$(GTK_INCLUDEDIR)			\
 	-I$(top_srcdir)/camel			\
 	-DG_LOG_DOMAIN=\"camel-cache-provider\"
diff --git a/camel/providers/imap/Makefile.am b/camel/providers/imap/Makefile.am
index 341fa6b42..eb4e39644 100644
--- a/camel/providers/imap/Makefile.am
+++ b/camel/providers/imap/Makefile.am
@@ -17,6 +17,7 @@ INCLUDES = -I.. \
 	-I$(top_srcdir)				\
 	-I$(includedir)				\
 	$(GTK_INCLUDEDIR)			\
+	$(EXTRA_GNOME_CFLAGS)			\
 	$(KRB4_CFLAGS)				\
 	-DG_LOG_DOMAIN=\"camel-imap-provider\"	
 
diff --git a/camel/providers/local/Makefile.am b/camel/providers/local/Makefile.am
index 2e9502133..e0bee4ff4 100644
--- a/camel/providers/local/Makefile.am
+++ b/camel/providers/local/Makefile.am
@@ -16,6 +16,7 @@ INCLUDES = -I.. \
 	-I$(top_srcdir)				\
 	-I$(includedir)				\
 	$(GTK_INCLUDEDIR)			\
+	$(EXTRA_GNOME_CFLAGS)			\
 	-DG_LOG_DOMAIN=\"camel-local-provider\"	
 
 libcamellocal_la_SOURCES = 			\
diff --git a/camel/providers/nntp/Makefile.am b/camel/providers/nntp/Makefile.am
index 4b686735e..268807e94 100644
--- a/camel/providers/nntp/Makefile.am
+++ b/camel/providers/nntp/Makefile.am
@@ -15,6 +15,7 @@ INCLUDES = -I../..				\
 	-I$(top_srcdir)				\
 	-I$(includedir)				\
 	$(GTK_INCLUDEDIR) 			\
+	$(EXTRA_GNOME_CFLAGS)			\
 	-DG_LOG_DOMAIN=\"camel-nntp-provider\"
 
 libcamelnntp_la_SOURCES = 			\
diff --git a/camel/providers/pop3/Makefile.am b/camel/providers/pop3/Makefile.am
index 608e640cd..bc12dfebc 100644
--- a/camel/providers/pop3/Makefile.am
+++ b/camel/providers/pop3/Makefile.am
@@ -17,6 +17,7 @@ INCLUDES =					\
 	-I$(top_srcdir)/e-util			\
 	$(KRB4_CFLAGS)				\
 	$(GTK_INCLUDEDIR)			\
+	$(EXTRA_GNOME_CFLAGS)			\
 	-DG_LOG_DOMAIN=\"camel-pop3-provider\"
 
 libcamelpop3_la_SOURCES = 			\
diff --git a/camel/providers/sendmail/Makefile.am b/camel/providers/sendmail/Makefile.am
index 965f56afb..2fcd5add4 100644
--- a/camel/providers/sendmail/Makefile.am
+++ b/camel/providers/sendmail/Makefile.am
@@ -14,7 +14,9 @@ INCLUDES =					\
 	-I$(srcdir)/../../..			\
 	-I$(includedir)				\
 	-I$(top_srcdir)/intl			\
-	$(GTK_INCLUDEDIR) -I$(top_srcdir)/camel \
+	$(GTK_INCLUDEDIR)			\
+	$(EXTRA_GNOME_CFLAGS)			\
+	-I$(top_srcdir)/camel 			\
         -DG_LOG_DOMAIN=\"camel-sendmail-provider\"
 
 libcamelsendmail_la_SOURCES = 			\
diff --git a/camel/providers/vee/Makefile.am b/camel/providers/vee/Makefile.am
index 6c0693b02..71e6c7128 100644
--- a/camel/providers/vee/Makefile.am
+++ b/camel/providers/vee/Makefile.am
@@ -16,6 +16,7 @@ INCLUDES = -I.. \
 	-I$(top_srcdir)/e-util			\
 	-I$(top_srcdir)				\
 	-I$(includedir)				\
+	$(EXTRA_GNOME_CFLAGS)			\
 	$(GTK_INCLUDEDIR)			\
 	-DG_LOG_DOMAIN=\"camel-vee-provider\"	
 
diff --git a/camel/tests/lib/Makefile.am b/camel/tests/lib/Makefile.am
index ea51a2c28..88e5b9926 100644
--- a/camel/tests/lib/Makefile.am
+++ b/camel/tests/lib/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = -I$(includedir)
+INCLUDES = -I$(includedir) -I$(top_srcdir)
 
 check_LIBRARIES = libcameltest.a