X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-xmltooling.git;a=blobdiff_plain;f=xmltooling%2FMakefile.am;h=39cfa0d33d818f67bb63be27a18337da391851d6;hp=c3f76e25940bbba1b7cc602780484f9eac83c316;hb=bdca4b4fc4a9175442533a7d32233c4351ddd8ed;hpb=d73e59e9834ff2447334d7a5e576cc4a2cb219f9

diff --git a/xmltooling/Makefile.am b/xmltooling/Makefile.am
index c3f76e2..39cfa0d 100644
--- a/xmltooling/Makefile.am
+++ b/xmltooling/Makefile.am
@@ -1,6 +1,10 @@
 AUTOMAKE_OPTIONS = foreign
 
-lib_LTLIBRARIES = libxmltooling.la
+if BUILD_XMLSEC
+lib_LTLIBRARIES = libxmltooling-lite.la libxmltooling.la
+else
+lib_LTLIBRARIES = libxmltooling-lite.la
+endif
 
 libxmltoolingincludedir = $(includedir)/xmltooling
 
@@ -28,11 +32,14 @@ libxmltoolinginclude_HEADERS = \
 	AbstractXMLObject.h \
 	AttributeExtensibleXMLObject.h \
 	base.h \
+	ConcreteXMLObjectBuilder.h \
+	char_traits.h \
 	config_pub.h \
 	ElementExtensibleXMLObject.h \
 	ElementProxy.h \
 	exceptions.h \
 	Lockable.h \
+	logging.h \
 	Namespace.h \
 	PluginManager.h \
 	QName.h \
@@ -54,17 +61,30 @@ implinclude_HEADERS = \
 
 ioinclude_HEADERS = \
 	io/AbstractXMLObjectMarshaller.h \
-	io/AbstractXMLObjectUnmarshaller.h
+	io/AbstractXMLObjectUnmarshaller.h \
+	io/GenericRequest.h \
+	io/GenericResponse.h \
+	io/HTTPRequest.h \
+	io/HTTPResponse.h
 
 secinclude_HEADERS = \
 	security/AbstractPKIXTrustEngine.h \
-	security/CachingKeyResolver.h \
+	security/BasicX509Credential.h \
 	security/ChainingTrustEngine.h \
+	security/Credential.h \
+	security/CredentialContext.h \
+	security/CredentialCriteria.h \
 	security/CredentialResolver.h \
-	security/KeyInfoSource.h \
-	security/KeyResolver.h \
-	security/OpenSSLCredentialResolver.h \
+	security/KeyInfoCredentialContext.h \
+	security/KeyInfoResolver.h \
+	security/OpenSSLCredential.h \
+	security/OpenSSLPathValidator.h \
+	security/PathValidator.h \
+	security/PKIXPathValidatorParams.h \
+	security/SecurityHelper.h \
+	security/SignatureTrustEngine.h \
 	security/TrustEngine.h \
+	security/X509Credential.h \
 	security/X509TrustEngine.h \
 	security/OpenSSLTrustEngine.h \
 	security/XSECCryptoX509CRL.h \
@@ -84,9 +104,12 @@ soapinclude_HEADERS = \
 	soap/OpenSSLSOAPTransport.h
 
 utilinclude_HEADERS = \
+    util/CurlURLInputStream.h \
 	util/DateTime.h \
 	util/NDC.h \
 	util/ParserPool.h \
+	util/PathResolver.h \
+	util/Predicates.h \
 	util/ReloadableXMLFile.h \
 	util/ReplayCache.h \
 	util/StorageService.h \
@@ -104,25 +127,38 @@ valinclude_HEADERS = \
 noinst_HEADERS = \
 	internal.h
 
-if BUILD_XMLSEC
 xmlsec_sources = \
 	encryption/impl/Decrypter.cpp \
+	encryption/impl/EncryptedKeyResolver.cpp \
 	encryption/impl/Encrypter.cpp \
-	security/impl/TrustEngine.cpp \
+    encryption/impl/EncryptionImpl.cpp \
+    encryption/impl/EncryptionSchemaValidators.cpp \
+	impl/MemoryStorageService.cpp \
 	security/impl/AbstractPKIXTrustEngine.cpp \
+	security/impl/BasicX509Credential.cpp \
+	security/impl/ChainingCredentialResolver.cpp \
 	security/impl/ChainingTrustEngine.cpp \
+	security/impl/CredentialCriteria.cpp \
 	security/impl/CredentialResolver.cpp \
+	security/impl/DummyCredentialResolver.cpp \
+	security/impl/ExplicitKeyTrustEngine.cpp \
 	security/impl/FilesystemCredentialResolver.cpp \
 	security/impl/InlineKeyResolver.cpp \
-	security/impl/ExplicitKeyTrustEngine.cpp \
-	security/impl/KeyResolver.cpp \
-	security/impl/XSECCryptoX509CRL.cpp \
+	security/impl/KeyInfoResolver.cpp \
 	security/impl/OpenSSLCryptoX509CRL.cpp \
+	security/impl/PKIXPathValidator.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
-else
-xmlsec_sources =
-endif
+	signature/impl/XMLSecSignatureImpl.cpp \
+	soap/impl/CURLSOAPTransport.cpp \
+	util/CurlURLInputStream.cpp \
+	util/ReplayCache.cpp \
+	util/StorageService.cpp
 
 if BUILD_PTHREAD
 thread_sources = util/PThreads.cpp
@@ -130,50 +166,63 @@ else
 thread_sources =
 endif
 
-libxmltooling_la_SOURCES = \
+common_sources = \
 	AbstractAttributeExtensibleXMLObject.cpp \
 	AbstractComplexElement.cpp \
 	AbstractDOMCachingXMLObject.cpp \
 	AbstractSimpleElement.cpp \
 	AbstractXMLObject.cpp \
 	exceptions.cpp \
+	Lockable.cpp \
 	Namespace.cpp \
 	QName.cpp \
 	unicode.cpp \
+    version.cpp \
 	XMLObjectBuilder.cpp \
 	XMLToolingConfig.cpp \
-	encryption/impl/EncryptionImpl.cpp \
-	encryption/impl/EncryptionSchemaValidators.cpp \
 	impl/AnyElement.cpp \
-	impl/MemoryStorageService.cpp \
 	impl/UnknownElement.cpp \
 	io/AbstractXMLObjectMarshaller.cpp \
 	io/AbstractXMLObjectUnmarshaller.cpp \
-	signature/impl/KeyInfoImpl.cpp \
-	signature/impl/KeyInfoSchemaValidators.cpp \
+	io/HTTPRequest.cpp \
+	io/HTTPResponse.cpp \
 	soap/impl/SOAPClient.cpp \
 	soap/impl/SOAPImpl.cpp \
 	soap/impl/SOAPSchemaValidators.cpp \
-	soap/impl/CURLSOAPTransport.cpp \
 	util/DateTime.cpp \
 	util/NDC.cpp \
 	util/ParserPool.cpp \
+	util/PathResolver.cpp \
 	util/ReloadableXMLFile.cpp \
-	util/ReplayCache.cpp \
-	util/StorageService.cpp \
 	util/TemplateEngine.cpp \
 	util/URLEncoder.cpp \
 	util/XMLConstants.cpp \
 	util/XMLHelper.cpp \
 	validation/ValidatorSuite.cpp \
-	${xmlsec_sources} \
 	$(thread_sources)
 
-# this is different from the project version
-# http://sources.redhat.com/autobook/autobook/autobook_91.html
-libxmltooling_la_LDFLAGS = -version-info 1:0:0
+libxmltooling_lite_la_SOURCES = \
+	${common_sources}
+libxmltooling_lite_la_CPPFLAGS = -DXMLTOOLING_LITE
+libxmltooling_lite_la_LDFLAGS = -version-info 6:6:0
+
+if BUILD_XMLSEC
+libxmltooling_la_SOURCES = \
+	${common_sources} \
+	${xmlsec_sources}
+libxmltooling_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 6:6:0
+endif
 
 install-exec-hook:
 	for la in $(lib_LTLIBRARIES) ; do rm -f $(DESTDIR)$(libdir)/$$la ; done
 
-EXTRA_DIST = xmltooling.vcproj config_pub.h.in config_pub_win32.h
+EXTRA_DIST = \
+    xmltooling.vcxproj \
+    xmltooling-lite.vcxproj \
+    xmltooling.vcxproj.filters \
+    xmltooling-lite.vcxproj.filters \
+    config_pub.h.in \
+    config_pub_win32.h\
+    resource.h\
+    xmltooling.rc \
+    util/Win32Threads.cpp