X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=blobdiff_plain;f=saml%2FMakefile.am;h=4d859d6e601af70a5629f1a5f22c4a6eaf36fb4f;hp=5444b1aed76b7418062a7a19bae2d03f523c281c;hb=69a716dedfd9e239bcc9206a7b8dc137b43f5f89;hpb=f3a43f14f9dd53428f9e879bb489d6a4cf2674a8

diff --git a/saml/Makefile.am b/saml/Makefile.am
index 5444b1a..4d859d6 100644
--- a/saml/Makefile.am
+++ b/saml/Makefile.am
@@ -38,10 +38,6 @@ libsamlinclude_HEADERS = \
 
 samlbindinclude_HEADERS = \
 	binding/ArtifactMap.h \
-	binding/GenericRequest.h \
-	binding/GenericResponse.h \
-	binding/HTTPRequest.h \
-	binding/HTTPResponse.h \
 	binding/MessageDecoder.h \
 	binding/MessageEncoder.h \
 	binding/SAMLArtifact.h \
@@ -58,7 +54,6 @@ siginclude_HEADERS = \
 	signature/SignatureProfileValidator.h
 
 utilinclude_HEADERS = \
-	util/CGIParser.h \
 	util/CommonDomainCookie.h \
 	util/SAMLConstants.h
 
@@ -69,6 +64,7 @@ saml1coreinclude_HEADERS = \
 saml1bindinclude_HEADERS = \
 	saml1/binding/SAMLArtifactType0001.h \
 	saml1/binding/SAMLArtifactType0002.h \
+	saml1/binding/SAML1MessageDecoder.h \
 	saml1/binding/SAML1SOAPClient.h
 
 saml1profinclude_HEADERS = \
@@ -82,14 +78,17 @@ saml2coreinclude_HEADERS = \
 saml2bindinclude_HEADERS = \
 	saml2/binding/SAML2Artifact.h \
 	saml2/binding/SAML2ArtifactType0004.h \
+	saml2/binding/SAML2MessageDecoder.h \
 	saml2/binding/SAML2Redirect.h \
 	saml2/binding/SAML2SOAPClient.h
 	
 saml2mdinclude_HEADERS = \
 	saml2/metadata/AbstractMetadataProvider.h \
 	saml2/metadata/ChainingMetadataProvider.h \
+	saml2/metadata/DynamicMetadataProvider.h \
 	saml2/metadata/EndpointManager.h \
 	saml2/metadata/Metadata.h \
+	saml2/metadata/MetadataCredentialContext.h \
 	saml2/metadata/MetadataCredentialCriteria.h \
 	saml2/metadata/MetadataFilter.h \
 	saml2/metadata/MetadataProvider.h \
@@ -97,7 +96,8 @@ saml2mdinclude_HEADERS = \
 
 saml2profinclude_HEADERS = \
 	saml2/profile/AssertionValidator.h \
-	saml2/profile/BrowserSSOProfileValidator.h
+	saml2/profile/BrowserSSOProfileValidator.h \
+	saml2/profile/SAML2AssertionPolicy.h
 
 noinst_HEADERS = \
 	internal.h
@@ -115,6 +115,9 @@ libsaml_la_SOURCES = \
 	binding/impl/SimpleSigningRule.cpp \
 	binding/impl/SOAPClient.cpp \
 	binding/impl/XMLSigningRule.cpp \
+	profile/impl/AudienceRestrictionRule.cpp \
+    profile/impl/ConditionsRule.cpp \
+    profile/impl/IgnoreRule.cpp \
 	saml1/core/impl/AssertionsImpl.cpp \
 	saml1/core/impl/AssertionsSchemaValidators.cpp \
 	saml1/core/impl/ProtocolsImpl.cpp \
@@ -123,14 +126,16 @@ libsaml_la_SOURCES = \
 	saml1/binding/impl/SAMLArtifactType0002.cpp \
 	saml1/binding/impl/SAML1ArtifactDecoder.cpp \
 	saml1/binding/impl/SAML1ArtifactEncoder.cpp \
+	saml1/binding/impl/SAML1MessageDecoder.cpp \
 	saml1/binding/impl/SAML1POSTDecoder.cpp \
 	saml1/binding/impl/SAML1POSTEncoder.cpp \
 	saml1/binding/impl/SAML1SOAPDecoder.cpp \
 	saml1/binding/impl/SAML1SOAPEncoder.cpp \
 	saml1/binding/impl/SAML1SOAPClient.cpp \
-	saml1/binding/impl/SAML1MessageRule.cpp \
-	saml1/profile/AssertionValidator.cpp \
-	saml1/profile/BrowserSSOProfileValidator.cpp \
+	saml1/profile/impl/AssertionValidator.cpp \
+	saml1/profile/impl/BrowserSSOProfileValidator.cpp \
+	saml1/profile/impl/SAML1BrowserSSORule.cpp \
+	saml2/core/impl/Assertions.cpp \
 	saml2/core/impl/Assertions20Impl.cpp \
 	saml2/core/impl/Assertions20SchemaValidators.cpp \
 	saml2/core/impl/Protocols20Impl.cpp \
@@ -138,16 +143,22 @@ libsaml_la_SOURCES = \
 	saml2/metadata/impl/AbstractMetadataProvider.cpp \
 	saml2/metadata/impl/BlacklistMetadataFilter.cpp \
 	saml2/metadata/impl/ChainingMetadataProvider.cpp \
+	saml2/metadata/impl/DynamicMetadataProvider.cpp \
 	saml2/metadata/impl/MetadataImpl.cpp \
 	saml2/metadata/impl/MetadataProvider.cpp \
 	saml2/metadata/impl/MetadataSchemaValidators.cpp \
+	saml2/metadata/impl/NullMetadataProvider.cpp \
 	saml2/metadata/impl/SignatureMetadataFilter.cpp \
+	saml2/metadata/impl/RequireValidUntilMetadataFilter.cpp \
 	saml2/metadata/impl/WhitelistMetadataFilter.cpp \
 	saml2/metadata/impl/XMLMetadataProvider.cpp \
 	saml2/binding/impl/SAML2Artifact.cpp \
 	saml2/binding/impl/SAML2ArtifactType0004.cpp \
 	saml2/binding/impl/SAML2ArtifactDecoder.cpp \
 	saml2/binding/impl/SAML2ArtifactEncoder.cpp \
+    saml2/binding/impl/SAML2ECPDecoder.cpp \
+    saml2/binding/impl/SAML2ECPEncoder.cpp \
+    saml2/binding/impl/SAML2MessageDecoder.cpp \
 	saml2/binding/impl/SAML2POSTDecoder.cpp \
 	saml2/binding/impl/SAML2POSTEncoder.cpp \
 	saml2/binding/impl/SAML2Redirect.cpp \
@@ -156,21 +167,24 @@ libsaml_la_SOURCES = \
 	saml2/binding/impl/SAML2SOAPDecoder.cpp \
 	saml2/binding/impl/SAML2SOAPEncoder.cpp \
 	saml2/binding/impl/SAML2SOAPClient.cpp \
-	saml2/binding/impl/SAML2MessageRule.cpp \
-	saml2/profile/Assertion20Validator.cpp \
-	saml2/profile/BrowserSSOProfile20Validator.cpp \
+	saml2/profile/impl/Assertion20Validator.cpp \
+	saml2/profile/impl/BrowserSSOProfile20Validator.cpp \
+    saml2/profile/impl/BearerConfirmationRule.cpp \
+	saml2/profile/impl/SAML2AssertionPolicy.cpp \
 	encryption/EncryptedKeyResolver.cpp \
 	signature/ContentReference.cpp \
 	signature/SignatureProfileValidator.cpp \
-	util/CGIParser.cpp \
 	util/CommonDomainCookie.cpp \
 	util/SAMLConstants.cpp
 
 # this is different from the project version
 # http://sources.redhat.com/autobook/autobook/autobook_91.html
-libsaml_la_LDFLAGS = -version-info 2:0:0
+libsaml_la_LDFLAGS = -version-info 4:0:0
 
 install-exec-hook:
 	for la in $(lib_LTLIBRARIES) ; do rm -f $(DESTDIR)$(libdir)/$$la ; done
 
-EXTRA_DIST = saml.vcproj
+EXTRA_DIST = saml.vcproj zlib resource.h saml.rc
+
+dist-hook:
+	rm -rf `find $(distdir)/zlib -name .svn`