Makefile.am cleanups.

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

3 files changed, 147 insertions, 132 deletions

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