From f77fe62a5c25c43915dfb33a3c948dd282efd366 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Fri, 4 May 2018 15:22:19 +0200
Subject: Re-layout Makefile.am files.

---
 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 ce629ea..a88cea8 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,23 +1,31 @@
+NULL =
+
 CLEANFILES =
 DISTCLEANFILES =
 EXTRA_DIST =
 
-TESTS = \
-	test-x2go-wrapper
+TESTS =								\
+        test-x2go-wrapper					\
+        $(NULL)
+
+check_PROGRAMS =						\
+        test-x2go-auth						\
+        $(TESTS)						\
+        $(NULL)
 
-check_PROGRAMS = \
-	test-x2go-auth \
-	$(TESTS)
+AM_CPPFLAGS = $(GTEST_CPPFLAGS)					\
+        $(REMOTE_APPS_MANAGER_CFLAGS)				\
+        -I${top_srcdir}/src -Wall -Werror			\
+        $(NULL)
 
-AM_CPPFLAGS = $(GTEST_CPPFLAGS) \
-	$(REMOTE_APPS_MANAGER_CFLAGS) \
-	-I${top_srcdir}/src -Wall -Werror
-AM_CXXFLAGS = $(GTEST_CXXFLAGS) \
-	$(REMOTE_APPS_MANAGER_CFLAGS)
+AM_CXXFLAGS = $(GTEST_CXXFLAGS)					\
+        $(REMOTE_APPS_MANAGER_CFLAGS)				\
+        $(NULL)
 
-AM_CFLAGS = \
-	 -Wall \
-	 -g
+AM_CFLAGS =							\
+        -Wall							\
+        -g							\
+        $(NULL)
 
 ##########################
 # Google Test Test Suite #
@@ -25,15 +33,18 @@ AM_CFLAGS = \
 
 check_LIBRARIES = libgtest.a
 
-nodist_libgtest_a_SOURCES = \
-  $(GTEST_SOURCE)/src/gtest-all.cc \
-  $(GTEST_SOURCE)/src/gtest_main.cc
+nodist_libgtest_a_SOURCES =					\
+        $(GTEST_SOURCE)/src/gtest-all.cc			\
+        $(GTEST_SOURCE)/src/gtest_main.cc			\
+        $(NULL)
 
-libgtest_a_CPPFLAGS = \
-	$(GTEST_CPPFLAGS) -w \
-	$(AM_CPPFLAGS)
-libgtest_a_CXXFLAGS = \
-	$(AM_CXXFLAGS)
+libgtest_a_CPPFLAGS =						\
+        $(GTEST_CPPFLAGS) -w					\
+        $(AM_CPPFLAGS)						\
+        $(NULL)
+libgtest_a_CXXFLAGS =						\
+        $(AM_CXXFLAGS)						\
+        $(NULL)
 
 ##########################
 # Wrapper
@@ -41,27 +52,32 @@ libgtest_a_CXXFLAGS = \
 
 test_x2go_wrapper: test-x2go-auth
 
-test_x2go_wrapper_SOURCES = \
-	mock_pam.c mock_pam.h \
-	mock_guest.c mock_guest.h \
-	test-x2go-wrapper.cc
+test_x2go_wrapper_SOURCES =					\
+        mock_pam.c mock_pam.h					\
+        mock_guest.c mock_guest.h				\
+        test-x2go-wrapper.cc					\
+        $(NULL)
 
-test_x2go_wrapper_LDADD = \
-	$(top_builddir)/src/libssh.la \
-	libgtest.a
+test_x2go_wrapper_LDADD =					\
+        $(top_builddir)/src/libssh.la				\
+        libgtest.a						\
+        $(NULL)
 
-test_x2go_wrapper_CXXFLAGS = \
-	$(AM_CXXFLAGS) \
-	-DAUTH_CHECK="\"$(abs_builddir)/test-x2go-auth\"" \
-	-I${top_srcdir}/src
+test_x2go_wrapper_CXXFLAGS =					\
+        $(AM_CXXFLAGS)						\
+        -DAUTH_CHECK="\"$(abs_builddir)/test-x2go-auth\""	\
+        -I${top_srcdir}/src					\
+        $(NULL)
 
-test_x2go_wrapper_LDFLAGS = \
-	-pthread
+test_x2go_wrapper_LDFLAGS =					\
+        -pthread						\
+        $(NULL)
 
 ##########################
 # Auth tool
 ##########################
 
-test_x2go_auth_SOURCES = \
-	test-x2go-auth.c
+test_x2go_auth_SOURCES =					\
+        test-x2go-auth.c					\
+        $(NULL)
 
-- 
cgit v1.2.3