X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=xmltoolingtest%2FMakefile.am;h=5698e75a4b1e55783f89d84e122b24a9b155493a;hb=aed9b61b70fcc321f6e86f07b633dacbcc364d3d;hp=c3243c9c7014b606efc26146e191a627960e7656;hpb=676c0279ec7584dbb046c84ed9768c726afc009d;p=shibboleth%2Fcpp-xmltooling.git

diff --git a/xmltoolingtest/Makefile.am b/xmltoolingtest/Makefile.am
index c3243c9..5698e75 100644
--- a/xmltoolingtest/Makefile.am
+++ b/xmltoolingtest/Makefile.am
@@ -1,18 +1,44 @@
 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
+xmlsec_sources = \
+    EncryptionTest.h \
+    FilesystemCredentialResolverTest.h \
+    InlineKeyResolverTest.h \
+    MemoryStorageServiceTest.h \
+    SecurityHelperTest.h \
+    SignatureTest.h
+else
+xmlsec_sources =
 endif
 
 xmltoolingtest_h = \
     ComplexXMLObjectTest.h \
+    DateTimeTest.h \
+    ExceptionTest.h \
+    KeyInfoTest.h \
     MarshallingTest.h \
-    UnknownTest.h \
     UnmarshallingTest.h \
-    xmltoolingtest.h
+    TemplateEngineTest.h \
+    xmltoolingtest.h \
+    ${xmlsec_sources}
 
 noinst_HEADERS = \
     XMLObjectBaseTestCase.h
@@ -31,6 +57,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