X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=samltest%2FMakefile.am;h=674d6f1ba7750fed2d048583de4d83f3d93c033a;hb=9758c5cfee9778257eedd9b982084a050a416912;hp=f5de16dcf581191e935cef9ee9838f7b2d1e00bb;hpb=0ba5816a876bed78a05d9ed77db97b809927f1c0;p=shibboleth%2Fcpp-opensaml.git

diff --git a/samltest/Makefile.am b/samltest/Makefile.am
index f5de16d..674d6f1 100644
--- a/samltest/Makefile.am
+++ b/samltest/Makefile.am
@@ -1,4 +1,4 @@
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign subdir-objects
 
 if BUILD_UNITTEST
 bin_PROGRAMS = samltest
@@ -9,10 +9,19 @@ endif
 
 samltest_h = \
     samltest.h \
+    SAMLArtifactCreationTest.h \
+    SAMLArtifactType0001Test.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/ExplicitKeyTrustEngineTest.h \
+    security/StaticPKIXTrustEngineTest.h \
     saml1/core/impl/ActionTest.h \
     saml1/core/impl/AdviceTest.h \
     saml1/core/impl/AssertionIDReferenceTest.h \
@@ -23,12 +32,16 @@ samltest_h = \
     saml1/core/impl/AudienceRestrictionConditionTest.h \
     saml1/core/impl/AudienceTest.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 \
     saml2/core/impl/ArtifactResolve20Test.h \
     saml2/core/impl/ArtifactResponse20Test.h \
     saml2/core/impl/Assertion20Test.h \
+    saml2/core/impl/AssertionIDRef20Test.h \
     saml2/core/impl/AssertionIDRequest20Test.h \
     saml2/core/impl/AssertionURIRef20Test.h \
     saml2/core/impl/Attribute20Test.h \
@@ -74,24 +87,32 @@ samltest_h = \
     saml2/core/impl/StatusCode20Test.h \
     saml2/core/impl/StatusDetail20Test.h \
     saml2/core/impl/StatusMessage20Test.h \
-    saml2/core/impl/StatusResponse20Test.h\
     saml2/core/impl/Subject20Test.h\
     saml2/core/impl/SubjectConfirmation20Test.h\
     saml2/core/impl/SubjectConfirmationData20Test.h\
     saml2/core/impl/SubjectLocality20Test.h\
     saml2/core/impl/Terminate20Test.h \
-    saml2/metadata/FilesystemMetadataProviderTest.h
+    saml2/binding/SAML2ArtifactTest.h \
+    saml2/binding/SAML2POSTTest.h \
+    saml2/binding/SAML2RedirectTest.h \
+    saml2/metadata/XMLMetadataProviderTest.h \
+    saml2/profile/SAML2PolicyTest.h
 
 noinst_HEADERS = \
+    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); \
@@ -102,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