X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=blobdiff_plain;f=saml%2FMakefile.am;h=057ba3d0267d2fb5afc6860e03b88e49a0c5203c;hp=5a7e28537bf0939a0ee5fd47e6f739d26769ec64;hb=4f13d41e6fb5c89be08b56afd964c9972f234b36;hpb=a30857e2c0f4bcd1817aa2939ffdc0856e93a533

diff --git a/saml/Makefile.am b/saml/Makefile.am
index 5a7e285..057ba3d 100644
--- a/saml/Makefile.am
+++ b/saml/Makefile.am
@@ -18,13 +18,18 @@ saml1bindincludedir = $(includedir)/saml/saml1/binding
 
 saml1coreincludedir = $(includedir)/saml/saml1/core
 
+saml1profincludedir = $(includedir)/saml/saml1/profile
+
 saml2bindincludedir = $(includedir)/saml/saml2/binding
 
 saml2coreincludedir = $(includedir)/saml/saml2/core
 
 saml2mdincludedir = $(includedir)/saml/saml2/metadata
 
+saml2profincludedir = $(includedir)/saml/saml2/profile
+
 libsamlinclude_HEADERS = \
+	Assertion.h \
 	base.h \
 	exceptions.h \
 	version.h \
@@ -33,20 +38,12 @@ libsamlinclude_HEADERS = \
 
 samlbindinclude_HEADERS = \
 	binding/ArtifactMap.h \
-	binding/ClientCertAuthRule.h \
-	binding/GenericRequest.h \
-	binding/GenericResponse.h \
-	binding/HTTPRequest.h \
-	binding/HTTPResponse.h \
 	binding/MessageDecoder.h \
 	binding/MessageEncoder.h \
-	binding/MessageFlowRule.h \
 	binding/SAMLArtifact.h \
 	binding/SecurityPolicy.h \
 	binding/SecurityPolicyRule.h \
-	binding/SimpleSigningRule.h \
-	binding/URLEncoder.h \
-	binding/XMLSigningRule.h
+	binding/SOAPClient.h
 
 encinclude_HEADERS = \
 	encryption/EncryptedKeyResolver.h
@@ -57,6 +54,7 @@ siginclude_HEADERS = \
 	signature/SignatureProfileValidator.h
 
 utilinclude_HEADERS = \
+	util/CommonDomainCookie.h \
 	util/SAMLConstants.h
 
 saml1coreinclude_HEADERS = \
@@ -66,12 +64,12 @@ saml1coreinclude_HEADERS = \
 saml1bindinclude_HEADERS = \
 	saml1/binding/SAMLArtifactType0001.h \
 	saml1/binding/SAMLArtifactType0002.h \
-	saml1/binding/SAML1ArtifactDecoder.h \
-	saml1/binding/SAML1ArtifactEncoder.h \
-	saml1/binding/SAML1POSTDecoder.h \
-	saml1/binding/SAML1POSTEncoder.h \
-	saml1/binding/SAML1SOAPDecoder.h \
-	saml1/binding/SAML1SOAPEncoder.h
+	saml1/binding/SAML1MessageDecoder.h \
+	saml1/binding/SAML1SOAPClient.h
+
+saml1profinclude_HEADERS = \
+	saml1/profile/AssertionValidator.h \
+	saml1/profile/BrowserSSOProfileValidator.h
 
 saml2coreinclude_HEADERS = \
 	saml2/core/Assertions.h \
@@ -80,25 +78,26 @@ saml2coreinclude_HEADERS = \
 saml2bindinclude_HEADERS = \
 	saml2/binding/SAML2Artifact.h \
 	saml2/binding/SAML2ArtifactType0004.h \
-	saml2/binding/SAML2ArtifactDecoder.h \
-	saml2/binding/SAML2ArtifactEncoder.h \
-	saml2/binding/SAML2POSTDecoder.h \
-	saml2/binding/SAML2POSTEncoder.h \
+	saml2/binding/SAML2MessageDecoder.h \
 	saml2/binding/SAML2Redirect.h \
-	saml2/binding/SAML2RedirectDecoder.h \
-	saml2/binding/SAML2RedirectEncoder.h \
-	saml2/binding/SAML2SOAPDecoder.h \
-	saml2/binding/SAML2SOAPEncoder.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/MetadataKeyInfoIterator.h \
 	saml2/metadata/MetadataProvider.h \
 	saml2/metadata/ObservableMetadataProvider.h
 
+saml2profinclude_HEADERS = \
+	saml2/profile/AssertionValidator.h \
+	saml2/profile/BrowserSSOProfileValidator.h
+
 noinst_HEADERS = \
 	internal.h
 
@@ -109,10 +108,11 @@ libsaml_la_SOURCES = \
 	binding/impl/MessageDecoder.cpp \
 	binding/impl/MessageEncoder.cpp \
 	binding/impl/MessageFlowRule.cpp \
+	binding/impl/NullSecurityRule.cpp \
 	binding/impl/SAMLArtifact.cpp \
 	binding/impl/SecurityPolicy.cpp \
 	binding/impl/SimpleSigningRule.cpp \
-	binding/impl/URLEncoder.cpp \
+	binding/impl/SOAPClient.cpp \
 	binding/impl/XMLSigningRule.cpp \
 	saml1/core/impl/AssertionsImpl.cpp \
 	saml1/core/impl/AssertionsSchemaValidators.cpp \
@@ -122,10 +122,15 @@ 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/profile/AssertionValidator.cpp \
+	saml1/profile/BrowserSSOProfileValidator.cpp \
+	saml2/core/impl/Assertions.cpp \
 	saml2/core/impl/Assertions20Impl.cpp \
 	saml2/core/impl/Assertions20SchemaValidators.cpp \
 	saml2/core/impl/Protocols20Impl.cpp \
@@ -133,17 +138,22 @@ libsaml_la_SOURCES = \
 	saml2/metadata/impl/AbstractMetadataProvider.cpp \
 	saml2/metadata/impl/BlacklistMetadataFilter.cpp \
 	saml2/metadata/impl/ChainingMetadataProvider.cpp \
-	saml2/metadata/impl/FilesystemMetadataProvider.cpp \
+	saml2/metadata/impl/DynamicMetadataProvider.cpp \
 	saml2/metadata/impl/MetadataImpl.cpp \
 	saml2/metadata/impl/MetadataProvider.cpp \
 	saml2/metadata/impl/MetadataSchemaValidators.cpp \
-	saml2/metadata/impl/ObservableMetadataProvider.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 \
@@ -151,16 +161,23 @@ libsaml_la_SOURCES = \
 	saml2/binding/impl/SAML2RedirectEncoder.cpp \
 	saml2/binding/impl/SAML2SOAPDecoder.cpp \
 	saml2/binding/impl/SAML2SOAPEncoder.cpp \
+	saml2/binding/impl/SAML2SOAPClient.cpp \
+	saml2/profile/Assertion20Validator.cpp \
+	saml2/profile/BrowserSSOProfile20Validator.cpp \
 	encryption/EncryptedKeyResolver.cpp \
 	signature/ContentReference.cpp \
 	signature/SignatureProfileValidator.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 3: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`