Multi-line svn commit, see body.

[shibboleth/cpp-xmltooling.git] / xmltooling / Makefile.am

diff --git a/xmltooling/Makefile.am b/xmltooling/Makefile.am
index f4368b3..87a5bae 100644 (file)
--- a/xmltooling/Makefile.am
+++ b/xmltooling/Makefile.am
@@ -32,6 +32,7 @@ libxmltoolinginclude_HEADERS = \
        AbstractXMLObject.h \
        AttributeExtensibleXMLObject.h \
        base.h \
+       ConcreteXMLObjectBuilder.h \
        config_pub.h \
        ElementExtensibleXMLObject.h \
        ElementProxy.h \
@@ -76,6 +77,7 @@ secinclude_HEADERS = \
        security/KeyInfoCredentialContext.h \
        security/KeyInfoResolver.h \
        security/OpenSSLCredential.h \
+       security/SecurityHelper.h \
        security/SignatureTrustEngine.h \
        security/TrustEngine.h \
        security/X509Credential.h \
@@ -98,9 +100,13 @@ soapinclude_HEADERS = \
        soap/OpenSSLSOAPTransport.h
 
 utilinclude_HEADERS = \
+    util/CurlNetAccessor.hpp \
+    util/CurlURLInputStream.hpp \
        util/DateTime.h \
        util/NDC.h \
        util/ParserPool.h \
+       util/PathResolver.h \
+       util/Predicates.h \
        util/ReloadableXMLFile.h \
        util/ReplayCache.h \
        util/StorageService.h \
@@ -122,6 +128,8 @@ xmlsec_sources = \
        encryption/impl/Decrypter.cpp \
        encryption/impl/EncryptedKeyResolver.cpp \
        encryption/impl/Encrypter.cpp \
+    encryption/impl/EncryptionImpl.cpp \
+    encryption/impl/EncryptionSchemaValidators.cpp \
        impl/MemoryStorageService.cpp \
        security/impl/AbstractPKIXTrustEngine.cpp \
        security/impl/BasicX509Credential.cpp \
@@ -134,11 +142,17 @@ xmlsec_sources = \
        security/impl/InlineKeyResolver.cpp \
        security/impl/KeyInfoResolver.cpp \
        security/impl/OpenSSLCryptoX509CRL.cpp \
+       security/impl/SecurityHelper.cpp \
+       security/impl/StaticPKIXTrustEngine.cpp \
        security/impl/TrustEngine.cpp \
        security/impl/XSECCryptoX509CRL.cpp \
+    signature/impl/KeyInfoImpl.cpp \
+    signature/impl/KeyInfoSchemaValidators.cpp \
        signature/impl/SignatureValidator.cpp \
        signature/impl/XMLSecSignatureImpl.cpp \
        soap/impl/CURLSOAPTransport.cpp \
+       util/CurlNetAccessor.cpp \
+       util/CurlURLInputStream.cpp \
        util/ReplayCache.cpp \
        util/StorageService.cpp
 
@@ -160,20 +174,18 @@ common_sources = \
        unicode.cpp \
        XMLObjectBuilder.cpp \
        XMLToolingConfig.cpp \
-       encryption/impl/EncryptionImpl.cpp \
-       encryption/impl/EncryptionSchemaValidators.cpp \
        impl/AnyElement.cpp \
        impl/UnknownElement.cpp \
        io/AbstractXMLObjectMarshaller.cpp \
        io/AbstractXMLObjectUnmarshaller.cpp \
-       signature/impl/KeyInfoImpl.cpp \
-       signature/impl/KeyInfoSchemaValidators.cpp \
+       io/HTTPRequest.cpp \
        soap/impl/SOAPClient.cpp \
        soap/impl/SOAPImpl.cpp \
        soap/impl/SOAPSchemaValidators.cpp \
        util/DateTime.cpp \
        util/NDC.cpp \
        util/ParserPool.cpp \
+       util/PathResolver.cpp \
        util/ReloadableXMLFile.cpp \
        util/TemplateEngine.cpp \
        util/URLEncoder.cpp \
@@ -185,10 +197,10 @@ common_sources = \
 libxmltooling_lite_la_SOURCES = \
        ${common_sources}
 libxmltooling_lite_la_CPPFLAGS = -DXMLTOOLING_LITE
-libxmltooling_lite_la_LDFLAGS = -version-info 1:0:0
+libxmltooling_lite_la_LDFLAGS = -version-info 2:0:0
 
 if BUILD_XMLSEC
-libxmltooling_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 1:0:0
+libxmltooling_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 2:0:0
 libxmltooling_la_SOURCES = \
        ${common_sources} \
        ${xmlsec_sources}
@@ -197,4 +209,11 @@ endif
 install-exec-hook:
        for la in $(lib_LTLIBRARIES) ; do rm -f $(DESTDIR)$(libdir)/$$la ; done
 
-EXTRA_DIST = xmltooling.vcproj xmltooling-lite.vcproj config_pub.h.in config_pub_win32.h
+EXTRA_DIST = \
+    xmltooling.vcproj \
+    xmltooling-lite.vcproj \
+    config_pub.h.in \
+    config_pub_win32.h\
+    resource.h\
+    xmltooling.rc \
+    util/Win32Threads.cpp