[libvirt] [dbus PATCH 15/15] autotools: Use consistent style

[Andrea Bolognani]

Sticking to one item per line will ensure future diffs
are minimal and easily understandable. More in general,
being consistent is good :)

Signed-off-by: Andrea Bolognani <abologna at redhat.com>
---
 Makefile.am       | 12 +++++++++---
 data/Makefile.am  | 32 +++++++++++++++++++++++---------
 docs/Makefile.am  | 16 ++++++++++++----
 src/Makefile.am   | 40 +++++++++++++++++++++++++++-------------
 tests/Makefile.am | 21 ++++++++++++++-------
 5 files changed, 85 insertions(+), 36 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index bb5ff5c..93941c6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,9 @@
-
-SUBDIRS = data docs src tests
+SUBDIRS = \
+	data \
+	docs \
+	src \
+	tests \
+	$(NULL)
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -11,7 +15,9 @@ EXTRA_DIST = \
 	README.md \
 	$(NULL)
 
-DISTCLEAN_FILES = $(PACKAGE).spec
+DISTCLEAN_FILES = \
+	$(PACKAGE).spec \
+	$(NULL)
 
 rpm: clean
 	@(unset CDPATH ; $(MAKE) dist && rpmbuild -ta $(distdir).tar.gz)
diff --git a/data/Makefile.am b/data/Makefile.am
index f1e9dfd..7b523da 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,22 +1,34 @@
 service_in_files = \
-	session/org.libvirt.service.in
+	session/org.libvirt.service.in \
+	$(NULL)
 servicedir = $(DBUS_SERVICES_DIR)
-service_DATA = $(service_in_files:.service.in=.service)
+service_DATA = \
+	$(service_in_files:.service.in=.service) \
+	$(NULL)
 
 system_service_in_files = \
-	system/org.libvirt.service.in
+	system/org.libvirt.service.in \
+	$(NULL)
 system_servicedir = $(DBUS_SYSTEM_SERVICES_DIR)
-system_service_DATA = $(system_service_in_files:.service.in=.service)
+system_service_DATA = \
+	$(system_service_in_files:.service.in=.service) \
+	$(NULL)
 
 system_policy_in_files = \
-	system/org.libvirt.conf.in
+	system/org.libvirt.conf.in \
+	$(NULL)
 system_policydir = $(DBUS_SYSTEM_POLICIES_DIR)
-system_policy_DATA = $(system_policy_in_files:.conf.in=.conf)
+system_policy_DATA = \
+	$(system_policy_in_files:.conf.in=.conf) \
+	$(NULL)
 
 polkit_in_files = \
-	system/libvirt-dbus.rules.in
+	system/libvirt-dbus.rules.in \
+	$(NULL)
 polkitdir = $(POLKIT_RULES_DIR)
-polkit_DATA = $(polkit_in_files:.rules.in=.rules)
+polkit_DATA = \
+	$(polkit_in_files:.rules.in=.rules) \
+	$(NULL)
 
 interfaces_files = \
 	org.libvirt.Connect.xml \
@@ -29,7 +41,9 @@ interfaces_files = \
 	org.libvirt.StorageVol.xml \
 	$(NULL)
 interfacesdir = $(DBUS_INTERFACES_DIR)
-interfaces_DATA = $(interfaces_files)
+interfaces_DATA = \
+	$(interfaces_files) \
+	$(NULL)
 
 EXTRA_DIST = \
 	$(service_in_files) \
diff --git a/docs/Makefile.am b/docs/Makefile.am
index c41ffae..fe8ca1c 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,13 +1,21 @@
 POD2MAN = pod2man -c "Virtualization Support" -r "$(PACKAGE)-$(VERSION)"
 
-PODFILES = libvirt-dbus.pod
+PODFILES = \
+	libvirt-dbus.pod \
+	$(NULL)
 
 %.8: %.pod
 	$(AM_V_GEN)$(POD2MAN) -s 8 $< $@ \
 		&& if grep 'POD ERROR' $@; then rm $@; exit 1; fi
 
-man8_MANS = libvirt-dbus.8
+man8_MANS = \
+	libvirt-dbus.8 \
+	$(NULL)
 
-EXTRA_DIST = $(PODFILES)
+EXTRA_DIST = \
+	$(PODFILES) \
+	$(NULL)
 
-CLEANFILES = $(man8_MANS)
+CLEANFILES = \
+	$(man8_MANS) \
+	$(NULL)
diff --git a/src/Makefile.am b/src/Makefile.am
index 493cf81..2fb1820 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,7 @@
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src \
-	-DVIRT_DBUS_INTERFACES_DIR=\"$(DBUS_INTERFACES_DIR)\"
+	-DVIRT_DBUS_INTERFACES_DIR=\"$(DBUS_INTERFACES_DIR)\" \
+	$(NULL)
 AM_CFLAGS = \
 	$(GIO2_CFLAGS) \
 	$(GLIB2_CFLAGS) \
@@ -27,24 +28,37 @@ libutil_la_SOURCES = \
 	util.h \
 	$(NULL)
 
-bin_PROGRAMS = libvirt-dbus
+bin_PROGRAMS = \
+	libvirt-dbus \
+	$(NULL)
 
 libvirt_dbus_SOURCES = \
+	connect.c \
+	connect.h \
+	domain.c \
+	domain.h \
+	events.c \
+	events.h \
+	gdbus.c \
+	gdbus.h \
 	main.c \
-	connect.c connect.h \
-	domain.c domain.h \
-	events.c events.h \
-	gdbus.c gdbus.h \
-	network.c network.h \
-	nodedev.c nodedev.h \
-	nwfilter.c nwfilter.h \
-	secret.c secret.h \
-	storagepool.c storagepool.h \
-	storagevol.c storagevol.h \
+	network.c \
+	network.h \
+	nodedev.c \
+	nodedev.h \
+	nwfilter.c \
+	nwfilter.h \
+	secret.c \
+	secret.h \
+	storagepool.c \
+	storagepool.h \
+	storagevol.c \
+	storagevol.h \
 	$(NULL)
 libvirt_dbus_LDADD = \
 	libutil.la \
 	$(GIO2_LIBS) \
 	$(GLIB2_LIBS) \
 	$(LIBVIRT_LIBS) \
-	$(LIBVIRT_GLIB_LIBS)
+	$(LIBVIRT_GLIB_LIBS) \
+	$(NULL)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2991689..09c3e2e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,17 +5,20 @@ AM_CPPFLAGS = \
 test_helpers = \
 	xmldata.py \
 	libvirttest.py \
-	conftest.py
+	conftest.py \
+	$(NULL)
 
 test_programs = \
 	test_connect.py \
 	test_domain.py \
 	test_network.py \
 	test_nodedev.py \
-	test_storage.py
+	test_storage.py \
+	$(NULL)
 
 check_PROGRAMS = \
-	test_util
+	test_util \
+	$(NULL)
 
 test_util_SOURCES = \
 	test_util.c \
@@ -23,21 +26,25 @@ test_util_SOURCES = \
 test_util_CFLAGS = \
 	$(GIO2_CFLAGS) \
 	$(GLIB2_CFLAGS) \
-	$(LIBVIRT_CFLAGS)
+	$(LIBVIRT_CFLAGS) \
+	$(NULL)
 test_util_LDFLAGS = \
 	$(GIO2_LDFLAGS) \
 	$(GLIB2_LDFLAGS) \
-	$(LIBVIRT_LDFLAGS)
+	$(LIBVIRT_LDFLAGS) \
+	$(NULL)
 test_util_LDADD = \
 	$(top_builddir)/src/libutil.la \
 	$(GIO2_LIBS) \
 	$(GLIB2_LIBS) \
-	$(LIBVIRT_LIBS)
+	$(LIBVIRT_LIBS) \
+	$(NULL)
 
 EXTRA_DIST = \
 	$(test_helpers) \
 	$(test_programs) \
-	travis-run
+	travis-run \
+	$(NULL)
 
 TESTS = \
 	$(check_PROGRAMS) \
-- 
2.17.1