Unix installation fixes

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

diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
index b35e327..b851cff 100644 (file)
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -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
@@ -69,7 +73,6 @@ handinclude_HEADERS = \
        handler/SessionInitiator.h
 
 liteinclude_HEADERS = \
-       lite/CGIParser.h \
        lite/CommonDomainCookie.h \
        lite/SAMLConstants.h
 
@@ -85,6 +88,7 @@ secinclude_HEADERS = \
        security/SecurityPolicy.h
 
 utilinclude_HEADERS = \
+       util/CGIParser.h \
        util/DOMPropertySet.h \
        util/PropertySet.h \
        util/SPConstants.h \
@@ -122,6 +126,7 @@ common_sources = \
        remoting/impl/SocketListener.cpp \
        remoting/impl/TCPListener.cpp \
        remoting/impl/UnixListener.cpp \
+       util/CGIParser.cpp \
        util/DOMPropertySet.cpp \
        util/SPConstants.cpp \
        util/TemplateParameters.cpp
@@ -129,7 +134,6 @@ common_sources = \
 libshibsp_lite_la_SOURCES = \
        ${common_sources} \
        impl/RemotedSessionCache.cpp \
-       lite/CGIParser.cpp \
        lite/CommonDomainCookie.cpp \
        lite/SAMLConstants.cpp
 
@@ -138,28 +142,28 @@ 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 \
@@ -180,8 +184,8 @@ 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:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:g' \
+           -e 's:@-XMLDIR-@:${xmldir}:g'
        cmp -s $@ $@.tmp || mv $@.tmp $@
        rm -f $@.tmp