Makefile.am cleanups.

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

9 files changed, 218 insertions, 179 deletions

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)