[cpp-log4shib] 07/17: Clean up tests/Makefile.am

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository cpp-log4shib.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-log4shib.git;a=commit;h=0e6475a9f70108b15f9b79dff762c2eea12cdc6d

commit 0e6475a9f70108b15f9b79dff762c2eea12cdc6d
Author: Ferenc Wágner <wferi at debian.org>
AuthorDate: Mon Jun 25 01:19:37 2018 +0200

    Clean up tests/Makefile.am
---
 tests/Makefile.am | 46 ++++------------------------------------------
 1 file changed, 4 insertions(+), 42 deletions(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 59ed950..1da1861 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,56 +2,18 @@ TESTS = testCategory testFixedContextCategory testNDC testPattern \
 	testErrorCollision testPriority testFilter testProperties \
 	testConfig testPropertyConfig sscpp706
 
-check_PROGRAMS = $(TESTS)
+check_PROGRAMS = $(TESTS) testmain testbench
 check_DATA = log4shib.init log4shib.properties testProperties.properties \
 	testConfig.log4shib.properties sscpp706.txt
 
-EXTRA_DIST = log4shib.init log4shib.properties testProperties.properties \
-	testConfig.log4shib.properties sscpp706.txt \
-	testNTEventLog.cpp
-
-noinst_PROGRAMS = testmain testbench sscpp706
+EXTRA_DIST = $(check_DATA) testNTEventLog.cpp
 
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
+LDADD = ../src/liblog4shib.la
+AM_DEFAULT_SOURCE_EXT = .cpp
 
-sscpp706_SOURCES = sscpp706.cpp
-sscpp706_LDADD = $(top_builddir)/src/liblog4shib.la
-
-testmain_SOURCES = testmain.cpp
-testmain_LDADD = $(top_builddir)/src/liblog4shib.la
-
-testCategory_SOURCES = testCategory.cpp
-testCategory_LDADD = $(top_builddir)/src/liblog4shib.la
-
-testFixedContextCategory_SOURCES = testFixedContextCategory.cpp
-testFixedContextCategory_LDADD = $(top_builddir)/src/liblog4shib.la
-
-testNDC_SOURCES = testNDC.cpp
-testNDC_LDADD = $(top_builddir)/src/liblog4shib.la
-
-testPattern_SOURCES = testPattern.cpp
-testPattern_LDADD = $(top_builddir)/src/liblog4shib.la
-
-testPriority_SOURCES = testPriority.cpp
-testPriority_LDADD = $(top_builddir)/src/liblog4shib.la
-
-testConfig_SOURCES = testConfig.cpp
-testConfig_LDADD = $(top_builddir)/src/liblog4shib.la
-
-testPropertyConfig_SOURCES = testPropertyConfig.cpp
-testPropertyConfig_LDADD = $(top_builddir)/src/liblog4shib.la
-
-testFilter_SOURCES = testFilter.cpp
-testFilter_LDADD = $(top_builddir)/src/liblog4shib.la
-
-testProperties_SOURCES = testProperties.cpp
-testProperties_LDADD = $(top_builddir)/src/liblog4shib.la
 
 testbench_SOURCES = Clock.cpp Clock.hh testbench.cpp 
-testbench_LDADD = $(top_builddir)/src/liblog4shib.la
-
-testErrorCollision_SOURCES = testErrorCollision.cpp
-testErrorCollision_LDADD = $(top_builddir)/src/liblog4shib.la
 
 distclean-local:
 	$(RM) -f *.log

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.