Override default package for path resolution.

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

diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
index 541860b..cb13ffb 100644 (file)
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
 
 pkgsysconfdir = $(sysconfdir)/@PACKAGE@
-xmldir = $(datadir)/xml
+pkgxmldir = $(datadir)/xml/@PACKAGE@
 
 lib_LTLIBRARIES = libshibsp.la libshibsp-lite.la
 
@@ -11,10 +11,14 @@ attrincludedir = $(includedir)/shibsp/attribute
 
 attrresincludedir = $(includedir)/shibsp/attribute/resolver
 
+attrfiltincludedir = $(includedir)/shibsp/attribute/filtering
+
 bindincludedir = $(includedir)/shibsp/binding
 
 handincludedir = $(includedir)/shibsp/handler
 
+liteincludedir = $(includedir)/shibsp/lite
+
 mdincludedir = $(includedir)/shibsp/metadata
 
 remincludedir = $(includedir)/shibsp/remoting
@@ -33,6 +37,7 @@ libshibspinclude_HEADERS = \
        RequestMapper.h \
        ServiceProvider.h \
        SessionCache.h \
+       SessionCacheEx.h \
        SPConfig.h \
        SPRequest.h \
        TransactionLog.h \
@@ -65,6 +70,7 @@ handinclude_HEADERS = \
        handler/AbstractHandler.h \
        handler/AssertionConsumerService.h \
        handler/Handler.h \
+       handler/LogoutHandler.h \
        handler/RemotedHandler.h \
        handler/SessionInitiator.h
 
@@ -98,22 +104,31 @@ common_sources = \
        AbstractSPRequest.cpp \
        Application.cpp \
        ServiceProvider.cpp \
-       SessionCache.cpp \
        SPConfig.cpp \
        attribute/Attribute.cpp \
        handler/impl/AbstractHandler.cpp \
        handler/impl/AssertionConsumerService.cpp \
        handler/impl/AssertionLookup.cpp \
+       handler/impl/ChainingLogoutInitiator.cpp \
        handler/impl/ChainingSessionInitiator.cpp \
+       handler/impl/LocalLogoutInitiator.cpp \
+       handler/impl/LogoutHandler.cpp \
+       handler/impl/MetadataGenerator.cpp \
        handler/impl/RemotedHandler.cpp \
+       handler/impl/StatusHandler.cpp \
+       handler/impl/SessionHandler.cpp \
        handler/impl/SAML1Consumer.cpp \
        handler/impl/SAML2Consumer.cpp \
        handler/impl/SAML2ArtifactResolution.cpp \
+       handler/impl/SAML2Logout.cpp \
+       handler/impl/SAML2LogoutInitiator.cpp \
+       handler/impl/SAML2NameIDMgmt.cpp \
        handler/impl/SAML2SessionInitiator.cpp \
        handler/impl/SAMLDSSessionInitiator.cpp \
        handler/impl/SessionInitiator.cpp \
        handler/impl/Shib1SessionInitiator.cpp \
        handler/impl/WAYFSessionInitiator.cpp \
+    impl/StorageServiceSessionCache.cpp \
        impl/XMLAccessControl.cpp \
        impl/XMLRequestMapper.cpp \
        impl/XMLServiceProvider.cpp \
@@ -129,7 +144,6 @@ common_sources = \
 
 libshibsp_lite_la_SOURCES = \
        ${common_sources} \
-       impl/RemotedSessionCache.cpp \
        lite/CommonDomainCookie.cpp \
        lite/SAMLConstants.cpp
 
@@ -138,34 +152,33 @@ libshibsp_la_SOURCES = \
        attribute/NameIDAttributeDecoder.cpp \
        attribute/ScopedAttributeDecoder.cpp \
        attribute/StringAttributeDecoder.cpp \
-       attribute/filtering/AttributeFilter.cpp \
-       attribute/filtering/ChainingAttributeFilter.cpp \
-       attribute/filtering/XMLAttributeFilter.cpp \
-       attribute/filtering/MatchFunctor.cpp \
-       attribute/filtering/AndMatchFunctor.cpp \
-       attribute/filtering/AnyMatchFunctor.cpp \
-       attribute/filtering/NotMatchFunctor.cpp \
-       attribute/filtering/OrMatchFunctor.cpp \
-       attribute/filtering/AttributeIssuerStringFunctor.cpp \
-       attribute/filtering/AttributeRequesterStringFunctor.cpp \
-       attribute/filtering/AttributeScopeStringFunctor.cpp \
-       attribute/filtering/AttributeValueStringFunctor.cpp \
-       attribute/filtering/AuthenticationMethodStringFunctor.cpp \
-       attribute/filtering/AttributeIssuerRegexFunctor.cpp \
-       attribute/filtering/AttributeRequesterRegexFunctor.cpp \
-       attribute/filtering/AttributeScopeRegexFunctor.cpp \
-       attribute/filtering/AttributeValueRegexFunctor.cpp \
-       attribute/filtering/AuthenticationMethodRegexFunctor.cpp \
-       attribute/filtering/NumberOfAttributeValuesFunctor.cpp \
-       attribute/filtering/AttributeIssuerInEntityGroupFunctor.cpp \
-       attribute/filtering/AttributeRequesterInEntityGroupFunctor.cpp \
-       attribute/filtering/AttributeScopeMatchesShibMDScopeFunctor.cpp \
+       attribute/filtering/impl/AttributeFilter.cpp \
+       attribute/filtering/impl/ChainingAttributeFilter.cpp \
+       attribute/filtering/impl/XMLAttributeFilter.cpp \
+       attribute/filtering/impl/MatchFunctor.cpp \
+       attribute/filtering/impl/AndMatchFunctor.cpp \
+       attribute/filtering/impl/AnyMatchFunctor.cpp \
+       attribute/filtering/impl/NotMatchFunctor.cpp \
+       attribute/filtering/impl/OrMatchFunctor.cpp \
+       attribute/filtering/impl/AttributeIssuerStringFunctor.cpp \
+       attribute/filtering/impl/AttributeRequesterStringFunctor.cpp \
+       attribute/filtering/impl/AttributeScopeStringFunctor.cpp \
+       attribute/filtering/impl/AttributeValueStringFunctor.cpp \
+       attribute/filtering/impl/AuthenticationMethodStringFunctor.cpp \
+       attribute/filtering/impl/AttributeIssuerRegexFunctor.cpp \
+       attribute/filtering/impl/AttributeRequesterRegexFunctor.cpp \
+       attribute/filtering/impl/AttributeScopeRegexFunctor.cpp \
+       attribute/filtering/impl/AttributeValueRegexFunctor.cpp \
+       attribute/filtering/impl/AuthenticationMethodRegexFunctor.cpp \
+       attribute/filtering/impl/NumberOfAttributeValuesFunctor.cpp \
+       attribute/filtering/impl/AttributeIssuerInEntityGroupFunctor.cpp \
+       attribute/filtering/impl/AttributeRequesterInEntityGroupFunctor.cpp \
+       attribute/filtering/impl/AttributeScopeMatchesShibMDScopeFunctor.cpp \
        attribute/resolver/impl/ChainingAttributeResolver.cpp \
        attribute/resolver/impl/QueryAttributeResolver.cpp \
        attribute/resolver/impl/XMLAttributeExtractor.cpp \
        binding/impl/ArtifactResolver.cpp \
        binding/impl/SOAPClient.cpp \
-       impl/StorageServiceSessionCache.cpp \
        metadata/MetadataExtImpl.cpp \
        metadata/MetadataExtSchemaValidators.cpp \
        security/PKIXTrustEngine.cpp \
@@ -174,14 +187,17 @@ libshibsp_la_SOURCES = \
 # this is different from the project version
 # http://sources.redhat.com/autobook/autobook/autobook_91.html
 libshibsp_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 1:0:0
-libshibsp_lite_la_LDFLAGS = -version-info 1:0:0
+libshibsp_lite_la_LDFLAGS = $(LITE_LIBS) -version-info 1:0:0
 libshibsp_lite_la_CPPFLAGS = -DSHIBSP_LITE
 
 paths.h: ${srcdir}/paths.h.in Makefile ${top_builddir}/config.status
        rm -f $@.tmp
        sed < ${srcdir}/$@.in > $@.tmp \
-           -e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:' \
-           -e 's:@-XMLDIR-@:${xmldir}:'
+           -e 's:@-PREFIX-@:${prefix}:g' \
+           -e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:g' \
+           -e 's:@-PKGXMLDIR-@:${pkgxmldir}:g' \
+           -e 's:@-XMLTOOLINGXMLDIR-@:${XMLTOOLINGXMLDIR}:g' \
+           -e 's:@-OPENSAMLXMLDIR-@:${OPENSAMLXMLDIR}:g'
        cmp -s $@ $@.tmp || mv $@.tmp $@
        rm -f $@.tmp