GNOME.org
 

[evolution-data-server] Bug 595393 - Use per-target CPPFLAGS in EDS

commit 2efe5abf9b94c84e68d49c21ced5f013b5fdec2c
Author: Matthew Barnes <mbarnes redhat com>
Date:   Thu Oct 1 20:37:51 2009 -0400

    Bug 595393 - Use per-target CPPFLAGS in EDS

 addressbook/backends/file/Makefile.am        |   14 +-
 addressbook/backends/google/Makefile.am      |   25 ++--
 addressbook/backends/groupwise/Makefile.am   |   16 ++-
 addressbook/backends/ldap/Makefile.am        |   12 +-
 addressbook/backends/vcf/Makefile.am         |    7 +-
 addressbook/backends/webdav/Makefile.am      |   22 ++--
 addressbook/libebook/Makefile.am             |   19 ++--
 addressbook/libedata-book/Makefile.am        |   50 +++++---
 addressbook/tests/ebook/Makefile.am          |   30 ++++-
 addressbook/tests/vcard/Makefile.am          |    6 +-
 calendar/backends/caldav/Makefile.am         |    7 +-
 calendar/backends/contacts/Makefile.am       |    7 +-
 calendar/backends/file/Makefile.am           |   25 ++--
 calendar/backends/google/Makefile.am         |    7 +-
 calendar/backends/groupwise/Makefile.am      |    7 +-
 calendar/backends/http/Makefile.am           |    7 +-
 calendar/backends/weather/Makefile.am        |    7 +-
 calendar/libecal/Makefile.am                 |   22 ++--
 calendar/libedata-cal/Makefile.am            |   21 ++--
 calendar/tests/ecal/Makefile.am              |   22 ++--
 camel/Makefile.am                            |   62 ++++++++--
 camel/providers/Makefile.am                  |    2 -
 camel/providers/groupwise/Makefile.am        |   10 +-
 camel/providers/hula/Makefile.am             |   22 ++--
 camel/providers/imap/Makefile.am             |    6 +-
 camel/providers/imap4/Makefile.am            |    5 +-
 camel/providers/imapx/Makefile.am            |   19 ++-
 camel/providers/imapx/camel-imapx-tokenise.h |  175 --------------------------
 camel/providers/local/Makefile.am            |    5 +-
 camel/providers/nntp/Makefile.am             |    6 +-
 camel/providers/pop3/Makefile.am             |    5 +-
 camel/providers/sendmail/Makefile.am         |    5 +-
 camel/providers/smtp/Makefile.am             |    5 +-
 camel/tests/Makefile.am                      |    1 -
 camel/tests/folder/Makefile.am               |   33 ++++-
 camel/tests/lib/Makefile.am                  |   24 +++--
 camel/tests/message/Makefile.am              |   28 +++--
 camel/tests/mime-filter/Makefile.am          |   16 ++-
 camel/tests/misc/Makefile.am                 |   25 +++-
 camel/tests/smime/Makefile.am                |   14 ++-
 camel/tests/stream/Makefile.am               |   13 ++-
 configure.ac                                 |    1 +
 libebackend/Makefile.am                      |   15 ++-
 libedataserver/Makefile.am                   |   17 ++-
 libedataserverui/Makefile.am                 |   62 +++++----
 servers/exchange/lib/Makefile.am             |   24 ++--
 servers/exchange/storage/Makefile.am         |   13 +-
 servers/exchange/xntlm/Makefile.am           |    3 +-
 servers/google/libgdata-google/Makefile.am   |    7 +-
 servers/google/libgdata/Makefile.am          |    7 +-
 servers/groupwise/Makefile.am                |   17 ++-
 src/Makefile.am                              |   32 +++---
 52 files changed, 511 insertions(+), 501 deletions(-)
---
diff --git a/addressbook/backends/file/Makefile.am b/addressbook/backends/file/Makefile.am
index f84d32b..4f8ae71 100644
--- a/addressbook/backends/file/Makefile.am
+++ b/addressbook/backends/file/Makefile.am
@@ -1,4 +1,7 @@
-AM_CPPFLAGS =						\
+extension_LTLIBRARIES = libebookbackendfile.la
+
+libebookbackendfile_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)					\
 	-DG_LOG_DOMAIN=\"libebookbackend\"		\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
@@ -7,8 +10,6 @@ AM_CPPFLAGS =						\
 	$(DB_CFLAGS)					\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
-extension_LTLIBRARIES = libebookbackendfile.la
-
 libebookbackendfile_la_SOURCES =			\
 	e-book-backend-file.c				\
 	e-book-backend-file.h				\
@@ -18,9 +19,8 @@ libebookbackendfile_la_LIBADD =						\
 	$(top_builddir)/addressbook/libebook/libebook-1.2.la		\
 	$(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la	\
 	$(top_builddir)/libedataserver/libedataserver-1.2.la		\
-	$(top_builddir)/libebackend/libebackend-1.2.la		\
-	$(DB_LIBS)				\
+	$(top_builddir)/libebackend/libebackend-1.2.la			\
+	$(DB_LIBS)							\
 	$(EVOLUTION_ADDRESSBOOK_LIBS)
 
-libebookbackendfile_la_LDFLAGS =	\
-	-module -avoid-version $(NO_UNDEFINED)
+libebookbackendfile_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
diff --git a/addressbook/backends/google/Makefile.am b/addressbook/backends/google/Makefile.am
index fde983e..c593b99 100644
--- a/addressbook/backends/google/Makefile.am
+++ b/addressbook/backends/google/Makefile.am
@@ -1,18 +1,19 @@
-AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\"libebookbackendgoogle\" \
-	-I$(top_srcdir) \
-	-I$(top_builddir) \
-	-I$(top_srcdir)/addressbook \
-	-I$(top_builddir)/addressbook \
-	-I$(top_srcdir)/servers/google/libgdata \
-	-I$(top_builddir)/servers/google/libgdata \
-	-I$(top_srcdir)/servers/google/libgdata-google \
+extension_LTLIBRARIES = libebookbackendgoogle.la
+
+libebookbackendgoogle_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)					\
+	-DG_LOG_DOMAIN=\"libebookbackendgoogle\" 	\
+	-I$(top_srcdir) 				\
+	-I$(top_builddir) 				\
+	-I$(top_srcdir)/addressbook 			\
+	-I$(top_builddir)/addressbook 			\
+	-I$(top_srcdir)/servers/google/libgdata 	\
+	-I$(top_builddir)/servers/google/libgdata 	\
+	-I$(top_srcdir)/servers/google/libgdata-google 	\
 	-I$(top_builddir)/servers/google/libgdata-google \
-	$(SOUP_CFLAGS) \
+	$(SOUP_CFLAGS) 					\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
-extension_LTLIBRARIES = libebookbackendgoogle.la
-
 libebookbackendgoogle_la_SOURCES = \
 	util.h \
 	util.c \
diff --git a/addressbook/backends/groupwise/Makefile.am b/addressbook/backends/groupwise/Makefile.am
index 5f3e667..530c8d4 100644
--- a/addressbook/backends/groupwise/Makefile.am
+++ b/addressbook/backends/groupwise/Makefile.am
@@ -1,4 +1,7 @@
-AM_CPPFLAGS =						\
+extension_LTLIBRARIES = libebookbackendgroupwise.la
+
+libebookbackendgroupwise_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)					\
 	-DG_LOG_DOMAIN=\"libebookbackend\"		\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
@@ -8,7 +11,6 @@ AM_CPPFLAGS =						\
 	$(DB_CFLAGS)					\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)                 \
 	$(SOUP_CFLAGS)	
-extension_LTLIBRARIES = libebookbackendgroupwise.la
 
 libebookbackendgroupwise_la_SOURCES =			\
 	e-book-backend-groupwise.c			\
@@ -29,6 +31,16 @@ libebookbackendgroupwise_la_LDFLAGS =		\
 	-module -avoid-version $(NO_UNDEFINED)
 
 noinst_PROGRAMS = create-account
+
+create_account_CPPFLAGS = \
+	$(AM_CPPFLAGS)		\
+	-I$(top_srcdir)					\
+	-I$(top_builddir)				\
+	-I$(top_srcdir)/addressbook			\
+	-I$(top_builddir)/addressbook			\
+	-I$(top_srcdir)/servers/groupwise            	\
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
 create_account_SOURCES = create-account.c
 
 create_account_LDADD =  $(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la      \
diff --git a/addressbook/backends/ldap/Makefile.am b/addressbook/backends/ldap/Makefile.am
index f4def36..c070f8f 100644
--- a/addressbook/backends/ldap/Makefile.am
+++ b/addressbook/backends/ldap/Makefile.am
@@ -1,4 +1,7 @@
-AM_CPPFLAGS =						\
+extension_LTLIBRARIES = libebookbackendldap.la
+
+libebookbackendldap_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)					\
 	-DG_LOG_DOMAIN=\"libebookbackend\"		\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
@@ -7,8 +10,6 @@ AM_CPPFLAGS =						\
 	$(LDAP_CFLAGS)					\
         $(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
-extension_LTLIBRARIES = libebookbackendldap.la
-
 libebookbackendldap_la_SOURCES =			\
 	e-book-backend-ldap.c				\
 	e-book-backend-ldap.h				\
@@ -22,10 +23,9 @@ libebookbackendldap_la_LIBADD =						\
 	$(EVOLUTION_ADDRESSBOOK_LIBS)					\
 	$(LDAP_LIBS)
 
-libebookbackendldap_la_LDFLAGS =	\
-	-module -avoid-version $(NO_UNDEFINED)
+libebookbackendldap_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
-LDAP_SCHEMA =						\
+LDAP_SCHEMA = \
 	evolutionperson.schema
 
 ldapschemadir = $(privdatadir)
diff --git a/addressbook/backends/vcf/Makefile.am b/addressbook/backends/vcf/Makefile.am
index 513594c..cbd59df 100644
--- a/addressbook/backends/vcf/Makefile.am
+++ b/addressbook/backends/vcf/Makefile.am
@@ -1,4 +1,7 @@
-AM_CPPFLAGS =						\
+extension_LTLIBRARIES = libebookbackendvcf.la
+
+libebookbackendvcf_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)					\
 	-DG_LOG_DOMAIN=\"libebookbackend\"		\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
@@ -6,8 +9,6 @@ AM_CPPFLAGS =						\
 	-I$(top_builddir)/addressbook			\
         $(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
-extension_LTLIBRARIES = libebookbackendvcf.la
-
 libebookbackendvcf_la_SOURCES =			\
 	e-book-backend-vcf.c			\
 	e-book-backend-vcf.h			\
diff --git a/addressbook/backends/webdav/Makefile.am b/addressbook/backends/webdav/Makefile.am
index 45e47df..ece0bd2 100644
--- a/addressbook/backends/webdav/Makefile.am
+++ b/addressbook/backends/webdav/Makefile.am
@@ -1,14 +1,15 @@
-AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\"libebookbackendgoogle\" \
-	-I$(top_srcdir) \
-	-I$(top_builddir) \
-	-I$(top_srcdir)/addressbook \
-	-I$(top_builddir)/addressbook \
-	$(SOUP_CFLAGS) \
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
-
 extension_LTLIBRARIES = libebookbackendwebdav.la
 
+libebookbackendwebdav_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)					\
+	-DG_LOG_DOMAIN=\"libebookbackendgoogle\" 	\
+	-I$(top_srcdir) 				\
+	-I$(top_builddir) 				\
+	-I$(top_srcdir)/addressbook 			\
+	-I$(top_builddir)/addressbook 			\
+	$(SOUP_CFLAGS) 					\
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
 libebookbackendwebdav_la_SOURCES = \
 	e-book-backend-webdav-factory.c \
 	e-book-backend-webdav.h \
@@ -21,5 +22,4 @@ libebookbackendwebdav_la_LIBADD = \
 	$(SOUP_LIBS) \
 	$(EVOLUTION_ADDRESSBOOK_LIBS)
 
-libebookbackendwebdav_la_LDFLAGS = \
-	-module -avoid-version $(NO_UNDEFINED)
+libebookbackendwebdav_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
diff --git a/addressbook/libebook/Makefile.am b/addressbook/libebook/Makefile.am
index 54f08b4..bb77edc 100644
--- a/addressbook/libebook/Makefile.am
+++ b/addressbook/libebook/Makefile.am
@@ -1,4 +1,12 @@
-AM_CPPFLAGS =						\
+# The marshallers
+MARSHAL_GENERATED = e-book-marshal.c e-book-marshal.h
+ EVO_MARSHAL_RULE@
+
+# The library
+lib_LTLIBRARIES = libebook-1.2.la
+
+libebook_1_2_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)					\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
 	-DG_LOG_DOMAIN=\"libebook\"			\
 	-I$(top_srcdir)					\
@@ -8,14 +16,7 @@ AM_CPPFLAGS =						\
 	-I$(top_builddir)/addressbook/libebook		\
         $(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
-# The marshallers
-MARSHAL_GENERATED = e-book-marshal.c e-book-marshal.h
- EVO_MARSHAL_RULE@
-
-# The library
-lib_LTLIBRARIES = libebook-1.2.la
-
-libebook_1_2_la_SOURCES =					\
+libebook_1_2_la_SOURCES =				\
 	$(MARSHAL_GENERATED)				\
 	$(DBUS_GENERATED_H)				\
 	e-address-western.c				\
diff --git a/addressbook/libedata-book/Makefile.am b/addressbook/libedata-book/Makefile.am
index 00eb44e..bcc44aa 100644
--- a/addressbook/libedata-book/Makefile.am
+++ b/addressbook/libedata-book/Makefile.am
@@ -1,16 +1,3 @@
-AM_CPPFLAGS =						\
-	-DG_LOG_DOMAIN=\"libedata-book\"		\
-	-DLIBEXECDIR=\"$(libexecdir)\"			\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	-I$(top_srcdir)/addressbook			\
-	-I$(top_builddir)/addressbook			\
-	$(DB_CFLAGS)					\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
-
-# The library
-lib_LTLIBRARIES = libedata-book-1.2.la
-
 DBUS_GENERATED_H = e-data-book-glue.h e-data-book-factory-glue.h e-data-book-view-glue.h
 %-glue.h: %.xml
 	dbus-binding-tool --mode=glib-server --output=$@ --prefix=$(subst -,_,$*) $^
@@ -22,6 +9,20 @@ glib_enum_prefix=e_data_book
 
 ENUM_GENERATED = e-data-book-enumtypes.h e-data-book-enumtypes.c
 
+# The library
+lib_LTLIBRARIES = libedata-book-1.2.la
+
+libedata_book_1_2_la_CPPFLAGS =				\
+	$(AM_CPPFLAGS)					\
+	-DG_LOG_DOMAIN=\"libedata-book\"		\
+	-DLIBEXECDIR=\"$(libexecdir)\"			\
+	-I$(top_srcdir)					\
+	-I$(top_builddir)				\
+	-I$(top_srcdir)/addressbook			\
+	-I$(top_builddir)/addressbook			\
+	$(DB_CFLAGS)					\
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
 libedata_book_1_2_la_SOURCES =				\
 	$(DBUS_GENERATED_H)				\
 	e-book-backend-factory.c			\
@@ -62,6 +63,23 @@ libedata_bookinclude_HEADERS =				\
 	e-book-backend-cache.h 				\
 	e-book-backend-db-cache.h
 
+factorydir = $(libexecdir)
+
+factory_PROGRAMS = e-addressbook-factory
+
+e_addressbook_factory_CPPFLAGS = \
+	$(AM_CPPFLAGS)				\
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS)		\
+	-DG_LOG_DOMAIN=\"libedata-book\"	\
+	-I$(top_srcdir)				\
+	-I$(top_builddir)			\
+	-I$(top_srcdir)/addressbook		\
+	-I$(top_builddir)/addressbook
+
+e_addressbook_factory_SOURCES = e-data-book-factory.c e-data-book-factory.h offline-listener.c	offline-listener.h
+
+e_addressbook_factory_LDADD = libedata-book-1.2.la
+
 %-$(API_VERSION).pc: %.pc
 	 cp $< $@
 
@@ -86,9 +104,3 @@ EXTRA_DIST = 						\
 
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
-
-factorydir = $(libexecdir)
-factory_PROGRAMS = e-addressbook-factory
-
-e_addressbook_factory_SOURCES = e-data-book-factory.c e-data-book-factory.h offline-listener.c	offline-listener.h
-e_addressbook_factory_LDADD = libedata-book-1.2.la
diff --git a/addressbook/tests/ebook/Makefile.am b/addressbook/tests/ebook/Makefile.am
index bc6a2da..56b97c6 100644
--- a/addressbook/tests/ebook/Makefile.am
+++ b/addressbook/tests/ebook/Makefile.am
@@ -1,28 +1,44 @@
-AM_CPPFLAGS = 				\
-	-I$(top_srcdir)			\
-	-I$(top_builddir)		\
-	-I$(top_srcdir)/addressbook	\
-	-I$(top_builddir)/addressbook	\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
-
 TEST_LIBS=							\
 	$(top_builddir)/addressbook/libebook/libebook-1.2.la	\
 	$(EVOLUTION_ADDRESSBOOK_LIBS)
 
 noinst_PROGRAMS= test-changes test-categories test-date test-ebook test-ebook-async test-ebook-view test-nonexistent-id test-photo test-query test-self test-string test-undefinedfield test-untyped-phones test-search test-stress-bookviews
 
+TEST_CPPFLAGS= \
+	$(AM_CPPFLAGS)			\
+	-I$(top_srcdir)			\
+	-I$(top_builddir)		\
+	-I$(top_srcdir)/addressbook	\
+	-I$(top_builddir)/addressbook	\
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
 test_search_LDADD=$(TEST_LIBS)
+test_search_CPPFLAGS=$(TEST_CPPFLAGS)
 test_date_LDADD=$(TEST_LIBS)
+test_date_CPPFLAGS=$(TEST_CPPFLAGS)
 test_ebook_LDADD=$(TEST_LIBS)
+test_ebook_CPPFLAGS=$(TEST_CPPFLAGS)
 test_ebook_async_LDADD=$(TEST_LIBS)
+test_ebook_async_CPPFLAGS=$(TEST_CPPFLAGS)
 test_ebook_view_LDADD=$(TEST_LIBS)
+test_ebook_view_CPPFLAGS=$(TEST_CPPFLAGS)
 test_changes_LDADD=$(TEST_LIBS)
+test_changes_CPPFLAGS=$(TEST_CPPFLAGS)
 test_categories_LDADD=$(TEST_LIBS)
+test_categories_CPPFLAGS=$(TEST_CPPFLAGS)
 test_nonexistent_id_LDADD=$(TEST_LIBS)
+test_nonexistent_id_CPPFLAGS=$(TEST_CPPFLAGS)
 test_photo_LDADD=$(TEST_LIBS)
+test_photo_CPPFLAGS=$(TEST_CPPFLAGS)
 test_query_LDADD=$(TEST_LIBS)
+test_query_CPPFLAGS=$(TEST_CPPFLAGS)
 test_self_LDADD=$(TEST_LIBS)
+test_self_CPPFLAGS=$(TEST_CPPFLAGS)
 test_string_LDADD=$(TEST_LIBS)
+test_string_CPPFLAGS=$(TEST_CPPFLAGS)
 test_undefinedfield_LDADD=$(TEST_LIBS)
+test_undefinedfield_CPPFLAGS=$(TEST_CPPFLAGS)
 test_untyped_phones_LDADD=$(TEST_LIBS)
+test_untyped_phones_CPPFLAGS=$(TEST_CPPFLAGS)
 test_stress_bookviews_LDADD=$(TEST_LIBS)
+test_stress_bookviews_CPPFLAGS=$(TEST_CPPFLAGS)
diff --git a/addressbook/tests/vcard/Makefile.am b/addressbook/tests/vcard/Makefile.am
index 48801e8..5a274ca 100644
--- a/addressbook/tests/vcard/Makefile.am
+++ b/addressbook/tests/vcard/Makefile.am
@@ -1,12 +1,12 @@
-AM_CPPFLAGS = 				\
+noinst_PROGRAMS = dump-vcard
+
+dump_vcard_CPPFLAGS = \
 	-I$(top_srcdir)			\
 	-I$(top_builddir)		\
 	-I$(top_srcdir)/addressbook	\
 	-I$(top_builddir)/addressbook	\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
-noinst_PROGRAMS = dump-vcard
-
 dump_vcard_LDADD = 						\
 	$(top_builddir)/addressbook/libebook/libebook-1.2.la	\
 	$(EVOLUTION_ADDRESSBOOK_LIBS)
diff --git a/calendar/backends/caldav/Makefile.am b/calendar/backends/caldav/Makefile.am
index 0c85597..45dde7d 100644
--- a/calendar/backends/caldav/Makefile.am
+++ b/calendar/backends/caldav/Makefile.am
@@ -1,4 +1,7 @@
-AM_CPPFLAGS = \
+extension_LTLIBRARIES = libecalbackendcaldav.la
+
+libecalbackendcaldav_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)	\
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/calendar \
 	-I$(top_builddir)/calendar \
@@ -6,8 +9,6 @@ AM_CPPFLAGS = \
 	$(SOUP_CFLAGS) \
 	-DG_LOG_DOMAIN=\"e-cal-backend-caldav\"
 
-extension_LTLIBRARIES = libecalbackendcaldav.la
-
 libecalbackendcaldav_la_SOURCES = \
 	e-cal-backend-caldav-factory.c \
 	e-cal-backend-caldav-factory.h \
diff --git a/calendar/backends/contacts/Makefile.am b/calendar/backends/contacts/Makefile.am
index e81a8e0..8a48934 100644
--- a/calendar/backends/contacts/Makefile.am
+++ b/calendar/backends/contacts/Makefile.am
@@ -1,4 +1,7 @@
-AM_CPPFLAGS =						\
+extension_LTLIBRARIES = libecalbackendcontacts.la
+
+libecalbackendcontacts_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)					\
 	-DG_LOG_DOMAIN=\"libecalbackendcontact\"	\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
@@ -8,8 +11,6 @@ AM_CPPFLAGS =						\
 	-I$(top_builddir)/addressbook			\
 	$(EVOLUTION_CALENDAR_CFLAGS)
 
-extension_LTLIBRARIES = libecalbackendcontacts.la
-
 libecalbackendcontacts_la_SOURCES =		\
 	e-cal-backend-contacts-factory.c	\
 	e-cal-backend-contacts-factory.h	\
diff --git a/calendar/backends/file/Makefile.am b/calendar/backends/file/Makefile.am
index e1e39a7..5adebcb 100644
--- a/calendar/backends/file/Makefile.am
+++ b/calendar/backends/file/Makefile.am
@@ -1,4 +1,7 @@
-AM_CPPFLAGS =						\
+extension_LTLIBRARIES = libecalbackendfile.la
+
+libecalbackendfile_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)					\
 	-DG_LOG_DOMAIN=\"libecalbackendfile\"		\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
@@ -6,18 +9,16 @@ AM_CPPFLAGS =						\
 	-I$(top_builddir)/calendar			\
 	$(EVOLUTION_CALENDAR_CFLAGS)
 
-extension_LTLIBRARIES = libecalbackendfile.la
-
 libecalbackendfile_la_SOURCES =		\
-	e-cal-backend-file-factory.c\
-	e-cal-backend-file-factory.h\
-	e-cal-backend-file-events.c\
-	e-cal-backend-file-events.h\
-	e-cal-backend-file-journal.c\
-	e-cal-backend-file-journal.h\
-	e-cal-backend-file-todos.c\
-	e-cal-backend-file-todos.h\
-	e-cal-backend-file.c	\
+	e-cal-backend-file-factory.c	\
+	e-cal-backend-file-factory.h	\
+	e-cal-backend-file-events.c	\
+	e-cal-backend-file-events.h	\
+	e-cal-backend-file-journal.c	\
+	e-cal-backend-file-journal.h	\
+	e-cal-backend-file-todos.c	\
+	e-cal-backend-file-todos.h	\
+	e-cal-backend-file.c		\
 	e-cal-backend-file.h
 
 libecalbackendfile_la_LIBADD =							\
diff --git a/calendar/backends/google/Makefile.am b/calendar/backends/google/Makefile.am
index f22cbae..f7959ad 100644
--- a/calendar/backends/google/Makefile.am
+++ b/calendar/backends/google/Makefile.am
@@ -1,4 +1,7 @@
-AM_CPPFLAGS =						\
+extension_LTLIBRARIES = libecalbackendgoogle.la
+
+libecalbackendgoogle_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)					\
 	-DG_LOG_DOMAIN=\"libecalbackendgoogle\"		\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
@@ -12,8 +15,6 @@ AM_CPPFLAGS =						\
 	$(SOUP_CFLAGS)					\
 	$(DEBUG_CFLAGS)					
 
-extension_LTLIBRARIES = libecalbackendgoogle.la
-
 libecalbackendgoogle_la_SOURCES =		\
 	e-cal-backend-google-factory.c		\
 	e-cal-backend-google-factory.h		\
diff --git a/calendar/backends/groupwise/Makefile.am b/calendar/backends/groupwise/Makefile.am
index c362c56..3a8c654 100644
--- a/calendar/backends/groupwise/Makefile.am
+++ b/calendar/backends/groupwise/Makefile.am
@@ -1,4 +1,7 @@
-AM_CPPFLAGS =						\
+extension_LTLIBRARIES = libecalbackendgroupwise.la
+
+libecalbackendgroupwise_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)					\
 	-DG_LOG_DOMAIN=\"libecalbackendgroupwise\"	\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
@@ -10,8 +13,6 @@ AM_CPPFLAGS =						\
 	$(SOUP_CFLAGS)					\
 	$(DEBUG_CFLAGS)
 
-extension_LTLIBRARIES = libecalbackendgroupwise.la
-
 libecalbackendgroupwise_la_SOURCES =		\
 	e-cal-backend-groupwise-factory.c	\
 	e-cal-backend-groupwise-factory.h	\
diff --git a/calendar/backends/http/Makefile.am b/calendar/backends/http/Makefile.am
index cd8ef34..603eb94 100644
--- a/calendar/backends/http/Makefile.am
+++ b/calendar/backends/http/Makefile.am
@@ -1,4 +1,7 @@
-AM_CPPFLAGS =						\
+extension_LTLIBRARIES = libecalbackendhttp.la
+
+libecalbackendhttp_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)					\
 	-DG_LOG_DOMAIN=\"libecalbackendhttp\"		\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
@@ -7,8 +10,6 @@ AM_CPPFLAGS =						\
 	$(EVOLUTION_CALENDAR_CFLAGS)			\
 	$(SOUP_CFLAGS)
 
-extension_LTLIBRARIES = libecalbackendhttp.la
-
 libecalbackendhttp_la_SOURCES =		\
 	e-cal-backend-http-factory.c	\
 	e-cal-backend-http-factory.h	\
diff --git a/calendar/backends/weather/Makefile.am b/calendar/backends/weather/Makefile.am
index 15e81bb..fe3e001 100644
--- a/calendar/backends/weather/Makefile.am
+++ b/calendar/backends/weather/Makefile.am
@@ -1,4 +1,7 @@
-AM_CPPFLAGS =						\
+extension_LTLIBRARIES = libecalbackendweather.la
+
+libecalbackendweather_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)					\
 	-DG_LOG_DOMAIN=\"libecalbackendweather\"	\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
@@ -12,8 +15,6 @@ AM_CPPFLAGS =						\
 	$(SOUP_CFLAGS)					\
 	$(LIBGWEATHER_CFLAGS)
 
-extension_LTLIBRARIES = libecalbackendweather.la
-
 libecalbackendweather_la_SOURCES =	\
 	e-cal-backend-weather-factory.c	\
 	e-cal-backend-weather-factory.h	\
diff --git a/calendar/libecal/Makefile.am b/calendar/libecal/Makefile.am
index 87553bf..3b4c8f0 100644
--- a/calendar/libecal/Makefile.am
+++ b/calendar/libecal/Makefile.am
@@ -1,14 +1,3 @@
-AM_CPPFLAGS =						\
-	-DG_LOG_DOMAIN=\"libecal\"			\
-	-I$(top_srcdir)/calendar			\
-	-I$(srcdir) -I$(top_srcdir) 			\
-	-I. 						\
-	-I.. 						\
-	-I$(top_builddir)				\
-	-I$(top_builddir)/calendar/libecal		\
-	$(LIBICAL_CFLAGS)				\
-	$(EVOLUTION_CALENDAR_CFLAGS)
-
 # The corba stubs and skels
 CORBA_GENERATED_C =				\
 	Evolution-DataServer-Calendar-common.c		\
@@ -35,6 +24,16 @@ MARSHAL_GENERATED = e-cal-marshal.c e-cal-marshal.h
 # The library
 lib_LTLIBRARIES = libecal-1.2.la
 
+libecal_1_2_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)							\
+	-DG_LOG_DOMAIN=\"libecal\"				\
+	-I$(top_srcdir) 						\
+	-I$(top_srcdir)/calendar				\
+	-I$(top_builddir)						\
+	-I$(top_builddir)/calendar/libecal		\
+	$(LIBICAL_CFLAGS)						\
+	$(EVOLUTION_CALENDAR_CFLAGS)
+
 libecal_1_2_la_SOURCES =	\
 	$(CORBA_GENERATED_C)	\
 	$(CORBA_GENERATED_H)	\
@@ -91,4 +90,3 @@ EXTRA_DIST = 						\
 
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
-
diff --git a/calendar/libedata-cal/Makefile.am b/calendar/libedata-cal/Makefile.am
index b3b66b8..7fd2c5d 100644
--- a/calendar/libedata-cal/Makefile.am
+++ b/calendar/libedata-cal/Makefile.am
@@ -1,13 +1,3 @@
-AM_CPPFLAGS =						\
-	-DG_LOG_DOMAIN=\"libedata-cal\"			\
-	-DBASE_VERSION=\""$(BASE_VERSION)"\"		\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_builddir)/calendar			\
-	$(LIBICAL_CFLAGS)				\
-	$(EVOLUTION_CALENDAR_CFLAGS)
-
 CORBA_GENERATED_H =				\
 	Evolution-DataServer-Calendar.h
 
@@ -31,6 +21,17 @@ $(CORBA_GENERATED_C): $(CORBA_GENERATED_H)
 # The libraray
 lib_LTLIBRARIES = libedata-cal-1.2.la
 
+libedata_cal_1_2_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)					\
+	-DG_LOG_DOMAIN=\"libedata-cal\"			\
+	-DBASE_VERSION=\""$(BASE_VERSION)"\"		\
+	-I$(top_srcdir)					\
+	-I$(top_builddir)				\
+	-I$(top_srcdir)/calendar			\
+	-I$(top_builddir)/calendar			\
+	$(LIBICAL_CFLAGS)				\
+	$(EVOLUTION_CALENDAR_CFLAGS)
+
 libedata_cal_1_2_la_SOURCES =		\
 	$(CORBA_GENERATED_C)		\
 	e-cal-backend.c			\
diff --git a/calendar/tests/ecal/Makefile.am b/calendar/tests/ecal/Makefile.am
index f4fd783..0cd6ac0 100644
--- a/calendar/tests/ecal/Makefile.am
+++ b/calendar/tests/ecal/Makefile.am
@@ -1,12 +1,3 @@
-AM_CPPFLAGS =						\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_builddir)/calendar			\
-	$(LIBICAL_CFLAGS)				\
-	$(EVOLUTION_CALENDAR_CFLAGS)
-
 EXTRA_DIST =                          \
 	$(test_scripts)               \
 	testdata.ics
@@ -18,7 +9,18 @@ test_scripts =                         \
 # The test program
 noinst_PROGRAMS = test-ecal test-recur test-search
 
+TEST_ECAL_CPPFLAGS= \
+	$(AM_CPPFLAGS)					\
+	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
+	-I$(top_srcdir)					\
+	-I$(top_builddir)				\
+	-I$(top_srcdir)/calendar			\
+	-I$(top_builddir)/calendar			\
+	$(LIBICAL_CFLAGS)				\
+	$(EVOLUTION_CALENDAR_CFLAGS)
+
 test_ecal_SOURCES = test-ecal.c
+test_ecal_CPPFLAGS = $(TEST_ECAL_CPPFLAGS)
 test_ecal_INCLUDES =			\
 	$(INCLUDES)			\
 	-DG_LOG_DOMAIN=\"test-ecal\"
@@ -28,6 +30,7 @@ test_ecal_LDADD =								\
 	$(EVOLUTION_CALENDAR_LIBS)
 
 test_recur_SOURCES = test-recur.c
+test_recur_CPPFLAGS = $(TEST_ECAL_CPPFLAGS)
 test_recur_INCLUDES =			\
 	$(INCLUDES)			\
 	-DG_LOG_DOMAIN=\"test-ecal\"
@@ -37,6 +40,7 @@ test_recur_LDADD =								\
 	$(EVOLUTION_CALENDAR_LIBS)
 
 test_search_SOURCES = test-search.c
+test_search_CPPFLAGS = $(TEST_ECAL_CPPFLAGS)
 test_search_INCLUDES =			\
 	$(INCLUDES)			\
 	-DG_LOG_DOMAIN=\"test-ecal\"
diff --git a/camel/Makefile.am b/camel/Makefile.am
index e3d160d..e696bed 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -1,5 +1,3 @@
-## Process this file with automake to produce Makefile.in
-
 SUBDIRS = . providers tests
 
 if OS_WIN32
@@ -31,12 +29,16 @@ camellibexec_PROGRAMS =	$(LOCK_HELPER) camel-index-control-1.2
 
 lib_LTLIBRARIES = libcamel-1.2.la libcamel-provider-1.2.la
 
-AM_CPPFLAGS = -I.. -I$(srcdir)/.. 			 	\
-	-DCAMEL_LIBEXECDIR=\""$(camellibexecdir)"\"	\
+libcamel_provider_1_2_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)									\
+	-I$(top_srcdir) 								\
+	-I$(top_builddir)								\
+	-I$(srcdir)										\
+	-DCAMEL_LIBEXECDIR=\""$(camellibexecdir)"\"		\
 	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" 	\
-	-DG_LOG_DOMAIN=\"camel\"			\
-	-DE_DATA_SERVER_PREFIX=\"$(prefix)\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
+	-DG_LOG_DOMAIN=\"camel\"						\
+	-DE_DATA_SERVER_PREFIX=\"$(prefix)\"			\
+	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"		\
 	$(CAMEL_CFLAGS)
 
 libcamel_provider_1_2_la_SOURCES = 		\
@@ -148,6 +150,18 @@ libcamel_provider_1_2_la_LIBADD =			\
 	$(SOCKET_LIBS)				\
 	$(REGEX_LIBS)
 
+libcamel_1_2_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)									\
+	-I$(top_srcdir) 								\
+	-I$(top_builddir)								\
+	-I$(srcdir)										\
+	-DCAMEL_LIBEXECDIR=\""$(camellibexecdir)"\"		\
+	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" 	\
+	-DG_LOG_DOMAIN=\"camel\"						\
+	-DE_DATA_SERVER_PREFIX=\"$(prefix)\"			\
+	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"		\
+	$(CAMEL_CFLAGS)
+
 libcamel_1_2_la_SOURCES = 			\
 	camel-address.c				\
 	camel-arg.c				\
@@ -302,21 +316,45 @@ libcamel_1_2_la_LIBADD =				\
 	$(ICONV_LIBS)							\
 	$(REGEX_LIBS)
 
+camel_lock_helper_1_2_CPPFLAGS = \
+	$(AM_CPPFLAGS)									\
+	-I$(top_srcdir) 								\
+	-I$(top_builddir)								\
+	-I$(srcdir)										\
+	-DCAMEL_LIBEXECDIR=\""$(camellibexecdir)"\"		\
+	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" 	\
+	-DG_LOG_DOMAIN=\"camel\"						\
+	-DE_DATA_SERVER_PREFIX=\"$(prefix)\"			\
+	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"		\
+	$(CAMEL_CFLAGS)
 
-camel_lock_helper_1_2_SOURCES = 		\
+camel_lock_helper_1_2_SOURCES = \
+	camel-lock.c					\
+	camel-lock.h					\
 	camel-lock-helper.c 			\
 	camel-lock-helper.h
 
 # NOTE: This needs to be cleaned up, it shouldn't link with all this crap,
 # because it might be setuid.
-camel_lock_helper_1_2_LDADD =			\
-	camel-lock.o				\
+camel_lock_helper_1_2_LDADD = \
 	$(libcamel_1_2_la_LIBADD)
 
-camel_index_control_1_2_SOURCES =		\
+camel_index_control_1_2_CPPFLAGS = \
+	$(AM_CPPFLAGS)									\
+	-I$(top_srcdir) 								\
+	-I$(top_builddir)								\
+	-I$(srcdir)										\
+	-DCAMEL_LIBEXECDIR=\""$(camellibexecdir)"\"		\
+	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" 	\
+	-DG_LOG_DOMAIN=\"camel\"						\
+	-DE_DATA_SERVER_PREFIX=\"$(prefix)\"			\
+	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"		\
+	$(CAMEL_CFLAGS)
+
+camel_index_control_1_2_SOURCES = \
 	camel-index-control.c
 
-camel_index_control_1_2_LDADD =			\
+camel_index_control_1_2_LDADD = \
 	libcamel-1.2.la				\
 	$(libcamel_1_2_la_LIBADD)
 
diff --git a/camel/providers/Makefile.am b/camel/providers/Makefile.am
index 6d79cd6..6472be1 100644
--- a/camel/providers/Makefile.am
+++ b/camel/providers/Makefile.am
@@ -1,5 +1,3 @@
-## Process this file with automake to produce Makefile.in
-
 if ENABLE_NNTP
 NNTP_DIR=nntp
 endif
diff --git a/camel/providers/groupwise/Makefile.am b/camel/providers/groupwise/Makefile.am
index c7d69c6..11b06eb 100644
--- a/camel/providers/groupwise/Makefile.am
+++ b/camel/providers/groupwise/Makefile.am
@@ -1,14 +1,14 @@
-## Process this file with automake to produce Makefile.in
-
 camel_provider_LTLIBRARIES = libcamelgroupwise.la
 camel_provider_DATA = libcamelgroupwise.urls
 
-AM_CPPFLAGS = -I.. \
+libcamelgroupwise_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)				\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/camel			\
+	-I$(top_srcdir)/camel/providers		\
 	-I$(top_srcdir)/camel/providers/imap    \
         -I$(top_srcdir)/libedataserver          \
-	-I$(top_srcdir)/servers/groupwise       \
+	-I$(top_srcdir)/servers/groupwise       \
 	$(CAMEL_CFLAGS)				\
 	$(GNOME_INCLUDEDIR)			\
         $(SOUP_CFLAGS)                          \
@@ -35,8 +35,8 @@ noinst_HEADERS =         			\
 	camel-groupwise-utils.h			\
 	camel-groupwise-transport.h		
 
-
 libcamelgroupwise_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED)
+
 libcamelgroupwise_la_LIBADD =                                            \
         $(top_builddir)/servers/groupwise/libegroupwise-1.2.la           \
 	$(top_builddir)/libedataserver/libedataserver-1.2.la             \
diff --git a/camel/providers/hula/Makefile.am b/camel/providers/hula/Makefile.am
index 8d17a0e..56e27e3 100644
--- a/camel/providers/hula/Makefile.am
+++ b/camel/providers/hula/Makefile.am
@@ -1,27 +1,25 @@
-## Process this file with automake to produce Makefile.in
-
 camel_provider_LTLIBRARIES = libcamelhula.la
 camel_provider_DATA = libcamelhula.urls
 
-AM_CPPFLAGS = -I.. \
+libcamelhula_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)				\
 	-I$(top_srcdir)				\
-	-I$(top_srcdir)/camel			\
-	-I$(top_srcdir)/camel/providers/imap    \
-        -I$(top_srcdir)/libedataserver          \
+	-I$(top_srcdir)/camel			\
+	-I$(top_srcdir)/camel/providers		\
+	-I$(top_srcdir)/camel/providers/imap	\
+	-I$(top_srcdir)/libedataserver          \
 	$(CAMEL_CFLAGS)				\
 	$(GNOME_INCLUDEDIR)			\
 	-DG_LOG_DOMAIN=\"camel-hula-provider\"
 
-libcamelhula_la_SOURCES = 			\
-	camel-hula-provider.c		
-	     	       	
-
+libcamelhula_la_SOURCES = camel-hula-provider.c
 
 libcamelhula_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED)
-libcamelhula_la_LIBADD =                                            \
+
+libcamelhula_la_LIBADD = \
 	$(top_builddir)/libedataserver/libedataserver-1.2.la             \
 	$(top_builddir)/camel/libcamel-provider-1.2.la	                 \
 	$(top_builddir)/camel/libcamel-1.2.la		                 \
 	$(CAMEL_LIBS)
 
-EXTRA_DIST = libcamelhula.urls
+EXTRA_DIST = libcamelhula.urls
diff --git a/camel/providers/imap/Makefile.am b/camel/providers/imap/Makefile.am
index 86e4b8b..d514b4c 100644
--- a/camel/providers/imap/Makefile.am
+++ b/camel/providers/imap/Makefile.am
@@ -1,9 +1,9 @@
-## Process this file with automake to produce Makefile.in
-
 camel_provider_LTLIBRARIES = libcamelimap.la
 camel_provider_DATA = libcamelimap.urls
 
-AM_CPPFLAGS = -I.. \
+libcamelimap_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)				\
+	-I.. 					\
 	-I$(srcdir)/..				\
 	-I$(top_srcdir)/camel			\
 	-I$(top_srcdir)				\
diff --git a/camel/providers/imap4/Makefile.am b/camel/providers/imap4/Makefile.am
index 6b0b61f..47d5ad9 100644
--- a/camel/providers/imap4/Makefile.am
+++ b/camel/providers/imap4/Makefile.am
@@ -1,9 +1,8 @@
-## Process this file with automake to produce Makefile.in
-
 camel_provider_LTLIBRARIES = libcamelimap4.la
 camel_provider_DATA = libcamelimap4.urls
 
-AM_CPPFLAGS = 					\
+libcamelimap4_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)				\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/camel			\
 	-I$(top_srcdir)				\
diff --git a/camel/providers/imapx/Makefile.am b/camel/providers/imapx/Makefile.am
index c9ff9df..8b1a37f 100644
--- a/camel/providers/imapx/Makefile.am
+++ b/camel/providers/imapx/Makefile.am
@@ -1,9 +1,9 @@
-## Process this file with automake to produce Makefile.in
-
 camel_provider_LTLIBRARIES = libcamelimapx.la
 camel_provider_DATA = libcamelimapx.urls
 
-INCLUDES = -I.. \
+libcamelimapx_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)				\
+	-I..					\
 	-I$(srcdir)/..				\
 	-I$(top_srcdir)/camel			\
 	-I$(top_srcdir)/intl			\
@@ -40,11 +40,20 @@ libcamelimapx_la_LDFLAGS = -avoid-version -module
 
 noinst_PROGRAMS = test-imapx
 
+test_imapx_CPPFLAGS = \
+	$(AM_CPPFLAGS)				\
+	-I..					\
+	-I$(srcdir)/..				\
+	-I$(top_srcdir)/camel			\
+	-I$(top_srcdir)/intl			\
+	-I$(top_srcdir)/e-util			\
+	-I$(top_srcdir)				\
+	$(CAMEL_CFLAGS)				\
+	-DG_LOG_DOMAIN=\"camel-imapx\"
 test_imapx_SOURCES = test-imapx.c
 test_imapx_LDADD =							\ 
 	$(top_builddir)/camel/libcamel-1.2.la				\
 	$(top_builddir)/camel/libcamel-provider-1.2.la			\
-	$(top_builddir)/camel/providers/imapx/libcamelimapx.la
-
+	libcamelimapx.la
 
 EXTRA_DIST = libcamelimapx.urls
diff --git a/camel/providers/imapx/camel-imapx-tokenise.h b/camel/providers/imapx/camel-imapx-tokenise.h
index 0309d39..e69de29 100644
--- a/camel/providers/imapx/camel-imapx-tokenise.h
+++ b/camel/providers/imapx/camel-imapx-tokenise.h
@@ -1,175 +0,0 @@
-/* ANSI-C code produced by gperf version 3.0.1 */
-/* Command-line: gperf -H imap_hash -N imap_tokenise_struct -L ANSI-C -o -t -k'1,$' camel-imapx-tokens.txt  */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf gnu org>."
-#endif
-
-#line 3 "camel-imapx-tokens.txt"
-struct _imap_keyword { char *name; camel_imapx_id_t id; };
-
-#define TOTAL_KEYWORDS 31
-#define MIN_WORD_LENGTH 2
-#define MAX_WORD_LENGTH 14
-#define MIN_HASH_VALUE 2
-#define MAX_HASH_VALUE 49
-/* maximum key range = 48, duplicates = 0 */
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static unsigned int
-imap_hash (register const char *str, register unsigned int len)
-{
-  static unsigned char asso_values[] =
-    {
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 20, 15,  0, 20,  0,
-      20, 50,  5,  0, 50,  0, 20, 50, 15,  0,
-      15, 50,  0,  0, 10, 10, 50, 50, 50,  5,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-      50, 50, 50, 50, 50, 50
-    };
-  return len + asso_values[(unsigned char)str[len - 1]] + asso_values[(unsigned char)str[0]];
-}
-
-#ifdef __GNUC__
-__inline
-#endif
-struct _imap_keyword *
-imap_tokenise_struct (register const char *str, register unsigned int len)
-{
-  static struct _imap_keyword wordlist[] =
-    {
-      {""}, {""},
-#line 22 "camel-imapx-tokens.txt"
-      {"OK",		IMAP_OK},
-      {""}, {""}, {""},
-#line 13 "camel-imapx-tokens.txt"
-      {"EXISTS",		IMAP_EXISTS},
-#line 14 "camel-imapx-tokens.txt"
-      {"EXPUNGE",	IMAP_EXPUNGE},
-#line 12 "camel-imapx-tokens.txt"
-      {"ENVELOPE",	IMAP_ENVELOPE},
-      {""},
-#line 27 "camel-imapx-tokens.txt"
-      {"READ-WRITE",	IMAP_READ_WRITE},
-#line 30 "camel-imapx-tokens.txt"
-      {"RFC822.SIZE",	IMAP_RFC822_SIZE},
-#line 17 "camel-imapx-tokens.txt"
-      {"INTERNALDATE",	IMAP_INTERNALDATE},
-#line 29 "camel-imapx-tokens.txt"
-      {"RFC822.HEADER",	IMAP_RFC822_HEADER},
-#line 26 "camel-imapx-tokens.txt"
-      {"READ-ONLY",	IMAP_READ_ONLY},
-#line 11 "camel-imapx-tokens.txt"
-      {"CAPABILITY",	IMAP_CAPABILITY},
-#line 28 "camel-imapx-tokens.txt"
-      {"RECENT",		IMAP_RECENT},
-#line 21 "camel-imapx-tokens.txt"
-      {"NO",		IMAP_NO},
-#line 10 "camel-imapx-tokens.txt"
-      {"BYE",		IMAP_BYE},
-#line 32 "camel-imapx-tokens.txt"
-      {"TRYCREATE",	IMAP_TRYCREATE},
-#line 23 "camel-imapx-tokens.txt"
-      {"PARSE",		IMAP_PARSE},
-#line 31 "camel-imapx-tokens.txt"
-      {"RFC822.TEXT",	IMAP_RFC822_TEXT},
-#line 20 "camel-imapx-tokens.txt"
-      {"NEWNAME",	IMAP_NEWNAME},
-      {""},
-#line 8 "camel-imapx-tokens.txt"
-      {"BODY",		IMAP_BODY},
-#line 16 "camel-imapx-tokens.txt"
-      {"FLAGS",		IMAP_FLAGS},
-#line 34 "camel-imapx-tokens.txt"
-      {"UIDVALIDITY",	IMAP_UIDVALIDITY},
-#line 25 "camel-imapx-tokens.txt"
-      {"PREAUTH",	IMAP_PREAUTH},
-#line 9 "camel-imapx-tokens.txt"
-      {"BODYSTRUCTURE",	IMAP_BODYSTRUCTURE},
-#line 24 "camel-imapx-tokens.txt"
-      {"PERMANENTFLAGS",	IMAP_PERMANENTFLAGS},
-#line 15 "camel-imapx-tokens.txt"
-      {"FETCH",		IMAP_FETCH},
-#line 35 "camel-imapx-tokens.txt"
-      {"UNSEEN",		IMAP_UNSEEN},
-      {""},
-#line 33 "camel-imapx-tokens.txt"
-      {"UID",		IMAP_UID},
-#line 18 "camel-imapx-tokens.txt"
-      {"LIST",		IMAP_LIST},
-#line 5 "camel-imapx-tokens.txt"
-      {"ALERT",          IMAP_ALERT},
-      {""}, {""},
-#line 7 "camel-imapx-tokens.txt"
-      {"BAD",		IMAP_BAD},
-#line 19 "camel-imapx-tokens.txt"
-      {"LSUB",		IMAP_LSUB},
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 6 "camel-imapx-tokens.txt"
-      {"APPENDUID",	IMAP_APPENDUID}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = imap_hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        {
-          register const char *s = wordlist[key].name;
-
-          if (*str == *s && !strcmp (str + 1, s + 1))
-            return &wordlist[key];
-        }
-    }
-  return 0;
-}
diff --git a/camel/providers/local/Makefile.am b/camel/providers/local/Makefile.am
index 02d4d98..c046901 100644
--- a/camel/providers/local/Makefile.am
+++ b/camel/providers/local/Makefile.am
@@ -1,5 +1,3 @@
-## Process this file with automake to produce Makefile.in
-
 camel_provider_LTLIBRARIES = libcamellocal.la
 camel_provider_DATA = libcamellocal.urls
 
@@ -18,7 +16,8 @@ SYSDEP_PROVIDER_SOURCES = \
 	camel-spool-summary.c
 endif
 
-AM_CPPFLAGS = \
+libcamellocal_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)				\
 	-I$(top_srcdir)/camel			\
 	-I$(top_srcdir)				\
 	$(CAMEL_CFLAGS)				\
diff --git a/camel/providers/nntp/Makefile.am b/camel/providers/nntp/Makefile.am
index bca0d12..8a0125b 100644
--- a/camel/providers/nntp/Makefile.am
+++ b/camel/providers/nntp/Makefile.am
@@ -1,9 +1,9 @@
-## Process this file with automake to produce Makefile.in
-
 camel_provider_LTLIBRARIES = libcamelnntp.la
 camel_provider_DATA = libcamelnntp.urls
 
-AM_CPPFLAGS = -I../..				\
+libcamelnntp_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)				\
+	-I../..					\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/camel			\
 	-I$(top_srcdir)				\
diff --git a/camel/providers/pop3/Makefile.am b/camel/providers/pop3/Makefile.am
index 46f92f3..82390b3 100644
--- a/camel/providers/pop3/Makefile.am
+++ b/camel/providers/pop3/Makefile.am
@@ -1,9 +1,8 @@
-## Process this file with automake to produce Makefile.in
-
 camel_provider_LTLIBRARIES = libcamelpop3.la
 camel_provider_DATA = libcamelpop3.urls
 
-AM_CPPFLAGS =					\
+libcamelpop3_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)				\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/camel			\
 	$(CAMEL_CFLAGS)				\
diff --git a/camel/providers/sendmail/Makefile.am b/camel/providers/sendmail/Makefile.am
index 0425d7e..d99217f 100644
--- a/camel/providers/sendmail/Makefile.am
+++ b/camel/providers/sendmail/Makefile.am
@@ -1,9 +1,8 @@
-## Process this file with automake to produce Makefile.in
-
 camel_provider_LTLIBRARIES = libcamelsendmail.la
 camel_provider_DATA = libcamelsendmail.urls
 
-AM_CPPFLAGS =						\
+libcamelsendmail_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)					\
 	-I..						\
 	-I$(srcdir)/..					\
 	-I$(srcdir)/../../..				\
diff --git a/camel/providers/smtp/Makefile.am b/camel/providers/smtp/Makefile.am
index 21bcd18..a01eaf0 100644
--- a/camel/providers/smtp/Makefile.am
+++ b/camel/providers/smtp/Makefile.am
@@ -1,9 +1,8 @@
-## Process this file with automake to produce Makefile.in
-
 camel_provider_LTLIBRARIES = libcamelsmtp.la
 camel_provider_DATA = libcamelsmtp.urls
 
-AM_CPPFLAGS =					\
+libcamelsmtp_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)				\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/camel			\
 	$(CAMEL_CFLAGS)				\
diff --git a/camel/tests/Makefile.am b/camel/tests/Makefile.am
index c721d4a..a25c7a5 100644
--- a/camel/tests/Makefile.am
+++ b/camel/tests/Makefile.am
@@ -1,4 +1,3 @@
-
 SUBDIRS = lib \
 	message folder stream smime misc mime-filter
 
diff --git a/camel/tests/folder/Makefile.am b/camel/tests/folder/Makefile.am
index 1763a5d..c7b2fb3 100644
--- a/camel/tests/folder/Makefile.am
+++ b/camel/tests/folder/Makefile.am
@@ -1,5 +1,5 @@
-
-AM_CPPFLAGS =						\
+FOLDER_TESTS_CPPFLAGS= \
+	$(AM_CPPFLAGS)					\
 	-I$(includedir)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/camel				\
@@ -7,7 +7,7 @@ AM_CPPFLAGS =						\
 	-DG_LOG_DOMAIN=\"evolution-tests\"		\
 	$(CAMEL_CFLAGS)
 
-LDADD = \
+FOLDER_TESTS_LDADD= \
 	$(top_builddir)/camel/tests/lib/libcameltest.a	\
 	$(top_builddir)/camel/tests/lib/libcameltest-provider.a	\
 	$(top_builddir)/camel/libcamel-${API_VERSION}.la 		\
@@ -21,7 +21,26 @@ check_PROGRAMS =  	\
 	test7	test8	test9	\
 	test10  test11
 
-#TESTS = test1 	test2 	test3 	\
-#	test4 	test5 	test6 	\
-#	test7	test8	test9	\
-#	test10  test11
+test1_CPPFLAGS = $(FOLDER_TESTS_CPPFLAGS)
+test2_CPPFLAGS = $(FOLDER_TESTS_CPPFLAGS)
+test3_CPPFLAGS = $(FOLDER_TESTS_CPPFLAGS)
+test4_CPPFLAGS = $(FOLDER_TESTS_CPPFLAGS)
+test5_CPPFLAGS = $(FOLDER_TESTS_CPPFLAGS)
+test6_CPPFLAGS = $(FOLDER_TESTS_CPPFLAGS)
+test7_CPPFLAGS = $(FOLDER_TESTS_CPPFLAGS)
+test8_CPPFLAGS = $(FOLDER_TESTS_CPPFLAGS)
+test9_CPPFLAGS = $(FOLDER_TESTS_CPPFLAGS)
+test10_CPPFLAGS = $(FOLDER_TESTS_CPPFLAGS)
+test11_CPPFLAGS = $(FOLDER_TESTS_CPPFLAGS)
+
+test1_LDADD = $(FOLDER_TESTS_LDADD)
+test2_LDADD = $(FOLDER_TESTS_LDADD)
+test3_LDADD = $(FOLDER_TESTS_LDADD)
+test4_LDADD = $(FOLDER_TESTS_LDADD)
+test5_LDADD = $(FOLDER_TESTS_LDADD)
+test6_LDADD = $(FOLDER_TESTS_LDADD)
+test7_LDADD = $(FOLDER_TESTS_LDADD)
+test8_LDADD = $(FOLDER_TESTS_LDADD)
+test9_LDADD = $(FOLDER_TESTS_LDADD)
+test10_LDADD = $(FOLDER_TESTS_LDADD)
+test11_LDADD = $(FOLDER_TESTS_LDADD)
diff --git a/camel/tests/lib/Makefile.am b/camel/tests/lib/Makefile.am
index 541763f..f7910a9 100644
--- a/camel/tests/lib/Makefile.am
+++ b/camel/tests/lib/Makefile.am
@@ -1,11 +1,3 @@
-
-AM_CPPFLAGS =						\
-	-I$(includedir)					\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/camel				\
-	-DCAMEL_BUILD_DIR=\"$(top_builddir)/camel\"	\
-	$(CAMEL_CFLAGS)
-
 check_LIBRARIES = libcameltest.a libcameltest-provider.a
 
 libcameltest_a_SOURCES = \
@@ -17,9 +9,25 @@ libcameltest_a_SOURCES = \
 	streams.c streams.h \
 	address-data.h
 
+libcameltest_provider_a_CPPFLAGS = \
+	$(AM_CPPFLAGS)								\
+	-I$(includedir)								\
+	-I$(top_srcdir)								\
+	-I$(top_srcdir)/camel						\
+	-DCAMEL_BUILD_DIR=\"$(top_builddir)/camel\"	\
+	$(CAMEL_CFLAGS)
+
 libcameltest_provider_a_SOURCES = \
 	camel-test-provider.c camel-test-provider.h
 
+libcameltest_a_CPPFLAGS = \
+	$(AM_CPPFLAGS)								\
+	-I$(includedir)								\
+	-I$(top_srcdir)								\
+	-I$(top_srcdir)/camel						\
+	-DCAMEL_BUILD_DIR=\"$(top_builddir)/camel\"	\
+	$(CAMEL_CFLAGS)
+
 libcameltest_a_LIBADD =				\
 	$(top_builddir)/camel/libcamel-${API_VERSION}.la		\
 	$(top_builddir)/libedataserver/libedataserver-${API_VERSION}.la
diff --git a/camel/tests/message/Makefile.am b/camel/tests/message/Makefile.am
index 575d5f8..2f7022a 100644
--- a/camel/tests/message/Makefile.am
+++ b/camel/tests/message/Makefile.am
@@ -1,24 +1,32 @@
-
-AM_CPPFLAGS =						\
-	-I$(includedir)					\
-	-I$(top_srcdir)					\
+MESSAGE_TESTS_CPPFLAGS= \
+	$(AM_CPPFLAGS)						\
+	-I$(includedir)						\
+	-I$(top_srcdir)						\
 	-I$(top_srcdir)/camel				\
-	-I$(top_srcdir)/camel/tests/lib 		\
-	-DG_LOG_DOMAIN=\"evolution-tests\"		\
+	-I$(top_srcdir)/camel/tests/lib		\
+	-DG_LOG_DOMAIN=\"evolution-tests\"	\
 	$(CAMEL_CFLAGS)
 
-LDADD = \
+MESSAGE_TESTS_LDADD= \
 	$(top_builddir)/libedataserver/libedataserver-${API_VERSION}.la \
 	$(top_builddir)/camel/tests/lib/libcameltest.a			\
 	$(top_builddir)/camel/libcamel-${API_VERSION}.la 		\
 	$(INTLLIBS)
 
-check_PROGRAMS =  	\
+check_PROGRAMS = \
 	test1		\
 	test2		\
 	test3		\
 	test4
 
-CLEANFILES = test3.msg test3-2.msg test3-3.msg
+test1_CPPFLAGS = $(MESSAGE_TESTS_CPPFLAGS)
+test2_CPPFLAGS = $(MESSAGE_TESTS_CPPFLAGS)
+test3_CPPFLAGS = $(MESSAGE_TESTS_CPPFLAGS)
+test4_CPPFLAGS = $(MESSAGE_TESTS_CPPFLAGS)
 
-#TESTS = test1 test2 test3 test4
+test1_LDADD = $(MESSAGE_TESTS_LDADD)
+test2_LDADD = $(MESSAGE_TESTS_LDADD)
+test3_LDADD = $(MESSAGE_TESTS_LDADD)
+test4_LDADD = $(MESSAGE_TESTS_LDADD)
+
+CLEANFILES = test3.msg test3-2.msg test3-3.msg
diff --git a/camel/tests/mime-filter/Makefile.am b/camel/tests/mime-filter/Makefile.am
index 2216192..9915543 100644
--- a/camel/tests/mime-filter/Makefile.am
+++ b/camel/tests/mime-filter/Makefile.am
@@ -1,5 +1,5 @@
-
-AM_CPPFLAGS =						\
+MIMEFILTER_TESTS_CPPFLAGS= \
+	$(AM_CPPFLAGS)					\
 	-I$(includedir)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/camel				\
@@ -8,7 +8,7 @@ AM_CPPFLAGS =						\
 	-DSOURCEDIR=\"$(srcdir)\"				\
 	$(CAMEL_CFLAGS)
 
-LDADD = \
+MIMEFILTER_TESTS_LDADD= \
 	$(top_builddir)/camel/libcamel-${API_VERSION}.la 		\
 	$(top_builddir)/libedataserver/libedataserver-${API_VERSION}.la \
 	$(top_builddir)/camel/tests/lib/libcameltest.a	\
@@ -28,5 +28,11 @@ check_PROGRAMS =  		\
 	test-charset		\
 	test-tohtml
 
-#TESTS = test1 \
-#	test-crlf test-charset test-tohtml
+test1_CPPFLAGS = $(MIMEFILTER_TESTS_CPPFLAGS)
+test1_LDADD = $(MIMEFILTER_TESTS_LDADD)
+test_crlf_CPPFLAGS = $(MIMEFILTER_TESTS_CPPFLAGS)
+test_crlf_LDFLAGS = $(MIMEFILTER_TESTS_LDADD)
+test_charset_CPPFLAGS = $(MIMEFILTER_TESTS_CPPFLAGS)
+test_charset_LDFLAGS = $(MIMEFILTER_TESTS_LDADD)
+test_tohtml_CPPFLAGS = $(MIMEFILTER_TESTS_CPPFLAGS)
+test_tohtml_LDFLAGS = $(MIMEFILTER_TESTS_LDADD)
diff --git a/camel/tests/misc/Makefile.am b/camel/tests/misc/Makefile.am
index a5cf63c..35b8ada 100644
--- a/camel/tests/misc/Makefile.am
+++ b/camel/tests/misc/Makefile.am
@@ -1,5 +1,5 @@
-
-AM_CPPFLAGS =						\
+MISC_TESTS_CPPFLAGS= \
+	$(AM_CPPFLAGS)					\
 	-I$(includedir)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/camel				\
@@ -7,7 +7,7 @@ AM_CPPFLAGS =						\
 	-DG_LOG_DOMAIN=\"evolution-tests\"		\
 	$(CAMEL_CFLAGS)
 
-LDADD = \
+MISC_TESTS_LDADD= \
 	$(top_builddir)/camel/libcamel-provider-${API_VERSION}.la 	\
 	$(top_builddir)/camel/libcamel-${API_VERSION}.la 		\
 	$(top_builddir)/libedataserver/libedataserver-${API_VERSION}.la \
@@ -21,8 +21,19 @@ check_PROGRAMS =  	\
 	url-scan	\
 	utf7		\
 	split		\
-	rfc2047		\
-	test2
-	split
+	rfc2047
 
-#TESTS = url utf7 split url-scan rfc2047 test2
+test1_CPPFLAGS = $(MISC_TESTS_CPPFLAGS)
+test1_LDADD = $(MISC_TESTS_LDADD)
+test2_CPPFLAGS = $(MISC_TESTS_CPPFLAGS)
+test2_LDADD = $(MISC_TESTS_LDADD)
+url_CPPFLAGS = $(MISC_TESTS_CPPFLAGS)
+url_LDADD = $(MISC_TESTS_LDADD)
+url_scan_CPPFLAGS = $(MISC_TESTS_CPPFLAGS)
+url_scan_LDADD  = $(MISC_TESTS_LDADD)
+utf7_CPPFLAGS = $(MISC_TESTS_CPPFLAGS)
+utf7_LDADD = $(MISC_TESTS_LDADD)
+split_CPPFLAGS = $(MISC_TESTS_CPPFLAGS)
+split_LDADD = $(MISC_TESTS_LDADD)
+rfc2047_CPPFLAGS = $(MISC_TESTS_CPPFLAGS)
+rfc2047_LDADD = $(MISC_TESTS_LDADD)
diff --git a/camel/tests/smime/Makefile.am b/camel/tests/smime/Makefile.am
index 25a8489..b9078da 100644
--- a/camel/tests/smime/Makefile.am
+++ b/camel/tests/smime/Makefile.am
@@ -1,5 +1,5 @@
-
-AM_CPPFLAGS =						\
+SMIME_TESTS_CPPFLAGS= \
+	$(AM_CPPFLAGS)					\
 	-I$(includedir)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/camel				\
@@ -8,7 +8,7 @@ AM_CPPFLAGS =						\
 	-DTEST_DATA_DIR=\"$(top_srcdir)/camel/tests/data\"\
 	$(CAMEL_CFLAGS)
 
-LDADD = \
+SMIME_TESTS_LDADD= \
 	$(top_builddir)/libedataserver/libedataserver-${API_VERSION}.la \
 	$(top_builddir)/camel/tests/lib/libcameltest.a	\
 	$(top_builddir)/camel/libcamel-provider-${API_VERSION}.la 		\
@@ -20,4 +20,10 @@ check_PROGRAMS =  	\
 #	pgp-mime	
 #	pkcs7
 
-#TESTS = pgp #pgp-mime pkcs7
+pgp_CPPFLAGS = $(SMIME_TESTS_CPPFLAGS)
+pgp_LDADD = $(SMIME_TESTS_LDADD)
+
+# pgp_mime_CPPFLAGS = $(SMIME_TESTS_CPPFLAGS)
+# pgp_mime_LDADD = $(SMIME_TESTS_LDADD)
+# pkcs7_CPPFLAGS = $(SMIME_TESTS_CPPFLAGS)
+# pkcs7_LDADD = $(SMIME_TESTS_LDADD)
diff --git a/camel/tests/stream/Makefile.am b/camel/tests/stream/Makefile.am
index 9363e68..132bae8 100644
--- a/camel/tests/stream/Makefile.am
+++ b/camel/tests/stream/Makefile.am
@@ -1,5 +1,5 @@
-
-AM_CPPFLAGS =						\
+STREAM_TESTS_CPPFLAGS= \
+	$(AM_CPPFLAGS)					\
 	-I$(includedir)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/camel				\
@@ -7,7 +7,7 @@ AM_CPPFLAGS =						\
 	-DG_LOG_DOMAIN=\"evolution-tests\"		\
 	$(CAMEL_CFLAGS)
 
-LDADD = \
+STREAM_TESTS_LDADD= \
 	$(top_builddir)/camel/libcamel-${API_VERSION}.la 		\
 	$(top_builddir)/libedataserver/libedataserver-${API_VERSION}.la \
 	$(top_builddir)/camel/tests/lib/libcameltest.a	\
@@ -16,4 +16,11 @@ LDADD = \
 check_PROGRAMS =  	\
 	test1 test2 test3
 
+test1_CPPFLAGS = $(STREAM_TESTS_CPPFLAGS)
+test1_LDADD = $(STREAM_TESTS_LDADD)
+test2_CPPFLAGS = $(STREAM_TESTS_CPPFLAGS)
+test2_LDADD = $(STREAM_TESTS_LDADD)
+test3_CPPFLAGS = $(STREAM_TESTS_CPPFLAGS)
+test3_LDADD = $(STREAM_TESTS_LDADD)
+
 #TESTS = test1 test2 test3
diff --git a/configure.ac b/configure.ac
index b646df5..90bf593 100644
--- a/configure.ac
+++ b/configure.ac
@@ -188,6 +188,7 @@ AM_MAINTAINER_MODE
 AC_PROG_CC
 AC_PROG_CPP
 AC_C_INLINE
+AM_PROG_CC_C_O
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
diff --git a/libebackend/Makefile.am b/libebackend/Makefile.am
index 7b18038..4cc55c1 100644
--- a/libebackend/Makefile.am
+++ b/libebackend/Makefile.am
@@ -1,12 +1,13 @@
-AM_CPPFLAGS =								\
-	-I$(top_srcdir)							\
-	-DG_LOG_DOMAIN=\"e-data-server\"				\
-	-DE_DATA_SERVER_EXTENSIONDIR=\"$(extensiondir)\"		\
-	$(DB_CFLAGS)							\
-	$(E_BACKEND_CFLAGS)
-
 lib_LTLIBRARIES = libebackend-1.2.la
 
+libebackend_1_2_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)						\
+	-I$(top_srcdir)						\
+	-DG_LOG_DOMAIN=\"e-data-server\"			\
+	-DE_DATA_SERVER_EXTENSIONDIR=\"$(extensiondir)\"	\
+	$(DB_CFLAGS)						\
+	$(E_BACKEND_CFLAGS)
+
 libebackend_1_2_la_SOURCES =		\
 	e-data-server-module.c		\
 	e-dbhash.c			\
diff --git a/libedataserver/Makefile.am b/libedataserver/Makefile.am
index 8d10cd8..3c09dcc 100644
--- a/libedataserver/Makefile.am
+++ b/libedataserver/Makefile.am
@@ -1,4 +1,8 @@
-AM_CPPFLAGS =								\
+lib_LTLIBRARIES = libedataserver-1.2.la
+noinst_PROGRAMS = test-source-list
+
+libedataserver_1_2_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)							\
 	-I$(top_srcdir)							\
 	-DG_LOG_DOMAIN=\"e-data-server\"				\
 	-DE_DATA_SERVER_PREFIX=\"$(prefix)\"				\
@@ -9,9 +13,6 @@ AM_CPPFLAGS =								\
 	$(E_DATA_SERVER_CFLAGS)						\
 	$(SOUP_CFLAGS)
 
-lib_LTLIBRARIES = libedataserver-1.2.la
-noinst_PROGRAMS = test-source-list
-
 libedataserver_1_2_la_SOURCES =		\
 	e-account-list.c		\
 	e-account.c			\
@@ -78,7 +79,15 @@ libedataserverinclude_HEADERS =		\
 	eds-version.h			\
 	md5-utils.h
 
+test_source_list_CPPFLAGS = \
+	$(AM_CPPFLAGS)				\
+	-I$(top_srcdir)				\
+	-DG_LOG_DOMAIN=\"e-data-server\"	\
+	$(E_DATA_SERVER_CFLAGS)			\
+	$(SOUP_CFLAGS)
+
 test_source_list_SOURCES = test-source-list.c
+
 test_source_list_LDADD = libedataserver-1.2.la $(E_DATA_SERVER_LIBS)
 
 %-$(API_VERSION).pc: %.pc
diff --git a/libedataserverui/Makefile.am b/libedataserverui/Makefile.am
index 2d2852b..2cfb28f 100644
--- a/libedataserverui/Makefile.am
+++ b/libedataserverui/Makefile.am
@@ -1,23 +1,25 @@
-AM_CPPFLAGS =								\
-	-I$(top_srcdir)							\
-	-I$(top_srcdir)/addressbook					\
-	-I$(top_builddir)/addressbook					\
-	-DG_LOG_DOMAIN=\"e-data-server-ui\"				\
-	-DE_DATA_SERVER_UI_UIDIR=\""$(uidir)"\"			\
-	$(E_DATA_SERVER_UI_CFLAGS)
-
 # The marshallers
 MARSHAL_GENERATED = e-data-server-ui-marshal.c e-data-server-ui-marshal.h
 @EVO_MARSHAL_RULE@
 
 lib_LTLIBRARIES = libedataserverui-1.2.la
+
 noinst_PROGRAMS = 			\
-	test-category-completion		\
+	test-category-completion	\
 	test-source-combo-box		\
 	test-source-selector		\
 	test-contact-store		\
 	test-name-selector
 
+libedataserverui_1_2_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)				\
+	-I$(top_srcdir)				\
+	-I$(top_srcdir)/addressbook		\
+	-I$(top_builddir)/addressbook		\
+	-DG_LOG_DOMAIN=\"e-data-server-ui\"	\
+	-DE_DATA_SERVER_UI_UIDIR=\""$(uidir)"\"	\
+	$(E_DATA_SERVER_UI_CFLAGS)
+
 libedataserverui_1_2_la_SOURCES =	\
 	$(MARSHAL_GENERATED)		\
 	e-categories-dialog.c		\
@@ -67,36 +69,40 @@ libedataserveruiinclude_HEADERS =	\
 	e-tree-model-generator.h	\
 	e-cell-renderer-color.h
 
-# Test programs
-test_category_completion_SOURCES = test-category-completion.c
-test_category_completion_LDADD = 					\
+TEST_EDATASERVERUI_CPPFLAGS= \
+	$(AM_CPPFLAGS)				\
+	-I$(top_srcdir)				\
+	-I$(top_srcdir)/addressbook		\
+	-I$(top_builddir)/addressbook		\
+	-DG_LOG_DOMAIN=\"e-data-server-ui\"	\
+	$(E_DATA_SERVER_UI_CFLAGS)
+
+TEST_EDATASERVERUI_LDFLAGS = \
 	libedataserverui-1.2.la 				\
 	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
 	$(E_DATA_SERVER_UI_LIBS)
 
+
+# Test programs
+test_category_completion_CPPFLAGS = $(TEST_EDATASERVERUI_CPPFLAGS)
+test_category_completion_SOURCES = test-category-completion.c
+test_category_completion_LDADD = $(TEST_EDATASERVERUI_LDFLAGS)
+
+test_source_selector_CPPFLAGS = $(TEST_EDATASERVERUI_CPPFLAGS)
 test_source_selector_SOURCES = test-source-selector.c
-test_source_selector_LDADD = 					\
-	libedataserverui-1.2.la 				\
-	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
-	$(E_DATA_SERVER_UI_LIBS)
+test_source_selector_LDADD =  $(TEST_EDATASERVERUI_LDFLAGS)
 
+test_source_combo_box_CPPFLAGS = $(TEST_EDATASERVERUI_CPPFLAGS)
 test_source_combo_box_SOURCES = test-source-combo-box.c
-test_source_combo_box_LDADD = 					\
-	libedataserverui-1.2.la 				\
-	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
-	$(E_DATA_SERVER_UI_LIBS)
+test_source_combo_box_LDADD =  $(TEST_EDATASERVERUI_LDFLAGS)
 
+test_contact_store_CPPFLAGS = $(TEST_EDATASERVERUI_CPPFLAGS)
 test_contact_store_SOURCES = test-contact-store.c
-test_contact_store_LDADD =					\
-	libedataserverui-1.2.la 				\
-	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
-	$(E_DATA_SERVER_UI_LIBS)
+test_contact_store_LDADD = $(TEST_EDATASERVERUI_LDFLAGS)
 
+test_name_selector_CPPFLAGS = $(TEST_EDATASERVERUI_CPPFLAGS)
 test_name_selector_SOURCES = test-name-selector.c
-test_name_selector_LDADD =					\
-	libedataserverui-1.2.la 				\
-	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
-	$(E_DATA_SERVER_UI_LIBS)
+test_name_selector_LDADD = $(TEST_EDATASERVERUI_LDFLAGS)
 
 %-$(API_VERSION).pc: %.pc
 	 cp $< $@
diff --git a/servers/exchange/lib/Makefile.am b/servers/exchange/lib/Makefile.am
index 50fa3af..2825a5c 100644
--- a/servers/exchange/lib/Makefile.am
+++ b/servers/exchange/lib/Makefile.am
@@ -1,15 +1,3 @@
-# Fix the code to not use E_DATA_SERVER_UI_CFLAGS
-
-AM_CPPFLAGS =                                                      \
-	-DCONNECTOR_PREFIX=\""$(prefix)"\"			\
-	-I$(top_srcdir)						\
-	-I$(top_srcdir)/servers/exchange/xntlm			\
-	$(LDAP_CFLAGS)						\
-	$(KRB5_CFLAGS)						\
-	$(SOUP_CFLAGS)						\
-	$(E_DATA_SERVER_CFLAGS)					\
-	$(E_DATA_SERVER_UI_CFLAGS)
-
 noinst_LTLIBRARIES =						\
 	libexchange.la
 
@@ -69,6 +57,18 @@ else
 KERBEROS_FILES =
 endif
 
+# Fix the code to not use E_DATA_SERVER_UI_CFLAGS
+
+libexchange_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)						\
+	-DCONNECTOR_PREFIX=\""$(prefix)"\"			\
+	-I$(top_srcdir)						\
+	-I$(top_srcdir)/servers/exchange/xntlm			\
+	$(LDAP_CFLAGS)						\
+	$(KRB5_CFLAGS)						\
+	$(SOUP_CFLAGS)						\
+	$(E_DATA_SERVER_CFLAGS)					\
+	$(E_DATA_SERVER_UI_CFLAGS)
 
 libexchange_la_SOURCES =					\
 	$(MARSHAL_GENERATED)					\
diff --git a/servers/exchange/storage/Makefile.am b/servers/exchange/storage/Makefile.am
index 3d503b1..f8f72cc 100644
--- a/servers/exchange/storage/Makefile.am
+++ b/servers/exchange/storage/Makefile.am
@@ -1,11 +1,15 @@
-# Fix the code to not use E_DATA_SERVER_UI_CFLAGS
-
 if OS_WIN32
 WIN32_BOOTSTRAP_LIBS =					\
 	$(top_builddir)/win32/libedataserverui-1.2.la
 endif
 
-AM_CPPFLAGS =							\
+lib_LTLIBRARIES =						\
+	libexchange-storage-1.2.la
+
+# Fix the code to not use E_DATA_SERVER_UI_CFLAGS
+
+libexchange_storage_1_2_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)						\
 	-DG_LOG_DOMAIN=\"evolution-exchange-storage\"		\
 	-DPREFIX=\"$(prefix)\"					\
 	-DSYSCONFDIR=\""$(sysconfdir)"\" 			\
@@ -23,9 +27,6 @@ AM_CPPFLAGS =							\
 	$(E_DATA_SERVER_CFLAGS)					\
 	$(E_DATA_SERVER_UI_CFLAGS)
 
-lib_LTLIBRARIES =						\
-	libexchange-storage-1.2.la
-
 libexchange_storage_1_2_la_SOURCES =				\
 	e-folder.c						\
 	e-folder.h						\
diff --git a/servers/exchange/xntlm/Makefile.am b/servers/exchange/xntlm/Makefile.am
index c6316d9..3d41096 100644
--- a/servers/exchange/xntlm/Makefile.am
+++ b/servers/exchange/xntlm/Makefile.am
@@ -8,6 +8,7 @@ libxntlm_la_SOURCES =	\
 	xntlm-md4.c	\
 	xntlm-md4.h
 
-AM_CPPFLAGS =		\
+libxntlm_la_CPPFLAGS =	\
+	$(AM_CPPFLAGS)	\
 	-I$(top_srcdir)	\
 	$(GLIB_CFLAGS)
diff --git a/servers/google/libgdata-google/Makefile.am b/servers/google/libgdata-google/Makefile.am
index 006083b..c4ad77d 100644
--- a/servers/google/libgdata-google/Makefile.am
+++ b/servers/google/libgdata-google/Makefile.am
@@ -1,12 +1,13 @@
-AM_CPPFLAGS =							\
+lib_LTLIBRARIES = libgdata-google-1.2.la
+
+libgdata_google_1_2_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)						\
 	-DG_LOG_DOMAIN=\"libgdata-google\"			\
 	-I$(top_srcdir)						\
 	-I$(top_builddir)					\
 	-I$(top_srcdir)/servers/google/libgdata			\
 	$(GDATA_CFLAGS)
 
-lib_LTLIBRARIES = libgdata-google-1.2.la
-
 libgdata_google_1_2_la_SOURCES =				\
 	gdata-google-service.c					\
 	gdata-google-service.h				
diff --git a/servers/google/libgdata/Makefile.am b/servers/google/libgdata/Makefile.am
index 78ca15d..83e91e2 100644
--- a/servers/google/libgdata/Makefile.am
+++ b/servers/google/libgdata/Makefile.am
@@ -1,11 +1,12 @@
-AM_CPPFLAGS =						\
+lib_LTLIBRARIES = libgdata-1.2.la
+
+libgdata_1_2_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)					\
 	-DG_LOG_DOMAIN=\"libgdata\"			\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
 	$(GDATA_CFLAGS)
 
-lib_LTLIBRARIES = libgdata-1.2.la
-
 libgdata_1_2_la_SOURCES =			\
 	gdata-feed.c                            \
 	gdata-feed.h 		                \
diff --git a/servers/groupwise/Makefile.am b/servers/groupwise/Makefile.am
index dd7eeb8..92a6b8a 100644
--- a/servers/groupwise/Makefile.am
+++ b/servers/groupwise/Makefile.am
@@ -1,25 +1,26 @@
+noinst_PROGRAMS = create-account soap-test
 
-AM_CPPFLAGS =						\
+SERVERS_GROUPWISE_CPPFLAGS= \
 	-DG_LOG_DOMAIN=\"libegroupwise\"		\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
 	$(SOUP_CFLAGS)					\
 	$(E_DATA_SERVER_CFLAGS)
 
-noinst_PROGRAMS = create-account soap-test 
-
+create_account_CPPFLAGS = $(SERVERS_GROUPWISE_CPPFLAGS)
 create_account_SOURCES = create-account.c
 create_account_LDADD = 						\
 	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
 	$(SOUP_LIBS)						\
 	$(E_DATA_SERVER_LIBS)
 
+soap_test_CPPFLAGS = $(SERVERS_GROUPWISE_CPPFLAGS)
 soap_test_SOURCES = soap-test.c
 soap_test_LDADD = 						\
 	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
 	$(SOUP_LIBS)						\
 	libegroupwise-1.2.la					\
-	$(E_DATA_SERVER_LIBS) 
+	$(E_DATA_SERVER_LIBS)
 
 build-timestamp.h : $(top_builddir)/config.h
 	echo "const char *build_timestamp = \"Evolution-Data-Server- BASE_VERSION@-`date +%F`\";" > $@
@@ -30,6 +31,14 @@ CLEANFILES = build-timestamp.h
 
 lib_LTLIBRARIES = libegroupwise-1.2.la
 
+libegroupwise_1_2_la_CPPFLAGS = \
+	$(AM_CPPFLAGS)					\
+	-DG_LOG_DOMAIN=\"libegroupwise\"		\
+	-I$(top_srcdir)					\
+	-I$(top_builddir)				\
+	$(SOUP_CFLAGS)					\
+	$(E_DATA_SERVER_CFLAGS)
+
 libegroupwise_1_2_la_SOURCES =			\
 	e-gw-connection.c			\
 	e-gw-connection.h			\
diff --git a/src/Makefile.am b/src/Makefile.am
index 5d8ce03..7bca1ca 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,19 +1,3 @@
-AM_CPPFLAGS =						\
-	-DG_LOG_DOMAIN=\"evolution-data-server\"	\
-	-DPREFIX=\"$(prefix)\"				\
-	-DSYSCONFDIR=\"$(sysconfdir)\"			\
-	-DDATADIR=\"$(datadir)\"			\
-	-DLIBDIR=\"$(libdir)\"				\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_builddir)/calendar			\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
-	$(SOUP_CFLAGS)					\
-	$(E_FACTORY_CFLAGS)				\
-	$(E_DATA_SERVER_CFLAGS)
-
-
 IDLS = \
 	Evolution-DataServer.idl
 
@@ -36,6 +20,22 @@ $(IDL_GENERATED_C): $(IDL_GENERATED_H)
 noinst_PROGRAMS =			\
 	evolution-data-server
 
+evolution_data_server_CPPFLAGS = \
+	$(AM_CPPFLAGS)					\
+	-DG_LOG_DOMAIN=\"evolution-data-server\"	\
+	-DPREFIX=\"$(prefix)\"				\
+	-DSYSCONFDIR=\"$(sysconfdir)\"			\
+	-DDATADIR=\"$(datadir)\"			\
+	-DLIBDIR=\"$(libdir)\"				\
+	-I$(top_srcdir)					\
+	-I$(top_srcdir)/calendar			\
+	-I$(top_srcdir)/calendar			\
+	-I$(top_builddir)/calendar			\
+	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
+	$(SOUP_CFLAGS)					\
+	$(E_FACTORY_CFLAGS)				\
+	$(E_DATA_SERVER_CFLAGS)
+
 evolution_data_server_SOURCES = \
 	$(IDL_GENERATED)		\
 	server-interface-check.c	\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]