Backport fixes from main branch and rev version.

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

diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
index 55072f9..36af47a 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 \
@@ -164,6 +166,7 @@ libshibsp_lite_la_SOURCES = \
 
 libshibsp_la_SOURCES = \
        ${common_sources} \
+       attribute/Base64AttributeDecoder.cpp \
        attribute/DOMAttributeDecoder.cpp \
        attribute/KeyInfoAttributeDecoder.cpp \
        attribute/NameIDAttributeDecoder.cpp \
@@ -173,6 +176,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 \
@@ -190,6 +194,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 \
@@ -213,8 +218,10 @@ 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 5:3:0
+libshibsp_la_LIBADD = $(XMLSEC_LIBS)
+libshibsp_lite_la_LDFLAGS = -version-info 5:3:0
+libshibsp_lite_la_LIBADD = $(LITE_LIBS)
 libshibsp_lite_la_CPPFLAGS = -DSHIBSP_LITE
 
 pkgsysconfdir = $(sysconfdir)/@PACKAGE_NAME@
@@ -247,6 +254,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