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

diff --git a/samltest/Makefile.am b/samltest/Makefile.am
index 7e7315b..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
@@ -14,6 +14,7 @@ samltest_h = \
     SAMLArtifactType0002Test.h \
     SAMLArtifactType0004Test.h \
     ArtifactMapTest.h \
+    CookieTest.h \
     encryption/EncryptedAssertionTest.h \
     signature/SAML1AssertionTest.h \
     signature/SAML1RequestTest.h \
@@ -98,16 +99,20 @@ samltest_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); \
@@ -118,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