X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=blobdiff_plain;f=saml%2FMakefile.am;h=76b13936b0f07f4d55c77579cdd61a311af45a65;hp=09daad38e10e5f9da5ffc17e7849b2b6ad9e9e51;hb=db44995ea6c326dcb51387a888da823c5d86c866;hpb=3905eb61129d5ad9fb033a2e2c258650d1f9b408

diff --git a/saml/Makefile.am b/saml/Makefile.am
index 09daad3..76b1393 100644
--- a/saml/Makefile.am
+++ b/saml/Makefile.am
@@ -84,9 +84,10 @@ 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/EntityMatcher.h \
 	saml2/metadata/Metadata.h \
 	saml2/metadata/MetadataCredentialContext.h \
 	saml2/metadata/MetadataCredentialCriteria.h \
@@ -104,6 +105,7 @@ noinst_HEADERS = \
 
 libsaml_la_SOURCES = \
 	SAMLConfig.cpp \
+    version.cpp \
 	binding/impl/ArtifactMap.cpp \
 	binding/impl/ClientCertAuthRule.cpp \
 	binding/impl/MessageDecoder.cpp \
@@ -116,8 +118,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 \
@@ -143,12 +145,20 @@ 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/EntityAttributesEntityMatcher.cpp \
+    saml2/metadata/impl/EntityAttributesMetadataFilter.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/NameEntityMatcher.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 \
@@ -157,9 +167,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 \
@@ -170,8 +180,8 @@ libsaml_la_SOURCES = \
 	saml2/binding/impl/SAML2SOAPClient.cpp \
 	saml2/profile/impl/Assertion20Validator.cpp \
 	saml2/profile/impl/BrowserSSOProfile20Validator.cpp \
-    saml2/profile/impl/BearerConfirmationRule.cpp \
-    saml2/profile/impl/DelegationRestrictionRule.cpp \
+	saml2/profile/impl/BearerConfirmationRule.cpp \
+	saml2/profile/impl/DelegationRestrictionRule.cpp \
 	saml2/profile/impl/SAML2AssertionPolicy.cpp \
 	encryption/EncryptedKeyResolver.cpp \
 	signature/ContentReference.cpp \
@@ -181,12 +191,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:5: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`