X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=xmltoolingtest%2FMakefile.am;h=33e439261d3a6f4dbb6a3ad79af503294605e3f5;hb=fe799793a4aced0cf8a21bb1c4c401215e04c8c6;hp=9430f4145dcbf4f8f9eec184fc7f8bee72941881;hpb=a21d1f24fc3fb85928b014b69c0e6916dcb66955;p=shibboleth%2Fcpp-xmltooling.git

diff --git a/xmltoolingtest/Makefile.am b/xmltoolingtest/Makefile.am
index 9430f41..33e4392 100644
--- a/xmltoolingtest/Makefile.am
+++ b/xmltoolingtest/Makefile.am
@@ -1,10 +1,20 @@
 AUTOMAKE_OPTIONS = foreign
 
 if BUILD_UNITTEST
+
 bin_PROGRAMS = xmltoolingtest
-xmltoolingtest_CXXFLAGS = $(CXXFLAGS) $(CXXTESTFLAGS)
+xmltoolingtest_CXXFLAGS = $(CXXTESTFLAGS)
+if BUILD_XMLSEC
+xmltoolingtest_LDFLAGS = $(XMLSEC_LIBS)
+xmltoolingtest_LDADD = $(top_builddir)/xmltooling/libxmltooling.la
+else
+xmltoolingtest_LDADD = $(top_builddir)/xmltooling/libxmltooling-lite.la
+endif
+
 else
+
 bin_PROGRAMS = 
+
 endif
 
 if BUILD_XMLSEC
@@ -12,6 +22,8 @@ xmlsec_sources = \
     EncryptionTest.h \
     FilesystemCredentialResolverTest.h \
     InlineKeyResolverTest.h \
+    MemoryStorageServiceTest.h \
+    SecurityHelperTest.h \
     SignatureTest.h
 else
 xmlsec_sources =
@@ -23,6 +35,7 @@ xmltoolingtest_h = \
     KeyInfoTest.h \
     MarshallingTest.h \
     UnmarshallingTest.h \
+    TemplateEngineTest.h \
     xmltoolingtest.h \
     ${xmlsec_sources}
 
@@ -43,6 +56,4 @@ do-cxxtestgen:
 $(nodist_xmltoolingtest_SOURCES): %.cpp: %.h
 	$(MAKE) do-cxxtestgen HFILE=$< CPPFILE=$@
 
-xmltoolingtest_LDADD = $(top_builddir)/xmltooling/libxmltooling.la
-
 EXTRA_DIST = xmltoolingtest.vcproj $(xmltoolingtest_h) data