https://bugs.internet2.edu/jira/browse/SSPCPP-293

[shibboleth/sp.git] / shibsp / Makefile.am

diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
index baa88ad..7184a59 100644 (file)
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -87,7 +87,8 @@ reminclude_HEADERS = \
        
 secinclude_HEADERS = \
        security/PKIXTrustEngine.h \
-       security/SecurityPolicy.h
+       security/SecurityPolicy.h \
+       security/SecurityPolicyProvider.h
 
 utilinclude_HEADERS = \
        util/CGIParser.h \
@@ -107,6 +108,10 @@ common_sources = \
        SPConfig.cpp \
        attribute/Attribute.cpp \
        attribute/ExtensibleAttribute.cpp \
+       attribute/NameIDAttribute.cpp \
+       attribute/SimpleAttribute.cpp \
+       attribute/ScopedAttribute.cpp \
+       attribute/XMLAttribute.cpp \
        handler/impl/AbstractHandler.cpp \
        handler/impl/AssertionConsumerService.cpp \
        handler/impl/AssertionLookup.cpp \
@@ -164,6 +169,7 @@ libshibsp_la_SOURCES = \
        attribute/filtering/impl/AttributeFilter.cpp \
        attribute/filtering/impl/ChainingAttributeFilter.cpp \
        attribute/filtering/impl/XMLAttributeFilter.cpp \
+       attribute/filtering/impl/BasicFilteringContext.cpp \
        attribute/filtering/impl/MatchFunctor.cpp \
        attribute/filtering/impl/AndMatchFunctor.cpp \
        attribute/filtering/impl/AnyMatchFunctor.cpp \
@@ -192,20 +198,22 @@ libshibsp_la_SOURCES = \
        attribute/resolver/impl/XMLAttributeExtractor.cpp \
        binding/impl/ArtifactResolver.cpp \
        binding/impl/SOAPClient.cpp \
+       impl/XMLSecurityPolicyProvider.cpp \
        metadata/DynamicMetadataProvider.cpp \
        metadata/MetadataExtImpl.cpp \
        metadata/MetadataExtSchemaValidators.cpp \
+       metadata/MetadataProviderCriteria.cpp \
        security/PKIXTrustEngine.cpp \
        security/SecurityPolicy.cpp
 
 # this is different from the project version
 # http://sources.redhat.com/autobook/autobook/autobook_91.html
-libshibsp_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 4:0:0
-libshibsp_lite_la_LDFLAGS = $(LITE_LIBS) -version-info 4:0:0
+libshibsp_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 5:0:0
+libshibsp_lite_la_LDFLAGS = $(LITE_LIBS) -version-info 5:0:0
 libshibsp_lite_la_CPPFLAGS = -DSHIBSP_LITE
 
-pkgsysconfdir = $(sysconfdir)/@PACKAGE@
-pkgxmldir = $(datadir)/xml/@PACKAGE@
+pkgsysconfdir = $(sysconfdir)/@PACKAGE_NAME@
+pkgxmldir = $(datadir)/xml/@PACKAGE_NAME@-@PACKAGE_VERSION@
 logdir = ${localstatedir}/log
 rundir = $(localstatedir)/run
 xmldir = $(datadir)/xml
@@ -229,5 +237,12 @@ paths.h: ${srcdir}/paths.h.in Makefile ${top_builddir}/config.status
 install-exec-hook:
        for la in $(lib_LTLIBRARIES) ; do rm -f $(DESTDIR)$(libdir)/$$la ; done
 
-EXTRA_DIST = shibsp.vcproj shibsp-lite.vcproj paths.h.in resource.h shibsp.rc
+EXTRA_DIST = \
+       shibsp.vcxproj \
+       shibsp-lite.vcxproj \
+       shibsp.vcxproj.filters \
+       shibsp-lite.vcxproj.filters \
+       paths.h.in \
+       resource.h \
+       shibsp.rc
 BUILT_SOURCES = paths.h