Makefile.am cleanups.

- Remove trailing tabs.
- Add terminators to multi-line lists.

62 files changed, 2122 insertions, 1828 deletions

diff --git a/Makefile.am b/Makefile.am
index 201c6b4a2..66bb72506 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,29 @@
 ACLOCAL_AMFLAGS=-I m4
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-private-docs --with-krb5=/usr --enable-introspection --disable-uoa --disable-examples
+DISTCHECK_CONFIGURE_FLAGS = \
+	--enable-gtk-doc \
+	--with-private-docs \
+	--with-krb5=/usr \
+	--enable-introspection \
+	--disable-uoa \
+	--disable-examples \
+	$(NULL)
 
-SUBDIRS = camel data private libedataserver libebackend addressbook calendar modules services tests docs art po
+SUBDIRS = \
+	camel \
+	data \
+	private \
+	libedataserver \
+	libebackend \
+	addressbook \
+	calendar \
+	modules \
+	services \
+	tests \
+	docs \
+	art \
+	po \
+	$(NULL)
 
 if HAVE_INTROSPECTION
 if HAVE_VALA
@@ -13,94 +34,97 @@ endif
 @GNOME_CODE_COVERAGE_RULES@
 
 %-$(API_VERSION).pc: %.pc
-	 cp $< $@
+	cp $< $@
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = evolution-data-server-$(API_VERSION).pc
 
-EXTRA_DIST = 						\
-	AUTHORS						\
-	$(changelogs)					\
-	README						\
-	HACKING						\
-	MAINTAINERS					\
-	TODO						\
-	NEWS						\
-	enumtypes.c.template				\
-	enumtypes.h.template				\
-	iconv-detect.c					\
-	intltool-merge.in				\
-	intltool-update.in				\
-	intltool-extract.in				\
-	evolution-data-server-zip.in			\
-	$(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in)
+EXTRA_DIST = \
+	AUTHORS \
+	$(changelogs) \
+	README \
+	HACKING \
+	MAINTAINERS \
+	TODO \
+	NEWS \
+	enumtypes.c.template \
+	enumtypes.h.template \
+	iconv-detect.c \
+	intltool-merge.in \
+	intltool-update.in \
+	intltool-extract.in \
+	evolution-data-server-zip.in \
+	$(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in) \
+	$(NULL)
 
-DISTCLEANFILES =					\
-	iconv-detect.h					\
-	$(pkgconfig_DATA)
+DISTCLEANFILES = \
+	iconv-detect.h \
+	$(pkgconfig_DATA) \
+	$(NULL)
 
-MAINTAINERCLEANFILES =					\
-	$(srcdir)/ABOUT-NLS				\
-	$(srcdir)/INSTALL				\
-	$(srcdir)/aclocal.m4				\
-	$(srcdir)/autoscan.log				\
-	$(srcdir)/compile				\
-	$(srcdir)/config.guess				\
-	$(srcdir)/config.h.in				\
-	$(srcdir)/config.rpath				\
-	$(srcdir)/config.sub				\
-	$(srcdir)/configure.scan			\
-	$(srcdir)/depcomp				\
-	$(srcdir)/gtk-doc.make				\
-	$(srcdir)/install-sh				\
-	$(srcdir)/ltmain.sh				\
-	$(srcdir)/m4/codeset.m4				\
-	$(srcdir)/m4/gettext.m4				\
-	$(srcdir)/m4/glibc2.m4				\
-	$(srcdir)/m4/glibc21.m4				\
-	$(srcdir)/m4/gtk-doc.m4				\
-	$(srcdir)/m4/iconv.m4				\
-	$(srcdir)/m4/intdiv0.m4				\
-	$(srcdir)/m4/intl.m4				\
-	$(srcdir)/m4/intldir.m4				\
-	$(srcdir)/m4/intlmacosx.m4			\
-	$(srcdir)/m4/intltool.m4			\
-	$(srcdir)/m4/intmax.m4				\
-	$(srcdir)/m4/introspection.m4			\
-	$(srcdir)/m4/inttypes-pri.m4			\
-	$(srcdir)/m4/inttypes_h.m4			\
-	$(srcdir)/m4/lcmessage.m4			\
-	$(srcdir)/m4/lib-ld.m4				\
-	$(srcdir)/m4/lib-link.m4			\
-	$(srcdir)/m4/lib-prefix.m4			\
-	$(srcdir)/m4/libtool.m4				\
-	$(srcdir)/m4/lock.m4				\
-	$(srcdir)/m4/longlong.m4			\
-	$(srcdir)/m4/ltoptions.m4			\
-	$(srcdir)/m4/ltsugar.m4				\
-	$(srcdir)/m4/ltversion.m4			\
-	$(srcdir)/m4/lt~obsolete.m4			\
-	$(srcdir)/m4/nls.m4				\
-	$(srcdir)/m4/po.m4				\
-	$(srcdir)/m4/printf-posix.m4			\
-	$(srcdir)/m4/progtest.m4			\
-	$(srcdir)/m4/size_max.m4			\
-	$(srcdir)/m4/stdint_h.m4			\
-	$(srcdir)/m4/uintmax_t.m4			\
-	$(srcdir)/m4/visibility.m4			\
-	$(srcdir)/m4/wchar_t.m4				\
-	$(srcdir)/m4/wint_t.m4				\
-	$(srcdir)/m4/xsize.m4				\
-	$(srcdir)/missing				\
-	$(srcdir)/mkinstalldirs				\
-	$(srcdir)/po/Makefile.in.in~			\
-	$(srcdir)/po/Makevars.template			\
-	$(srcdir)/po/Rules-quot				\
-	$(srcdir)/po/boldquot.sed			\
-	$(srcdir)/po/en@boldquot.header			\
-	$(srcdir)/po/en@quot.header			\
-	$(srcdir)/po/insert-header.sin			\
-	$(srcdir)/po/quot.sed				\
-	$(srcdir)/po/remove-potcdate.sin
+MAINTAINERCLEANFILES = \
+	$(srcdir)/ABOUT-NLS \
+	$(srcdir)/INSTALL \
+	$(srcdir)/aclocal.m4 \
+	$(srcdir)/autoscan.log \
+	$(srcdir)/compile \
+	$(srcdir)/config.guess \
+	$(srcdir)/config.h.in \
+	$(srcdir)/config.rpath \
+	$(srcdir)/config.sub \
+	$(srcdir)/configure.scan \
+	$(srcdir)/depcomp \
+	$(srcdir)/gtk-doc.make \
+	$(srcdir)/install-sh \
+	$(srcdir)/ltmain.sh \
+	$(srcdir)/m4/codeset.m4 \
+	$(srcdir)/m4/gettext.m4 \
+	$(srcdir)/m4/glibc2.m4 \
+	$(srcdir)/m4/glibc21.m4 \
+	$(srcdir)/m4/gtk-doc.m4 \
+	$(srcdir)/m4/iconv.m4 \
+	$(srcdir)/m4/intdiv0.m4 \
+	$(srcdir)/m4/intl.m4 \
+	$(srcdir)/m4/intldir.m4 \
+	$(srcdir)/m4/intlmacosx.m4 \
+	$(srcdir)/m4/intltool.m4 \
+	$(srcdir)/m4/intmax.m4 \
+	$(srcdir)/m4/introspection.m4 \
+	$(srcdir)/m4/inttypes-pri.m4 \
+	$(srcdir)/m4/inttypes_h.m4 \
+	$(srcdir)/m4/lcmessage.m4 \
+	$(srcdir)/m4/lib-ld.m4 \
+	$(srcdir)/m4/lib-link.m4 \
+	$(srcdir)/m4/lib-prefix.m4 \
+	$(srcdir)/m4/libtool.m4 \
+	$(srcdir)/m4/lock.m4 \
+	$(srcdir)/m4/longlong.m4 \
+	$(srcdir)/m4/ltoptions.m4 \
+	$(srcdir)/m4/ltsugar.m4 \
+	$(srcdir)/m4/ltversion.m4 \
+	$(srcdir)/m4/lt~obsolete.m4 \
+	$(srcdir)/m4/nls.m4 \
+	$(srcdir)/m4/po.m4 \
+	$(srcdir)/m4/printf-posix.m4 \
+	$(srcdir)/m4/progtest.m4 \
+	$(srcdir)/m4/size_max.m4 \
+	$(srcdir)/m4/stdint_h.m4 \
+	$(srcdir)/m4/uintmax_t.m4 \
+	$(srcdir)/m4/visibility.m4 \
+	$(srcdir)/m4/wchar_t.m4 \
+	$(srcdir)/m4/wint_t.m4 \
+	$(srcdir)/m4/xsize.m4 \
+	$(srcdir)/missing \
+	$(srcdir)/mkinstalldirs \
+	$(srcdir)/po/Makefile.in.in~ \
+	$(srcdir)/po/Makevars.template \
+	$(srcdir)/po/Rules-quot \
+	$(srcdir)/po/boldquot.sed \
+	$(srcdir)/po/en@boldquot.header \
+	$(srcdir)/po/en@quot.header \
+	$(srcdir)/po/insert-header.sin \
+	$(srcdir)/po/quot.sed \
+	$(srcdir)/po/remove-potcdate.sin \
+	$(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/addressbook/backends/file/Makefile.am b/addressbook/backends/file/Makefile.am
index bdad952a1..de41f5424 100644
--- a/addressbook/backends/file/Makefile.am
+++ b/addressbook/backends/file/Makefile.am
@@ -1,37 +1,42 @@
+NULL =
+
 ebook_backend_LTLIBRARIES = libebookbackendfile.la
 
 libebookbackendfile_la_CPPFLAGS = \
-	$(AM_CPPFLAGS)					\
-	-DG_LOG_DOMAIN=\"libebookbackend\"		\
-	-DBACKENDDIR="\"$(ebook_backenddir)\""		\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	-I$(top_srcdir)/addressbook			\
-	-I$(top_builddir)/addressbook			\
-	$(DB_CFLAGS)					\
-	$(CAMEL_CFLAGS)					\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)			\
-	$(CODE_COVERAGE_CFLAGS)				\
+	$(AM_CPPFLAGS) \
+	-DG_LOG_DOMAIN=\"libebookbackend\" \
+	-DBACKENDDIR="\"$(ebook_backenddir)\"" \
+	-I$(top_srcdir) \
+	-I$(top_builddir) \
+	-I$(top_srcdir)/addressbook \
+	-I$(top_builddir)/addressbook \
+	$(DB_CFLAGS) \
+	$(CAMEL_CFLAGS) \
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
+	$(CODE_COVERAGE_CFLAGS) \
 	$(NULL)
 
-libebookbackendfile_la_SOURCES =			\
-	e-book-backend-file.c				\
-	e-book-backend-file.h				\
-	e-book-backend-file-migrate-bdb.c		\
-	e-book-backend-file-migrate-bdb.h		\
-	e-book-backend-file-factory.c
+libebookbackendfile_la_SOURCES = \
+	e-book-backend-file.c \
+	e-book-backend-file.h \
+	e-book-backend-file-migrate-bdb.c \
+	e-book-backend-file-migrate-bdb.h \
+	e-book-backend-file-factory.c \
+	$(NULL)
 
-libebookbackendfile_la_LIBADD =						\
-	$(top_builddir)/addressbook/libebook/libebook-1.2.la		\
+libebookbackendfile_la_LIBADD = \
+	$(top_builddir)/addressbook/libebook/libebook-1.2.la \
 	$(top_builddir)/addressbook/libebook-contacts/libebook-contacts-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)							\
-	$(CAMEL_LIBS)							\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)
+	$(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) \
+	$(CAMEL_LIBS) \
+	$(EVOLUTION_ADDRESSBOOK_LIBS) \
+	$(NULL)
 
-libebookbackendfile_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) \
+libebookbackendfile_la_LDFLAGS = \
+	-module -avoid-version $(NO_UNDEFINED) \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(NULL)
 
diff --git a/addressbook/backends/google/Makefile.am b/addressbook/backends/google/Makefile.am
index d588a560d..1b340b025 100644
--- a/addressbook/backends/google/Makefile.am
+++ b/addressbook/backends/google/Makefile.am
@@ -1,3 +1,5 @@
+NULL =
+
 SUBDIRS = . tests
 
 ebook_backend_LTLIBRARIES = libebookbackendgoogle.la
@@ -23,7 +25,8 @@ libebookbackendgoogle_la_SOURCES = \
 	e-book-google-utils.c \
 	e-book-google-utils.h \
 	e-gdata-oauth2-authorizer.c \
-	e-gdata-oauth2-authorizer.h
+	e-gdata-oauth2-authorizer.h \
+	$(NULL)
 
 libebookbackendgoogle_la_LIBADD = \
 	$(top_builddir)/addressbook/libebook/libebook-1.2.la \
@@ -34,7 +37,8 @@ libebookbackendgoogle_la_LIBADD = \
 	$(EVOLUTION_ADDRESSBOOK_LIBS) \
 	$(SOUP_LIBS) \
 	$(GDATA_LIBS) \
-	$(CAMEL_LIBS)
+	$(CAMEL_LIBS) \
+	$(NULL)
 
 libebookbackendgoogle_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED) \
diff --git a/addressbook/backends/google/tests/Makefile.am b/addressbook/backends/google/tests/Makefile.am
index 3b3119790..cf660e66d 100644
--- a/addressbook/backends/google/tests/Makefile.am
+++ b/addressbook/backends/google/tests/Makefile.am
@@ -1,3 +1,5 @@
+NULL =
+
 phone_numbers_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	-I$(top_srcdir) \
@@ -7,12 +9,14 @@ phone_numbers_CPPFLAGS = \
 	-I$(top_srcdir)/addressbook/backends/google \
 	-DG_LOG_DOMAIN=\"evolution-tests\" \
 	$(NULL)
+
 phone_numbers_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
 	$(GDATA_CFLAGS) \
 	$(CAMEL_CFLAGS) \
 	$(NULL)
+
 LDADD = \
 	$(AM_LDADD) \
 	$(top_builddir)/addressbook/backends/google/libebook-google-utils.la \
diff --git a/addressbook/backends/ldap/Makefile.am b/addressbook/backends/ldap/Makefile.am
index ccd2dcf29..03dbf90c9 100644
--- a/addressbook/backends/ldap/Makefile.am
+++ b/addressbook/backends/ldap/Makefile.am
@@ -1,41 +1,44 @@
+NULL =
+
 ebook_backend_LTLIBRARIES = libebookbackendldap.la
 
 libebookbackendldap_la_CPPFLAGS = \
-	$(AM_CPPFLAGS)					\
-	-DG_LOG_DOMAIN=\"libebookbackend\"		\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	-I$(top_srcdir)/addressbook			\
-	-I$(top_builddir)/addressbook			\
-	$(LDAP_CFLAGS)					\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)			\
-	$(CODE_COVERAGE_CFLAGS)				\
-	$(CAMEL_CFLAGS)					\
+	$(AM_CPPFLAGS) \
+	-DG_LOG_DOMAIN=\"libebookbackend\" \
+	-I$(top_srcdir) \
+	-I$(top_builddir) \
+	-I$(top_srcdir)/addressbook \
+	-I$(top_builddir)/addressbook \
+	$(LDAP_CFLAGS) \
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
+	$(CODE_COVERAGE_CFLAGS) \
+	$(CAMEL_CFLAGS) \
 	$(NULL)
 
-libebookbackendldap_la_SOURCES =			\
-	e-book-backend-ldap.c				\
-	e-book-backend-ldap.h				\
-	e-book-backend-ldap-factory.c			\
-	e-source-ldap.c					\
-	e-source-ldap.h
+libebookbackendldap_la_SOURCES = \
+	e-book-backend-ldap.c \
+	e-book-backend-ldap.h \
+	e-book-backend-ldap-factory.c \
+	e-source-ldap.c \
+	e-source-ldap.h \
+	$(NULL)
 
-libebookbackendldap_la_LIBADD =						\
-	$(top_builddir)/addressbook/libebook/libebook-1.2.la		\
+libebookbackendldap_la_LIBADD = \
+	$(top_builddir)/addressbook/libebook/libebook-1.2.la \
 	$(top_builddir)/addressbook/libebook-contacts/libebook-contacts-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			\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)					\
-	$(CAMEL_LIBS)							\
-	$(LDAP_LIBS)
+	$(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la \
+	$(top_builddir)/libedataserver/libedataserver-1.2.la \
+	$(top_builddir)/libebackend/libebackend-1.2.la \
+	$(EVOLUTION_ADDRESSBOOK_LIBS) \
+	$(CAMEL_LIBS) \
+	$(LDAP_LIBS) \
+	$(NULL)
 
 libebookbackendldap_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(NULL)
 
-LDAP_SCHEMA = \
-	evolutionperson.schema
+LDAP_SCHEMA = evolutionperson.schema
 
 ldapschemadir = $(privdatadir)
 ldapschema_DATA= $(LDAP_SCHEMA)
diff --git a/addressbook/backends/webdav/Makefile.am b/addressbook/backends/webdav/Makefile.am
index b1a474040..4a6d4018b 100644
--- a/addressbook/backends/webdav/Makefile.am
+++ b/addressbook/backends/webdav/Makefile.am
@@ -1,22 +1,25 @@
+NULL =
+
 ebook_backend_LTLIBRARIES = libebookbackendwebdav.la
 
 libebookbackendwebdav_la_CPPFLAGS = \
-	$(AM_CPPFLAGS)					\
-	-DG_LOG_DOMAIN=\"libebookbackendwebdav\" 	\
-	-I$(top_srcdir) 				\
-	-I$(top_builddir) 				\
-	-I$(top_srcdir)/addressbook 			\
-	-I$(top_builddir)/addressbook 			\
-	$(SOUP_CFLAGS) 					\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)			\
-	$(CAMEL_CFLAGS)					\
-	$(CODE_COVERAGE_CFLAGS)				\
+	$(AM_CPPFLAGS) \
+	-DG_LOG_DOMAIN=\"libebookbackendwebdav\" \
+	-I$(top_srcdir) \
+	-I$(top_builddir) \
+	-I$(top_srcdir)/addressbook \
+	-I$(top_builddir)/addressbook \
+	$(SOUP_CFLAGS) \
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
+	$(CAMEL_CFLAGS) \
+	$(CODE_COVERAGE_CFLAGS) \
 	$(NULL)
 
 libebookbackendwebdav_la_SOURCES = \
 	e-book-backend-webdav-factory.c \
 	e-book-backend-webdav.h \
-	e-book-backend-webdav.c
+	e-book-backend-webdav.c \
+	$(NULL)
 
 libebookbackendwebdav_la_LIBADD = \
 	$(top_builddir)/addressbook/libebook/libebook-1.2.la \
@@ -26,9 +29,11 @@ libebookbackendwebdav_la_LIBADD = \
 	$(top_builddir)/libebackend/libebackend-1.2.la \
 	$(SOUP_LIBS) \
 	$(EVOLUTION_ADDRESSBOOK_LIBS) \
-	$(CAMEL_LIBS)
+	$(CAMEL_LIBS) \
+	$(NULL)
 
-libebookbackendwebdav_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) \
+libebookbackendwebdav_la_LDFLAGS = \
+	-module -avoid-version $(NO_UNDEFINED) \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(NULL)
 
diff --git a/addressbook/libebook-contacts/Makefile.am b/addressbook/libebook-contacts/Makefile.am
index 23144d58a..70255b1a4 100644
--- a/addressbook/libebook-contacts/Makefile.am
+++ b/addressbook/libebook-contacts/Makefile.am
@@ -1,3 +1,5 @@
+NULL =
+
 CLEANFILES=
 BUILT_SOURCES=
 
@@ -25,56 +27,57 @@ noinst_LTLIBRARIES += libephonenumber-private.la
 endif # ENABLE_PHONENUMBER
 
 libebook_contacts_1_2_la_CPPFLAGS = \
-	$(AM_CPPFLAGS)					\
-	-DLIBEBOOK_CONTACTS_COMPILATION			\
-	-DLOCALEDIR=\""$(localedir)"\"			\
-	-DG_LOG_DOMAIN=\"libebook-contacts\"		\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/addressbook			\
-	-I$(top_builddir)				\
-	-I$(top_builddir)/addressbook			\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)			\
-	$(CAMEL_CFLAGS)					\
-	$(CODE_COVERAGE_CFLAGS)				\
+	$(AM_CPPFLAGS) \
+	-DLIBEBOOK_CONTACTS_COMPILATION \
+	-DLOCALEDIR=\""$(localedir)"\" \
+	-DG_LOG_DOMAIN=\"libebook-contacts\" \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/addressbook \
+	-I$(top_builddir) \
+	-I$(top_builddir)/addressbook \
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
+	$(CAMEL_CFLAGS) \
+	$(CODE_COVERAGE_CFLAGS) \
 	$(NULL)
 
-libebook_contacts_1_2_la_SOURCES =				\
-	$(ENUM_GENERATED)				\
-	e-address-western.c				\
-	e-name-western.c				\
-	e-name-western-tables.h                         \
-	e-book-query.c					\
-	e-contact.c					\
-	e-vcard.c					\
-	e-phone-number.c				\
-	e-phone-number-private.h			\
-	e-book-contacts-types.c				\
+libebook_contacts_1_2_la_SOURCES = \
+	$(ENUM_GENERATED) \
+	e-address-western.c \
+	e-name-western.c \
+	e-name-western-tables.h \
+	e-book-query.c \
+	e-contact.c \
+	e-vcard.c \
+	e-phone-number.c \
+	e-phone-number-private.h \
+	e-book-contacts-types.c \
 	e-source-backend-summary-setup.c
 
-libebook_contacts_1_2_la_LIBADD =					\
-	$(top_builddir)/camel/libcamel-1.2.la			\
-	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)				\
+libebook_contacts_1_2_la_LIBADD = \
+	$(top_builddir)/camel/libcamel-1.2.la \
+	$(top_builddir)/libedataserver/libedataserver-1.2.la \
+	$(EVOLUTION_ADDRESSBOOK_LIBS) \
 	$(CAMEL_LIBS)
 
-libebook_contacts_1_2_la_LDFLAGS = 							\
+libebook_contacts_1_2_la_LDFLAGS = \
 	-version-info $(LIBEBOOK_CONTACTS_CURRENT):$(LIBEBOOK_CONTACTS_REVISION):$(LIBEBOOK_CONTACTS_AGE) $(NO_UNDEFINED) \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(NULL)
 
 libebookcontactsincludedir = $(privincludedir)/libebook-contacts
 
-libebookcontactsinclude_HEADERS =			\
-	libebook-contacts.h				\
-	e-book-contacts-enumtypes.h			\
-	e-book-contacts-types.h				\
-	e-book-query.h					\
-	e-address-western.h				\
-	e-name-western.h				\
-	e-contact.h					\
-	e-vcard.h					\
-	e-phone-number.h				\
-	e-source-backend-summary-setup.h
+libebookcontactsinclude_HEADERS = \
+	libebook-contacts.h \
+	e-book-contacts-enumtypes.h \
+	e-book-contacts-types.h \
+	e-book-query.h \
+	e-address-western.h \
+	e-name-western.h \
+	e-contact.h \
+	e-vcard.h \
+	e-phone-number.h \
+	e-source-backend-summary-setup.h \
+	$(NULL)
 
 if ENABLE_PHONENUMBER
 
@@ -129,7 +132,7 @@ EBookContacts_1_2_gir_CFLAGS = \
 	-I$(top_builddir)/addressbook/ \
 	-I$(top_srcdir)/addressbook/libebook-contacts \
 	-I$(top_builddir)/addressbook/libebook-contacts \
-	-DLIBEBOOK_CONTACTS_COMPILATION		\
+	-DLIBEBOOK_CONTACTS_COMPILATION \
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
 	$(CAMEL_CFLAGS) \
 	$(NULL)
@@ -158,10 +161,11 @@ BUILT_SOURCES += $(ENUM_GENERATED)
 CLEANFILES    += $(BUILT_SOURCES)
 DISTCLEANFILES = $(pkgconfig_DATA)
 
-EXTRA_DIST = 						\
-	$(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in)	\
-	e-name-western-tables.h.in                      \
-	gen-western-table.py
+EXTRA_DIST = \
+	$(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in) \
+	e-name-western-tables.h.in \
+	gen-western-table.py \
+	$(NULL)
 
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/addressbook/libebook/Makefile.am b/addressbook/libebook/Makefile.am
index 724b38ac1..c70addb46 100644
--- a/addressbook/libebook/Makefile.am
+++ b/addressbook/libebook/Makefile.am
@@ -1,3 +1,5 @@
+NULL =
+
 CLEANFILES=
 BUILT_SOURCES=
 
@@ -16,67 +18,69 @@ e-book-enumtypes.c: $(top_srcdir)/enumtypes.c.template $(ENUM_TYPES)
 
 ENUM_GENERATED = e-book-enumtypes.h e-book-enumtypes.c
 
-# The library
 lib_LTLIBRARIES = libebook-1.2.la
 
 libebook_1_2_la_CPPFLAGS = \
-	$(AM_CPPFLAGS)					\
-	-DLIBEBOOK_COMPILATION				\
-	-DLOCALEDIR=\""$(localedir)"\"			\
-	-DG_LOG_DOMAIN=\"libebook\"			\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/addressbook			\
-	-I$(top_srcdir)/addressbook/libegdbus		\
-	-I$(top_srcdir)/private				\
-	-I$(top_builddir)				\
-	-I$(top_builddir)/addressbook			\
-	-I$(top_builddir)/addressbook/libegdbus		\
-	-I$(top_builddir)/addressbook/libebook		\
-	-I$(top_builddir)/private			\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)			\
-	$(CAMEL_CFLAGS)					\
-	$(CODE_COVERAGE_CFLAGS)				\
+	$(AM_CPPFLAGS) \
+	-DLIBEBOOK_COMPILATION \
+	-DLOCALEDIR=\""$(localedir)"\" \
+	-DG_LOG_DOMAIN=\"libebook\" \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/addressbook \
+	-I$(top_srcdir)/addressbook/libegdbus \
+	-I$(top_srcdir)/private \
+	-I$(top_builddir) \
+	-I$(top_builddir)/addressbook \
+	-I$(top_builddir)/addressbook/libegdbus \
+	-I$(top_builddir)/addressbook/libebook \
+	-I$(top_builddir)/private \
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
+	$(CAMEL_CFLAGS) \
+	$(CODE_COVERAGE_CFLAGS) \
 	$(NULL)
 
-libebook_1_2_la_SOURCES =				\
-	$(ENUM_GENERATED)				\
-	e-book-client.c					\
-	e-book-client-cursor.c				\
-	e-book-client-view.c				\
-	e-book-view-private.h				\
-	e-book-view.c					\
-	e-book.c					\
-	e-destination.c					\
-	e-error.h
-
-libebook_1_2_la_LIBADD =					\
+libebook_1_2_la_SOURCES = \
+	$(ENUM_GENERATED) \
+	e-book-client.c \
+	e-book-client-cursor.c \
+	e-book-client-view.c \
+	e-book-view-private.h \
+	e-book-view.c \
+	e-book.c \
+	e-destination.c \
+	e-error.h \
+	$(NULL)
+
+libebook_1_2_la_LIBADD = \
 	$(top_builddir)/addressbook/libebook-contacts/libebook-contacts-1.2.la \
 	$(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la \
-	$(top_builddir)/addressbook/libegdbus/libegdbus-book.la	\
-	$(top_builddir)/camel/libcamel-1.2.la			\
-	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
+	$(top_builddir)/addressbook/libegdbus/libegdbus-book.la \
+	$(top_builddir)/camel/libcamel-1.2.la \
+	$(top_builddir)/libedataserver/libedataserver-1.2.la \
 	$(top_builddir)/libebackend/libebackend-1.2.la \
-	$(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la	\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)				\
-	$(CAMEL_LIBS)
+	$(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la \
+	$(EVOLUTION_ADDRESSBOOK_LIBS) \
+	$(CAMEL_LIBS) \
+	$(NULL)
 
-libebook_1_2_la_LDFLAGS = 							\
+libebook_1_2_la_LDFLAGS = \
 	-version-info $(LIBEBOOK_CURRENT):$(LIBEBOOK_REVISION):$(LIBEBOOK_AGE) $(NO_UNDEFINED) \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(NULL)
 
 libebookincludedir = $(privincludedir)/libebook
 
-libebookinclude_HEADERS =				\
-	libebook.h					\
-	e-book-client.h					\
-	e-book-client-cursor.h				\
-	e-book-client-view.h				\
-	e-book-enumtypes.h				\
-	e-book-view.h					\
-	e-book-types.h					\
-	e-destination.h					\
-	e-book.h
+libebookinclude_HEADERS = \
+	libebook.h \
+	e-book-client.h \
+	e-book-client-cursor.h \
+	e-book-client-view.h \
+	e-book-enumtypes.h \
+	e-book-view.h \
+	e-book-types.h \
+	e-destination.h \
+	e-book.h \
+	$(NULL)
 
 %-$(API_VERSION).pc: %.pc
 	 cp $< $@
@@ -148,8 +152,9 @@ BUILT_SOURCES += $(ENUM_GENERATED)
 CLEANFILES    += $(BUILT_SOURCES)
 DISTCLEANFILES = $(pkgconfig_DATA)
 
-EXTRA_DIST = 						\
-	$(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in)
+EXTRA_DIST = \
+	$(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in) \
+	$(NULL)
 
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/addressbook/libedata-book/Makefile.am b/addressbook/libedata-book/Makefile.am
index 880d1e632..6b39d2d4b 100644
--- a/addressbook/libedata-book/Makefile.am
+++ b/addressbook/libedata-book/Makefile.am
@@ -1,4 +1,5 @@
-# The library
+NULL =
+
 lib_LTLIBRARIES = libedata-book-1.2.la
 
 libedata_book_1_2_la_CPPFLAGS = \
@@ -34,7 +35,8 @@ libedata_book_1_2_la_SOURCES = \
 	e-data-book-direct.c \
 	e-data-book-factory.c \
 	e-data-book-view.c \
-	ximian-vcard.h
+	ximian-vcard.h \
+	$(NULL)
 
 libedata_book_1_2_la_LIBADD = \
 	$(top_builddir)/addressbook/libebook-contacts/libebook-contacts-1.2.la \
@@ -44,7 +46,8 @@ libedata_book_1_2_la_LIBADD = \
 	$(DB_LIBS) \
 	$(CAMEL_LIBS) \
 	$(SQLITE3_LIBS) \
-	$(EVOLUTION_ADDRESSBOOK_LIBS)
+	$(EVOLUTION_ADDRESSBOOK_LIBS) \
+	$(NULL)
 
 libedata_book_1_2_la_LDFLAGS = \
 	-version-info $(LIBEDATABOOK_CURRENT):$(LIBEDATABOOK_REVISION):$(LIBEDATABOOK_AGE) $(NO_UNDEFINED) \
@@ -67,7 +70,8 @@ libedata_bookinclude_HEADERS = \
 	e-data-book-direct.h \
 	e-book-backend-cache.h \
 	e-book-backend-sqlitedb.h \
-	e-book-backend-db-cache.h
+	e-book-backend-db-cache.h \
+	$(NULL)
 
 factorydir = $(libexecdir)
 
@@ -75,7 +79,7 @@ noinst_PROGRAMS = e-book-backend-sqlitedb-test
 
 e_book_backend_sqlitedb_test_CPPFLAGS = \
 	$(libedata_book_1_2_la_CPPFLAGS)
-e_book_backend_sqlitedb_test_SOURCES =	e-book-backend-sqlitedb-test.c
+e_book_backend_sqlitedb_test_SOURCES = e-book-backend-sqlitedb-test.c
 e_book_backend_sqlitedb_test_LDADD = \
 	libedata-book-1.2.la \
 	$(libedata_book_1_2_la_LIBADD)
@@ -90,6 +94,7 @@ DISTCLEANFILES = $(pkgconfig_DATA)
 
 EXTRA_DIST = \
 	e-data-book-view.xml \
-	$(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in)
+	$(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in) \
+	$(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/addressbook/libegdbus/Makefile.am b/addressbook/libegdbus/Makefile.am
index 6f75cfe4b..ebe242810 100644
--- a/addressbook/libegdbus/Makefile.am
+++ b/addressbook/libegdbus/Makefile.am
@@ -1,24 +1,28 @@
-# The library
+NULL =
+
 noinst_LTLIBRARIES = libegdbus-book.la
 
-libegdbus_book_la_CPPFLAGS =			\
-	$(AM_CPPFLAGS)				\
-	-DG_LOG_DOMAIN=\"libegdbus-book\"	\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/addressbook		\
-	$(E_DATA_SERVER_CFLAGS)			\
-	$(CODE_COVERAGE_CFLAGS)			\
+libegdbus_book_la_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-DG_LOG_DOMAIN=\"libegdbus-book\" \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/addressbook \
+	$(E_DATA_SERVER_CFLAGS) \
+	$(CODE_COVERAGE_CFLAGS) \
 	$(NULL)
 
-libegdbus_book_la_SOURCES =			\
-	e-gdbus-book-view.h			\
-	e-gdbus-book-view.c
+libegdbus_book_la_SOURCES = \
+	e-gdbus-book-view.h \
+	e-gdbus-book-view.c \
+	$(NULL)
 
-libegdbus_book_la_LIBADD =			\
-	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
-	$(E_DATA_SERVER_LIBS)
+libegdbus_book_la_LIBADD = \
+	$(top_builddir)/libedataserver/libedataserver-1.2.la \
+	$(E_DATA_SERVER_LIBS) \
+	$(NULL)
 
-libegdbus_book_la_LDFLAGS = $(NO_UNDEFINED) \
+libegdbus_book_la_LDFLAGS = \
+	$(NO_UNDEFINED) \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(NULL)
 
diff --git a/art/Makefile.am b/art/Makefile.am
index fed6667ea..cf68a6c51 100644
--- a/art/Makefile.am
+++ b/art/Makefile.am
@@ -1,24 +1,24 @@
 images_DATA = \
-	category_birthday_16.png		\
-	category_business_16.png		\
-	category_favorites_16.png		\
-	category_gifts_16.png			\
-	category_goals_16.png			\
-	category_holiday_16.png			\
-	category_holiday-cards_16.png		\
-	category_hot-contacts_16.png		\
-	category_ideas_16.png			\
-	category_international_16.png		\
-	category_key-customer_16.png		\
-	category_miscellaneous_16.png		\
-	category_personal_16.png		\
-	category_phonecalls_16.png		\
-	category_status_16.png			\
-	category_strategies_16.png		\
-	category_suppliers_16.png		\
-	category_time-and-expenses_16.png
+	category_birthday_16.png \
+	category_business_16.png \
+	category_favorites_16.png \
+	category_gifts_16.png \
+	category_goals_16.png \
+	category_holiday_16.png \
+	category_holiday-cards_16.png \
+	category_hot-contacts_16.png \
+	category_ideas_16.png \
+	category_international_16.png \
+	category_key-customer_16.png \
+	category_miscellaneous_16.png \
+	category_personal_16.png \
+	category_phonecalls_16.png \
+	category_status_16.png \
+	category_strategies_16.png \
+	category_suppliers_16.png \
+	category_time-and-expenses_16.png \
+	$(NULL)
 
-EXTRA_DIST = \
-	$(images_DATA)
+EXTRA_DIST = $(images_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/calendar/backends/caldav/Makefile.am b/calendar/backends/caldav/Makefile.am
index db8f459c9..788d8f066 100644
--- a/calendar/backends/caldav/Makefile.am
+++ b/calendar/backends/caldav/Makefile.am
@@ -1,7 +1,9 @@
+NULL =
+
 ecal_backend_LTLIBRARIES = libecalbackendcaldav.la
 
 libecalbackendcaldav_la_CPPFLAGS = \
-	$(AM_CPPFLAGS)	\
+	$(AM_CPPFLAGS) \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/calendar \
 	-I$(top_builddir)/calendar \
@@ -15,7 +17,8 @@ libecalbackendcaldav_la_CPPFLAGS = \
 libecalbackendcaldav_la_SOURCES = \
 	e-cal-backend-caldav-factory.c \
 	e-cal-backend-caldav.c \
-	e-cal-backend-caldav.h
+	e-cal-backend-caldav.h \
+	$(NULL)
 
 libecalbackendcaldav_la_LIBADD = \
 	$(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la \
@@ -24,7 +27,8 @@ libecalbackendcaldav_la_LIBADD = \
 	$(top_builddir)/libebackend/libebackend-1.2.la \
 	$(EVOLUTION_CALENDAR_LIBS) \
 	$(CAMEL_CFLAGS) \
-	$(SOUP_LIBS)
+	$(SOUP_LIBS) \
+	$(NULL)
 
 libecalbackendcaldav_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED) \
diff --git a/calendar/backends/contacts/Makefile.am b/calendar/backends/contacts/Makefile.am
index d0579a3e4..7f8e6dcdc 100644
--- a/calendar/backends/contacts/Makefile.am
+++ b/calendar/backends/contacts/Makefile.am
@@ -1,39 +1,43 @@
+NULL =
+
 ecal_backend_LTLIBRARIES = libecalbackendcontacts.la
 
 libecalbackendcontacts_la_CPPFLAGS = \
-	$(AM_CPPFLAGS)					\
-	-DG_LOG_DOMAIN=\"libecalbackendcontact\"	\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_builddir)/calendar			\
-	-I$(top_srcdir)/addressbook			\
-	-I$(top_builddir)/addressbook			\
-	$(EVOLUTION_CALENDAR_CFLAGS)			\
-	$(CAMEL_CFLAGS)					\
-	$(SOUP_CFLAGS)					\
-	$(CODE_COVERAGE_CFLAGS)				\
+	$(AM_CPPFLAGS) \
+	-DG_LOG_DOMAIN=\"libecalbackendcontact\" \
+	-I$(top_srcdir) \
+	-I$(top_builddir) \
+	-I$(top_srcdir)/calendar \
+	-I$(top_builddir)/calendar \
+	-I$(top_srcdir)/addressbook \
+	-I$(top_builddir)/addressbook \
+	$(EVOLUTION_CALENDAR_CFLAGS) \
+	$(CAMEL_CFLAGS) \
+	$(SOUP_CFLAGS) \
+	$(CODE_COVERAGE_CFLAGS) \
 	$(NULL)
 
-libecalbackendcontacts_la_SOURCES =		\
-	e-cal-backend-contacts-factory.c	\
-	e-cal-backend-contacts.c		\
-	e-cal-backend-contacts.h		\
-	e-source-contacts.c			\
-	e-source-contacts.h
+libecalbackendcontacts_la_SOURCES = \
+	e-cal-backend-contacts-factory.c \
+	e-cal-backend-contacts.c \
+	e-cal-backend-contacts.h \
+	e-source-contacts.c \
+	e-source-contacts.h \
+	$(NULL)
 
-libecalbackendcontacts_la_LIBADD =					\
-	$(top_builddir)/calendar/libecal/libecal-1.2.la			\
-	$(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la	\
-	$(top_builddir)/addressbook/libebook/libebook-1.2.la		\
+libecalbackendcontacts_la_LIBADD = \
+	$(top_builddir)/calendar/libecal/libecal-1.2.la \
+	$(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la \
+	$(top_builddir)/addressbook/libebook/libebook-1.2.la \
 	$(top_builddir)/addressbook/libebook-contacts/libebook-contacts-1.2.la \
-	$(top_builddir)/libedataserver/libedataserver-1.2.la		\
-	$(top_builddir)/libebackend/libebackend-1.2.la			\
-	$(EVOLUTION_CALENDAR_LIBS)					\
-	$(CAMEL_CFLAGS)							\
-	$(SOUP_LIBS)
+	$(top_builddir)/libedataserver/libedataserver-1.2.la \
+	$(top_builddir)/libebackend/libebackend-1.2.la \
+	$(EVOLUTION_CALENDAR_LIBS) \
+	$(CAMEL_CFLAGS) \
+	$(SOUP_LIBS) \
+	$(NULL)
 
-libecalbackendcontacts_la_LDFLAGS =	\
+libecalbackendcontacts_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED) \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(NULL)
diff --git a/calendar/backends/file/Makefile.am b/calendar/backends/file/Makefile.am
index bd2193b46..1803f3b4d 100644
--- a/calendar/backends/file/Makefile.am
+++ b/calendar/backends/file/Makefile.am
@@ -1,65 +1,72 @@
+NULL =
+
 ecal_backend_LTLIBRARIES = libecalbackendfile.la
 
 libecalbackendfile_la_CPPFLAGS = \
-	$(AM_CPPFLAGS)					\
-	-DG_LOG_DOMAIN=\"libecalbackendfile\"		\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_builddir)/calendar			\
-	$(EVOLUTION_CALENDAR_CFLAGS)			\
-	$(CAMEL_CFLAGS)					\
-	$(CODE_COVERAGE_CFLAGS)				\
+	$(AM_CPPFLAGS) \
+	-DG_LOG_DOMAIN=\"libecalbackendfile\" \
+	-I$(top_srcdir) \
+	-I$(top_builddir) \
+	-I$(top_srcdir)/calendar \
+	-I$(top_builddir)/calendar \
+	$(EVOLUTION_CALENDAR_CFLAGS) \
+	$(CAMEL_CFLAGS) \
+	$(CODE_COVERAGE_CFLAGS) \
 	$(NULL)
 
 noinst_PROGRAMS = test-interval-searches
 
-libecalbackendfile_la_SOURCES =		\
-	e-cal-backend-file-factory.c	\
-	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		\
-	e-source-local.c		\
-	e-source-local.h
+libecalbackendfile_la_SOURCES = \
+	e-cal-backend-file-factory.c \
+	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 \
+	e-source-local.c \
+	e-source-local.h \
+	$(NULL)
 
-libecalbackendfile_la_LIBADD =						\
-	$(top_builddir)/calendar/libecal/libecal-1.2.la			\
-	$(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la	\
-	$(top_builddir)/libedataserver/libedataserver-1.2.la		\
-	$(top_builddir)/libebackend/libebackend-1.2.la			\
-	$(EVOLUTION_CALENDAR_LIBS)					\
-	$(CAMEL_LIBS)
+libecalbackendfile_la_LIBADD = \
+	$(top_builddir)/calendar/libecal/libecal-1.2.la \
+	$(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la \
+	$(top_builddir)/libedataserver/libedataserver-1.2.la \
+	$(top_builddir)/libebackend/libebackend-1.2.la \
+	$(EVOLUTION_CALENDAR_LIBS) \
+	$(CAMEL_LIBS) \
+	$(NULL)
 
-libecalbackendfile_la_LDFLAGS =		\
+libecalbackendfile_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED) \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(NULL)
 
-test_interval_searches_SOURCES =	\
-	e-cal-backend-file.c		\
-	e-source-local.c		\
-	e-source-local.h
+test_interval_searches_SOURCES = \
+	e-cal-backend-file.c \
+	e-source-local.c \
+	e-source-local.h \
+	$(NULL)
 
 test_interval_searches_LDADD = \
-	$(top_builddir)/calendar/libecal/libecal-1.2.la			\
-	$(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la	\
-	$(top_builddir)/libedataserver/libedataserver-1.2.la		\
-	$(top_builddir)/libebackend/libebackend-1.2.la			\
-	$(EVOLUTION_CALENDAR_LIBS)
+	$(top_builddir)/calendar/libecal/libecal-1.2.la \
+	$(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la \
+	$(top_builddir)/libedataserver/libedataserver-1.2.la \
+	$(top_builddir)/libebackend/libebackend-1.2.la \
+	$(EVOLUTION_CALENDAR_LIBS) \
+	$(NULL)
 
 test_interval_searches_CPPFLAGS = \
-	$(AM_CPPFLAGS)			\
-	-I$(top_srcdir)			\
-	-I$(top_srcdir)/calendar	\
-	-I$(top_builddir)		\
-	-I$(top_builddir)/calendar	\
-	$(EVOLUTION_CALENDAR_CFLAGS)	\
-	$(CAMEL_CFLAGS)			\
-	-DTEST_QUERY_RESULT=1
+	$(AM_CPPFLAGS) \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/calendar \
+	-I$(top_builddir) \
+	-I$(top_builddir)/calendar \
+	$(EVOLUTION_CALENDAR_CFLAGS) \
+	$(CAMEL_CFLAGS) \
+	-DTEST_QUERY_RESULT=1 \
+	$(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/calendar/backends/http/Makefile.am b/calendar/backends/http/Makefile.am
index 55404db5f..ad115d4b9 100644
--- a/calendar/backends/http/Makefile.am
+++ b/calendar/backends/http/Makefile.am
@@ -1,33 +1,37 @@
+NULL =
+
 ecal_backend_LTLIBRARIES = libecalbackendhttp.la
 
 libecalbackendhttp_la_CPPFLAGS = \
-	$(AM_CPPFLAGS)					\
-	-DG_LOG_DOMAIN=\"libecalbackendhttp\"		\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_builddir)/calendar			\
-	$(EVOLUTION_CALENDAR_CFLAGS)			\
-	$(CAMEL_CFLAGS)					\
-	$(SOUP_CFLAGS)					\
-	$(CODE_COVERAGE_CFLAGS)				\
+	$(AM_CPPFLAGS) \
+	-DG_LOG_DOMAIN=\"libecalbackendhttp\" \
+	-I$(top_srcdir) \
+	-I$(top_builddir) \
+	-I$(top_srcdir)/calendar \
+	-I$(top_builddir)/calendar \
+	$(EVOLUTION_CALENDAR_CFLAGS) \
+	$(CAMEL_CFLAGS) \
+	$(SOUP_CFLAGS) \
+	$(CODE_COVERAGE_CFLAGS) \
 	$(NULL)
 
-libecalbackendhttp_la_SOURCES =		\
-	e-cal-backend-http-factory.c	\
-	e-cal-backend-http.c		\
-	e-cal-backend-http.h
+libecalbackendhttp_la_SOURCES = \
+	e-cal-backend-http-factory.c \
+	e-cal-backend-http.c \
+	e-cal-backend-http.h \
+	$(NULL)
 
-libecalbackendhttp_la_LIBADD =						\
-	$(top_builddir)/calendar/libecal/libecal-1.2.la			\
-	$(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la	\
-	$(top_builddir)/libedataserver/libedataserver-1.2.la		\
-	$(top_builddir)/libebackend/libebackend-1.2.la			\
-	$(EVOLUTION_CALENDAR_LIBS)					\
-	$(CAMEL_LIBS)							\
-	$(SOUP_LIBS)
+libecalbackendhttp_la_LIBADD = \
+	$(top_builddir)/calendar/libecal/libecal-1.2.la \
+	$(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la \
+	$(top_builddir)/libedataserver/libedataserver-1.2.la \
+	$(top_builddir)/libebackend/libebackend-1.2.la \
+	$(EVOLUTION_CALENDAR_LIBS) \
+	$(CAMEL_LIBS) \
+	$(SOUP_LIBS) \
+	$(NULL)
 
-libecalbackendhttp_la_LDFLAGS =		\
+libecalbackendhttp_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED) \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(NULL)
diff --git a/calendar/backends/weather/Makefile.am b/calendar/backends/weather/Makefile.am
index 25ee7a997..f8abad594 100644
--- a/calendar/backends/weather/Makefile.am
+++ b/calendar/backends/weather/Makefile.am
@@ -1,43 +1,47 @@
+NULL =
+
 ecal_backend_LTLIBRARIES = libecalbackendweather.la
 
 libecalbackendweather_la_CPPFLAGS = \
-	$(AM_CPPFLAGS)					\
-	-DG_LOG_DOMAIN=\"libecalbackendweather\"	\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_builddir)/calendar			\
-	-I$(top_srcdir)/addressbook			\
-	-I$(top_builddir)/addressbook			\
-	-DE_DATA_SERVER_PREFIX=\"$(prefix)\"		\
-	-DWEATHER_DATADIR=\""$(weatherdatadir)"\"	\
-	$(EVOLUTION_CALENDAR_CFLAGS)			\
-	$(CAMEL_CFLAGS)					\
-	$(SOUP_CFLAGS)					\
-	$(LIBGWEATHER_CFLAGS)				\
-	$(CODE_COVERAGE_CFLAGS)				\
+	$(AM_CPPFLAGS) \
+	-DG_LOG_DOMAIN=\"libecalbackendweather\" \
+	-I$(top_srcdir) \
+	-I$(top_builddir) \
+	-I$(top_srcdir)/calendar \
+	-I$(top_builddir)/calendar \
+	-I$(top_srcdir)/addressbook \
+	-I$(top_builddir)/addressbook \
+	-DE_DATA_SERVER_PREFIX=\"$(prefix)\" \
+	-DWEATHER_DATADIR=\""$(weatherdatadir)"\" \
+	$(EVOLUTION_CALENDAR_CFLAGS) \
+	$(CAMEL_CFLAGS) \
+	$(SOUP_CFLAGS) \
+	$(LIBGWEATHER_CFLAGS) \
+	$(CODE_COVERAGE_CFLAGS) \
 	$(NULL)
 
-libecalbackendweather_la_SOURCES =	\
-	e-cal-backend-weather-factory.c	\
-	e-cal-backend-weather.c		\
-	e-cal-backend-weather.h		\
-	e-source-weather.c		\
-	e-source-weather.h		\
-	e-weather-source.c		\
-	e-weather-source.h
+libecalbackendweather_la_SOURCES = \
+	e-cal-backend-weather-factory.c \
+	e-cal-backend-weather.c \
+	e-cal-backend-weather.h \
+	e-source-weather.c \
+	e-source-weather.h \
+	e-weather-source.c \
+	e-weather-source.h \
+	$(NULL)
 
-libecalbackendweather_la_LIBADD =					\
-	$(top_builddir)/calendar/libecal/libecal-1.2.la			\
-	$(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la	\
-	$(top_builddir)/libedataserver/libedataserver-1.2.la		\
-	$(top_builddir)/libebackend/libebackend-1.2.la			\
-	$(EVOLUTION_CALENDAR_LIBS)					\
-	$(CAMEL_LIBS)							\
-	$(SOUP_LIBS)							\
-	$(LIBGWEATHER_LIBS)
+libecalbackendweather_la_LIBADD = \
+	$(top_builddir)/calendar/libecal/libecal-1.2.la \
+	$(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la \
+	$(top_builddir)/libedataserver/libedataserver-1.2.la \
+	$(top_builddir)/libebackend/libebackend-1.2.la \
+	$(EVOLUTION_CALENDAR_LIBS) \
+	$(CAMEL_LIBS) \
+	$(SOUP_LIBS) \
+	$(LIBGWEATHER_LIBS) \
+	$(NULL)
 
-libecalbackendweather_la_LDFLAGS =		\
+libecalbackendweather_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED) \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(NULL)
diff --git a/calendar/libecal/Makefile.am b/calendar/libecal/Makefile.am
index 009e1491d..eb12c3793 100644
--- a/calendar/libecal/Makefile.am
+++ b/calendar/libecal/Makefile.am
@@ -1,3 +1,5 @@
+NULL =
+
 ENUM_TYPES = e-cal-types.h
 
 e-cal-enumtypes.h: $(top_srcdir)/enumtypes.h.template $(ENUM_TYPES)
@@ -11,77 +13,81 @@ e-cal-enumtypes.c: $(top_srcdir)/enumtypes.c.template $(ENUM_TYPES)
 		--fhead "#include \"e-cal-enumtypes.h\"" \
 		$(addprefix $(srcdir)/,$(ENUM_TYPES)) > $@
 
-ENUM_GENERATED = e-cal-enumtypes.h e-cal-enumtypes.c
+ENUM_GENERATED = \
+	e-cal-enumtypes.h \
+	e-cal-enumtypes.c \
+	$(NULL)
 
-# The library
 lib_LTLIBRARIES = libecal-1.2.la
 
 libecal_INCLUDES = \
-	-I$(top_srcdir) 			\
-	-I$(top_srcdir)/calendar		\
-	-I$(top_srcdir)/calendar/libegdbus	\
-	-I$(top_srcdir)/calendar/libedata-cal	\
-	-I$(top_srcdir)/private			\
-	-I$(top_builddir)			\
-	-I$(top_builddir)/calendar		\
-	-I$(top_builddir)/calendar/libecal	\
-	-I$(top_builddir)/private
-
-libecal_1_2_la_CPPFLAGS =			\
-	$(AM_CPPFLAGS)				\
-	$(libecal_INCLUDES)			\
-	-DLIBECAL_COMPILATION			\
-	-DG_LOG_DOMAIN=\"libecal\"		\
-	$(EVOLUTION_CALENDAR_CFLAGS)		\
-	$(CAMEL_CFLAGS)				\
-	$(CODE_COVERAGE_CFLAGS)			\
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/calendar \
+	-I$(top_srcdir)/calendar/libegdbus \
+	-I$(top_srcdir)/calendar/libedata-cal \
+	-I$(top_srcdir)/private \
+	-I$(top_builddir) \
+	-I$(top_builddir)/calendar \
+	-I$(top_builddir)/calendar/libecal \
+	-I$(top_builddir)/private \
+	$(NULL)
+
+libecal_1_2_la_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	$(libecal_INCLUDES) \
+	-DLIBECAL_COMPILATION \
+	-DG_LOG_DOMAIN=\"libecal\" \
+	$(EVOLUTION_CALENDAR_CFLAGS) \
+	$(CAMEL_CFLAGS) \
+	$(CODE_COVERAGE_CFLAGS) \
 	$(NULL)
 
-libecal_1_2_la_SOURCES =			\
-	$(ENUM_GENERATED)			\
-	e-cal.c					\
-	e-cal-client.c				\
-	e-cal-client-view.c			\
-	e-cal-component.c			\
-	e-cal-recur.c				\
-	e-cal-time-util.c			\
-	e-cal-check-timezones.c 		\
-	e-cal-system-timezone.c			\
-	e-cal-system-timezone.h			\
-	e-cal-util.c				\
-	e-cal-view.c				\
-	e-cal-view-private.h			\
-	e-timezone-cache.c			\
+libecal_1_2_la_SOURCES = \
+	$(ENUM_GENERATED) \
+	e-cal.c \
+	e-cal-client.c \
+	e-cal-client-view.c \
+	e-cal-component.c \
+	e-cal-recur.c \
+	e-cal-time-util.c \
+	e-cal-check-timezones.c \
+	e-cal-system-timezone.c \
+	e-cal-system-timezone.h \
+	e-cal-util.c \
+	e-cal-view.c \
+	e-cal-view-private.h \
+	e-timezone-cache.c \
 	$(NULL)
 
-libecal_1_2_la_LIBADD = 					\
-	$(top_builddir)/libedataserver/libedataserver-1.2.la 	\
-	$(top_builddir)/calendar/libegdbus/libegdbus-cal.la	\
-	$(EVOLUTION_CALENDAR_LIBS)				\
-	$(CAMEL_LIBS)
+libecal_1_2_la_LIBADD = \
+	$(top_builddir)/libedataserver/libedataserver-1.2.la \
+	$(top_builddir)/calendar/libegdbus/libegdbus-cal.la \
+	$(EVOLUTION_CALENDAR_LIBS) \
+	$(CAMEL_LIBS) \
+	$(NULL)
 
-libecal_1_2_la_LDFLAGS = 					\
+libecal_1_2_la_LDFLAGS = \
 	-version-info $(LIBECAL_CURRENT):$(LIBECAL_REVISION):$(LIBECAL_AGE) $(NO_UNDEFINED) \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(NULL)
 
 libecalincludedir = $(privincludedir)/libecal
 
-libecalinclude_HEADERS =	\
-	libecal.h		\
-	e-cal.h			\
-	e-cal-client.h		\
-	e-cal-client-view.h	\
-	e-cal-component.h	\
-	e-cal-enumtypes.h	\
-	e-cal-recur.h		\
-	e-cal-time-util.h	\
+libecalinclude_HEADERS = \
+	libecal.h \
+	e-cal.h \
+	e-cal-client.h \
+	e-cal-client-view.h \
+	e-cal-component.h \
+	e-cal-enumtypes.h \
+	e-cal-recur.h \
+	e-cal-time-util.h \
         e-cal-check-timezones.h \
-	e-cal-system-timezone.h	\
-	e-cal-types.h		\
-	e-cal-util.h		\
-	e-cal-view.h		\
-	e-timezone-cache.h	\
+	e-cal-system-timezone.h \
+	e-cal-types.h \
+	e-cal-util.h \
+	e-cal-view.h \
+	e-timezone-cache.h \
 	$(NULL)
 
 %-$(API_VERSION).pc: %.pc
@@ -94,8 +100,9 @@ BUILT_SOURCES = $(ENUM_GENERATED)
 CLEANFILES = $(BUILT_SOURCES)
 DISTCLEANFILES = $(pkgconfig_DATA)
 
-EXTRA_DIST = 						\
-	$(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in)
+EXTRA_DIST = \
+	$(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in) \
+	$(NULL)
 
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/calendar/libedata-cal/Makefile.am b/calendar/libedata-cal/Makefile.am
index 0276649fc..7467c3417 100644
--- a/calendar/libedata-cal/Makefile.am
+++ b/calendar/libedata-cal/Makefile.am
@@ -1,75 +1,80 @@
-# The libraray
+NULL =
+
 lib_LTLIBRARIES = libedata-cal-1.2.la
 
-libedata_cal_1_2_la_CPPFLAGS = 			\
-	$(AM_CPPFLAGS)				\
-	-DLIBEDATA_CAL_COMPILATION		\
-	-DG_LOG_DOMAIN=\"libedata-cal\"		\
-	-DBACKENDDIR=\"$(ecal_backenddir)\"	\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/calendar		\
-	-I$(top_srcdir)/calendar/libegdbus	\
-	-I$(top_srcdir)/private			\
-	-I$(top_builddir)			\
-	-I$(top_builddir)/calendar		\
-	-I$(top_builddir)/private		\
-	$(EVOLUTION_CALENDAR_CFLAGS)		\
-	$(CAMEL_CFLAGS)				\
-	$(CODE_COVERAGE_CFLAGS)			\
+libedata_cal_1_2_la_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-DLIBEDATA_CAL_COMPILATION \
+	-DG_LOG_DOMAIN=\"libedata-cal\" \
+	-DBACKENDDIR=\"$(ecal_backenddir)\" \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/calendar \
+	-I$(top_srcdir)/calendar/libegdbus \
+	-I$(top_srcdir)/private \
+	-I$(top_builddir) \
+	-I$(top_builddir)/calendar \
+	-I$(top_builddir)/private \
+	$(EVOLUTION_CALENDAR_CFLAGS) \
+	$(CAMEL_CFLAGS) \
+	$(CODE_COVERAGE_CFLAGS) \
 	$(NULL)
 
-libedata_cal_1_2_la_SOURCES =		\
-	e-cal-backend.c			\
-	e-cal-backend-cache.c		\
-	e-cal-backend-factory.c		\
-	e-cal-backend-intervaltree.c	\
-	e-cal-backend-sexp.c		\
-	e-cal-backend-sync.c		\
-	e-cal-backend-util.c		\
-	e-cal-backend-store.c		\
-	e-data-cal.c			\
-	e-data-cal-factory.c		\
-	e-data-cal-view.c
+libedata_cal_1_2_la_SOURCES = \
+	e-cal-backend.c \
+	e-cal-backend-cache.c \
+	e-cal-backend-factory.c \
+	e-cal-backend-intervaltree.c \
+	e-cal-backend-sexp.c \
+	e-cal-backend-sync.c \
+	e-cal-backend-util.c \
+	e-cal-backend-store.c \
+	e-data-cal.c \
+	e-data-cal-factory.c \
+	e-data-cal-view.c \
+	$(NULL)
 
-libedata_cal_1_2_la_LIBADD =					\
-	$(top_builddir)/calendar/libecal/libecal-1.2.la		\
-	$(top_builddir)/calendar/libegdbus/libegdbus-cal.la	\
-	$(top_builddir)/libedataserver/libedataserver-1.2.la 	\
-	$(top_builddir)/libebackend/libebackend-1.2.la 		\
-	$(EVOLUTION_CALENDAR_LIBS)				\
-	$(CAMEL_LIBS)
+libedata_cal_1_2_la_LIBADD = \
+	$(top_builddir)/calendar/libecal/libecal-1.2.la \
+	$(top_builddir)/calendar/libegdbus/libegdbus-cal.la \
+	$(top_builddir)/libedataserver/libedataserver-1.2.la \
+	$(top_builddir)/libebackend/libebackend-1.2.la \
+	$(EVOLUTION_CALENDAR_LIBS) \
+	$(CAMEL_LIBS) \
+	$(NULL)
 
-libedata_cal_1_2_la_LDFLAGS =								\
+libedata_cal_1_2_la_LDFLAGS = \
 	-version-info $(LIBEDATACAL_CURRENT):$(LIBEDATACAL_REVISION):$(LIBEDATACAL_AGE) $(NO_UNDEFINED) \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(NULL)
 
 libedata_calincludedir = $(privincludedir)/libedata-cal
 
-libedata_calinclude_HEADERS = 		\
-	libedata-cal.h			\
-	e-cal-backend.h			\
-	e-cal-backend-cache.h		\
-	e-cal-backend-factory.h		\
-	e-cal-backend-intervaltree.h	\
-	e-cal-backend-sync.h		\
-	e-cal-backend-util.h		\
-	e-cal-backend-sexp.h		\
-	e-data-cal.h			\
-	e-data-cal-factory.h		\
-	e-cal-backend-store.h		\
-	e-data-cal-view.h
+libedata_calinclude_HEADERS = \
+	libedata-cal.h \
+	e-cal-backend.h \
+	e-cal-backend-cache.h \
+	e-cal-backend-factory.h \
+	e-cal-backend-intervaltree.h \
+	e-cal-backend-sync.h \
+	e-cal-backend-util.h \
+	e-cal-backend-sexp.h \
+	e-data-cal.h \
+	e-data-cal-factory.h \
+	e-cal-backend-store.h \
+	e-data-cal-view.h \
+	$(NULL)
 
 %-$(API_VERSION).pc: %.pc
-	 cp $< $@
+	cp $< $@
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libedata-cal-$(API_VERSION).pc
 
 DISTCLEANFILES = $(pkgconfig_DATA)
 
-EXTRA_DIST = 						\
-	e-data-cal-view.xml				\
-	$(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in)
+EXTRA_DIST = \
+	e-data-cal-view.xml \
+	$(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in) \
+	$(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/calendar/libegdbus/Makefile.am b/calendar/libegdbus/Makefile.am
index ffeeaf5da..aa707c631 100644
--- a/calendar/libegdbus/Makefile.am
+++ b/calendar/libegdbus/Makefile.am
@@ -1,23 +1,27 @@
-# The library
+NULL =
+
 noinst_LTLIBRARIES = libegdbus-cal.la
 
-libegdbus_cal_la_CPPFLAGS =			\
-	$(AM_CPPFLAGS)				\
-	-DG_LOG_DOMAIN=\"libegdbus-cal\"	\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/calendar		\
-	$(E_DATA_SERVER_CFLAGS)			\
-	$(CODE_COVERAGE_CFLAGS)			\
+libegdbus_cal_la_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-DG_LOG_DOMAIN=\"libegdbus-cal\" \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/calendar \
+	$(E_DATA_SERVER_CFLAGS) \
+	$(CODE_COVERAGE_CFLAGS) \
 	$(NULL)
 
-libegdbus_cal_la_SOURCES =			\
-	e-gdbus-cal-view.h			\
-	e-gdbus-cal-view.c
+libegdbus_cal_la_SOURCES = \
+	e-gdbus-cal-view.h \
+	e-gdbus-cal-view.c \
+	$(NULL)
 
-libegdbus_cal_la_LIBADD =			\
-	$(E_DATA_SERVER_LIBS)
+libegdbus_cal_la_LIBADD = \
+	$(E_DATA_SERVER_LIBS) \
+	$(NULL)
 
-libegdbus_cal_la_LDFLAGS = $(NO_UNDEFINED) \
+libegdbus_cal_la_LDFLAGS = \
+	$(NO_UNDEFINED) \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(NULL)
 
diff --git a/camel/Makefile.am b/camel/Makefile.am
index 4f6dee7ef..d6d92c454 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -1,14 +1,18 @@
+NULL =
+
 SUBDIRS = . providers tests
 
 if OS_WIN32
 LIBCAMEL_PLATFORM_DEP_SOURCES = \
-	camel-win32.c
+	camel-win32.c \
+	$(NULL)
 LOCK_HELPER =
 else
 LIBCAMEL_PLATFORM_DEP_SOURCES = \
 	camel-lock-client.c \
 	camel-movemail.c \
-	camel-stream-process.c
+	camel-stream-process.c \
+	$(NULL)
 LOCK_HELPER = camel-lock-helper-1.2
 endif
 
@@ -42,301 +46,310 @@ camel-enumtypes.c: $(top_srcdir)/enumtypes.c.template $(ENUM_TYPES)
 ENUM_GENERATED = camel-enumtypes.h camel-enumtypes.c
 
 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)\"			\
-	-DLOCALEDIR=\""$(localedir)"\"				\
-	-DCAMEL_COMPILATION					\
-	$(CAMEL_CFLAGS)						\
-	$(CODE_COVERAGE_CFLAGS)					\
+	$(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)\" \
+	-DLOCALEDIR=\""$(localedir)"\" \
+	-DCAMEL_COMPILATION \
+	$(CAMEL_CFLAGS) \
+	$(CODE_COVERAGE_CFLAGS) \
 	$(NULL)
 
-libcamel_1_2_la_SOURCES = 			\
-	$(ENUM_GENERATED)			\
-	camel-address.c				\
-	camel-block-file.c			\
-	camel-certdb.c				\
-	camel-charset-map.c			\
-	camel-cipher-context.c			\
-	camel-data-cache.c			\
-	camel-data-wrapper.c			\
-	camel-db.c				\
-	camel-debug.c				\
-	camel-file-utils.c			\
-	camel-filter-driver.c			\
-	camel-filter-input-stream.c		\
-	camel-filter-output-stream.c		\
-	camel-filter-search.c			\
-	camel-folder-search.c			\
-	camel-folder-summary.c			\
-	camel-folder-thread.c			\
-	camel-folder.c				\
-	camel-gpg-context.c			\
-	camel-html-parser.c			\
-	camel-iconv.c				\
-	camel-index.c				\
-	camel-internet-address.c		\
-	camel-junk-filter.c			\
-	camel-local-settings.c			\
-	camel-lock.c				\
-	camel-medium.c				\
-	camel-memchunk.c			\
-	camel-mempool.c				\
-	camel-mime-filter-basic.c		\
-	camel-mime-filter-bestenc.c		\
-	camel-mime-filter-canon.c		\
-	camel-mime-filter-charset.c		\
-	camel-mime-filter-crlf.c		\
-	camel-mime-filter-enriched.c		\
-	camel-mime-filter-from.c		\
-	camel-mime-filter-gzip.c		\
-	camel-mime-filter-html.c		\
-	camel-mime-filter-index.c		\
-	camel-mime-filter-linewrap.c		\
-	camel-mime-filter-pgp.c			\
-	camel-mime-filter-progress.c		\
-	camel-mime-filter-tohtml.c		\
-	camel-mime-filter-windows.c		\
-	camel-mime-filter-yenc.c		\
-	camel-mime-filter.c			\
-	camel-mime-message.c			\
-	camel-mime-parser.c			\
-	camel-mime-part-utils.c			\
-	camel-mime-part.c			\
-	camel-mime-tables.c			\
-	camel-mime-utils.c			\
-	camel-msgport.c				\
-	camel-multipart-encrypted.c		\
-	camel-multipart-signed.c		\
-	camel-multipart.c			\
-	camel-net-utils.c			\
-	camel-network-service.c			\
-	camel-network-settings.c		\
-	camel-nntp-address.c			\
-	camel-object-bag.c			\
-	camel-object.c				\
-	camel-offline-folder.c			\
-	camel-offline-settings.c		\
-	camel-offline-store.c			\
-	camel-operation.c			\
-	camel-partition-table.c			\
-	camel-provider.c			\
-	camel-sasl-anonymous.c			\
-	camel-sasl-cram-md5.c			\
-	camel-sasl-digest-md5.c			\
-	camel-sasl-gssapi.c			\
-	camel-sasl-login.c			\
-	camel-sasl-ntlm.c			\
-	camel-sasl-plain.c			\
-	camel-sasl-popb4smtp.c			\
-	camel-sasl.c				\
-	camel-search-private.c			\
-	camel-search-sql-sexp.c			\
-	camel-service.c				\
-	camel-session.c				\
-	camel-settings.c			\
-	camel-sexp.c				\
-	camel-smime-context.c			\
-	camel-store-settings.c			\
-	camel-store-summary.c			\
-	camel-store.c				\
-	camel-stream-buffer.c			\
-	camel-stream-filter.c			\
-	camel-stream-fs.c			\
-	camel-stream-mem.c			\
-	camel-stream-null.c			\
-	camel-stream.c				\
-	camel-string-utils.c			\
-	camel-subscribable.c			\
-	camel-text-index.c			\
-	camel-transport.c			\
-	camel-trie.c				\
-	camel-uid-cache.c			\
-	camel-url-scanner.c			\
-	camel-url.c				\
-	camel-utf8.c				\
-	camel-vee-data-cache.c			\
-	camel-vee-folder.c			\
-	camel-vee-store.c			\
-	camel-vee-summary.c			\
-	camel-vtrash-folder.c			\
-	camel.c					\
-	$(LIBCAMEL_PLATFORM_DEP_SOURCES)
+libcamel_1_2_la_SOURCES = \
+	$(ENUM_GENERATED) \
+	camel-address.c \
+	camel-block-file.c \
+	camel-certdb.c \
+	camel-charset-map.c \
+	camel-cipher-context.c \
+	camel-data-cache.c \
+	camel-data-wrapper.c \
+	camel-db.c \
+	camel-debug.c \
+	camel-file-utils.c \
+	camel-filter-driver.c \
+	camel-filter-input-stream.c \
+	camel-filter-output-stream.c \
+	camel-filter-search.c \
+	camel-folder-search.c \
+	camel-folder-summary.c \
+	camel-folder-thread.c \
+	camel-folder.c \
+	camel-gpg-context.c \
+	camel-html-parser.c \
+	camel-iconv.c \
+	camel-index.c \
+	camel-internet-address.c \
+	camel-junk-filter.c \
+	camel-local-settings.c \
+	camel-lock.c \
+	camel-medium.c \
+	camel-memchunk.c \
+	camel-mempool.c \
+	camel-mime-filter-basic.c \
+	camel-mime-filter-bestenc.c \
+	camel-mime-filter-canon.c \
+	camel-mime-filter-charset.c \
+	camel-mime-filter-crlf.c \
+	camel-mime-filter-enriched.c \
+	camel-mime-filter-from.c \
+	camel-mime-filter-gzip.c \
+	camel-mime-filter-html.c \
+	camel-mime-filter-index.c \
+	camel-mime-filter-linewrap.c \
+	camel-mime-filter-pgp.c \
+	camel-mime-filter-progress.c \
+	camel-mime-filter-tohtml.c \
+	camel-mime-filter-windows.c \
+	camel-mime-filter-yenc.c \
+	camel-mime-filter.c \
+	camel-mime-message.c \
+	camel-mime-parser.c \
+	camel-mime-part-utils.c \
+	camel-mime-part.c \
+	camel-mime-tables.c \
+	camel-mime-utils.c \
+	camel-msgport.c \
+	camel-multipart-encrypted.c \
+	camel-multipart-signed.c \
+	camel-multipart.c \
+	camel-net-utils.c \
+	camel-network-service.c \
+	camel-network-settings.c \
+	camel-nntp-address.c \
+	camel-object-bag.c \
+	camel-object.c \
+	camel-offline-folder.c \
+	camel-offline-settings.c \
+	camel-offline-store.c \
+	camel-operation.c \
+	camel-partition-table.c \
+	camel-provider.c \
+	camel-sasl-anonymous.c \
+	camel-sasl-cram-md5.c \
+	camel-sasl-digest-md5.c \
+	camel-sasl-gssapi.c \
+	camel-sasl-login.c \
+	camel-sasl-ntlm.c \
+	camel-sasl-plain.c \
+	camel-sasl-popb4smtp.c \
+	camel-sasl.c \
+	camel-search-private.c \
+	camel-search-sql-sexp.c \
+	camel-service.c \
+	camel-session.c \
+	camel-settings.c \
+	camel-sexp.c \
+	camel-smime-context.c \
+	camel-store-settings.c \
+	camel-store-summary.c \
+	camel-store.c \
+	camel-stream-buffer.c \
+	camel-stream-filter.c \
+	camel-stream-fs.c \
+	camel-stream-mem.c \
+	camel-stream-null.c \
+	camel-stream.c \
+	camel-string-utils.c \
+	camel-subscribable.c \
+	camel-text-index.c \
+	camel-transport.c \
+	camel-trie.c \
+	camel-uid-cache.c \
+	camel-url-scanner.c \
+	camel-url.c \
+	camel-utf8.c \
+	camel-vee-data-cache.c \
+	camel-vee-folder.c \
+	camel-vee-store.c \
+	camel-vee-summary.c \
+	camel-vtrash-folder.c \
+	camel.c \
+	$(LIBCAMEL_PLATFORM_DEP_SOURCES) \
+	$(NULL)
 
-libcamelinclude_HEADERS =			\
-	camel-address.h				\
-	camel-block-file.h			\
-	camel-certdb.h				\
-	camel-charset-map.h			\
-	camel-cipher-context.h			\
-	camel-data-cache.h			\
-	camel-data-wrapper.h			\
-	camel-db.h				\
-	camel-debug.h				\
-	camel-enums.h				\
-	camel-enumtypes.h			\
-	camel-file-utils.h			\
-	camel-filter-driver.h			\
-	camel-filter-input-stream.h		\
-	camel-filter-output-stream.h		\
-	camel-filter-search.h			\
-	camel-folder-search.h			\
-	camel-folder-summary.h			\
-	camel-folder-thread.h			\
-	camel-folder.h				\
-	camel-gpg-context.h			\
-	camel-html-parser.h			\
-	camel-iconv.h				\
-	camel-index.h				\
-	camel-internet-address.h		\
-	camel-junk-filter.h			\
-	camel-local-settings.h			\
-	camel-lock-client.h			\
-	camel-lock-helper.h			\
-	camel-lock.h				\
-	camel-medium.h				\
-	camel-memchunk.h			\
-	camel-mempool.h				\
-	camel-mime-filter-basic.h		\
-	camel-mime-filter-bestenc.h		\
-	camel-mime-filter-canon.h		\
-	camel-mime-filter-charset.h		\
-	camel-mime-filter-crlf.h		\
-	camel-mime-filter-enriched.h		\
-	camel-mime-filter-from.h		\
-	camel-mime-filter-gzip.h		\
-	camel-mime-filter-html.h		\
-	camel-mime-filter-index.h		\
-	camel-mime-filter-linewrap.h		\
-	camel-mime-filter-pgp.h			\
-	camel-mime-filter-progress.h		\
-	camel-mime-filter-tohtml.h		\
-	camel-mime-filter-windows.h		\
-	camel-mime-filter-yenc.h		\
-	camel-mime-filter.h			\
-	camel-mime-message.h			\
-	camel-mime-parser.h			\
-	camel-mime-part-utils.h			\
-	camel-mime-part.h			\
-	camel-mime-utils.h			\
-	camel-movemail.h			\
-	camel-msgport.h				\
-	camel-multipart-encrypted.h		\
-	camel-multipart-signed.h		\
-	camel-multipart.h			\
-	camel-net-utils.h			\
-	camel-network-service.h			\
-	camel-network-settings.h		\
-	camel-nntp-address.h			\
-	camel-object-bag.h			\
-	camel-object.h				\
-	camel-offline-folder.h			\
-	camel-offline-settings.h		\
-	camel-offline-store.h			\
-	camel-operation.h			\
-	camel-partition-table.h			\
-	camel-provider.h			\
-	camel-sasl-anonymous.h			\
-	camel-sasl-cram-md5.h			\
-	camel-sasl-digest-md5.h			\
-	camel-sasl-gssapi.h			\
-	camel-sasl-login.h			\
-	camel-sasl-ntlm.h			\
-	camel-sasl-plain.h			\
-	camel-sasl-popb4smtp.h			\
-	camel-sasl.h				\
-	camel-search-private.h			\
-	camel-search-sql-sexp.h			\
-	camel-service.h				\
-	camel-session.h				\
-	camel-settings.h			\
-	camel-sexp.h				\
-	camel-smime-context.h			\
-	camel-store-settings.h			\
-	camel-store-summary.h			\
-	camel-store.h				\
-	camel-stream-buffer.h			\
-	camel-stream-filter.h			\
-	camel-stream-fs.h			\
-	camel-stream-mem.h			\
-	camel-stream-null.h			\
-	camel-stream-process.h			\
-	camel-stream.h				\
-	camel-string-utils.h			\
-	camel-subscribable.h			\
-	camel-text-index.h			\
-	camel-transport.h			\
-	camel-trie.h				\
-	camel-uid-cache.h			\
-	camel-url-scanner.h			\
-	camel-url.h				\
-	camel-utf8.h				\
-	camel-vee-data-cache.h			\
-	camel-vee-folder.h			\
-	camel-vee-store.h			\
-	camel-vee-summary.h			\
-	camel-vtrash-folder.h			\
-	camel.h
+libcamelinclude_HEADERS = \
+	camel-address.h \
+	camel-block-file.h \
+	camel-certdb.h \
+	camel-charset-map.h \
+	camel-cipher-context.h \
+	camel-data-cache.h \
+	camel-data-wrapper.h \
+	camel-db.h \
+	camel-debug.h \
+	camel-enums.h \
+	camel-enumtypes.h \
+	camel-file-utils.h \
+	camel-filter-driver.h \
+	camel-filter-input-stream.h \
+	camel-filter-output-stream.h \
+	camel-filter-search.h \
+	camel-folder-search.h \
+	camel-folder-summary.h \
+	camel-folder-thread.h \
+	camel-folder.h \
+	camel-gpg-context.h \
+	camel-html-parser.h \
+	camel-iconv.h \
+	camel-index.h \
+	camel-internet-address.h \
+	camel-junk-filter.h \
+	camel-local-settings.h \
+	camel-lock-client.h \
+	camel-lock-helper.h \
+	camel-lock.h \
+	camel-medium.h \
+	camel-memchunk.h \
+	camel-mempool.h \
+	camel-mime-filter-basic.h \
+	camel-mime-filter-bestenc.h \
+	camel-mime-filter-canon.h \
+	camel-mime-filter-charset.h \
+	camel-mime-filter-crlf.h \
+	camel-mime-filter-enriched.h \
+	camel-mime-filter-from.h \
+	camel-mime-filter-gzip.h \
+	camel-mime-filter-html.h \
+	camel-mime-filter-index.h \
+	camel-mime-filter-linewrap.h \
+	camel-mime-filter-pgp.h \
+	camel-mime-filter-progress.h \
+	camel-mime-filter-tohtml.h \
+	camel-mime-filter-windows.h \
+	camel-mime-filter-yenc.h \
+	camel-mime-filter.h \
+	camel-mime-message.h \
+	camel-mime-parser.h \
+	camel-mime-part-utils.h \
+	camel-mime-part.h \
+	camel-mime-utils.h \
+	camel-movemail.h \
+	camel-msgport.h \
+	camel-multipart-encrypted.h \
+	camel-multipart-signed.h \
+	camel-multipart.h \
+	camel-net-utils.h \
+	camel-network-service.h \
+	camel-network-settings.h \
+	camel-nntp-address.h \
+	camel-object-bag.h \
+	camel-object.h \
+	camel-offline-folder.h \
+	camel-offline-settings.h \
+	camel-offline-store.h \
+	camel-operation.h \
+	camel-partition-table.h \
+	camel-provider.h \
+	camel-sasl-anonymous.h \
+	camel-sasl-cram-md5.h \
+	camel-sasl-digest-md5.h \
+	camel-sasl-gssapi.h \
+	camel-sasl-login.h \
+	camel-sasl-ntlm.h \
+	camel-sasl-plain.h \
+	camel-sasl-popb4smtp.h \
+	camel-sasl.h \
+	camel-search-private.h \
+	camel-search-sql-sexp.h \
+	camel-service.h \
+	camel-session.h \
+	camel-settings.h \
+	camel-sexp.h \
+	camel-smime-context.h \
+	camel-store-settings.h \
+	camel-store-summary.h \
+	camel-store.h \
+	camel-stream-buffer.h \
+	camel-stream-filter.h \
+	camel-stream-fs.h \
+	camel-stream-mem.h \
+	camel-stream-null.h \
+	camel-stream-process.h \
+	camel-stream.h \
+	camel-string-utils.h \
+	camel-subscribable.h \
+	camel-text-index.h \
+	camel-transport.h \
+	camel-trie.h \
+	camel-uid-cache.h \
+	camel-url-scanner.h \
+	camel-url.h \
+	camel-utf8.h \
+	camel-vee-data-cache.h \
+	camel-vee-folder.h \
+	camel-vee-store.h \
+	camel-vee-summary.h \
+	camel-vtrash-folder.h \
+	camel.h \
+	$(NULL)
 
 libcamel_1_2_la_LDFLAGS = -version-info $(LIBCAMEL_CURRENT):$(LIBCAMEL_REVISION):$(LIBCAMEL_AGE) $(NO_UNDEFINED) \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(NULL)
 
-libcamel_1_2_la_LIBADD =				\
-	$(CAMEL_LIBS)					\
-	$(SOCKET_LIBS)					\
-	$(ICONV_LIBS)					\
-	$(REGEX_LIBS)					\
-	$(LIBDWFL_LIBS)
+libcamel_1_2_la_LIBADD = \
+	$(CAMEL_LIBS) \
+	$(SOCKET_LIBS) \
+	$(ICONV_LIBS) \
+	$(REGEX_LIBS) \
+	$(LIBDWFL_LIBS) \
+	$(NULL)
 
 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)\"			\
-	-DLOCALEDIR=\""$(localedir)"\"				\
-	-DCAMEL_COMPILATION					\
-	$(CAMEL_CFLAGS)
+	$(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)\" \
+	-DLOCALEDIR=\""$(localedir)"\" \
+	-DCAMEL_COMPILATION \
+	$(CAMEL_CFLAGS) \
+	$(NULL)
 
 camel_lock_helper_1_2_SOURCES = \
-	camel-lock.c					\
-	camel-lock.h					\
-	camel-lock-helper.c 			\
-	camel-lock-helper.h
+	camel-lock.c \
+	camel-lock.h \
+	camel-lock-helper.c \
+	camel-lock-helper.h \
+	$(NULL)
 
 # 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 = \
-	$(libcamel_1_2_la_LIBADD)
+	$(libcamel_1_2_la_LIBADD) \
+	$(NULL)
 
 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)\"			\
-	-DLOCALEDIR=\""$(localedir)"\"				\
-	-DCAMEL_COMPILATION					\
-	$(CAMEL_CFLAGS)
+	$(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)\" \
+	-DLOCALEDIR=\""$(localedir)"\" \
+	-DCAMEL_COMPILATION \
+	$(CAMEL_CFLAGS) \
+	$(NULL)
 
 camel_index_control_1_2_SOURCES = \
-	camel-index-control.c
+	camel-index-control.c \
+	$(NULL)
 
 camel_index_control_1_2_LDADD = \
-	libcamel-1.2.la				\
-	$(libcamel_1_2_la_LIBADD)
+	libcamel-1.2.la \
+	$(libcamel_1_2_la_LIBADD) \
+	$(NULL)
 
 camel-mime-tables.c: $(srcdir)/gentables.pl
 	perl $(srcdir)/gentables.pl > $@
@@ -373,18 +386,21 @@ install-exec-hook:
 	    echo "No user to chown to"; \
 	fi
 
-noinst_HEADERS =				\
-	camel-charset-map-private.h		\
-	camel-win32.h				
+noinst_HEADERS = \
+	camel-charset-map-private.h \
+	camel-win32.h \
+	$(NULL)
 
-BUILT_SOURCES =					\
-	camel-mime-tables.c			\
-	$(ENUM_GENERATED)
+BUILT_SOURCES = \
+	camel-mime-tables.c \
+	$(ENUM_GENERATED) \
+	$(NULL)
 
-EXTRA_DIST =					\
-	$(pkgconfig_in_files)	 		\
-	gentables.pl				\
-	README
+EXTRA_DIST = \
+	$(pkgconfig_in_files) \
+	gentables.pl \
+	README \
+	$(NULL)
 
 CLEANFILES = $(BUILT_SOURCES)
 DISTCLEANFILES = $(pkgconfig_DATA)
diff --git a/camel/providers/imapx/Makefile.am b/camel/providers/imapx/Makefile.am
index 2897b6e9d..c4a6ab940 100644
--- a/camel/providers/imapx/Makefile.am
+++ b/camel/providers/imapx/Makefile.am
@@ -1,3 +1,5 @@
+NULL =
+
 camel_provider_LTLIBRARIES = libcamelimapx.la
 camel_provider_DATA = libcamelimapx.urls
 
@@ -54,7 +56,8 @@ libcamelimapx_la_SOURCES = \
 
 libcamelimapx_la_LIBADD = \
 	$(top_builddir)/camel/libcamel-1.2.la \
-	$(CAMEL_LIBS)
+	$(CAMEL_LIBS) \
+	$(NULL)
 
 libcamelimapx_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED) \
 	$(CODE_COVERAGE_LDFLAGS) \
@@ -69,11 +72,13 @@ test_imapx_CPPFLAGS = \
 	-I$(top_srcdir)/camel \
 	-I$(top_srcdir) \
 	$(CAMEL_CFLAGS) \
-	-DG_LOG_DOMAIN=\"camel-imapx\"
+	-DG_LOG_DOMAIN=\"camel-imapx\" \
+	$(NULL)
 test_imapx_SOURCES = test-imapx.c
 test_imapx_LDADD = \
 	$(CAMEL_LIBS) \
-	$(top_builddir)/camel/libcamel-1.2.la
+	$(top_builddir)/camel/libcamel-1.2.la \
+	$(NULL)
 
 BUILT_SOURCES = camel-imapx-tokenise.h
 
diff --git a/camel/providers/local/Makefile.am b/camel/providers/local/Makefile.am
index b4c9cbddf..c78b912c2 100644
--- a/camel/providers/local/Makefile.am
+++ b/camel/providers/local/Makefile.am
@@ -1,3 +1,5 @@
+NULL =
+
 camel_provider_LTLIBRARIES = libcamellocal.la
 camel_provider_DATA = libcamellocal.urls
 
@@ -5,66 +7,70 @@ if OS_WIN32
 SYSDEP_PROVIDER_SOURCES =
 else
 SYSDEP_PROVIDER_SOURCES = \
-	camel-spool-folder.c			\
-	camel-spool-settings.c			\
-	camel-spool-store.c			\
-	camel-spool-summary.c
+	camel-spool-folder.c \
+	camel-spool-settings.c \
+	camel-spool-store.c \
+	camel-spool-summary.c \
+	$(NULL)
 endif
 
 libcamellocal_la_CPPFLAGS = \
-	$(AM_CPPFLAGS)				\
-	-I$(top_srcdir)/camel			\
-	-I$(top_srcdir)				\
-	$(CAMEL_CFLAGS)				\
-	-DG_LOG_DOMAIN=\"camel-local-provider\"	\
-	$(CODE_COVERAGE_CFLAGS)			\
+	$(AM_CPPFLAGS) \
+	-I$(top_srcdir)/camel \
+	-I$(top_srcdir) \
+	$(CAMEL_CFLAGS) \
+	-DG_LOG_DOMAIN=\"camel-local-provider\" \
+	$(CODE_COVERAGE_CFLAGS) \
 	$(NULL)
 
-libcamellocal_la_SOURCES = 			\
-	camel-local-folder.c			\
-	camel-local-store.c			\
-	camel-local-summary.c			\
-	camel-local-private.c			\
-	camel-local-provider.c			\
-	camel-mbox-folder.c			\
-	camel-mbox-store.c			\
-	camel-mbox-summary.c			\
-	camel-mh-folder.c			\
-	camel-mh-settings.c			\
-	camel-mh-store.c			\
-	camel-mh-summary.c			\
-	camel-maildir-folder.c			\
-	camel-maildir-store.c			\
-	camel-maildir-summary.c			\
-	$(SYSDEP_PROVIDER_SOURCES)
+libcamellocal_la_SOURCES = \
+	camel-local-folder.c \
+	camel-local-store.c \
+	camel-local-summary.c \
+	camel-local-private.c \
+	camel-local-provider.c \
+	camel-mbox-folder.c \
+	camel-mbox-store.c \
+	camel-mbox-summary.c \
+	camel-mh-folder.c \
+	camel-mh-settings.c \
+	camel-mh-store.c \
+	camel-mh-summary.c \
+	camel-maildir-folder.c \
+	camel-maildir-store.c \
+	camel-maildir-summary.c \
+	$(SYSDEP_PROVIDER_SOURCES) \
+	$(NULL)
 
-noinst_HEADERS =				\
-	camel-local-folder.h			\
-	camel-local-store.h			\
-	camel-local-summary.h			\
-	camel-mh-folder.h			\
-	camel-mh-settings.h			\
-	camel-mh-store.h			\
-	camel-mh-summary.h			\
-	camel-mbox-folder.h			\
-	camel-mbox-store.h			\
-	camel-mbox-summary.h			\
-	camel-maildir-folder.h			\
-	camel-maildir-store.h			\
-	camel-maildir-summary.h			\
-	camel-spool-folder.h			\
-	camel-spool-settings.h			\
-	camel-spool-store.h			\
-	camel-spool-summary.h			\
-	camel-local-private.h
+noinst_HEADERS = \
+	camel-local-folder.h \
+	camel-local-store.h \
+	camel-local-summary.h \
+	camel-mh-folder.h \
+	camel-mh-settings.h \
+	camel-mh-store.h \
+	camel-mh-summary.h \
+	camel-mbox-folder.h \
+	camel-mbox-store.h \
+	camel-mbox-summary.h \
+	camel-maildir-folder.h \
+	camel-maildir-store.h \
+	camel-maildir-summary.h \
+	camel-spool-folder.h \
+	camel-spool-settings.h \
+	camel-spool-store.h \
+	camel-spool-summary.h \
+	camel-local-private.h \
+	$(NULL)
 
 libcamellocal_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED) \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(NULL)
 
 libcamellocal_la_LIBADD = \
-	$(top_builddir)/camel/libcamel-1.2.la	\
-	$(CAMEL_LIBS)
+	$(top_builddir)/camel/libcamel-1.2.la \
+	$(CAMEL_LIBS) \
+	$(NULL)
 
 EXTRA_DIST = libcamellocal.urls
 
diff --git a/camel/providers/nntp/Makefile.am b/camel/providers/nntp/Makefile.am
index 7d3078d1f..4e94aeccb 100644
--- a/camel/providers/nntp/Makefile.am
+++ b/camel/providers/nntp/Makefile.am
@@ -1,45 +1,47 @@
+NULL =
+
 camel_provider_LTLIBRARIES = libcamelnntp.la
 camel_provider_DATA = libcamelnntp.urls
 
 libcamelnntp_la_CPPFLAGS = \
-	$(AM_CPPFLAGS)				\
-	-I../..					\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/camel			\
-	-I$(top_srcdir)				\
-	$(CAMEL_CFLAGS)				\
-	$(GNOME_INCLUDEDIR)			\
-	$(GTK_INCLUDEDIR)			\
-	-DG_LOG_DOMAIN=\"camel-nntp-provider\"	\
-	$(CODE_COVERAGE_CFLAGS)			\
+	$(AM_CPPFLAGS) \
+	-I../.. \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/camel \
+	-I$(top_srcdir) \
+	$(CAMEL_CFLAGS) \
+	$(GNOME_INCLUDEDIR) \
+	$(GTK_INCLUDEDIR) \
+	-DG_LOG_DOMAIN=\"camel-nntp-provider\" \
+	$(CODE_COVERAGE_CFLAGS) \
 	$(NULL)
 
-libcamelnntp_la_SOURCES = 			\
-	camel-nntp-folder.c			\
-	camel-nntp-provider.c			\
-	camel-nntp-settings.c			\
-	camel-nntp-store-summary.c		\
-	camel-nntp-store.c			\
-	camel-nntp-stream.c			\
-	camel-nntp-summary.c
-
-noinst_HEADERS =				\
-	camel-nntp-folder.h			\
-	camel-nntp-private.h			\
-	camel-nntp-resp-codes.h			\
-	camel-nntp-settings.h			\
-	camel-nntp-store-summary.h		\
-	camel-nntp-store.h			\
-	camel-nntp-stream.h			\
-	camel-nntp-summary.h
+libcamelnntp_la_SOURCES = \
+	camel-nntp-folder.c \
+	camel-nntp-folder.h \
+	camel-nntp-private.h \
+	camel-nntp-provider.c \
+	camel-nntp-resp-codes.h \
+	camel-nntp-settings.c \
+	camel-nntp-settings.h \
+	camel-nntp-store-summary.c \
+	camel-nntp-store-summary.h \
+	camel-nntp-store.c \
+	camel-nntp-store.h \
+	camel-nntp-stream.c \
+	camel-nntp-stream.h \
+	camel-nntp-summary.c \
+	camel-nntp-summary.h \
+	$(NULL)
 
 libcamelnntp_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED) \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(NULL)
 
 libcamelnntp_la_LIBADD = \
-	$(top_builddir)/camel/libcamel-1.2.la	\
-	$(CAMEL_LIBS)
+	$(top_builddir)/camel/libcamel-1.2.la \
+	$(CAMEL_LIBS) \
+	$(NULL)
 
 EXTRA_DIST = libcamelnntp.urls
 
diff --git a/camel/providers/pop3/Makefile.am b/camel/providers/pop3/Makefile.am
index e5fd3c0ed..f93bedae6 100644
--- a/camel/providers/pop3/Makefile.am
+++ b/camel/providers/pop3/Makefile.am
@@ -1,37 +1,42 @@
+NULL =
+
 camel_provider_LTLIBRARIES = libcamelpop3.la
 camel_provider_DATA = libcamelpop3.urls
 
 libcamelpop3_la_CPPFLAGS = \
-	$(AM_CPPFLAGS)				\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/camel			\
-	$(CAMEL_CFLAGS)				\
-	-DG_LOG_DOMAIN=\"camel-pop3-provider\"	\
-	$(CODE_COVERAGE_CFLAGS)			\
+	$(AM_CPPFLAGS) \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/camel \
+	$(CAMEL_CFLAGS) \
+	-DG_LOG_DOMAIN=\"camel-pop3-provider\" \
+	$(CODE_COVERAGE_CFLAGS) \
 	$(NULL)
 
-libcamelpop3_la_SOURCES = 			\
-	camel-pop3-engine.c			\
-	camel-pop3-folder.c			\
-	camel-pop3-provider.c			\
-	camel-pop3-settings.c			\
-	camel-pop3-stream.c			\
-	camel-pop3-store.c
-
-noinst_HEADERS =			\
-	camel-pop3-engine.h			\
-	camel-pop3-folder.h			\
-	camel-pop3-settings.h			\
-	camel-pop3-stream.h			\
-	camel-pop3-store.h
+libcamelpop3_la_SOURCES = \
+	camel-pop3-engine.c \
+	camel-pop3-folder.c \
+	camel-pop3-provider.c \
+	camel-pop3-settings.c \
+	camel-pop3-stream.c \
+	camel-pop3-store.c \
+	$(NULL)
+
+noinst_HEADERS = \
+	camel-pop3-engine.h \
+	camel-pop3-folder.h \
+	camel-pop3-settings.h \
+	camel-pop3-stream.h \
+	camel-pop3-store.h \
+	$(NULL)
 
 libcamelpop3_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED) \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(NULL)
 
 libcamelpop3_la_LIBADD = \
-	$(top_builddir)/camel/libcamel-1.2.la	\
-	$(CAMEL_LIBS)
+	$(top_builddir)/camel/libcamel-1.2.la \
+	$(CAMEL_LIBS) \
+	$(NULL)
 
 EXTRA_DIST = libcamelpop3.urls
 
diff --git a/camel/providers/sendmail/Makefile.am b/camel/providers/sendmail/Makefile.am
index b656a564c..ce79ab4b3 100644
--- a/camel/providers/sendmail/Makefile.am
+++ b/camel/providers/sendmail/Makefile.am
@@ -1,35 +1,37 @@
+NULL =
+
 camel_provider_LTLIBRARIES = libcamelsendmail.la
 camel_provider_DATA = libcamelsendmail.urls
 
 libcamelsendmail_la_CPPFLAGS = \
-	$(AM_CPPFLAGS)					\
-	-I..						\
-	-I$(srcdir)/..					\
-	-I$(srcdir)/../../..				\
-	-I$(top_srcdir)/camel                   	\
-	$(CAMEL_CFLAGS)					\
-	$(GNOME_INCLUDEDIR)				\
-	$(GTK_INCLUDEDIR) 				\
-	-DG_LOG_DOMAIN=\"camel-sendmail-provider\"	\
-	$(CODE_COVERAGE_CFLAGS)				\
+	$(AM_CPPFLAGS) \
+	-I.. \
+	-I$(srcdir)/.. \
+	-I$(srcdir)/../../.. \
+	-I$(top_srcdir)/camel \
+	$(CAMEL_CFLAGS) \
+	$(GNOME_INCLUDEDIR) \
+	$(GTK_INCLUDEDIR) \
+	-DG_LOG_DOMAIN=\"camel-sendmail-provider\" \
+	$(CODE_COVERAGE_CFLAGS) \
 	$(NULL)
 
-libcamelsendmail_la_SOURCES = 			\
-	camel-sendmail-settings.h		\
-	camel-sendmail-settings.c		\
-	camel-sendmail-provider.c		\
-	camel-sendmail-transport.c
-
-noinst_HEADERS =		\
-	camel-sendmail-transport.h
+libcamelsendmail_la_SOURCES = \
+	camel-sendmail-settings.h \
+	camel-sendmail-settings.c \
+	camel-sendmail-provider.c \
+	camel-sendmail-transport.c \
+	camel-sendmail-transport.h \
+	$(NULL)
 
 libcamelsendmail_la_LDFLAGS = -avoid-version -module \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(NULL)
 
 libcamelsendmail_la_LIBADD = \
-	$(top_builddir)/camel/libcamel-1.2.la				\
-	$(CAMEL_LIBS)
+	$(top_builddir)/camel/libcamel-1.2.la \
+	$(CAMEL_LIBS) \
+	$(NULL)
 
 EXTRA_DIST = libcamelsendmail.urls
 
diff --git a/camel/providers/smtp/Makefile.am b/camel/providers/smtp/Makefile.am
index 299f4faa1..9e2c348bc 100644
--- a/camel/providers/smtp/Makefile.am
+++ b/camel/providers/smtp/Makefile.am
@@ -1,31 +1,33 @@
+NULL =
+
 camel_provider_LTLIBRARIES = libcamelsmtp.la
 camel_provider_DATA = libcamelsmtp.urls
 
 libcamelsmtp_la_CPPFLAGS = \
-	$(AM_CPPFLAGS)				\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/camel			\
-	$(CAMEL_CFLAGS)				\
-	-DG_LOG_DOMAIN=\"camel-smtp-provider\"	\
-	$(CODE_COVERAGE_CFLAGS)			\
+	$(AM_CPPFLAGS) \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/camel \
+	$(CAMEL_CFLAGS) \
+	-DG_LOG_DOMAIN=\"camel-smtp-provider\" \
+	$(CODE_COVERAGE_CFLAGS) \
 	$(NULL)
 
-libcamelsmtp_la_SOURCES = 			\
-	camel-smtp-provider.c			\
-	camel-smtp-settings.c			\
-	camel-smtp-settings.h			\
-	camel-smtp-transport.c
-
-noinst_HEADERS = \
-	camel-smtp-transport.h
+libcamelsmtp_la_SOURCES = \
+	camel-smtp-provider.c \
+	camel-smtp-settings.c \
+	camel-smtp-settings.h \
+	camel-smtp-transport.c \
+	camel-smtp-transport.h \
+	$(NULL)
 
 libcamelsmtp_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED) \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(NULL)
 
 libcamelsmtp_la_LIBADD = \
-	$(top_builddir)/camel/libcamel-1.2.la	\
-	$(CAMEL_LIBS)
+	$(top_builddir)/camel/libcamel-1.2.la \
+	$(CAMEL_LIBS) \
+	$(NULL)
 
 EXTRA_DIST = libcamelsmtp.urls
 
diff --git a/camel/tests/Makefile.am b/camel/tests/Makefile.am
index 8aa63fd8d..bd61e2c5f 100644
--- a/camel/tests/Makefile.am
+++ b/camel/tests/Makefile.am
@@ -1,5 +1,13 @@
-SUBDIRS = lib \
-	message folder smime misc mime-filter
+NULL =
+
+SUBDIRS = \
+	lib \
+	message \
+	folder \
+	smime \
+	misc \
+	mime-filter \
+	$(NULL)
 
 EXTRA_DIST = data
 
diff --git a/camel/tests/folder/Makefile.am b/camel/tests/folder/Makefile.am
index 09b29e6da..1368113c3 100644
--- a/camel/tests/folder/Makefile.am
+++ b/camel/tests/folder/Makefile.am
@@ -1,24 +1,36 @@
+NULL =
+
 FOLDER_TESTS_CPPFLAGS= \
-	$(AM_CPPFLAGS)					\
-	-I$(includedir)					\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/camel				\
-	-I$(top_srcdir)/camel/tests/lib 		\
-	-DG_LOG_DOMAIN=\"evolution-tests\"		\
-	$(CAMEL_CFLAGS)
+	$(AM_CPPFLAGS) \
+	-I$(includedir) \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/camel \
+	-I$(top_srcdir)/camel/tests/lib \
+	-DG_LOG_DOMAIN=\"evolution-tests\" \
+	$(CAMEL_CFLAGS) \
+	$(NULL)
 
 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 	\
-	$(INTLLIBS)						\
-	$(CAMEL_LIBS)
+	$(top_builddir)/camel/tests/lib/libcameltest.a \
+	$(top_builddir)/camel/tests/lib/libcameltest-provider.a \
+	$(top_builddir)/camel/libcamel-${API_VERSION}.la \
+	$(INTLLIBS) \
+	$(CAMEL_LIBS) \
+	$(NULL)
 
-check_PROGRAMS =  	\
-	test1	test2	test3	\
-	test4	test5	test6	\
-	test7	test8	test9	\
-	test10  test11
+check_PROGRAMS = \
+	test1 \
+	test2 \
+	test3 \
+	test4 \
+	test5 \
+	test6 \
+	test7 \
+	test8 \
+	test9 \
+	test10 \
+	test11 \
+	$(NULL)
 
 test1_CPPFLAGS = $(FOLDER_TESTS_CPPFLAGS)
 test2_CPPFLAGS = $(FOLDER_TESTS_CPPFLAGS)
diff --git a/camel/tests/lib/Makefile.am b/camel/tests/lib/Makefile.am
index e7752446b..7d25da1dc 100644
--- a/camel/tests/lib/Makefile.am
+++ b/camel/tests/lib/Makefile.am
@@ -1,33 +1,45 @@
+NULL =
+
 check_LIBRARIES = libcameltest.a libcameltest-provider.a
 
 libcameltest_a_SOURCES = \
-	camel-test.c camel-test.h \
-	messages.c messages.h \
-	addresses.c addresses.h \
-	folders.c folders.h \
-	session.c session.h \
-	address-data.h
+	camel-test.c \
+	camel-test.h \
+	messages.c \
+	messages.h \
+	addresses.c \
+	addresses.h \
+	folders.c \
+	folders.h \
+	session.c \
+	session.h \
+	address-data.h \
+	$(NULL)
 
 libcameltest_provider_a_CPPFLAGS = \
-	$(AM_CPPFLAGS)					\
-	-I$(includedir)					\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/camel				\
-	-DCAMEL_BUILD_DIR=\"$(top_builddir)/camel\"	\
-	$(CAMEL_CFLAGS)
+	$(AM_CPPFLAGS) \
+	-I$(includedir) \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/camel \
+	-DCAMEL_BUILD_DIR=\"$(top_builddir)/camel\" \
+	$(CAMEL_CFLAGS) \
+	$(NULL)
 
 libcameltest_provider_a_SOURCES = \
-	camel-test-provider.c camel-test-provider.h
+	camel-test-provider.c \
+	camel-test-provider.h \
+	$(NULL)
 
 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 =	 \
+	$(AM_CPPFLAGS) \
+	-I$(includedir) \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/camel \
+	-DCAMEL_BUILD_DIR=\"$(top_builddir)/camel\" \
+	$(CAMEL_CFLAGS) \
+	$(NULL)
+
+libcameltest_a_LIBADD = \
 	$(top_builddir)/camel/libcamel-${API_VERSION}.la
 
 libcameltest_provider_a_LIBADD = \
diff --git a/camel/tests/message/Makefile.am b/camel/tests/message/Makefile.am
index 261376bba..657a4efaf 100644
--- a/camel/tests/message/Makefile.am
+++ b/camel/tests/message/Makefile.am
@@ -1,22 +1,25 @@
 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\"	\
-	$(CAMEL_CFLAGS)
+	$(AM_CPPFLAGS) \
+	-I$(includedir) \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/camel \
+	-I$(top_srcdir)/camel/tests/lib \
+	-DG_LOG_DOMAIN=\"evolution-tests\" \
+	$(CAMEL_CFLAGS) \
+	$(NULL)
 
 MESSAGE_TESTS_LDADD= \
-	$(top_builddir)/camel/tests/lib/libcameltest.a		\
-	$(top_builddir)/camel/libcamel-${API_VERSION}.la 	\
-	$(INTLLIBS)						\
-	$(CAMEL_LIBS)
+	$(top_builddir)/camel/tests/lib/libcameltest.a \
+	$(top_builddir)/camel/libcamel-1.2.la \
+	$(INTLLIBS) \
+	$(CAMEL_LIBS) \
+	$(NULL)
 
 check_PROGRAMS = \
-	test1		\
-	test2		\
-	test4
+	test1 \
+	test2 \
+	test4 \
+	$(NULL)
 
 test1_CPPFLAGS = $(MESSAGE_TESTS_CPPFLAGS)
 test2_CPPFLAGS = $(MESSAGE_TESTS_CPPFLAGS)
diff --git a/camel/tests/mime-filter/Makefile.am b/camel/tests/mime-filter/Makefile.am
index 466b3ab6f..b63909762 100644
--- a/camel/tests/mime-filter/Makefile.am
+++ b/camel/tests/mime-filter/Makefile.am
@@ -1,32 +1,38 @@
+NULL =
+
 MIMEFILTER_TESTS_CPPFLAGS= \
-	$(AM_CPPFLAGS)					\
-	-I$(includedir)					\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/camel				\
-	-I$(top_srcdir)/camel/tests/lib 		\
-	-DG_LOG_DOMAIN=\"evolution-tests\"		\
-	-DSOURCEDIR=\"$(srcdir)\"			\
-	$(CAMEL_CFLAGS)
+	$(AM_CPPFLAGS) \
+	-I$(includedir) \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/camel \
+	-I$(top_srcdir)/camel/tests/lib \
+	-DG_LOG_DOMAIN=\"evolution-tests\" \
+	-DSOURCEDIR=\"$(srcdir)\" \
+	$(CAMEL_CFLAGS) \
+	$(NULL)
 
 MIMEFILTER_TESTS_LDADD= \
-	$(top_builddir)/camel/libcamel-${API_VERSION}.la 	\
-	$(top_builddir)/camel/tests/lib/libcameltest.a		\
-	$(INTLLIBS)						\
-	$(CAMEL_LIBS)
+	$(top_builddir)/camel/libcamel-${API_VERSION}.la \
+	$(top_builddir)/camel/tests/lib/libcameltest.a \
+	$(INTLLIBS) \
+	$(CAMEL_LIBS) \
+	$(NULL)
 
-EXTRA_DIST =				\
-	crlf-1.in			\
-	crlf-1.out			\
-	charset-iso-2022-jp.0.in	\
-	charset-iso-2022-jp.0.out	\
-	charset-gb2312.0.in		\
-	charset-gb2312.0.out
+EXTRA_DIST = \
+	crlf-1.in \
+	crlf-1.out \
+	charset-iso-2022-jp.0.in \
+	charset-iso-2022-jp.0.out \
+	charset-gb2312.0.in \
+	charset-gb2312.0.out \
+	$(NULL)
 
-check_PROGRAMS =  		\
-	test1			\
-	test-crlf		\
-	test-charset		\
-	test-tohtml
+check_PROGRAMS = \
+	test1 \
+	test-crlf \
+	test-charset \
+	test-tohtml \
+	$(NULL)
 
 test1_CPPFLAGS = $(MIMEFILTER_TESTS_CPPFLAGS)
 test1_LDADD = $(MIMEFILTER_TESTS_LDADD)
diff --git a/camel/tests/misc/Makefile.am b/camel/tests/misc/Makefile.am
index 3bdab5b82..9e9194878 100644
--- a/camel/tests/misc/Makefile.am
+++ b/camel/tests/misc/Makefile.am
@@ -1,26 +1,31 @@
+NULL =
+
 MISC_TESTS_CPPFLAGS= \
-	$(AM_CPPFLAGS)					\
-	-I$(includedir)					\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/camel				\
-	-I$(top_srcdir)/camel/tests/lib 		\
-	-DG_LOG_DOMAIN=\"evolution-tests\"		\
-	$(CAMEL_CFLAGS)
+	$(AM_CPPFLAGS) \
+	-I$(includedir) \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/camel \
+	-I$(top_srcdir)/camel/tests/lib \
+	-DG_LOG_DOMAIN=\"evolution-tests\" \
+	$(CAMEL_CFLAGS) \
+	$(NULL)
 
 MISC_TESTS_LDADD= \
-	$(top_builddir)/camel/libcamel-${API_VERSION}.la 	\
-	$(top_builddir)/camel/tests/lib/libcameltest.a		\
-	$(INTLLIBS)						\
-	$(CAMEL_LIBS)
+	$(top_builddir)/camel/libcamel-${API_VERSION}.la \
+	$(top_builddir)/camel/tests/lib/libcameltest.a \
+	$(INTLLIBS) \
+	$(CAMEL_LIBS) \
+	$(NULL)
 
-check_PROGRAMS =  	\
-	test1		\
-	test2		\
-	url		\
-	url-scan	\
-	utf7		\
-	split		\
-	rfc2047
+check_PROGRAMS = \
+	test1 \
+	test2 \
+	url \
+	url-scan \
+	utf7 \
+	split \
+	rfc2047 \
+	$(NULL)
 
 test1_CPPFLAGS = $(MISC_TESTS_CPPFLAGS)
 test1_LDADD = $(MISC_TESTS_LDADD)
diff --git a/camel/tests/smime/Makefile.am b/camel/tests/smime/Makefile.am
index 921f46b6e..7d9745b9a 100644
--- a/camel/tests/smime/Makefile.am
+++ b/camel/tests/smime/Makefile.am
@@ -1,20 +1,24 @@
+NULL =
+
 SMIME_TESTS_CPPFLAGS= \
-	$(AM_CPPFLAGS)					\
-	-I$(includedir)					\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/camel				\
-	-I$(top_srcdir)/camel/tests/lib 		\
-	-DG_LOG_DOMAIN=\"evolution-tests\"		\
+	$(AM_CPPFLAGS) \
+	-I$(includedir) \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/camel \
+	-I$(top_srcdir)/camel/tests/lib \
+	-DG_LOG_DOMAIN=\"evolution-tests\" \
 	-DTEST_DATA_DIR=\"$(top_srcdir)/camel/tests/data\"\
-	$(CAMEL_CFLAGS)
+	$(CAMEL_CFLAGS) \
+	$(NULL)
 
 SMIME_TESTS_LDADD= \
-	$(top_builddir)/camel/tests/lib/libcameltest.a		\
-	$(top_builddir)/camel/libcamel-${API_VERSION}.la 	\
-	$(INTLLIBS)						\
-	$(CAMEL_LIBS)
+	$(top_builddir)/camel/tests/lib/libcameltest.a \
+	$(top_builddir)/camel/libcamel-${API_VERSION}.la \
+	$(INTLLIBS) \
+	$(CAMEL_LIBS) \
+	$(NULL)
 
-check_PROGRAMS =  	\
+check_PROGRAMS = \
 	pgp
 #	pgp-mime	
 #	pkcs7
diff --git a/data/Makefile.am b/data/Makefile.am
index 0da5e8a3e..cbe3ec30c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,8 +1,11 @@
-gsettings_SCHEMAS =						\
-	org.gnome.Evolution.DefaultSources.gschema.xml		\
-	org.gnome.evolution-data-server.calendar.gschema.xml	\
-	org.gnome.evolution-data-server.addressbook.gschema.xml	\
-	org.gnome.evolution.shell.network-config.gschema.xml
+NULL =
+
+gsettings_SCHEMAS = \
+	org.gnome.Evolution.DefaultSources.gschema.xml \
+	org.gnome.evolution-data-server.calendar.gschema.xml \
+	org.gnome.evolution-data-server.addressbook.gschema.xml \
+	org.gnome.evolution.shell.network-config.gschema.xml \
+	$(NULL)
 
 @INTLTOOL_XML_NOMERGE_RULE@
 
@@ -16,9 +19,14 @@ all-am:
 convertdir = $(datadir)/GConf/gsettings
 convert_DATA = evolution-data-server.convert
 
-EXTRA_DIST = $(gsettings_SCHEMAS:.xml=.xml.in) \
-	     $(convert_DATA)
+EXTRA_DIST = \
+	$(gsettings_SCHEMAS:.xml=.xml.in) \
+	$(convert_DATA) \
+	$(NULL)
 
-CLEANFILES = $(gsettings_SCHEMAS) gschemas.compiled
+CLEANFILES = \
+	$(gsettings_SCHEMAS) \
+	gschemas.compiled \
+	$(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 7890920b0..034926c59 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,2 +1,3 @@
 SUBDIRS = reference
+
 -include $(top_srcdir)/git.mk
diff --git a/docs/reference/addressbook/libebook-contacts/Makefile.am b/docs/reference/addressbook/libebook-contacts/Makefile.am
index 8107ce31d..c96ebe4a8 100644
--- a/docs/reference/addressbook/libebook-contacts/Makefile.am
+++ b/docs/reference/addressbook/libebook-contacts/Makefile.am
@@ -1,3 +1,5 @@
+NULL =
+
 # The name of the module.
 DOC_MODULE = libebook-contacts
 
@@ -20,22 +22,25 @@ HFILE_GLOB = $(top_srcdir)/addressbook/libebook-contacts/*.h
 CFILE_GLOB = $(top_srcdir)/addressbook/libebook-contacts/*.c
 
 IGNORE_HFILES = \
-	e-book-contacts-enumtypes.h	\
-	e-phone-number-private.h
+	e-book-contacts-enumtypes.h \
+	e-phone-number-private.h \
+	$(NULL)
 
 GTKDOC_CFLAGS = \
-	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/addressbook			\
-	-I$(top_builddir)				\
-	-I$(top_builddir)/addressbook			\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)			\
-	$(CAMEL_CFLAGS)
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/addressbook \
+	-I$(top_builddir) \
+	-I$(top_builddir)/addressbook \
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
+	$(CAMEL_CFLAGS) \
+	$(NULL)
 
 GTKDOC_LIBS = \
-	$(top_builddir)/addressbook/libebook-contacts/libebook-contacts-1.2.la	\
-	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)				\
-	$(CAMEL_LIBS)
+	$(top_builddir)/addressbook/libebook-contacts/libebook-contacts-1.2.la \
+	$(top_builddir)/libedataserver/libedataserver-1.2.la \
+	$(EVOLUTION_ADDRESSBOOK_LIBS) \
+	$(CAMEL_LIBS) \
+	$(NULL)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/docs/reference/addressbook/libebook/Makefile.am b/docs/reference/addressbook/libebook/Makefile.am
index f413c1cec..179f6c13b 100644
--- a/docs/reference/addressbook/libebook/Makefile.am
+++ b/docs/reference/addressbook/libebook/Makefile.am
@@ -1,3 +1,5 @@
+NULL =
+
 # The name of the module.
 DOC_MODULE = libebook
 
@@ -20,32 +22,36 @@ HFILE_GLOB = $(top_srcdir)/addressbook/libebook/*.h
 CFILE_GLOB = $(top_srcdir)/addressbook/libebook/*.c
 
 IGNORE_HFILES = \
-	e-book-enumtypes.h				\
-	e-data-book-bindings.h				\
-	e-data-book-factory-bindings.h			\
-	e-data-book-view-bindings.h
+	e-book-enumtypes.h \
+	e-data-book-bindings.h \
+	e-data-book-factory-bindings.h \
+	e-data-book-view-bindings.h \
+	$(NULL)
 
 GTKDOC_CFLAGS = \
-	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/addressbook			\
-	-I$(top_builddir)				\
-	-I$(top_builddir)/addressbook			\
-	-I$(top_builddir)/addressbook/libebook		\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)			\
-	$(CAMEL_CFLAGS)
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/addressbook \
+	-I$(top_builddir) \
+	-I$(top_builddir)/addressbook \
+	-I$(top_builddir)/addressbook/libebook \
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
+	$(CAMEL_CFLAGS) \
+	$(NULL)
 
 GTKDOC_LIBS = \
-	$(top_builddir)/addressbook/libebook-contacts/libebook-contacts-1.2.la		\
-	$(top_builddir)/addressbook/libebook/libebook-1.2.la	\
-	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)				\
-	$(CAMEL_LIBS)
+	$(top_builddir)/addressbook/libebook-contacts/libebook-contacts-1.2.la \
+	$(top_builddir)/addressbook/libebook/libebook-1.2.la \
+	$(top_builddir)/libedataserver/libedataserver-1.2.la \
+	$(EVOLUTION_ADDRESSBOOK_LIBS) \
+	$(CAMEL_LIBS) \
+	$(NULL)
 
 HTML_IMAGES = \
-	cursor-positions.png		\
-	cursor-positions-filtered.png	\
-	cursor-positions-step.png	\
-	cursor-alphabetic-indexes.png
+	cursor-positions.png \
+	cursor-positions-filtered.png \
+	cursor-positions-step.png \
+	cursor-alphabetic-indexes.png \
+	$(NULL)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/docs/reference/addressbook/libedata-book/Makefile.am b/docs/reference/addressbook/libedata-book/Makefile.am
index 0c4407403..5773ed0f4 100644
--- a/docs/reference/addressbook/libedata-book/Makefile.am
+++ b/docs/reference/addressbook/libedata-book/Makefile.am
@@ -1,3 +1,5 @@
+NULL =
+
 # The name of the module.
 DOC_MODULE = libedata-book
 
@@ -18,27 +20,30 @@ HFILE_GLOB = $(top_srcdir)/addressbook/libedata-book/*.h
 CFILE_GLOB = $(top_srcdir)/addressbook/libedata-book/*.c
 
 IGNORE_HFILES = \
-	e-data-book-glue.h				\
-	e-data-book-factory-glue.h			\
-	e-data-book-view-glue.h				\
-	e-data-book-types.h				\
-	opid.h
+	e-data-book-glue.h \
+	e-data-book-factory-glue.h \
+	e-data-book-view-glue.h \
+	e-data-book-types.h \
+	opid.h \
+	$(NULL)
 
 GTKDOC_CFLAGS = \
-	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/addressbook			\
-	-I$(top_builddir)				\
-	-I$(top_builddir)/addressbook			\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)			\
-	$(CAMEL_CFLAGS)
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/addressbook \
+	-I$(top_builddir) \
+	-I$(top_builddir)/addressbook \
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
+	$(CAMEL_CFLAGS) \
+	$(NULL)
 
 GTKDOC_LIBS = \
-	$(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la	\
-	$(top_builddir)/addressbook/libebook/libebook-1.2.la		\
-	$(top_builddir)/libebackend/libebackend-1.2.la			\
-	$(top_builddir)/libedataserver/libedataserver-1.2.la		\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)					\
-	$(CAMEL_LIBS)
+	$(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la \
+	$(top_builddir)/addressbook/libebook/libebook-1.2.la \
+	$(top_builddir)/libebackend/libebackend-1.2.la \
+	$(top_builddir)/libedataserver/libedataserver-1.2.la \
+	$(EVOLUTION_ADDRESSBOOK_LIBS) \
+	$(CAMEL_LIBS) \
+	$(NULL)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/docs/reference/calendar/libecal/Makefile.am b/docs/reference/calendar/libecal/Makefile.am
index 69daef876..a498f850b 100644
--- a/docs/reference/calendar/libecal/Makefile.am
+++ b/docs/reference/calendar/libecal/Makefile.am
@@ -1,3 +1,5 @@
+NULL =
+
 # The name of the module.
 DOC_MODULE = libecal
 
@@ -18,25 +20,28 @@ HFILE_GLOB = $(top_srcdir)/calendar/libecal/*.h
 CFILE_GLOB = $(top_srcdir)/calendar/libecal/*.c
 
 IGNORE_HFILES = \
-	e-cal-enumtypes.h					\
-	e-data-cal-bindings.h					\
-	e-data-cal-factory-bindings.h				\
-	e-data-cal-view-bindings.h
+	e-cal-enumtypes.h \
+	e-data-cal-bindings.h \
+	e-data-cal-factory-bindings.h \
+	e-data-cal-view-bindings.h \
+	$(NULL)
 
 GTKDOC_CFLAGS = \
-	-I$(top_srcdir) 					\
-	-I$(top_srcdir)/calendar				\
-	-I$(top_builddir)					\
-	-I$(top_builddir)/calendar				\
-	-I$(top_builddir)/calendar/libecal			\
-	$(EVOLUTION_CALENDAR_CFLAGS)				\
-	$(CAMEL_CFLAGS)
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/calendar \
+	-I$(top_builddir) \
+	-I$(top_builddir)/calendar \
+	-I$(top_builddir)/calendar/libecal \
+	$(EVOLUTION_CALENDAR_CFLAGS) \
+	$(CAMEL_CFLAGS) \
+	$(NULL)
 
 GTKDOC_LIBS = \
-	$(top_builddir)/calendar/libecal/libecal-1.2.la		\
-	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
-	$(EVOLUTION_CALENDAR_LIBS)				\
-	$(CAMEL_LIBS)
+	$(top_builddir)/calendar/libecal/libecal-1.2.la \
+	$(top_builddir)/libedataserver/libedataserver-1.2.la \
+	$(EVOLUTION_CALENDAR_LIBS) \
+	$(CAMEL_LIBS) \
+	$(NULL)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/docs/reference/calendar/libedata-cal/Makefile.am b/docs/reference/calendar/libedata-cal/Makefile.am
index 8722bf235..75440761d 100644
--- a/docs/reference/calendar/libedata-cal/Makefile.am
+++ b/docs/reference/calendar/libedata-cal/Makefile.am
@@ -1,4 +1,5 @@
-## Process this file with automake to produce Makefile.in
+NULL =
+
 # The name of the module.
 DOC_MODULE = libedata-cal
 
@@ -19,27 +20,30 @@ HFILE_GLOB = $(top_srcdir)/calendar/libedata-cal/*.h
 CFILE_GLOB = $(top_srcdir)/calendar/libedata-cal/*.c
 
 IGNORE_HFILES = \
-	e-data-cal-glue.h				\
-	e-data-cal-factory-glue.h			\
-	e-data-cal-view-glue.h				\
-	e-data-cal-types.h
+	e-data-cal-glue.h \
+	e-data-cal-factory-glue.h \
+	e-data-cal-view-glue.h \
+	e-data-cal-types.h \
+	$(NULL)
 
 GTKDOC_CFLAGS = \
-	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_builddir)				\
-	-I$(top_builddir)/calendar			\
-	$(EVOLUTION_CALENDAR_CFLAGS)			\
-	$(CAMEL_CFLAGS)
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/calendar \
+	-I$(top_builddir) \
+	-I$(top_builddir)/calendar \
+	$(EVOLUTION_CALENDAR_CFLAGS) \
+	$(CAMEL_CFLAGS) \
+	$(NULL)
 
 GTKDOC_LIBS = \
-	$(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la	\
-	$(top_builddir)/calendar/libecal/libecal-1.2.la			\
-	$(top_builddir)/libedataserver/libedataserver-1.2.la		\
-	$(top_builddir)/libebackend/libebackend-1.2.la			\
-	$(EVOLUTION_CALENDAR_LIBS)					\
-	$(CAMEL_LIBS)							\
-	$(DB_LIBS)
+	$(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la \
+	$(top_builddir)/calendar/libecal/libecal-1.2.la \
+	$(top_builddir)/libedataserver/libedataserver-1.2.la \
+	$(top_builddir)/libebackend/libebackend-1.2.la \
+	$(EVOLUTION_CALENDAR_LIBS) \
+	$(CAMEL_LIBS) \
+	$(DB_LIBS) \
+	$(NULL)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/docs/reference/camel/Makefile.am b/docs/reference/camel/Makefile.am
index 899d8d4a8..59b3b4cb9 100644
--- a/docs/reference/camel/Makefile.am
+++ b/docs/reference/camel/Makefile.am
@@ -1,3 +1,5 @@
+NULL =
+
 # The name of the module.
 DOC_MODULE = camel
 
@@ -66,7 +68,7 @@ IGNORE_HFILES = \
 include $(top_srcdir)/gtk-doc.make
 
 # Other files to distribute
-EXTRA_DIST +=  \
+EXTRA_DIST += \
 	$(content_files) \
 	$(DOC_MODULE)-docs.sgml \
 	$(DOC_MODULE)-sections.txt \
diff --git a/docs/reference/libebackend/Makefile.am b/docs/reference/libebackend/Makefile.am
index 714d11497..03f6bdc36 100644
--- a/docs/reference/libebackend/Makefile.am
+++ b/docs/reference/libebackend/Makefile.am
@@ -1,3 +1,5 @@
+NULL =
+
 # The name of the module.
 DOC_MODULE = libebackend
 
@@ -16,20 +18,22 @@ DOC_SOURCE_DIR = $(top_srcdir)/libebackend
 # Used for dependencies. The docs will be rebuilt if any of these change.
 HFILE_GLOB = $(top_srcdir)/libebackend/*.h
 CFILE_GLOB = $(top_srcdir)/libebackend/*.c
-IGNORE_HFILES = 
-
-GTKDOC_CFLAGS  =					\
-	-I$(top_srcdir)/libebackend			\
-	-I$(top_srcdir) 				\
-	-I$(top_builddir)				\
-	$(E_BACKEND_CFLAGS)				\
-	$(CAMEL_CFLAGS)
-
-GTKDOC_LIBS = 							\
-	$(top_builddir)/libebackend/libebackend-1.2.la		\
-	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
-	$(E_BACKEND_LIBS)					\
-	$(CAMEL_LIBS)
+IGNORE_HFILES =
+
+GTKDOC_CFLAGS = \
+	-I$(top_srcdir)/libebackend \
+	-I$(top_srcdir) \
+	-I$(top_builddir) \
+	$(E_BACKEND_CFLAGS) \
+	$(CAMEL_CFLAGS) \
+	$(NULL)
+
+GTKDOC_LIBS = \
+	$(top_builddir)/libebackend/libebackend-1.2.la \
+	$(top_builddir)/libedataserver/libedataserver-1.2.la \
+	$(E_BACKEND_LIBS) \
+	$(CAMEL_LIBS) \
+	$(NULL)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/docs/reference/libedataserver/Makefile.am b/docs/reference/libedataserver/Makefile.am
index c3c0e631a..9de538dcc 100644
--- a/docs/reference/libedataserver/Makefile.am
+++ b/docs/reference/libedataserver/Makefile.am
@@ -1,3 +1,5 @@
+NULL =
+
 # The name of the module.
 DOC_MODULE = libedataserver
 
@@ -17,21 +19,24 @@ DOC_SOURCE_DIR = $(top_srcdir)/libedataserver
 HFILE_GLOB = $(top_srcdir)/libedataserver/*.h
 CFILE_GLOB = $(top_srcdir)/libedataserver/*.c
 
-IGNORE_HFILES = 					\
-	e-client-private.h				\
-	e-gdbus-templates.h				\
-	e-source-enumtypes.h				\
-	libedataserver-private.h
-
-GTKDOC_CFLAGS  =					\
-	-I$(top_srcdir)/libedataserver			\
-	-I$(top_srcdir) 				\
-	-I$(top_builddir)				\
-	$(E_DATA_SERVER_CFLAGS)
-
-GTKDOC_LIBS = 							\
-	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
-	$(E_DATA_SERVER_LIBS)
+IGNORE_HFILES = \
+	e-client-private.h \
+	e-gdbus-templates.h \
+	e-source-enumtypes.h \
+	libedataserver-private.h \
+	$(NULL)
+
+GTKDOC_CFLAGS  = \
+	-I$(top_srcdir)/libedataserver \
+	-I$(top_srcdir) \
+	-I$(top_builddir) \
+	$(E_DATA_SERVER_CFLAGS) \
+	$(NULL)
+
+GTKDOC_LIBS = \
+	$(top_builddir)/libedataserver/libedataserver-1.2.la \
+	$(E_DATA_SERVER_LIBS) \
+	$(NULL)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/docs/reference/private/Makefile.am b/docs/reference/private/Makefile.am
index 2803a64ad..dd275774f 100644
--- a/docs/reference/private/Makefile.am
+++ b/docs/reference/private/Makefile.am
@@ -1,3 +1,5 @@
+NULL =
+
 # The name of the module.
 DOC_MODULE = libedbus-private
 
@@ -16,14 +18,16 @@ CFILE_GLOB = $(top_srcdir)/private/*.c
 
 IGNORE_HFILES =
 
-GTKDOC_CFLAGS  =					\
-	-I$(top_srcdir) 				\
-	-I$(top_builddir)				\
-	$(E_DATA_SERVER_CFLAGS)
+GTKDOC_CFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_builddir) \
+	$(E_DATA_SERVER_CFLAGS) \
+	$(NULL)
 
-GTKDOC_LIBS = 						\
-	$(top_builddir)/private/libedbus-private.la	\
-	$(E_DATA_SERVER_LIBS)
+GTKDOC_LIBS = \
+	$(top_builddir)/private/libedbus-private.la \
+	$(E_DATA_SERVER_LIBS) \
+	$(NULL)
 
 # Extra options to supply to gtkdoc-mkdb
 # This is needed for cross-references to D-Bus interfaces to work.
diff --git a/libebackend/Makefile.am b/libebackend/Makefile.am
index 783732ec0..f057181ee 100644
--- a/libebackend/Makefile.am
+++ b/libebackend/Makefile.am
@@ -1,3 +1,5 @@
+NULL =
+
 ENUM_TYPES = e-backend-enums.h
 
 e-backend-enumtypes.h: $(top_srcdir)/enumtypes.h.template $(ENUM_TYPES)
@@ -11,70 +13,75 @@ e-backend-enumtypes.c: $(top_srcdir)/enumtypes.c.template $(ENUM_TYPES)
 		--fhead "#include \"e-backend-enumtypes.h\"" \
 		$(addprefix $(srcdir)/,$(ENUM_TYPES)) > $@
 
-ENUM_GENERATED = e-backend-enumtypes.h e-backend-enumtypes.c
+ENUM_GENERATED = \
+	e-backend-enumtypes.h \
+	e-backend-enumtypes.c \
+	$(NULL)
 
 BUILT_SOURCES = $(ENUM_GENERATED)
 
 lib_LTLIBRARIES = libebackend-1.2.la
 
 libebackend_1_2_la_CPPFLAGS = \
-	$(AM_CPPFLAGS)						\
-	-I$(top_srcdir)						\
-	-I$(top_srcdir)/private					\
-	-I$(top_builddir)					\
-	-I$(top_builddir)/private				\
-	-DLIBEBACKEND_COMPILATION				\
-	-DG_LOG_DOMAIN=\"libebackend\"				\
-	-DMODULE_DIRECTORY=\"$(moduledir)\"			\
-	-DE_DATA_SERVER_PRIVDATADIR=\"$(privdatadir)\"		\
-	-DSYSTEM_WIDE_RO_SOURCES_DIRECTORY=\"$(ro_sourcesdir)\"	\
-	-DSYSTEM_WIDE_RW_SOURCES_DIRECTORY=\"$(rw_sourcesdir)\"	\
-	$(DB_CFLAGS)						\
-	$(CAMEL_CFLAGS)						\
-	$(SQLITE3_CFLAGS)					\
-	$(E_BACKEND_CFLAGS)					\
-	$(GCR_BASE_CFLAGS)					\
-	$(GIO_UNIX_CFLAGS)					\
-	$(SOUP_CFLAGS)						\
-	$(CODE_COVERAGE_CFLAGS)					\
+	$(AM_CPPFLAGS) \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/private \
+	-I$(top_builddir) \
+	-I$(top_builddir)/private \
+	-DLIBEBACKEND_COMPILATION \
+	-DG_LOG_DOMAIN=\"libebackend\" \
+	-DMODULE_DIRECTORY=\"$(moduledir)\" \
+	-DE_DATA_SERVER_PRIVDATADIR=\"$(privdatadir)\" \
+	-DSYSTEM_WIDE_RO_SOURCES_DIRECTORY=\"$(ro_sourcesdir)\" \
+	-DSYSTEM_WIDE_RW_SOURCES_DIRECTORY=\"$(rw_sourcesdir)\" \
+	$(DB_CFLAGS) \
+	$(CAMEL_CFLAGS) \
+	$(SQLITE3_CFLAGS) \
+	$(E_BACKEND_CFLAGS) \
+	$(GCR_BASE_CFLAGS) \
+	$(GIO_UNIX_CFLAGS) \
+	$(SOUP_CFLAGS) \
+	$(CODE_COVERAGE_CFLAGS) \
 	$(NULL)
 
-libebackend_1_2_la_SOURCES =		\
-	$(BUILT_SOURCES)		\
-	e-authentication-mediator.c	\
-	e-authentication-session.c	\
-	e-backend.c			\
-	e-backend-factory.c		\
-	e-collection-backend.c		\
-	e-collection-backend-factory.c	\
-	e-data-factory.c		\
-	e-dbus-server.c			\
-	e-extensible.c			\
-	e-extension.c			\
-	e-oauth2-support.c		\
-	e-offline-listener.c		\
-	e-dbhash.c			\
-	e-db3-utils.c			\
-	e-module.c			\
-	e-server-side-source.c		\
-	e-soup-auth-bearer.c		\
-	e-source-registry-server.c	\
-	e-sqlite3-vfs.c			\
-	e-user-prompter.c		\
-	e-user-prompter-server.c	\
+libebackend_1_2_la_SOURCES = \
+	$(BUILT_SOURCES) \
+	e-authentication-mediator.c \
+	e-authentication-session.c \
+	e-backend.c \
+	e-backend-factory.c \
+	e-collection-backend.c \
+	e-collection-backend-factory.c \
+	e-data-factory.c \
+	e-dbus-server.c \
+	e-extensible.c \
+	e-extension.c \
+	e-oauth2-support.c \
+	e-offline-listener.c \
+	e-dbhash.c \
+	e-db3-utils.c \
+	e-module.c \
+	e-server-side-source.c \
+	e-soup-auth-bearer.c \
+	e-source-registry-server.c \
+	e-sqlite3-vfs.c \
+	e-user-prompter.c \
+	e-user-prompter-server.c \
 	e-user-prompter-server-extension.c \
-	e-file-cache.c
+	e-file-cache.c \
+	$(NULL)
 
-libebackend_1_2_la_LIBADD = 				\
+libebackend_1_2_la_LIBADD = \
 	$(top_builddir)/libedataserver/libedataserver-1.2.la \
-	$(top_builddir)/private/libedbus-private.la	\
-	$(E_BACKEND_LIBS)				\
-	$(CAMEL_LIBS)					\
-	$(SQLITE3_LIBS)					\
-	$(GCR_BASE_LIBS)				\
-	$(GIO_UNIX_LIBS)				\
-	$(SOUP_LIBS)					\
-	$(DB_LIBS)
+	$(top_builddir)/private/libedbus-private.la \
+	$(E_BACKEND_LIBS) \
+	$(CAMEL_LIBS) \
+	$(SQLITE3_LIBS) \
+	$(GCR_BASE_LIBS) \
+	$(GIO_UNIX_LIBS) \
+	$(SOUP_LIBS) \
+	$(DB_LIBS) \
+	$(NULL)
 
 libebackend_1_2_la_LDFLAGS = \
 	-version-info $(LIBEBACKEND_CURRENT):$(LIBEBACKEND_REVISION):$(LIBEBACKEND_AGE) $(NO_UNDEFINED) \
@@ -83,33 +90,34 @@ libebackend_1_2_la_LDFLAGS = \
 
 libebackendincludedir = $(privincludedir)/libebackend
 
-libebackendinclude_HEADERS =		\
-	libebackend.h			\
-	e-authentication-mediator.h	\
-	e-authentication-session.h	\
-	e-backend.h			\
-	e-backend-enums.h		\
-	e-backend-enumtypes.h		\
-	e-backend-factory.h		\
-	e-collection-backend.h		\
-	e-collection-backend-factory.h	\
-	e-data-factory.h		\
-	e-dbus-server.h			\
-	e-extensible.h			\
-	e-extension.h			\
-	e-oauth2-support.h		\
-	e-offline-listener.h		\
-	e-db3-utils.h			\
-	e-dbhash.h			\
-	e-module.h			\
-	e-server-side-source.h		\
-	e-soup-auth-bearer.h		\
-	e-source-registry-server.h	\
-	e-sqlite3-vfs.h			\
-	e-user-prompter.h		\
-	e-user-prompter-server.h	\
+libebackendinclude_HEADERS = \
+	libebackend.h \
+	e-authentication-mediator.h \
+	e-authentication-session.h \
+	e-backend.h \
+	e-backend-enums.h \
+	e-backend-enumtypes.h \
+	e-backend-factory.h \
+	e-collection-backend.h \
+	e-collection-backend-factory.h \
+	e-data-factory.h \
+	e-dbus-server.h \
+	e-extensible.h \
+	e-extension.h \
+	e-oauth2-support.h \
+	e-offline-listener.h \
+	e-db3-utils.h \
+	e-dbhash.h \
+	e-module.h \
+	e-server-side-source.h \
+	e-soup-auth-bearer.h \
+	e-source-registry-server.h \
+	e-sqlite3-vfs.h \
+	e-user-prompter.h \
+	e-user-prompter-server.h \
 	e-user-prompter-server-extension.h \
-	e-file-cache.h
+	e-file-cache.h \
+	$(NULL)
 
 %-$(API_VERSION).pc: %.pc
 	 cp $< $@
@@ -118,13 +126,15 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libebackend-$(API_VERSION).pc
 
 gsettings_SCHEMAS = \
-	org.gnome.evolution.eds-shell.gschema.xml
+	org.gnome.evolution.eds-shell.gschema.xml \
+	$(NULL)
 
 @GSETTINGS_RULES@
 
-EXTRA_DIST = 						\
-	$(gsettings_SCHEMAS)				\
-	$(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in)
+EXTRA_DIST = \
+	$(gsettings_SCHEMAS) \
+	$(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in) \
+	$(NULL)
 
 CLEANFILES = $(gsettings_SCHEMAS:.xml=.valid)
 
diff --git a/libedataserver/Makefile.am b/libedataserver/Makefile.am
index e67244330..0391f8348 100644
--- a/libedataserver/Makefile.am
+++ b/libedataserver/Makefile.am
@@ -19,97 +19,98 @@ lib_LTLIBRARIES = libedataserver-1.2.la
 noinst_LTLIBRARIES = libedataserver-private.la
 
 libedataserver_1_2_la_CPPFLAGS = \
-	$(AM_CPPFLAGS)							\
-	-I$(top_srcdir)							\
-	-I$(top_srcdir)/private						\
-	-I$(top_builddir)						\
-	-I$(top_builddir)/private					\
-	-DLIBEDATASERVER_COMPILATION					\
-	-DG_LOG_DOMAIN=\"e-data-server\"				\
-	-DE_DATA_SERVER_PREFIX=\"$(prefix)\"				\
-	-DE_DATA_SERVER_LOCALEDIR=\""$(localedir)"\"			\
-	-DE_DATA_SERVER_EXTENSIONDIR=\"$(extensiondir)\"		\
-	-DE_DATA_SERVER_IMAGESDIR=\"$(imagesdir)\"			\
-	-DE_DATA_SERVER_PRIVDATADIR=\"$(privdatadir)\"			\
-	-DE_DATA_SERVER_UI_UIDIR=\""$(uidir)"\"				\
-	$(E_DATA_SERVER_CFLAGS)						\
-	$(GCR_BASE_CFLAGS)						\
-	$(GIO_UNIX_CFLAGS)						\
-	$(SOUP_CFLAGS)							\
-	$(CODE_COVERAGE_CFLAGS)						\
-	$(ICU_CFLAGS)							\
+	$(AM_CPPFLAGS) \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/private \
+	-I$(top_builddir) \
+	-I$(top_builddir)/private \
+	-DLIBEDATASERVER_COMPILATION \
+	-DG_LOG_DOMAIN=\"e-data-server\" \
+	-DE_DATA_SERVER_PREFIX=\"$(prefix)\" \
+	-DE_DATA_SERVER_LOCALEDIR=\""$(localedir)"\" \
+	-DE_DATA_SERVER_EXTENSIONDIR=\"$(extensiondir)\" \
+	-DE_DATA_SERVER_IMAGESDIR=\"$(imagesdir)\" \
+	-DE_DATA_SERVER_PRIVDATADIR=\"$(privdatadir)\" \
+	-DE_DATA_SERVER_UI_UIDIR=\""$(uidir)"\" \
+	$(E_DATA_SERVER_CFLAGS) \
+	$(GCR_BASE_CFLAGS) \
+	$(GIO_UNIX_CFLAGS) \
+	$(SOUP_CFLAGS) \
+	$(CODE_COVERAGE_CFLAGS) \
+	$(ICU_CFLAGS) \
+	$(NULL)
+
+libedataserver_1_2_la_SOURCES = \
+	$(BUILT_SOURCES) \
+	e-alphabet-index-private.h \
+	e-cancellable-locks.c \
+	e-categories.c \
+	e-client.c \
+	e-client-private.h \
+	e-collator.c \
+	e-credentials.c \
+	e-flag.c \
+	e-gdbus-templates.c \
+	e-iterator.c \
+	e-list.c \
+	e-list-iterator.c \
+	e-memory.c \
+	e-operation-pool.c \
+	e-proxy.c \
+	e-sexp.c \
+	e-source.c \
+	e-source-extension.c \
+	e-source-address-book.c \
+	e-source-alarms.c \
+	e-source-authentication.c \
+	e-source-authenticator.c \
+	e-source-autocomplete.c \
+	e-source-backend.c \
+	e-source-calendar.c \
+	e-source-camel.c \
+	e-source-collection.c \
+	e-source-goa.c \
+	e-source-mail-account.c \
+	e-source-mail-composition.c \
+	e-source-mail-identity.c \
+	e-source-mail-signature.c \
+	e-source-mail-submission.c \
+	e-source-mail-transport.c \
+	e-source-mdn.c \
+	e-source-offline.c \
+	e-source-openpgp.c \
+	e-source-proxy.c \
+	e-source-refresh.c \
+	e-source-registry.c \
+	e-source-resource.c \
+	e-source-revision-guards.c \
+	e-source-security.c \
+	e-source-selectable.c \
+	e-source-smime.c \
+	e-source-uoa.c \
+	e-source-webdav.c \
+	e-debug-log.c \
+	e-time-utils.c \
+	e-transliterator-private.h \
+	e-uid.c \
+	e-url.c \
+	e-data-server-util.c \
+	e-xml-utils.c \
+	e-xml-hash-utils.c \
+	libedataserver-private.h \
+	eds-version.c \
 	$(NULL)
 
-libedataserver_1_2_la_SOURCES =		\
-	$(BUILT_SOURCES)		\
-	e-alphabet-index-private.h	\
-	e-cancellable-locks.c		\
-	e-categories.c			\
-	e-client.c			\
-	e-client-private.h		\
-	e-collator.c			\
-	e-credentials.c			\
-	e-flag.c			\
-	e-gdbus-templates.c		\
-	e-iterator.c			\
-	e-list.c			\
-	e-list-iterator.c		\
-	e-memory.c			\
-	e-operation-pool.c		\
-	e-proxy.c			\
-	e-sexp.c			\
-	e-source.c			\
-	e-source-extension.c		\
-	e-source-address-book.c		\
-	e-source-alarms.c		\
-	e-source-authentication.c	\
-	e-source-authenticator.c	\
-	e-source-autocomplete.c		\
-	e-source-backend.c		\
-	e-source-calendar.c		\
-	e-source-camel.c		\
-	e-source-collection.c		\
-	e-source-goa.c			\
-	e-source-mail-account.c		\
-	e-source-mail-composition.c	\
-	e-source-mail-identity.c	\
-	e-source-mail-signature.c	\
-	e-source-mail-submission.c	\
-	e-source-mail-transport.c	\
-	e-source-mdn.c			\
-	e-source-offline.c		\
-	e-source-openpgp.c		\
-	e-source-proxy.c		\
-	e-source-refresh.c		\
-	e-source-registry.c		\
-	e-source-resource.c		\
-	e-source-revision-guards.c	\
-	e-source-security.c		\
-	e-source-selectable.c		\
-	e-source-smime.c		\
-	e-source-uoa.c			\
-	e-source-webdav.c		\
-	e-debug-log.c			\
-	e-time-utils.c			\
-	e-transliterator-private.h	\
-	e-uid.c				\
-	e-url.c				\
-	e-data-server-util.c		\
-	e-xml-utils.c			\
-	e-xml-hash-utils.c		\
-	libedataserver-private.h	\
-	eds-version.c
-
-libedataserver_1_2_la_LIBADD =				\
-	$(top_builddir)/camel/libcamel-1.2.la		\
-	$(top_builddir)/private/libedbus-private.la	\
-	$(E_DATA_SERVER_LIBS)				\
-	$(GCR_BASE_LIBS)				\
-	$(GIO_UNIX_LIBS)				\
-	$(ICONV_LIBS)					\
-	$(SOCKET_LIBS)					\
-	$(SOUP_LIBS)					\
-	$(ICU_LIBS)					\
+libedataserver_1_2_la_LIBADD = \
+	$(top_builddir)/camel/libcamel-1.2.la \
+	$(top_builddir)/private/libedbus-private.la \
+	$(E_DATA_SERVER_LIBS) \
+	$(GCR_BASE_LIBS) \
+	$(GIO_UNIX_LIBS) \
+	$(ICONV_LIBS) \
+	$(SOCKET_LIBS) \
+	$(SOUP_LIBS) \
+	$(ICU_LIBS) \
 	$(NULL)
 
 libedataserver_1_2_la_LDFLAGS = \
@@ -119,67 +120,71 @@ libedataserver_1_2_la_LDFLAGS = \
 
 libedataserverincludedir = $(privincludedir)/libedataserver
 
-libedataserverinclude_HEADERS =		\
-	libedataserver.h		\
-	e-cancellable-locks.h		\
-	e-categories.h			\
-	e-client.h			\
-	e-collator.h			\
-	e-credentials.h			\
-	e-flag.h			\
-	e-gdbus-templates.h		\
-	e-iterator.h			\
-	e-list.h			\
-	e-list-iterator.h		\
-	e-memory.h			\
-	e-operation-pool.h		\
-	e-proxy.h			\
-	e-sexp.h			\
-	e-source.h			\
-	e-source-address-book.h		\
-	e-source-alarms.h		\
-	e-source-authentication.h	\
-	e-source-authenticator.h	\
-	e-source-autocomplete.h		\
-	e-source-backend.h		\
-	e-source-calendar.h		\
-	e-source-camel.h		\
-	e-source-collection.h		\
-	e-source-enums.h		\
-	e-source-enumtypes.h		\
-	e-source-extension.h		\
-	e-source-goa.h			\
-	e-source-mail-account.h		\
-	e-source-mail-composition.h	\
-	e-source-mail-identity.h	\
-	e-source-mail-signature.h	\
-	e-source-mail-submission.h	\
-	e-source-mail-transport.h	\
-	e-source-mdn.h			\
-	e-source-offline.h		\
-	e-source-openpgp.h		\
-	e-source-proxy.h		\
-	e-source-refresh.h		\
-	e-source-registry.h		\
-	e-source-resource.h		\
-	e-source-revision-guards.h	\
-	e-source-security.h		\
-	e-source-selectable.h		\
-	e-source-smime.h		\
-	e-source-uoa.h			\
-	e-source-webdav.h		\
-	e-debug-log.h			\
-	e-time-utils.h			\
-	e-uid.h				\
-	e-url.h				\
-	e-data-server-util.h		\
-	e-xml-utils.h			\
-	e-xml-hash-utils.h		\
-	eds-version.h
+libedataserverinclude_HEADERS = \
+	libedataserver.h \
+	e-cancellable-locks.h \
+	e-categories.h \
+	e-client.h \
+	e-collator.h \
+	e-credentials.h \
+	e-flag.h \
+	e-gdbus-templates.h \
+	e-iterator.h \
+	e-list.h \
+	e-list-iterator.h \
+	e-memory.h \
+	e-operation-pool.h \
+	e-proxy.h \
+	e-sexp.h \
+	e-source.h \
+	e-source-address-book.h \
+	e-source-alarms.h \
+	e-source-authentication.h \
+	e-source-authenticator.h \
+	e-source-autocomplete.h \
+	e-source-backend.h \
+	e-source-calendar.h \
+	e-source-camel.h \
+	e-source-collection.h \
+	e-source-enums.h \
+	e-source-enumtypes.h \
+	e-source-extension.h \
+	e-source-goa.h \
+	e-source-mail-account.h \
+	e-source-mail-composition.h \
+	e-source-mail-identity.h \
+	e-source-mail-signature.h \
+	e-source-mail-submission.h \
+	e-source-mail-transport.h \
+	e-source-mdn.h \
+	e-source-offline.h \
+	e-source-openpgp.h \
+	e-source-proxy.h \
+	e-source-refresh.h \
+	e-source-registry.h \
+	e-source-resource.h \
+	e-source-revision-guards.h \
+	e-source-security.h \
+	e-source-selectable.h \
+	e-source-smime.h \
+	e-source-uoa.h \
+	e-source-webdav.h \
+	e-debug-log.h \
+	e-time-utils.h \
+	e-uid.h \
+	e-url.h \
+	e-data-server-util.h \
+	e-xml-utils.h \
+	e-xml-hash-utils.h \
+	eds-version.h \
+	$(NULL)
 
 # We put the C++ code into a separate static library, so that we can use
 # the C linker for libebook-contacts.
-libedataserver_private_la_SOURCES = e-alphabet-index-private.cpp e-transliterator-private.cpp
+libedataserver_private_la_SOURCES = \
+	e-alphabet-index-private.cpp \
+	e-transliterator-private.cpp \
+	$(NULL)
 libedataserver_private_la_CPPFLAGS = $(libedataserver_1_2_la_CPPFLAGS)
 libedataserver_1_2_la_LIBADD += @predeps_CXX@ libedataserver-private.la @postdeps_CXX@
 
@@ -191,13 +196,15 @@ pkgconfig_DATA = libedataserver-$(API_VERSION).pc
 
 EXTRA_DIST = \
 	$(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in) \
-	eds-version.h.in
+	eds-version.h.in \
+	$(NULL)
 
 CLEANFILES = $(BUILT_SOURCES)
 
 DISTCLEANFILES = \
 	eds-version.h \
-	$(pkgconfig_DATA)
+	$(pkgconfig_DATA) \
+	$(NULL)
 
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
@@ -211,7 +218,8 @@ INTROSPECTION_COMPILER_ARGS =
 if HAVE_INTROSPECTION
 introspection_sources = \
 	$(filter-out %-private.h e-sexp.h, $(libedataserverinclude_HEADERS) \
-	$(libedataserver_1_2_la_SOURCES))
+	$(libedataserver_1_2_la_SOURCES)) \
+	$(NULL)
 
 EDataServer-1.2.gir: libedataserver-1.2.la
 EDataServer_1_2_gir_INCLUDES = GObject-2.0 libxml2-2.0 Gio-2.0
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 14fb8f7e3..5196e4135 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,13 @@
-SUBDIRS = test-server-utils libedataserver libebook-contacts libedata-book libebook book-migration libecal libedata-cal
+SUBDIRS = \
+	test-server-utils \
+	libedataserver \
+	libebook-contacts \
+	libedata-book \
+	libebook \
+	book-migration \
+	libecal \
+	libedata-cal \
+	$(NULL)
 
 if BUILD_EXAMPLES
 SUBDIRS += cursor-example
diff --git a/tests/book-migration/Makefile.am b/tests/book-migration/Makefile.am
index 5afd5ee8d..1999307fc 100644
--- a/tests/book-migration/Makefile.am
+++ b/tests/book-migration/Makefile.am
@@ -1,30 +1,30 @@
 SUBDIRS = db
 
-noinst_PROGRAMS =						\
-	setup-migration-test					\
-	$(TESTS)						\
+noinst_PROGRAMS = \
+	setup-migration-test \
+	$(TESTS) \
 	$(NULL)
 
-TEST_CPPFLAGS =							\
-	$(AM_CPPFLAGS)						\
-	-I$(top_srcdir)						\
-	-I$(top_builddir)					\
-	-I$(top_srcdir)/addressbook				\
-	-I$(top_builddir)/addressbook				\
-	-I$(top_srcdir)/calendar     				\
-	-I$(top_builddir)/calendar   				\
-	-I$(top_srcdir)/tests/test-server-utils     		\
-	-I$(top_builddir)/tests/test-server-utils   		\
-	-I$(top_srcdir)/tests/libebook/client     		\
-	-I$(top_builddir)/tests/libebook/client   		\
-	-I$(top_srcdir)/private					\
-	-I$(top_builddir)/private				\
+TEST_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(top_srcdir) \
+	-I$(top_builddir) \
+	-I$(top_srcdir)/addressbook \
+	-I$(top_builddir)/addressbook \
+	-I$(top_srcdir)/calendar \
+	-I$(top_builddir)/calendar \
+	-I$(top_srcdir)/tests/test-server-utils \
+	-I$(top_builddir)/tests/test-server-utils \
+	-I$(top_srcdir)/tests/libebook/client \
+	-I$(top_builddir)/tests/libebook/client \
+	-I$(top_srcdir)/private \
+	-I$(top_builddir)/private \
 	-DEDS_TEST_WORK_DIR=\""$(abs_top_builddir)/tests/test-server-utils/cache"\" \
 	-DEDS_TEST_SQLITE_BOOKS=\""$(abs_top_srcdir)/tests/book-migration/db"\" \
 	-DEDS_TEST_BUILT_BOOKS=\""$(abs_top_builddir)/tests/book-migration/db"\" \
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)				\
-	$(EVOLUTION_CALENDAR_CFLAGS)				\
-	$(CAMEL_CFLAGS)						\
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
+	$(EVOLUTION_CALENDAR_CFLAGS) \
+	$(CAMEL_CFLAGS) \
 	$(NULL)
 
 # If db_load is detected at configure time, then we've built
@@ -37,42 +37,42 @@ if HAVE_DB_LOAD
 TEST_CPPFLAGS += -DTEST_VERSIONS_WITH_BDB
 endif
 
-TEST_LIBS = 				\
-	$(top_builddir)/addressbook/libebook/libebook-1.2.la	\
-	$(top_builddir)/tests/test-server-utils/libetestserverutils.la	\
-	$(top_builddir)/tests/libebook/client/libclient-test-utils.la	\
-	$(top_builddir)/private/libedbus-private.la		\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)				\
-	$(EVOLUTION_CALENDAR_LIBS)				\
-	$(CAMEL_LIBS)						\
+TEST_LIBS = \
+	$(top_builddir)/addressbook/libebook/libebook-1.2.la \
+	$(top_builddir)/tests/test-server-utils/libetestserverutils.la \
+	$(top_builddir)/tests/libebook/client/libclient-test-utils.la \
+	$(top_builddir)/private/libedbus-private.la \
+	$(EVOLUTION_ADDRESSBOOK_LIBS) \
+	$(EVOLUTION_CALENDAR_LIBS) \
+	$(CAMEL_LIBS) \
 	$(NULL)
 
 # Should be kept ordered approximately from least to most difficult/complex
-TESTS =								\
-	test-migration					\
+TESTS = \
+	test-migration \
 	$(NULL)
 
 EXTRA_DIST = \
-	$(srcdir)/vcards/migrate-1.vcf	\
-	$(srcdir)/vcards/migrate-2.vcf	\
-	$(srcdir)/vcards/migrate-3.vcf	\
-	$(srcdir)/vcards/migrate-4.vcf	\
-	$(srcdir)/vcards/migrate-5.vcf	\
-	$(srcdir)/vcards/migrate-6.vcf	\
-	$(srcdir)/vcards/migrate-7.vcf	\
-	$(srcdir)/vcards/migrate-8.vcf	\
-	$(srcdir)/vcards/migrate-9.vcf	\
-	$(srcdir)/vcards/migrate-10.vcf	\
-	$(srcdir)/vcards/migrate-11.vcf	\
-	$(srcdir)/vcards/migrate-12.vcf	\
-	$(srcdir)/vcards/migrate-13.vcf	\
-	$(srcdir)/vcards/migrate-14.vcf	\
-	$(srcdir)/vcards/migrate-15.vcf	\
-	$(srcdir)/vcards/migrate-16.vcf	\
-	$(srcdir)/vcards/migrate-17.vcf	\
-	$(srcdir)/vcards/migrate-18.vcf	\
-	$(srcdir)/vcards/migrate-19.vcf	\
-	$(srcdir)/vcards/migrate-20.vcf	\
+	$(srcdir)/vcards/migrate-1.vcf \
+	$(srcdir)/vcards/migrate-2.vcf \
+	$(srcdir)/vcards/migrate-3.vcf \
+	$(srcdir)/vcards/migrate-4.vcf \
+	$(srcdir)/vcards/migrate-5.vcf \
+	$(srcdir)/vcards/migrate-6.vcf \
+	$(srcdir)/vcards/migrate-7.vcf \
+	$(srcdir)/vcards/migrate-8.vcf \
+	$(srcdir)/vcards/migrate-9.vcf \
+	$(srcdir)/vcards/migrate-10.vcf \
+	$(srcdir)/vcards/migrate-11.vcf \
+	$(srcdir)/vcards/migrate-12.vcf \
+	$(srcdir)/vcards/migrate-13.vcf \
+	$(srcdir)/vcards/migrate-14.vcf \
+	$(srcdir)/vcards/migrate-15.vcf \
+	$(srcdir)/vcards/migrate-16.vcf \
+	$(srcdir)/vcards/migrate-17.vcf \
+	$(srcdir)/vcards/migrate-18.vcf \
+	$(srcdir)/vcards/migrate-19.vcf \
+	$(srcdir)/vcards/migrate-20.vcf \
 	$(NULL)
 
 # This rule should be run once every stable release and then the
@@ -87,12 +87,12 @@ EXTRA_DIST = \
 # the older test sandboxes, then setup-migration-test can be
 # manually compiled and used with older builds of EDS.
 setup-migration: setup-migration-test
-	@echo -n "Setting up new migration sandbox in $(top_srcdir)/tests/book-migration/db/$(EDS_MAJOR_VERSION).$(EDS_MINOR_VERSION)... " &&	\
-	$(top_builddir)/tests/book-migration/setup-migration-test 		\
-	--use-test-sandbox --book-id $(EDS_MAJOR_VERSION).$(EDS_MINOR_VERSION)				\
-	--contacts-directory $(top_srcdir)/tests/book-migration/vcards &&	\
-	mkdir -p $(top_srcdir)/tests/book-migration/db/$(EDS_MAJOR_VERSION).$(EDS_MINOR_VERSION) &&		\
-	cp $(top_builddir)/tests/test-server-utils/cache/evolution/addressbook/$(EDS_MAJOR_VERSION).$(EDS_MINOR_VERSION)/contacts.db	\
+	@echo -n "Setting up new migration sandbox in $(top_srcdir)/tests/book-migration/db/$(EDS_MAJOR_VERSION).$(EDS_MINOR_VERSION)... " && \
+	$(top_builddir)/tests/book-migration/setup-migration-test \
+	--use-test-sandbox --book-id $(EDS_MAJOR_VERSION).$(EDS_MINOR_VERSION) \
+	--contacts-directory $(top_srcdir)/tests/book-migration/vcards && \
+	mkdir -p $(top_srcdir)/tests/book-migration/db/$(EDS_MAJOR_VERSION).$(EDS_MINOR_VERSION) && \
+	cp $(top_builddir)/tests/test-server-utils/cache/evolution/addressbook/$(EDS_MAJOR_VERSION).$(EDS_MINOR_VERSION)/contacts.db \
 	$(top_srcdir)/tests/book-migration/db/$(EDS_MAJOR_VERSION).$(EDS_MINOR_VERSION) && echo "Done."
 
 test_migration_LDADD=$(TEST_LIBS)
diff --git a/tests/book-migration/db/Makefile.am b/tests/book-migration/db/Makefile.am
index 56ea270a1..188a0e51d 100644
--- a/tests/book-migration/db/Makefile.am
+++ b/tests/book-migration/db/Makefile.am
@@ -1,19 +1,21 @@
 
 EXTRA_DIST = \
-	3.0/addressbook.dump 3.0/addressbook.db.summary	\
-	3.2/addressbook.dump 3.2/contacts.db		\
-	3.4/addressbook.dump 3.4/contacts.db		\
-	3.6/addressbook.dump 3.6/contacts.db		\
-	3.8/contacts.db 3.10/contacts.db
+	3.0/addressbook.dump 3.0/addressbook.db.summary \
+	3.2/addressbook.dump 3.2/contacts.db \
+	3.4/addressbook.dump 3.4/contacts.db \
+	3.6/addressbook.dump 3.6/contacts.db \
+	3.8/contacts.db 3.10/contacts.db \
+	$(NULL)
 
 # Use db_load with our BDB dump text file
 if HAVE_DB_LOAD
 
-GENERATED_DBS = 		\
-	$(top_builddir)/tests/book-migration/db/3.0/addressbook.db	\
-	$(top_builddir)/tests/book-migration/db/3.2/addressbook.db	\
-	$(top_builddir)/tests/book-migration/db/3.4/addressbook.db	\
-	$(top_builddir)/tests/book-migration/db/3.6/addressbook.db
+GENERATED_DBS = \
+	$(top_builddir)/tests/book-migration/db/3.0/addressbook.db \
+	$(top_builddir)/tests/book-migration/db/3.2/addressbook.db \
+	$(top_builddir)/tests/book-migration/db/3.4/addressbook.db \
+	$(top_builddir)/tests/book-migration/db/3.6/addressbook.db \
+	$(NULL)
 
 noinst_DATA = $(GENERATED_DBS)
 CLEANFILES = $(GENERATED_DBS)
diff --git a/tests/cursor-example/Makefile.am b/tests/cursor-example/Makefile.am
index 44ab6430b..e0b003a90 100644
--- a/tests/cursor-example/Makefile.am
+++ b/tests/cursor-example/Makefile.am
@@ -1,19 +1,23 @@
-BUILT_SOURCES = cursor-example-resources.h cursor-example-resources.c
+BUILT_SOURCES = \
+	cursor-example-resources.h \
+	cursor-example-resources.c \
+	$(NULL)
 
 noinst_PROGRAMS = cursor-example
-cursor_example_SOURCES =	\
-	$(BUILT_SOURCES)	\
-	cursor-data.c		\
-	cursor-data.h		\
-	cursor-example.c	\
-	cursor-example.h	\
-	cursor-navigator.c	\
-	cursor-navigator.h	\
-	cursor-search.c		\
-	cursor-search.h		\
-	cursor-slot.c		\
-	cursor-slot.h		\
-	main.c
+cursor_example_SOURCES = \
+	$(BUILT_SOURCES) \
+	cursor-data.c \
+	cursor-data.h \
+	cursor-example.c \
+	cursor-example.h \
+	cursor-navigator.c \
+	cursor-navigator.h \
+	cursor-search.c \
+	cursor-search.h \
+	cursor-slot.c \
+	cursor-slot.h \
+	main.c \
+	$(NULL)
 
 # Here we intentionally leave out $(AM_CPPFLAGS) from
 # $(cursor_example_CPPFLAGS), this is because we're
@@ -21,34 +25,35 @@ cursor_example_SOURCES =	\
 # dependency EDS has on GTK+, and we dont want the
 # -DGDK_VERSION_MAX_ALLOWED and -DGLIB_VERSION_MAX_ALLOWED
 # flags passed in.
-cursor_example_CPPFLAGS =					\
-	-DG_LOG_DOMAIN=\"cursor-example\"			\
-	-I$(top_srcdir)						\
-	-I$(top_builddir)					\
-	-I$(top_srcdir)/addressbook				\
-	-I$(top_builddir)/addressbook				\
-	-I$(top_srcdir)/calendar     				\
-	-I$(top_builddir)/calendar   				\
-	-DSRCDIR=\""$(abs_srcdir)"\"				\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)				\
-	$(EXAMPLES_CFLAGS) $(CAMEL_CFLAGS)			\
-	$(CODE_COVERAGE_CFLAGS)					\
-	$(WARNING_FLAGS)					\
+cursor_example_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"cursor-example\" \
+	-I$(top_srcdir) \
+	-I$(top_builddir) \
+	-I$(top_srcdir)/addressbook \
+	-I$(top_builddir)/addressbook \
+	-I$(top_srcdir)/calendar \
+	-I$(top_builddir)/calendar \
+	-DSRCDIR=\""$(abs_srcdir)"\" \
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
+	$(EXAMPLES_CFLAGS) $(CAMEL_CFLAGS) \
+	$(CODE_COVERAGE_CFLAGS) \
+	$(WARNING_FLAGS) \
 	$(NULL)
-cursor_example_CFLAGS   = 
-cursor_example_LDFLAGS  = \
-	$(top_builddir)/addressbook/libebook/libebook-1.2.la	\
-	$(top_builddir)/tests/test-server-utils/libetestserverutils.la	\
-	$(top_builddir)/private/libedbus-private.la		\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)				\
-	$(EXAMPLES_LIBS) $(CAMEL_LIBS)				\
+cursor_example_CFLAGS =
+cursor_example_LDFLAGS = \
+	$(top_builddir)/addressbook/libebook/libebook-1.2.la \
+	$(top_builddir)/tests/test-server-utils/libetestserverutils.la \
+	$(top_builddir)/private/libedbus-private.la \
+	$(EVOLUTION_ADDRESSBOOK_LIBS) \
+	$(EXAMPLES_LIBS) $(CAMEL_LIBS) \
 	$(NULL)
 cursor_example_LDADD =
 
-UI_FILES = 			\
-	cursor-example.ui	\
-	cursor-search.ui	\
-	cursor-slot.ui
+UI_FILES = \
+	cursor-example.ui \
+	cursor-search.ui \
+	cursor-slot.ui \
+	$(NULL)
 
 # Generate resources
 cursor-example-resources.h: cursor-example.gresources.xml $(UI_FILES)
diff --git a/tests/libebook-contacts/Makefile.am b/tests/libebook-contacts/Makefile.am
index bf8fe2b6f..7ab0a4b04 100644
--- a/tests/libebook-contacts/Makefile.am
+++ b/tests/libebook-contacts/Makefile.am
@@ -6,32 +6,32 @@ NULL =
 ### EBook Tests (deprecated) ###
 
 TEST_CPPFLAGS = \
-	$(AM_CPPFLAGS)                  \
-	-I$(top_srcdir)                 \
-	-I$(top_builddir)               \
-	-I$(top_srcdir)/addressbook     \
-	-I$(top_builddir)/addressbook   \
-	-DSRCDIR=\""$(abs_srcdir)"\"    \
+	$(AM_CPPFLAGS) \
+	-I$(top_srcdir) \
+	-I$(top_builddir) \
+	-I$(top_srcdir)/addressbook \
+	-I$(top_builddir)/addressbook \
+	-DSRCDIR=\""$(abs_srcdir)"\" \
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
 	$(CAMEL_CFLAGS) \
 	$(NULL)
 
 TEST_LIBS = \
-	$(top_builddir)/addressbook/libebook-contacts/libebook-contacts-1.2.la	\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)                           \
+	$(top_builddir)/addressbook/libebook-contacts/libebook-contacts-1.2.la \
+	$(EVOLUTION_ADDRESSBOOK_LIBS) \
 	$(CAMEL_LIBS) \
 	$(NULL)
 
 # Should be kept ordered approximately from least to most difficult/complex
 TESTS = \
-	test-contact-types	\
-	test-vcard-parsing	\
-	test-untyped-phones	\
-	test-query		\
-	test-phone-number	\
+	test-contact-types \
+	test-vcard-parsing \
+	test-untyped-phones \
+	test-query \
+	test-phone-number \
 	$(NULL)
 
-# test-bulk-methods			
+# test-bulk-methods
 
 test_contact_types_LDADD=$(TEST_LIBS)
 test_contact_types_CPPFLAGS=$(TEST_CPPFLAGS)
@@ -44,8 +44,6 @@ test_query_CPPFLAGS=$(TEST_CPPFLAGS)
 test_phone_number_LDADD=$(TEST_LIBS)
 test_phone_number_CPPFLAGS=$(TEST_CPPFLAGS)
 
-noinst_PROGRAMS =	\
-	$(TESTS)	\
-	$(NULL)
+noinst_PROGRAMS = $(TESTS)
 
 -include $(top_srcdir)/git.mk
diff --git a/tests/libebook/Makefile.am b/tests/libebook/Makefile.am
index 5f6a65ae1..890b06987 100644
--- a/tests/libebook/Makefile.am
+++ b/tests/libebook/Makefile.am
@@ -5,39 +5,42 @@ SUBDIRS = vcard client
 ### EBook Tests (deprecated) ###
 
 noinst_LTLIBRARIES = libebook-test-utils.la
-libebook_test_utils_la_SOURCES = ebook-test-utils.c ebook-test-utils.h
+libebook_test_utils_la_SOURCES = \
+	ebook-test-utils.c \
+	ebook-test-utils.h \
+	$(NULL)
 
 libebook_test_utils_la_CPPFLAGS = \
-	$(AM_CPPFLAGS)                  \
-	-I$(top_srcdir)                 \
-	-I$(top_builddir)               \
-	-I$(top_srcdir)/addressbook     \
-	-I$(top_builddir)/addressbook   \
-	-I$(top_srcdir)/calendar     \
-	-I$(top_builddir)/calendar   \
-	-I$(top_srcdir)/tests/test-server-utils     \
-	-I$(top_builddir)/tests/test-server-utils   \
-	-DSRCDIR=\""$(abs_srcdir)"\"    \
+	$(AM_CPPFLAGS) \
+	-I$(top_srcdir) \
+	-I$(top_builddir) \
+	-I$(top_srcdir)/addressbook \
+	-I$(top_builddir)/addressbook \
+	-I$(top_srcdir)/calendar \
+	-I$(top_builddir)/calendar \
+	-I$(top_srcdir)/tests/test-server-utils \
+	-I$(top_builddir)/tests/test-server-utils \
+	-DSRCDIR=\""$(abs_srcdir)"\" \
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
 	$(EVOLUTION_CALENDAR_CFLAGS) \
 	$(CAMEL_CFLAGS) \
 	$(NULL)
 
 libebook_test_utils_la_LIBADD = \
-	$(top_builddir)/addressbook/libebook/libebook-1.2.la	\
-	$(top_builddir)/tests/test-server-utils/libetestserverutils.la	\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)                           \
-	$(EVOLUTION_CALENDAR_LIBS)                           \
+	$(top_builddir)/addressbook/libebook/libebook-1.2.la \
+	$(top_builddir)/tests/test-server-utils/libetestserverutils.la \
+	$(EVOLUTION_ADDRESSBOOK_LIBS) \
+	$(EVOLUTION_CALENDAR_LIBS) \
 	$(CAMEL_LIBS) \
 	$(NULL)
 
-TEST_CPPFLAGS =					\
-	$(libebook_test_utils_la_CPPFLAGS)	\
+TEST_CPPFLAGS = \
+	$(libebook_test_utils_la_CPPFLAGS) \
 	$(NULL)
 
-TEST_LIBS =					\
-	$(libebook_test_utils_la_LIBADD)	\
-	libebook-test-utils.la			\
+TEST_LIBS = \
+	$(libebook_test_utils_la_LIBADD) \
+	libebook-test-utils.la \
 	$(NULL)
 
 ### EBookClient Tests ###
@@ -54,51 +57,50 @@ TESTS = \
 	test-ebook-get-supported-auth-methods \
 	test-ebook-remove-contact-by-id \
 	test-ebook-remove-contacts \
-	test-ebook-get-book-view
-
-noinst_PROGRAMS = \
-	$(TESTS)				\
+	test-ebook-get-book-view \
 	$(NULL)
 
+noinst_PROGRAMS = $(TESTS)
+
 EXTRA_DIST = \
-	$(srcdir)/data/vcards/name-only.vcf	\
-	$(srcdir)/data/vcards/simple-1.vcf	\
-	$(srcdir)/data/vcards/simple-2.vcf	\
-	$(srcdir)/data/vcards/sorted-1.vcf	\
-	$(srcdir)/data/vcards/sorted-2.vcf	\
-	$(srcdir)/data/vcards/sorted-3.vcf	\
-	$(srcdir)/data/vcards/sorted-4.vcf	\
-	$(srcdir)/data/vcards/sorted-5.vcf	\
-	$(srcdir)/data/vcards/sorted-6.vcf	\
-	$(srcdir)/data/vcards/sorted-7.vcf	\
-	$(srcdir)/data/vcards/sorted-8.vcf	\
-	$(srcdir)/data/vcards/sorted-9.vcf	\
-	$(srcdir)/data/vcards/sorted-10.vcf	\
-	$(srcdir)/data/vcards/sorted-11.vcf	\
-	$(srcdir)/data/vcards/sorted-12.vcf	\
-	$(srcdir)/data/vcards/sorted-13.vcf	\
-	$(srcdir)/data/vcards/sorted-14.vcf	\
-	$(srcdir)/data/vcards/sorted-15.vcf	\
-	$(srcdir)/data/vcards/sorted-16.vcf	\
-	$(srcdir)/data/vcards/sorted-17.vcf	\
-	$(srcdir)/data/vcards/sorted-18.vcf	\
-	$(srcdir)/data/vcards/sorted-19.vcf	\
-	$(srcdir)/data/vcards/sorted-20.vcf	\
-	$(srcdir)/data/vcards/custom-1.vcf	\
-	$(srcdir)/data/vcards/custom-2.vcf	\
-	$(srcdir)/data/vcards/custom-3.vcf	\
-	$(srcdir)/data/vcards/custom-4.vcf	\
-	$(srcdir)/data/vcards/custom-5.vcf	\
-	$(srcdir)/data/vcards/custom-6.vcf	\
-	$(srcdir)/data/vcards/custom-7.vcf	\
-	$(srcdir)/data/vcards/custom-8.vcf	\
-	$(srcdir)/data/vcards/custom-9.vcf	\
-	$(srcdir)/data/vcards/custom-10.vcf	\
-	$(srcdir)/data/vcards/custom-11.vcf	\
-	$(srcdir)/data/vcards/custom-12.vcf	\
-	$(srcdir)/data/vcards/custom-13.vcf	\
-	$(srcdir)/data/vcards/custom-14.vcf	\
-	$(srcdir)/data/vcards/custom-15.vcf	\
+	$(srcdir)/data/vcards/name-only.vcf \
+	$(srcdir)/data/vcards/simple-1.vcf \
+	$(srcdir)/data/vcards/simple-2.vcf \
+	$(srcdir)/data/vcards/sorted-1.vcf \
+	$(srcdir)/data/vcards/sorted-2.vcf \
+	$(srcdir)/data/vcards/sorted-3.vcf \
+	$(srcdir)/data/vcards/sorted-4.vcf \
+	$(srcdir)/data/vcards/sorted-5.vcf \
+	$(srcdir)/data/vcards/sorted-6.vcf \
+	$(srcdir)/data/vcards/sorted-7.vcf \
+	$(srcdir)/data/vcards/sorted-8.vcf \
+	$(srcdir)/data/vcards/sorted-9.vcf \
+	$(srcdir)/data/vcards/sorted-10.vcf \
+	$(srcdir)/data/vcards/sorted-11.vcf \
+	$(srcdir)/data/vcards/sorted-12.vcf \
+	$(srcdir)/data/vcards/sorted-13.vcf \
+	$(srcdir)/data/vcards/sorted-14.vcf \
+	$(srcdir)/data/vcards/sorted-15.vcf \
+	$(srcdir)/data/vcards/sorted-16.vcf \
+	$(srcdir)/data/vcards/sorted-17.vcf \
+	$(srcdir)/data/vcards/sorted-18.vcf \
+	$(srcdir)/data/vcards/sorted-19.vcf \
+	$(srcdir)/data/vcards/sorted-20.vcf \
+	$(srcdir)/data/vcards/custom-1.vcf \
+	$(srcdir)/data/vcards/custom-2.vcf \
+	$(srcdir)/data/vcards/custom-3.vcf \
+	$(srcdir)/data/vcards/custom-4.vcf \
+	$(srcdir)/data/vcards/custom-5.vcf \
+	$(srcdir)/data/vcards/custom-6.vcf \
+	$(srcdir)/data/vcards/custom-7.vcf \
+	$(srcdir)/data/vcards/custom-8.vcf \
+	$(srcdir)/data/vcards/custom-9.vcf \
+	$(srcdir)/data/vcards/custom-10.vcf \
+	$(srcdir)/data/vcards/custom-11.vcf \
+	$(srcdir)/data/vcards/custom-12.vcf \
+	$(srcdir)/data/vcards/custom-13.vcf \
+	$(srcdir)/data/vcards/custom-14.vcf \
+	$(srcdir)/data/vcards/custom-15.vcf \
 	$(NULL)
 
 test_ebook_commit_contact_LDADD=$(TEST_LIBS)
diff --git a/tests/libebook/client/Makefile.am b/tests/libebook/client/Makefile.am
index de75b5573..5af456d31 100644
--- a/tests/libebook/client/Makefile.am
+++ b/tests/libebook/client/Makefile.am
@@ -1,80 +1,81 @@
 noinst_LTLIBRARIES = libclient-test-utils.la
 
-libclient_test_utils_la_SOURCES = client-test-utils.c client-test-utils.h
+libclient_test_utils_la_SOURCES = \
+	client-test-utils.c \
+	client-test-utils.h \
+	$(NULL)
 
-libclient_test_utils_la_CPPFLAGS =				\
-	$(AM_CPPFLAGS)						\
-	-I$(top_srcdir)						\
-	-I$(top_builddir)					\
-	-I$(top_srcdir)/addressbook				\
-	-I$(top_builddir)/addressbook				\
-	-I$(top_srcdir)/calendar     				\
-	-I$(top_builddir)/calendar   				\
-	-I$(top_srcdir)/tests/test-server-utils     		\
-	-I$(top_builddir)/tests/test-server-utils   		\
-	-I$(top_srcdir)/private					\
-	-I$(top_builddir)/private				\
-	-DSRCDIR=\""$(abs_srcdir)"\"				\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)				\
-	$(EVOLUTION_CALENDAR_CFLAGS)				\
-	$(CAMEL_CFLAGS)						\
+libclient_test_utils_la_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(top_srcdir) \
+	-I$(top_builddir) \
+	-I$(top_srcdir)/addressbook \
+	-I$(top_builddir)/addressbook \
+	-I$(top_srcdir)/calendar \
+	-I$(top_builddir)/calendar \
+	-I$(top_srcdir)/tests/test-server-utils \
+	-I$(top_builddir)/tests/test-server-utils \
+	-I$(top_srcdir)/private \
+	-I$(top_builddir)/private \
+	-DSRCDIR=\""$(abs_srcdir)"\" \
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
+	$(EVOLUTION_CALENDAR_CFLAGS) \
+	$(CAMEL_CFLAGS) \
 	$(NULL)
 
-libclient_test_utils_la_LIBADD = 				\
-	$(top_builddir)/addressbook/libebook/libebook-1.2.la	\
-	$(top_builddir)/tests/test-server-utils/libetestserverutils.la	\
-	$(top_builddir)/private/libedbus-private.la		\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)				\
-	$(EVOLUTION_CALENDAR_LIBS)				\
-	$(CAMEL_LIBS)						\
+libclient_test_utils_la_LIBADD = \
+	$(top_builddir)/addressbook/libebook/libebook-1.2.la \
+	$(top_builddir)/tests/test-server-utils/libetestserverutils.la \
+	$(top_builddir)/private/libedbus-private.la \
+	$(EVOLUTION_ADDRESSBOOK_LIBS) \
+	$(EVOLUTION_CALENDAR_LIBS) \
+	$(CAMEL_LIBS) \
 	$(NULL)
 
 # Should be kept ordered approximately from least to most difficult/complex
-TESTS =								\
-	test-client-refresh					\
-	test-client-add-contact					\
-	test-client-get-contact					\
-	test-client-get-contact-uids				\
-	test-client-modify-contact				\
-	test-client-remove-contact				\
-	test-client-remove-contact-by-uid			\
-	test-client-remove-contacts				\
-	test-client-add-and-get-sync				\
-	test-client-add-and-get-async				\
-	test-client-self					\
-	test-client-preserve-uid				\
-	test-client-photo-is-uri				\
-	test-client-e164-param					\
-        test-client-custom-summary				\
-	test-client-get-revision				\
-	test-client-write-write					\
-	test-client-get-view					\
-	test-client-uid-only-view				\
-	test-client-revision-view				\
-	test-client-view-operations		 		\
-	test-client-suppress-notifications			\
-	test-client-cursor-create				\
-	test-client-cursor-operations				\
+TESTS = \
+	test-client-refresh \
+	test-client-add-contact \
+	test-client-get-contact \
+	test-client-get-contact-uids \
+	test-client-modify-contact \
+	test-client-remove-contact \
+	test-client-remove-contact-by-uid \
+	test-client-remove-contacts \
+	test-client-add-and-get-sync \
+	test-client-add-and-get-async \
+	test-client-self \
+	test-client-preserve-uid \
+	test-client-photo-is-uri \
+	test-client-e164-param \
+        test-client-custom-summary \
+	test-client-get-revision \
+	test-client-write-write \
+	test-client-get-view \
+	test-client-uid-only-view \
+	test-client-revision-view \
+	test-client-view-operations \
+	test-client-suppress-notifications \
+	test-client-cursor-create \
+	test-client-cursor-operations \
 	$(NULL)
 
 # The noinst tests are functional tests, not unit tests.
 #
 # Either they were designed as functional tests or have
 # not been ported to use ETestServerFixture yet.
-noinst_PROGRAMS =						\
-	$(TESTS)						\
-	$(NULL)
+noinst_PROGRAMS = $(TESTS)
 
-TEST_CPPFLAGS =							\
-	$(libclient_test_utils_la_CPPFLAGS)			\
-	$(EVOLUTION_ADDRESSBOOK_CPPFLAGS)			\
+TEST_CPPFLAGS = \
+	$(libclient_test_utils_la_CPPFLAGS) \
+	$(EVOLUTION_ADDRESSBOOK_CPPFLAGS) \
 	$(NULL)
 
-TEST_LIBS =							\
-	$(libclient_test_utils_la_LIBADD)			\
-	libclient-test-utils.la					\
-	$(top_builddir)/addressbook/libebook/libebook-1.2.la	\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)				\
+TEST_LIBS = \
+	$(libclient_test_utils_la_LIBADD) \
+	libclient-test-utils.la \
+	$(top_builddir)/addressbook/libebook/libebook-1.2.la \
+	$(EVOLUTION_ADDRESSBOOK_LIBS) \
 	$(NULL)
 
 test_client_add_and_get_sync_LDADD=$(TEST_LIBS)
diff --git a/tests/libebook/vcard/Makefile.am b/tests/libebook/vcard/Makefile.am
index 91f39f10e..f4f5dfb2c 100644
--- a/tests/libebook/vcard/Makefile.am
+++ b/tests/libebook/vcard/Makefile.am
@@ -1,19 +1,31 @@
 noinst_PROGRAMS = dump-vcard
 
 dump_vcard_CPPFLAGS = \
-	-I$(top_srcdir)			\
-	-I$(top_builddir)		\
-	-I$(top_srcdir)/addressbook	\
-	-I$(top_builddir)/addressbook	\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)	\
+	-I$(top_srcdir) \
+	-I$(top_builddir) \
+	-I$(top_srcdir)/addressbook \
+	-I$(top_builddir)/addressbook \
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
 	$(CAMEL_CFLAGS)
 
-dump_vcard_LDADD = 						\
-	$(top_builddir)/addressbook/libebook-contacts/libebook-contacts-1.2.la	\
-	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)				\
+dump_vcard_LDADD = \
+	$(top_builddir)/addressbook/libebook-contacts/libebook-contacts-1.2.la \
+	$(top_builddir)/libedataserver/libedataserver-1.2.la \
+	$(EVOLUTION_ADDRESSBOOK_LIBS) \
 	$(CAMEL_LIBS)
 
-EXTRA_DIST=1.vcf 2.vcf 3.vcf 4.vcf 5.vcf 6.vcf 7.vcf 8.vcf 9.vcf 10.vcf 11.vcf
+EXTRA_DIST = \
+	1.vcf \
+	2.vcf \
+	3.vcf \
+	4.vcf \
+	5.vcf \
+	6.vcf \
+	7.vcf \
+	8.vcf \
+	9.vcf \
+	10.vcf \
+	11.vcf \
+	$(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/tests/libecal/Makefile.am b/tests/libecal/Makefile.am
index 7212c6dfe..4e78c9451 100644
--- a/tests/libecal/Makefile.am
+++ b/tests/libecal/Makefile.am
@@ -3,69 +3,73 @@ SUBDIRS = client
 @GNOME_CODE_COVERAGE_RULES@
 
 noinst_LTLIBRARIES = libecal-test-utils.la
-libecal_test_utils_la_SOURCES = ecal-test-utils.c ecal-test-utils.h
+libecal_test_utils_la_SOURCES = \
+	ecal-test-utils.c \
+	ecal-test-utils.h \
+	$(NULL)
 
 libecal_test_utils_la_CPPFLAGS = \
-	$(AM_CPPFLAGS)					\
-	-DLOCALEDIR=\""$(localedir)"\"			\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	-I$(top_srcdir)/addressbook     		\
-	-I$(top_builddir)/addressbook   		\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_builddir)/calendar			\
-	-I$(top_srcdir)/tests/test-server-utils     	\
-	-I$(top_builddir)/tests/test-server-utils   	\
-	$(EVOLUTION_CALENDAR_CFLAGS)                    \
-	$(CAMEL_CFLAGS)					\
+	$(AM_CPPFLAGS) \
+	-DLOCALEDIR=\""$(localedir)"\" \
+	-I$(top_srcdir) \
+	-I$(top_builddir) \
+	-I$(top_srcdir)/addressbook \
+	-I$(top_builddir)/addressbook \
+	-I$(top_srcdir)/calendar \
+	-I$(top_builddir)/calendar \
+	-I$(top_srcdir)/tests/test-server-utils \
+	-I$(top_builddir)/tests/test-server-utils \
+	$(EVOLUTION_CALENDAR_CFLAGS) \
+	$(CAMEL_CFLAGS) \
 	$(NULL)
 
 libecal_test_utils_la_LIBADD = \
-	$(top_builddir)/calendar/libecal/libecal-1.2.la		\
-	$(top_builddir)/tests/test-server-utils/libetestserverutils.la	\
-	$(EVOLUTION_CALENDAR_LIBS)				\
-	$(CAMEL_LIBS)						\
+	$(top_builddir)/calendar/libecal/libecal-1.2.la \
+	$(top_builddir)/tests/test-server-utils/libetestserverutils.la \
+	$(EVOLUTION_CALENDAR_LIBS) \
+	$(CAMEL_LIBS) \
 	$(NULL)
 
 TEST_ECAL_LIBS = \
 	$(libecal_test_utils_la_LIBADD) \
-	libecal-test-utils.la           \
+	libecal-test-utils.la \
 	$(NULL)
 
 # ordered by relative complexity
 TESTS = \
-	test-ecal-get-timezone			\
-	test-ecal-add-timezone			\
-	test-ecal-set-default-timezone		\
-	test-ecal-get-alarm-email-address	\
-	test-ecal-get-cal-address		\
-	test-ecal-get-ldap-attribute		\
-	test-ecal-get-capabilities		\
-	test-ecal-get-default-object		\
-	test-ecal-create-object			\
-	test-ecal-create-object--2		\
-	test-ecal-get-objects-for-uid		\
-	test-ecal-remove-object			\
-	test-ecal-get-object-list		\
-	test-ecal-modify-object			\
-	test-ecal-send-objects			\
-	test-ecal-receive-objects		\
-	test-ecal-get-query			\
+	test-ecal-get-timezone \
+	test-ecal-add-timezone \
+	test-ecal-set-default-timezone \
+	test-ecal-get-alarm-email-address \
+	test-ecal-get-cal-address \
+	test-ecal-get-ldap-attribute \
+	test-ecal-get-capabilities \
+	test-ecal-get-default-object \
+	test-ecal-create-object \
+	test-ecal-create-object--2 \
+	test-ecal-get-objects-for-uid \
+	test-ecal-remove-object \
+	test-ecal-get-object-list \
+	test-ecal-modify-object \
+	test-ecal-send-objects \
+	test-ecal-receive-objects \
+	test-ecal-get-query \
 	$(NULL)
 
 # test-ecal-get-free-busy:
 #   broken by design, the API needs to be fixed.
 BROKEN_TESTS = \
-	test-ecal-get-free-busy
+	test-ecal-get-free-busy \
+	$(NULL)
 
 # The test program
-noinst_PROGRAMS = 		\
-	$(TESTS) 		\
-	$(BROKEN_TESTS)		\
+noinst_PROGRAMS =  \
+	$(TESTS) \
+	$(BROKEN_TESTS) \
 	$(NULL)
 
 
-TEST_ECAL_CPPFLAGS= \
+TEST_ECAL_CPPFLAGS = \
 	$(libecal_test_utils_la_CPPFLAGS) \
 	$(NULL)
 
diff --git a/tests/libecal/client/Makefile.am b/tests/libecal/client/Makefile.am
index 5cfdf1ecb..abe809088 100644
--- a/tests/libecal/client/Makefile.am
+++ b/tests/libecal/client/Makefile.am
@@ -1,52 +1,52 @@
 
-TEST_CPPFLAGS=							\
-	$(AM_CPPFLAGS)						\
-	-I$(top_srcdir)						\
-	-I$(top_builddir)					\
-	-I$(top_srcdir)/addressbook     			\
-	-I$(top_builddir)/addressbook   			\
-	-I$(top_srcdir)/calendar				\
-	-I$(top_builddir)/calendar				\
-	-I$(top_srcdir)/tests/test-server-utils     		\
-	-I$(top_builddir)/tests/test-server-utils   		\
-	-DSRCDIR=\""$(abs_srcdir)"\"				\
-	$(EVOLUTION_CALENDAR_CFLAGS)				\
-	$(CAMEL_CFLAGS)						\
+TEST_CPPFLAGS= \
+	$(AM_CPPFLAGS) \
+	-I$(top_srcdir) \
+	-I$(top_builddir) \
+	-I$(top_srcdir)/addressbook \
+	-I$(top_builddir)/addressbook \
+	-I$(top_srcdir)/calendar \
+	-I$(top_builddir)/calendar \
+	-I$(top_srcdir)/tests/test-server-utils \
+	-I$(top_builddir)/tests/test-server-utils \
+	-DSRCDIR=\""$(abs_srcdir)"\" \
+	$(EVOLUTION_CALENDAR_CFLAGS) \
+	$(CAMEL_CFLAGS) \
 	$(NULL)
 
-TEST_LIBS =							\
-	$(top_builddir)/calendar/libecal/libecal-1.2.la		\
-	$(top_builddir)/tests/test-server-utils/libetestserverutils.la	\
-	$(EVOLUTION_CALENDAR_LIBS)				\
-	$(CAMEL_LIBS)						\
+TEST_LIBS = \
+	$(top_builddir)/calendar/libecal/libecal-1.2.la \
+	$(top_builddir)/tests/test-server-utils/libetestserverutils.la \
+	$(EVOLUTION_CALENDAR_LIBS) \
+	$(CAMEL_LIBS) \
 	$(NULL)
 
 # ordered by relative complexity
-TESTS = 					\
-	test-client-refresh			\
-	test-client-add-timezone		\
-	test-client-create-object		\
-	test-client-remove-object		\
-	test-client-get-object-list		\
-	test-client-modify-object		\
-	test-client-send-objects		\
-	test-client-receive-objects		\
-        test-client-bulk-methods		\
-	test-client-get-attachment-uris		\
-	test-client-get-view			\
-	test-client-revision-view		\
-	test-client-get-revision		\
+TESTS = \
+	test-client-refresh \
+	test-client-add-timezone \
+	test-client-create-object \
+	test-client-remove-object \
+	test-client-get-object-list \
+	test-client-modify-object \
+	test-client-send-objects \
+	test-client-receive-objects \
+        test-client-bulk-methods \
+	test-client-get-attachment-uris \
+	test-client-get-view \
+	test-client-revision-view \
+	test-client-get-revision \
 	$(NULL)
 
 # test-client-get-free-busy:
 #   broken by design, the API needs to be fixed.
 #
-BROKEN_TESTS =		\
-	test-client-get-free-busy
+BROKEN_TESTS = \
+	test-client-get-free-busy \
+	$(NULL)
 
 # The test program
-noinst_PROGRAMS = $(TESTS) $(BROKEN_TESTS)	\
-	$(NULL)
+noinst_PROGRAMS = $(TESTS) $(BROKEN_TESTS)
 
 # ordered alphanumerically
 test_client_add_timezone_LDADD=$(TEST_LIBS)
diff --git a/tests/libedata-book/Makefile.am b/tests/libedata-book/Makefile.am
index bce27fa9f..0901c958f 100644
--- a/tests/libedata-book/Makefile.am
+++ b/tests/libedata-book/Makefile.am
@@ -1,45 +1,45 @@
 
 noinst_LTLIBRARIES = libdata-test-utils.la
 
-libdata_test_utils_la_SOURCES =					\
-	data-test-utils.c					\
-	data-test-utils.h					\
+libdata_test_utils_la_SOURCES = \
+	data-test-utils.c \
+	data-test-utils.h \
 	$(NULL)
 
-libdata_test_utils_la_CPPFLAGS =				\
-	$(AM_CPPFLAGS)						\
-	-I$(top_srcdir)						\
-	-I$(top_builddir)					\
-	-I$(top_srcdir)/addressbook				\
-	-I$(top_builddir)/addressbook				\
-	-I$(top_srcdir)/calendar     				\
-	-I$(top_builddir)/calendar   				\
-	-I$(top_srcdir)/tests/libedataserver     		\
-	-I$(top_builddir)/tests/libedataserver   		\
-	-I$(top_srcdir)/tests/test-server-utils     		\
-	-I$(top_builddir)/tests/test-server-utils   		\
-	-I$(top_srcdir)/private					\
-	-I$(top_builddir)/private				\
-	-DBACKENDDIR=\"$(ebook_backenddir)\"			\
-	-DDATADIR=\"$(datadir)\"				\
-	-DSRCDIR=\""$(abs_srcdir)"\"				\
-	-DBUILDDIR=\""$(abs_topbuilddir)"\"			\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)				\
-	$(EVOLUTION_CALENDAR_CFLAGS)				\
-	$(GIO_UNIX_CFLAGS) 					\
-	$(CAMEL_CFLAGS)						\
+libdata_test_utils_la_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(top_srcdir) \
+	-I$(top_builddir) \
+	-I$(top_srcdir)/addressbook \
+	-I$(top_builddir)/addressbook \
+	-I$(top_srcdir)/calendar \
+	-I$(top_builddir)/calendar \
+	-I$(top_srcdir)/tests/libedataserver \
+	-I$(top_builddir)/tests/libedataserver \
+	-I$(top_srcdir)/tests/test-server-utils \
+	-I$(top_builddir)/tests/test-server-utils \
+	-I$(top_srcdir)/private \
+	-I$(top_builddir)/private \
+	-DBACKENDDIR=\"$(ebook_backenddir)\" \
+	-DDATADIR=\"$(datadir)\" \
+	-DSRCDIR=\""$(abs_srcdir)"\" \
+	-DBUILDDIR=\""$(abs_topbuilddir)"\" \
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
+	$(EVOLUTION_CALENDAR_CFLAGS) \
+	$(GIO_UNIX_CFLAGS) \
+	$(CAMEL_CFLAGS) \
 	$(NULL)
 
-libdata_test_utils_la_LIBADD = 				\
-	$(top_builddir)/addressbook/libebook-contacts/libebook-contacts-1.2.la		\
-	$(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la	\
-	$(top_builddir)/addressbook/libebook/libebook-1.2.la	\
-	$(top_builddir)/tests/test-server-utils/libetestserverutils.la	\
-	$(top_builddir)/private/libedbus-private.la		\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)				\
-	$(EVOLUTION_CALENDAR_LIBS)				\
-	$(GIO_UNIX_LIBS) 					\
-	$(CAMEL_LIBS)						\
+libdata_test_utils_la_LIBADD = \
+	$(top_builddir)/addressbook/libebook-contacts/libebook-contacts-1.2.la \
+	$(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la \
+	$(top_builddir)/addressbook/libebook/libebook-1.2.la \
+	$(top_builddir)/tests/test-server-utils/libetestserverutils.la \
+	$(top_builddir)/private/libedbus-private.la \
+	$(EVOLUTION_ADDRESSBOOK_LIBS) \
+	$(EVOLUTION_CALENDAR_LIBS) \
+	$(GIO_UNIX_LIBS) \
+	$(CAMEL_LIBS) \
 	$(NULL)
 
 # Should be kept ordered approximately from least to most difficult/complex
@@ -51,35 +51,35 @@ libdata_test_utils_la_LIBADD = 				\
 #
 # This is because each migrated test changes the
 # locale and reloads the same addressbook of the previous test. 
-TESTS =						\
-	test-sqlite-get-contact			\
-	test-sqlite-create-cursor		\
-	test-sqlite-cursor-move-by-posix	\
-	test-sqlite-cursor-move-by-en-US	\
-	test-sqlite-cursor-move-by-fr-CA	\
-	test-sqlite-cursor-move-by-de-DE	\
-	test-sqlite-cursor-set-target		\
-	test-sqlite-cursor-calculate		\
-	test-sqlite-cursor-set-sexp		\
-	test-sqlite-cursor-posix-initial	\
-	test-sqlite-cursor-en-US-migrated	\
-	test-sqlite-cursor-fr-CA-migrated	\
-	test-sqlite-cursor-de-DE-migrated	\
-	test-sqlite-cursor-posix-migrated	\
+TESTS = \
+	test-sqlite-get-contact \
+	test-sqlite-create-cursor \
+	test-sqlite-cursor-move-by-posix \
+	test-sqlite-cursor-move-by-en-US \
+	test-sqlite-cursor-move-by-fr-CA \
+	test-sqlite-cursor-move-by-de-DE \
+	test-sqlite-cursor-set-target \
+	test-sqlite-cursor-calculate \
+	test-sqlite-cursor-set-sexp \
+	test-sqlite-cursor-posix-initial \
+	test-sqlite-cursor-en-US-migrated \
+	test-sqlite-cursor-fr-CA-migrated \
+	test-sqlite-cursor-de-DE-migrated \
+	test-sqlite-cursor-posix-migrated \
 	test-sqlite-cursor-change-locale
 
 noinst_PROGRAMS = $(TESTS)
 
-TEST_CPPFLAGS =							\
-	$(libdata_test_utils_la_CPPFLAGS)			\
-	$(EVOLUTION_ADDRESSBOOK_CPPFLAGS)			\
+TEST_CPPFLAGS = \
+	$(libdata_test_utils_la_CPPFLAGS) \
+	$(EVOLUTION_ADDRESSBOOK_CPPFLAGS) \
 	$(NULL)
 
-TEST_LIBS =							\
-	$(libdata_test_utils_la_LIBADD)			\
-	libdata-test-utils.la					\
-	$(top_builddir)/addressbook/libebook/libebook-1.2.la	\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)				\
+TEST_LIBS = \
+	$(libdata_test_utils_la_LIBADD) \
+	libdata-test-utils.la \
+	$(top_builddir)/addressbook/libebook/libebook-1.2.la \
+	$(EVOLUTION_ADDRESSBOOK_LIBS) \
 	$(NULL)
 
 test_sqlite_get_contact_LDADD=$(TEST_LIBS)
diff --git a/tests/libedata-cal/Makefile.am b/tests/libedata-cal/Makefile.am
index 145c13b2e..695d06ee5 100644
--- a/tests/libedata-cal/Makefile.am
+++ b/tests/libedata-cal/Makefile.am
@@ -20,7 +20,7 @@ test_CPPFLAGS = \
 
 test_LDADD = \
 	$(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la \
-	$(top_builddir)/calendar/libecal/libecal-1.2.la  \
+	$(top_builddir)/calendar/libecal/libecal-1.2.la \
 	$(top_builddir)/libebackend/libebackend-1.2.la \
 	$(top_builddir)/libedataserver/libedataserver-1.2.la \
 	$(EVOLUTION_CALENDAR_LIBS) \
diff --git a/tests/libedataserver/Makefile.am b/tests/libedataserver/Makefile.am
index 77b688de7..07922fbd5 100644
--- a/tests/libedataserver/Makefile.am
+++ b/tests/libedataserver/Makefile.am
@@ -5,7 +5,7 @@ NULL =
 TESTS = \
 	e-source-test \
 	e-source-registry-test \
-	e-collator-test	\
+	e-collator-test \
 	$(NULL)
 
 noinst_PROGRAMS = $(TESTS)
@@ -27,6 +27,7 @@ test_CPPFLAGS = \
 	$(NULL)
 
 test_LDADD = \
+	$(top_builddir)/libebackend/libebackend-1.2.la \
 	$(top_builddir)/libedataserver/libedataserver-1.2.la \
 	$(top_builddir)/addressbook/libebook/libebook-1.2.la \
 	$(top_builddir)/calendar/libecal/libecal-1.2.la \
@@ -62,7 +63,7 @@ noinst_PROGRAMS += e-user-prompter-test
 
 e_user_prompter_test_SOURCES = e-user-prompter-test.c
 e_user_prompter_test_CPPFLAGS = $(test_CPPFLAGS) $(GTK_CFLAGS)
-e_user_prompter_test_LDADD = $(top_builddir)/libebackend/libebackend-1.2.la $(test_LDADD) $(GTK_LIBS)
+e_user_prompter_test_LDADD = $(test_LDADD) $(GTK_LIBS)
 endif
 
 -include $(top_srcdir)/git.mk
diff --git a/tests/test-server-utils/Makefile.am b/tests/test-server-utils/Makefile.am
index 4a14936de..202f62cf1 100644
--- a/tests/test-server-utils/Makefile.am
+++ b/tests/test-server-utils/Makefile.am
@@ -57,8 +57,6 @@ test_fixture_CPPFLAGS = $(common_cflags)
 test_fixture_LDADD    = $(common_libs) libetestserverutils.la
 test_fixture_SOURCES  = test-fixture.c
 
--include $(top_srcdir)/git.mk
-
 ######################################
 # The test directory needs to be     #
 # cleaned in order to pass distcheck #
@@ -67,3 +65,5 @@ clean-local: clean-local-check
 .PHONY: clean-local-check
 clean-local-check:
 	-rm -rf $(abs_top_builddir)/tests/test-server-utils/cache
+
+-include $(top_srcdir)/git.mk
diff --git a/tests/test-server-utils/services/Makefile.am b/tests/test-server-utils/services/Makefile.am
index f3d52870d..b7bc2da8f 100644
--- a/tests/test-server-utils/services/Makefile.am
+++ b/tests/test-server-utils/services/Makefile.am
@@ -1,6 +1,7 @@
 EXTRA_DIST = \
 	org.gnome.evolution.dataserver.AddressBook.service.in	\
 	org.gnome.evolution.dataserver.Calendar.service.in	\
-	org.gnome.evolution.dataserver.Sources.service.in
+	org.gnome.evolution.dataserver.Sources.service.in \
+	$(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/vala/Makefile.am b/vala/Makefile.am
index 449d13e88..6f9d874e4 100644
--- a/vala/Makefile.am
+++ b/vala/Makefile.am
@@ -1,3 +1,5 @@
+NULL =
+
 vapidir = $(datarootdir)/vala/vapi
 vapi_DATA = \
 	libedataserver-1.2.vapi \