From 5b58804662e795411c5223a737b36318fecdfc8d Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 7 May 2018 16:39:56 +0200
Subject: Makefile.am: Re-layout format.

---
 tests/Makefile.am | 88 ++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 52 insertions(+), 36 deletions(-)

(limited to 'tests')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7927598..a165072 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,12 +1,14 @@
+NULL =
 
 CLEANFILES =
 DISTCLEANFILES =
 EXTRA_DIST =
 check_PROGRAMS =
 
-TESTS = \
-	server-tester \
-	dbus-interface-tester
+TESTS =											\
+        server-tester									\
+        dbus-interface-tester								\
+        $(NULL)
 
 #####################################
 # Server Test
@@ -19,19 +21,25 @@ server-tester: server-test Makefile.am
 	@echo gtester --verbose -k -o $(SERVER_XML_REPORT) $(abs_builddir)/server-test >> $@
 	@chmod +x $@
 
-CLEANFILES += \
-	$(SERVER_XML_REPORT) \
-	server-tester
+CLEANFILES +=										\
+        $(SERVER_XML_REPORT)								\
+        server-tester									\
+        $(NULL)
 
-server_test_SOURCES = \
-	server-test.c
-server_test_CFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_builddir)/src \
-	$(SERVICE_CFLAGS)
-server_test_LDADD = \
-	$(top_builddir)/src/libservers.la \
-	$(SERVICE_LIBS)
+server_test_SOURCES =									\
+        server-test.c									\
+        $(NULL)
+
+server_test_CFLAGS =									\
+        -I$(top_srcdir)/src								\
+        -I$(top_builddir)/src								\
+        $(SERVICE_CFLAGS)								\
+        $(NULL)
+
+server_test_LDADD =									\
+        $(top_builddir)/src/libservers.la						\
+        $(SERVICE_LIBS)									\
+        $(NULL)
 
 check_PROGRAMS += server-test
 
@@ -45,30 +53,38 @@ dbus-interface-tester: dbus-interface uccs-config.conf slmock-config.conf Makefi
 	@echo gtester --verbose -k -o $(DBUS_XML_REPORT) $(abs_builddir)/dbus-interface >> $@
 	@chmod +x $@
 
-CLEANFILES += \
-	$(DBUS_XML_REPORT) \
-	dbus-interface-tester \
-	slmock-config.conf
+CLEANFILES +=										\
+        $(DBUS_XML_REPORT)								\
+        dbus-interface-tester								\
+        slmock-config.conf								\
+        $(NULL)
 
-EXTRA_DIST += \
-	null-config.conf \
-	uccs-config.conf \
-	slmock \
-	slmock-config.conf.in
+EXTRA_DIST +=										\
+        null-config.conf								\
+        uccs-config.conf								\
+        slmock										\
+        slmock-config.conf.in								\
+        $(NULL)
 
 slmock-config.conf: slmock-config.conf.in
 	sed -e "s|\@slmock\@|$(abs_srcdir)/slmock|" $< > $@
-dbus_interface_SOURCES = \
-	dbus-interface.c
-dbus_interface_CFLAGS = \
-	-DREMOTE_LOGON_SERVICE="\"$(abs_top_builddir)/src/remote-logon-service\"" \
-	-DUCCS_CONFIG_FILE="\"$(abs_srcdir)/uccs-config.conf\"" \
-	-DSLMOCK_CONFIG_FILE="\"$(abs_builddir)/slmock-config.conf\"" \
-	-DNULL_CONFIG_FILE="\"$(abs_srcdir)/null-config.conf\"" \
-	$(SERVICE_CFLAGS) \
-	$(TEST_CFLAGS)
-dbus_interface_LDADD = \
-	$(SERVICE_LIBS) \
-	$(TEST_LIBS)
+
+dbus_interface_SOURCES =			\
+        dbus-interface.c			\
+        $(NULL)
+
+dbus_interface_CFLAGS =									\
+        -DREMOTE_LOGON_SERVICE="\"$(abs_top_builddir)/src/remote-logon-service\""	\
+        -DUCCS_CONFIG_FILE="\"$(abs_srcdir)/uccs-config.conf\""				\
+        -DSLMOCK_CONFIG_FILE="\"$(abs_builddir)/slmock-config.conf\""			\
+        -DNULL_CONFIG_FILE="\"$(abs_srcdir)/null-config.conf\""				\
+        $(SERVICE_CFLAGS)								\
+        $(TEST_CFLAGS)									\
+        $(NULL)
+
+dbus_interface_LDADD =									\
+        $(SERVICE_LIBS)									\
+        $(TEST_LIBS)									\
+        $(NULL)
 
 check_PROGRAMS += dbus-interface
-- 
cgit v1.2.3