X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=xmltoolingtest%2FMakefile.am;h=33e439261d3a6f4dbb6a3ad79af503294605e3f5;hb=10942e2040fe67f6d8903385b274e83d58965aa2;hp=6705fd901ffe60de7b4379da7e8845ad7a951f28;hpb=94a433897896656a12cc14881cdea102e21ae69d;p=shibboleth%2Fcpp-xmltooling.git

diff --git a/xmltoolingtest/Makefile.am b/xmltoolingtest/Makefile.am
index 6705fd9..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 =
@@ -22,7 +34,6 @@ xmltoolingtest_h = \
     ExceptionTest.h \
     KeyInfoTest.h \
     MarshallingTest.h \
-    MemoryStorageServiceTest.h \
     UnmarshallingTest.h \
     TemplateEngineTest.h \
     xmltoolingtest.h \
@@ -45,10 +56,4 @@ do-cxxtestgen:
 $(nodist_xmltoolingtest_SOURCES): %.cpp: %.h
 	$(MAKE) do-cxxtestgen HFILE=$< CPPFILE=$@
 
-if BUILD_XMLSEC
-xmltoolingtest_LDADD = $(top_builddir)/xmltooling/libxmltooling.la
-else
-xmltoolingtest_LDADD = $(top_builddir)/xmltooling/libxmltooling-lite.la
-endif
-
 EXTRA_DIST = xmltoolingtest.vcproj $(xmltoolingtest_h) data