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

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

diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
index b677beb..34ce43c 100644 (file)
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -29,8 +29,10 @@ libshibspinclude_HEADERS = \
        AccessControl.h \
        Application.h \
        base.h \
+       config_pub.h \
        exceptions.h \
        paths.h \
+       GSSRequest.h \
        RequestMapper.h \
        ServiceProvider.h \
        SessionCache.h \
@@ -43,6 +45,7 @@ libshibspinclude_HEADERS = \
 attrinclude_HEADERS = \
        attribute/Attribute.h \
        attribute/AttributeDecoder.h \
+       attribute/BinaryAttribute.h \
        attribute/ExtensibleAttribute.h \
        attribute/NameIDAttribute.h \
        attribute/ScopedAttribute.h \
@@ -108,7 +111,9 @@ common_sources = \
        Application.cpp \
        ServiceProvider.cpp \
        SPConfig.cpp \
+    version.cpp \
        attribute/Attribute.cpp \
+       attribute/BinaryAttribute.cpp \
        attribute/ExtensibleAttribute.cpp \
        attribute/NameIDAttribute.cpp \
        attribute/SimpleAttribute.cpp \
@@ -121,6 +126,7 @@ common_sources = \
        handler/impl/ChainingLogoutInitiator.cpp \
        handler/impl/ChainingSessionInitiator.cpp \
        handler/impl/CookieSessionInitiator.cpp \
+       handler/impl/DiscoveryFeed.cpp \
        handler/impl/FormSessionInitiator.cpp \
        handler/impl/LocalLogoutInitiator.cpp \
        handler/impl/LogoutHandler.cpp \
@@ -163,6 +169,7 @@ libshibsp_lite_la_SOURCES = \
 
 libshibsp_la_SOURCES = \
        ${common_sources} \
+       attribute/Base64AttributeDecoder.cpp \
        attribute/DOMAttributeDecoder.cpp \
        attribute/KeyInfoAttributeDecoder.cpp \
        attribute/NameIDAttributeDecoder.cpp \
@@ -172,6 +179,7 @@ libshibsp_la_SOURCES = \
        attribute/XMLAttributeDecoder.cpp \
        attribute/filtering/impl/AttributeFilter.cpp \
        attribute/filtering/impl/ChainingAttributeFilter.cpp \
+       attribute/filtering/impl/DummyAttributeFilter.cpp \
        attribute/filtering/impl/XMLAttributeFilter.cpp \
        attribute/filtering/impl/BasicFilteringContext.cpp \
        attribute/filtering/impl/MatchFunctor.cpp \
@@ -189,6 +197,7 @@ libshibsp_la_SOURCES = \
        attribute/filtering/impl/AttributeScopeRegexFunctor.cpp \
        attribute/filtering/impl/AttributeValueRegexFunctor.cpp \
        attribute/filtering/impl/AuthenticationMethodRegexFunctor.cpp \
+       attribute/filtering/impl/NameIDQualifierStringFunctor.cpp \
        attribute/filtering/impl/NumberOfAttributeValuesFunctor.cpp \
        attribute/filtering/impl/AttributeIssuerInEntityGroupFunctor.cpp \
        attribute/filtering/impl/AttributeRequesterInEntityGroupFunctor.cpp \
@@ -212,12 +221,14 @@ 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 5:0:0
-libshibsp_lite_la_LDFLAGS = $(LITE_LIBS) -version-info 5:0:0
+libshibsp_la_LDFLAGS = -version-info 6:0:0
+libshibsp_la_LIBADD = $(XMLSEC_LIBS)
+libshibsp_lite_la_LDFLAGS = -version-info 6:0:0
+libshibsp_lite_la_LIBADD = $(LITE_LIBS)
 libshibsp_lite_la_CPPFLAGS = -DSHIBSP_LITE
 
 pkgsysconfdir = $(sysconfdir)/@PACKAGE_NAME@
-pkgxmldir = $(datadir)/xml/@PACKAGE_NAME@-@PACKAGE_VERSION@
+pkgxmldir = $(datadir)/xml/@PACKAGE_NAME@
 logdir = ${localstatedir}/log
 rundir = $(localstatedir)/run
 xmldir = $(datadir)/xml
@@ -246,6 +257,8 @@ EXTRA_DIST = \
        shibsp-lite.vcxproj \
        shibsp.vcxproj.filters \
        shibsp-lite.vcxproj.filters \
+       config_pub.h.in \
+    config_pub_win32.h\
        paths.h.in \
        resource.h \
        shibsp.rc