X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=blobdiff_plain;f=samltest%2FMakefile.am;h=124f4ce23575b08493f6457fdcc462436aa3c5d9;hp=706d38b4442d88b31fc951b46c8a29943f3f6df8;hb=HEAD;hpb=19a320b1a8d5c733503a4b1aa842865d59b25d24

diff --git a/samltest/Makefile.am b/samltest/Makefile.am
index 706d38b..124f4ce 100644
--- a/samltest/Makefile.am
+++ b/samltest/Makefile.am
@@ -14,13 +14,14 @@ samltest_h = \
     SAMLArtifactType0002Test.h \
     SAMLArtifactType0004Test.h \
     ArtifactMapTest.h \
+    CookieTest.h \
     encryption/EncryptedAssertionTest.h \
     signature/SAML1AssertionTest.h \
     signature/SAML1RequestTest.h \
     signature/SAML1ResponseTest.h \
     signature/SAML2AssertionTest.h \
-    security/AbstractPKIXTrustEngineTest.h \
     security/ExplicitKeyTrustEngineTest.h \
+    security/StaticPKIXTrustEngineTest.h \
     saml1/core/impl/ActionTest.h \
     saml1/core/impl/AdviceTest.h \
     saml1/core/impl/AssertionIDReferenceTest.h \
@@ -33,6 +34,7 @@ samltest_h = \
     saml1/core/impl/AuthenticationStatementTest.h \
     saml1/binding/SAML1ArtifactTest.h \
     saml1/binding/SAML1POSTTest.h \
+    saml1/profile/SAML1PolicyTest.h \
     saml2/core/impl/Action20Test.h \
     saml2/core/impl/Advice20Test.h \
     saml2/core/impl/Artifact20Test.h \
@@ -93,19 +95,24 @@ samltest_h = \
     saml2/binding/SAML2ArtifactTest.h \
     saml2/binding/SAML2POSTTest.h \
     saml2/binding/SAML2RedirectTest.h \
-    saml2/metadata/XMLMetadataProviderTest.h
+    saml2/metadata/XMLMetadataProviderTest.h \
+    saml2/profile/SAML2PolicyTest.h
 
 noinst_HEADERS = \
-	binding.h \
+    binding.h \
     internal.h \
-    signature/SAMLSignatureTestBase.h
+    signature/SAMLSignatureTestBase.h \
+    $(samltest_h)
 
 nodist_samltest_SOURCES = $(samltest_h:.h=.cpp)
 
+if BUILD_UNITTEST
+BUILT_SOURCES = $(nodist_samltest_SOURCES)
 CLEANFILES = $(nodist_samltest_SOURCES)
+endif
 
 do-cxxtestgen:
-	if test $(HFILE) = "samltest.h"; then \
+	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); \
@@ -116,4 +123,4 @@ $(nodist_samltest_SOURCES): %.cpp: %.h
 
 samltest_LDADD = $(top_builddir)/saml/libsaml.la
 
-EXTRA_DIST = samltest.vcproj $(samltest_h) data
+EXTRA_DIST = samltest.vcxproj samltest.vcxproj.filters data