X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=xmltoolingtest%2FMakefile.am;h=43146740b7b7855ee2f219ab9ff31ecfe176d829;hb=fb770e37f24d038a9b082b8f780edd654501dbd4;hp=041b563eea0efc52c49aab4e99908411b30ee615;hpb=7e9e728f583a229392a8a6390831416994e219ca;p=shibboleth%2Fcpp-xmltooling.git

diff --git a/xmltoolingtest/Makefile.am b/xmltoolingtest/Makefile.am
index 041b563..4314674 100644
--- a/xmltoolingtest/Makefile.am
+++ b/xmltoolingtest/Makefile.am
@@ -1,34 +1,50 @@
-AUTOMAKE_OPTIONS = foreign
-
-if BUILD_UNITTEST
-bin_PROGRAMS = xmltoolingtest
-xmltoolingtest_CXXFLAGS = $(CXXFLAGS) $(CXXTESTFLAGS)
-bin_PROGRAMS = 
-endif
-
-xmltoolingtest_h = \
-	xmltoolingtest.h \
-	MarshallingTest.h \
-	UnknownText.h \
-	UnmarshallingTest.h
-
-noinst_HEADERS = \
-	XMLObjectBaseTestCase.h
-
-nodist_xmltoolingtest_SOURCES = $(xmltoolingtest_h:.h=.cpp)
-
-CLEANFILES = $(nodist_xmltoolingtest_SOURCES)
-
-do-cxxtestgen:
-	if test $(HFILE) = "xmltoolingtest.h"; 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;
-
-$(nodist_xmltoolingtest_SOURCES): %.cpp: %.h
-	$(MAKE) do-cxxtestgen HFILE=$< CPPFILE=$@
-
-xmltoolingtest_LDADD = $(top_builddir)/xmltooling/libxmltooling.la
-
-EXTRA_DIST = xmltoolingtest.vcproj $(xmltoolingtest_h) data
+AUTOMAKE_OPTIONS = foreign
+
+if BUILD_UNITTEST
+bin_PROGRAMS = xmltoolingtest
+xmltoolingtest_CXXFLAGS = $(CXXFLAGS) $(CXXTESTFLAGS)
+else
+bin_PROGRAMS = 
+endif
+
+if BUILD_XMLSEC
+xmlsec_sources = \
+    EncryptionTest.h \
+    FilesystemCredentialResolverTest.h \
+    InlineKeyResolverTest.h \
+    SignatureTest.h
+else
+xmlsec_sources =
+endif
+
+xmltoolingtest_h = \
+    ComplexXMLObjectTest.h \
+    ExceptionTest.h \
+    KeyInfoTest.h \
+    MarshallingTest.h \
+    MemoryStorageServiceTest.h \
+    UnmarshallingTest.h \
+    TemplateEngineTest.h \
+    xmltoolingtest.h \
+    ${xmlsec_sources}
+
+noinst_HEADERS = \
+    XMLObjectBaseTestCase.h
+
+nodist_xmltoolingtest_SOURCES = $(xmltoolingtest_h:.h=.cpp)
+
+CLEANFILES = $(nodist_xmltoolingtest_SOURCES)
+
+do-cxxtestgen:
+	if test $(HFILE) = "xmltoolingtest.h"; 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;
+
+$(nodist_xmltoolingtest_SOURCES): %.cpp: %.h
+	$(MAKE) do-cxxtestgen HFILE=$< CPPFILE=$@
+
+xmltoolingtest_LDADD = $(top_builddir)/xmltooling/libxmltooling.la
+
+EXTRA_DIST = xmltoolingtest.vcproj $(xmltoolingtest_h) data