X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=xmltooling%2FMakefile.am;h=87a5baef190fd2d46a4c85db70b7d171cb3aff00;hb=fe799793a4aced0cf8a21bb1c4c401215e04c8c6;hp=19592361d2072559ca6702e3f38fbd462cb5f558;hpb=d96a01ce4d9648bb3186f74d43610b6f12d49758;p=shibboleth%2Fcpp-xmltooling.git

diff --git a/xmltooling/Makefile.am b/xmltooling/Makefile.am
index 1959236..87a5bae 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,13 @@ libxmltoolinginclude_HEADERS = \
 	AbstractXMLObject.h \
 	AttributeExtensibleXMLObject.h \
 	base.h \
+	ConcreteXMLObjectBuilder.h \
 	config_pub.h \
 	ElementExtensibleXMLObject.h \
 	ElementProxy.h \
 	exceptions.h \
 	Lockable.h \
+	logging.h \
 	Namespace.h \
 	PluginManager.h \
 	QName.h \
@@ -54,7 +60,11 @@ 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 \
@@ -67,6 +77,8 @@ secinclude_HEADERS = \
 	security/KeyInfoCredentialContext.h \
 	security/KeyInfoResolver.h \
 	security/OpenSSLCredential.h \
+	security/SecurityHelper.h \
+	security/SignatureTrustEngine.h \
 	security/TrustEngine.h \
 	security/X509Credential.h \
 	security/X509TrustEngine.h \
@@ -88,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 \
@@ -108,28 +124,37 @@ valinclude_HEADERS = \
 noinst_HEADERS = \
 	internal.h
 
-if BUILD_XMLSEC
 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 \
+	security/impl/ChainingCredentialResolver.cpp \
 	security/impl/ChainingTrustEngine.cpp \
-	security/impl/Credential.cpp \
+	security/impl/CredentialCriteria.cpp \
 	security/impl/CredentialResolver.cpp \
 	security/impl/ExplicitKeyTrustEngine.cpp \
 	security/impl/FilesystemCredentialResolver.cpp \
 	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
-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
@@ -137,7 +162,7 @@ else
 thread_sources =
 endif
 
-libxmltooling_la_SOURCES = \
+common_sources = \
 	AbstractAttributeExtensibleXMLObject.cpp \
 	AbstractComplexElement.cpp \
 	AbstractDOMCachingXMLObject.cpp \
@@ -149,38 +174,46 @@ libxmltooling_la_SOURCES = \
 	unicode.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 \
 	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 2:0:0
+
+if BUILD_XMLSEC
+libxmltooling_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 2: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 \
+    util/Win32Threads.cpp