X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2FMakefile.am;h=1dab792eb5a7be26e7105b2e01575087bafc8c28;hb=88db1dea04530c681ed8aa2ec853125fa771acb0;hp=eb19340df80d58e06f2d10913f4ea5767d336226;hpb=c3cd4ec3fa87d0ad3c6f65c1a5e15f548b1b6cc2;p=shibboleth%2Fcpp-opensaml.git

diff --git a/saml/Makefile.am b/saml/Makefile.am
index eb19340..1dab792 100644
--- a/saml/Makefile.am
+++ b/saml/Makefile.am
@@ -84,7 +84,7 @@ saml2bindinclude_HEADERS = \
 	
 saml2mdinclude_HEADERS = \
 	saml2/metadata/AbstractMetadataProvider.h \
-	saml2/metadata/ChainingMetadataProvider.h \
+	saml2/metadata/DiscoverableMetadataProvider.h \
 	saml2/metadata/DynamicMetadataProvider.h \
 	saml2/metadata/EndpointManager.h \
 	saml2/metadata/Metadata.h \
@@ -104,6 +104,7 @@ noinst_HEADERS = \
 
 libsaml_la_SOURCES = \
 	SAMLConfig.cpp \
+    version.cpp \
 	binding/impl/ArtifactMap.cpp \
 	binding/impl/ClientCertAuthRule.cpp \
 	binding/impl/MessageDecoder.cpp \
@@ -116,8 +117,8 @@ libsaml_la_SOURCES = \
 	binding/impl/SOAPClient.cpp \
 	binding/impl/XMLSigningRule.cpp \
 	profile/impl/AudienceRestrictionRule.cpp \
-    profile/impl/ConditionsRule.cpp \
-    profile/impl/IgnoreRule.cpp \
+	profile/impl/ConditionsRule.cpp \
+	profile/impl/IgnoreRule.cpp \
 	saml1/core/impl/AssertionsImpl.cpp \
 	saml1/core/impl/AssertionsSchemaValidators.cpp \
 	saml1/core/impl/ProtocolsImpl.cpp \
@@ -132,8 +133,9 @@ libsaml_la_SOURCES = \
 	saml1/binding/impl/SAML1SOAPDecoder.cpp \
 	saml1/binding/impl/SAML1SOAPEncoder.cpp \
 	saml1/binding/impl/SAML1SOAPClient.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 \
@@ -142,11 +144,17 @@ libsaml_la_SOURCES = \
 	saml2/metadata/impl/AbstractMetadataProvider.cpp \
 	saml2/metadata/impl/BlacklistMetadataFilter.cpp \
 	saml2/metadata/impl/ChainingMetadataProvider.cpp \
+	saml2/metadata/impl/DiscoverableMetadataProvider.cpp \
 	saml2/metadata/impl/DynamicMetadataProvider.cpp \
+	saml2/metadata/impl/EntityRoleMetadataFilter.cpp \
+	saml2/metadata/impl/FolderMetadataProvider.cpp \
+	saml2/metadata/impl/MetadataCredentialContext.cpp \
+	saml2/metadata/impl/MetadataCredentialCriteria.cpp \
 	saml2/metadata/impl/MetadataImpl.cpp \
 	saml2/metadata/impl/MetadataProvider.cpp \
 	saml2/metadata/impl/MetadataSchemaValidators.cpp \
 	saml2/metadata/impl/NullMetadataProvider.cpp \
+	saml2/metadata/impl/ObservableMetadataProvider.cpp \
 	saml2/metadata/impl/SignatureMetadataFilter.cpp \
 	saml2/metadata/impl/RequireValidUntilMetadataFilter.cpp \
 	saml2/metadata/impl/WhitelistMetadataFilter.cpp \
@@ -155,9 +163,9 @@ libsaml_la_SOURCES = \
 	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/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 \
@@ -166,9 +174,11 @@ libsaml_la_SOURCES = \
 	saml2/binding/impl/SAML2SOAPDecoder.cpp \
 	saml2/binding/impl/SAML2SOAPEncoder.cpp \
 	saml2/binding/impl/SAML2SOAPClient.cpp \
-	saml2/profile/Assertion20Validator.cpp \
-	saml2/profile/BrowserSSOProfile20Validator.cpp \
-	saml2/profile/SAML2AssertionPolicy.cpp \
+	saml2/profile/impl/Assertion20Validator.cpp \
+	saml2/profile/impl/BrowserSSOProfile20Validator.cpp \
+	saml2/profile/impl/BearerConfirmationRule.cpp \
+	saml2/profile/impl/DelegationRestrictionRule.cpp \
+	saml2/profile/impl/SAML2AssertionPolicy.cpp \
 	encryption/EncryptedKeyResolver.cpp \
 	signature/ContentReference.cpp \
 	signature/SignatureProfileValidator.cpp \
@@ -177,12 +187,12 @@ libsaml_la_SOURCES = \
 
 # this is different from the project version
 # http://sources.redhat.com/autobook/autobook/autobook_91.html
-libsaml_la_LDFLAGS = -version-info 4:0:0
+libsaml_la_LDFLAGS = -version-info 8:0:0
 
 install-exec-hook:
 	for la in $(lib_LTLIBRARIES) ; do rm -f $(DESTDIR)$(libdir)/$$la ; done
 
-EXTRA_DIST = saml.vcproj zlib resource.h saml.rc
+EXTRA_DIST = saml.vcxproj saml.vcxproj.filters resource.h saml.rc
 
 dist-hook:
 	rm -rf `find $(distdir)/zlib -name .svn`