[cpp-opensaml] 15/19: Refactor test source generation

[Scott Cantor]

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

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

View the commit online:
http://git.shibboleth.net/view/?p=cpp-opensaml.git;a=commit;h=18fd0fa80777da0d9c779b0828b46e520305c21b

commit 18fd0fa80777da0d9c779b0828b46e520305c21b
Author: Ferenc Wágner <wferi at niif.hu>
AuthorDate: Tue Jul 12 16:35:28 2016 +0200

    Refactor test source generation
---
 samltest/Makefile.am | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/samltest/Makefile.am b/samltest/Makefile.am
index f7463dc..82a184f 100644
--- a/samltest/Makefile.am
+++ b/samltest/Makefile.am
@@ -7,7 +7,6 @@ check_PROGRAMS = samltest
 samltest_CXXFLAGS = $(CXXTESTFLAGS)
 
 samltest_h = \
-    samltest.h \
     SAMLArtifactCreationTest.h \
     SAMLArtifactType0001Test.h \
     SAMLArtifactType0002Test.h \
@@ -101,21 +100,18 @@ noinst_HEADERS = \
     binding.h \
     internal.h \
     signature/SAMLSignatureTestBase.h \
+    samltest.h \
     $(samltest_h)
 
-nodist_samltest_SOURCES = $(samltest_h:.h=.cpp)
+nodist_samltest_SOURCES = $(samltest_h:.h=.cpp) samltest.cpp
 
 CLEANFILES = $(nodist_samltest_SOURCES)
 
-do-cxxtestgen:
-	if test "$(CPPFILE)" = "samltest.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;
+samltest.cpp: samltest.h
+	$(CXXTEST) --have-eh --have-std --abort-on-fail --error-printer -o $@ $<
 
-$(nodist_samltest_SOURCES): %.cpp: %.h
-	$(MAKE) do-cxxtestgen HFILE=$< CPPFILE=$@
+$(samltest_h:.h=.cpp): %.cpp: %.h
+	$(CXXTEST) --have-eh --have-std --abort-on-fail --part -o $@ $<
 
 samltest_CXXFLAGS = \
     $(xerces_CFLAGS) \

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