[xmltooling] 15/19: Refactor test source generation

[Ferenc Wágner]

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

wferi-guest pushed a commit to branch patch-queue/debian/experimental
in repository xmltooling.

commit 9ca29bdb66d10c3ed05c81342858e03ad2327084
Author: Ferenc Wágner <wferi at niif.hu>
Date:   Wed Jul 6 18:46:59 2016 +0200

    Refactor test source generation
---
 xmltoolingtest/Makefile.am | 56 +++++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 31 deletions(-)

diff --git a/xmltoolingtest/Makefile.am b/xmltoolingtest/Makefile.am
index c7d3455..480294b 100644
--- a/xmltoolingtest/Makefile.am
+++ b/xmltoolingtest/Makefile.am
@@ -15,46 +15,40 @@ endif
 
 if BUILD_XMLSEC
 xmlsec_sources = \
-    EncryptionTest.h \
-    FilesystemCredentialResolverTest.h \
-    InlineKeyResolverTest.h \
-    MemoryStorageServiceTest.h \
-    PKIXEngineTest.h \
-    SecurityHelperTest.h \
-    SignatureTest.h
-else
-xmlsec_sources =
+    EncryptionTest.cpp \
+    FilesystemCredentialResolverTest.cpp \
+    InlineKeyResolverTest.cpp \
+    MemoryStorageServiceTest.cpp \
+    PKIXEngineTest.cpp \
+    SecurityHelperTest.cpp \
+    SignatureTest.cpp
 endif
 
-xmltoolingtest_h = \
-    ComplexXMLObjectTest.h \
-    DateTimeTest.h \
-    ExceptionTest.h \
-    KeyInfoTest.h \
-    MarshallingTest.h \
-    NonVisibleNamespaceTest.h \
-    SOAPTest.h \
-    UnmarshallingTest.h \
-    TemplateEngineTest.h \
-    xmltoolingtest.h \
+xmltoolingtest_sources = \
+    ComplexXMLObjectTest.cpp \
+    DateTimeTest.cpp \
+    ExceptionTest.cpp \
+    KeyInfoTest.cpp \
+    MarshallingTest.cpp \
+    NonVisibleNamespaceTest.cpp \
+    SOAPTest.cpp \
+    UnmarshallingTest.cpp \
+    TemplateEngineTest.cpp \
     ${xmlsec_sources}
 
 noinst_HEADERS = \
     XMLObjectBaseTestCase.h \
-    $(xmltoolingtest_h)
+    xmltoolingtest.h \
+    $(xmltoolingtest_sources:.cpp=.h)
 
-nodist_xmltoolingtest_SOURCES = $(xmltoolingtest_h:.h=.cpp)
+nodist_xmltoolingtest_SOURCES = xmltoolingtest.cpp $(xmltoolingtest_sources)
 
-CLEANFILES = $(nodist_xmltoolingtest_SOURCES)
+xmltoolingtest.cpp: %.cpp: %.h
+	$(CXXTEST) --error-printer --have-eh --have-std --abort-on-fail -o $@ $<
 
-do-cxxtestgen:
-	if test "$(CPPFILE)" = "xmltoolingtest.cpp"; then \
-		$(CXXTEST) --error-printer --have-eh --have-std --abort-on-fail -o $(CPPFILE) $(HFILE); \
-	else \
-		$(CXXTEST) --part --have-eh --have-std --abort-on-fail -o $(CPPFILE) $(HFILE); \
-	fi;
+$(xmltoolingtest_sources): %.cpp: %.h
+	$(CXXTEST) --part --have-eh --have-std --abort-on-fail -o $@ $<
 
-$(nodist_xmltoolingtest_SOURCES): %.cpp: %.h
-	$(MAKE) do-cxxtestgen HFILE=$< CPPFILE=$@
+CLEANFILES = $(nodist_xmltoolingtest_SOURCES)
 
 EXTRA_DIST = data

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/xmltooling.git