X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=xmltooling%2FMakefile.am;h=d61b2ec95d9a38c3c78c2e08db98a1a84e4f23de;hb=c435af531f8de0446bcf71b359ab90caf813f34a;hp=ee9038c9b59b0fbf49bd007c38511ca418540e86;hpb=3f8868e5cb335be5e708cb4565e47110125984d2;p=shibboleth%2Fxmltooling.git

diff --git a/xmltooling/Makefile.am b/xmltooling/Makefile.am
index ee9038c..d61b2ec 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
 
@@ -33,6 +37,7 @@ libxmltoolinginclude_HEADERS = \
 	ElementProxy.h \
 	exceptions.h \
 	Lockable.h \
+	logging.h \
 	Namespace.h \
 	PluginManager.h \
 	QName.h \
@@ -54,25 +59,34 @@ 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/BasicX509Credential.h \
 	security/ChainingTrustEngine.h \
-	security/KeyInfoSource.h \
+	security/Credential.h \
+	security/CredentialContext.h \
+	security/CredentialCriteria.h \
+	security/CredentialResolver.h \
+	security/KeyInfoCredentialContext.h \
+	security/KeyInfoResolver.h \
+	security/OpenSSLCredential.h \
+	security/SignatureTrustEngine.h \
 	security/TrustEngine.h \
+	security/X509Credential.h \
 	security/X509TrustEngine.h \
 	security/OpenSSLTrustEngine.h \
 	security/XSECCryptoX509CRL.h \
 	security/OpenSSLCryptoX509CRL.h
 
 siginclude_HEADERS = \
-	signature/CachingKeyResolver.h \
 	signature/ContentReference.h \
-	signature/CredentialResolver.h \
 	signature/KeyInfo.h \
-	signature/KeyResolver.h \
-	signature/OpenSSLCredentialResolver.h \
 	signature/Signature.h \
 	signature/SignatureValidator.h
 
@@ -84,13 +98,19 @@ 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 \
 	util/TemplateEngine.h \
 	util/Threads.h \
+	util/URLEncoder.h \
 	util/XMLConstants.h \
 	util/XMLHelper.h \
 	util/XMLObjectChildrenList.h
@@ -102,25 +122,32 @@ 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 \
+	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/ExplicitKeyTrustEngine.cpp \
-	security/impl/XSECCryptoX509CRL.cpp \
+	security/impl/FilesystemCredentialResolver.cpp \
+	security/impl/InlineKeyResolver.cpp \
+	security/impl/KeyInfoResolver.cpp \
 	security/impl/OpenSSLCryptoX509CRL.cpp \
-	signature/impl/CredentialResolver.cpp \
-	signature/impl/FilesystemCredentialResolver.cpp \
-	signature/impl/InlineKeyResolver.cpp \
-	signature/impl/KeyResolver.cpp \
+	security/impl/StaticPKIXTrustEngine.cpp \
+	security/impl/TrustEngine.cpp \
+	security/impl/XSECCryptoX509CRL.cpp \
 	signature/impl/SignatureValidator.cpp \
-	signature/impl/XMLSecSignatureImpl.cpp
-else
-xmlsec_sources =
-endif
+	signature/impl/XMLSecSignatureImpl.cpp \
+	soap/impl/CURLSOAPTransport.cpp \
+	util/CurlNetAccessor.cpp \
+	util/CurlURLInputStream.cpp \
+	util/ReplayCache.cpp \
+	util/StorageService.cpp
 
 if BUILD_PTHREAD
 thread_sources = util/PThreads.cpp
@@ -128,7 +155,7 @@ else
 thread_sources =
 endif
 
-libxmltooling_la_SOURCES = \
+common_sources = \
 	AbstractAttributeExtensibleXMLObject.cpp \
 	AbstractComplexElement.cpp \
 	AbstractDOMCachingXMLObject.cpp \
@@ -143,33 +170,40 @@ libxmltooling_la_SOURCES = \
 	encryption/impl/EncryptionImpl.cpp \
 	encryption/impl/EncryptionSchemaValidators.cpp \
 	impl/AnyElement.cpp \
-	impl/MemoryStorageService.cpp \
 	impl/UnknownElement.cpp \
 	io/AbstractXMLObjectMarshaller.cpp \
 	io/AbstractXMLObjectUnmarshaller.cpp \
+	io/HTTPRequest.cpp \
 	signature/impl/KeyInfoImpl.cpp \
 	signature/impl/KeyInfoSchemaValidators.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/ReplayCache.cpp \
-	util/StorageService.cpp \
+	util/PathResolver.cpp \
+	util/ReloadableXMLFile.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 1:0:0
+
+if BUILD_XMLSEC
+libxmltooling_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 1:0:0
+libxmltooling_la_SOURCES = \
+	${common_sources} \
+	${xmlsec_sources}
+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.vcproj xmltooling-lite.vcproj config_pub.h.in config_pub_win32.h resource.h xmltooling.rc