X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=xmltooling%2FMakefile.am;h=9681b81e9af999571b1adf17157c53089a9c5168;hb=785ea306c1f4757224afe3172ecb2eb1c97263e5;hp=fa5ee268418e4b5be91f0945d4ea5952b64c6400;hpb=7c2636878325d3c99889f626a93dc876b5a77d65;p=shibboleth%2Fcpp-xmltooling.git

diff --git a/xmltooling/Makefile.am b/xmltooling/Makefile.am
index fa5ee26..9681b81 100644
--- a/xmltooling/Makefile.am
+++ b/xmltooling/Makefile.am
@@ -4,6 +4,8 @@ lib_LTLIBRARIES = libxmltooling.la
 
 libxmltoolingincludedir = $(includedir)/xmltooling
 
+encincludedir = $(includedir)/xmltooling/encryption
+
 implincludedir = $(includedir)/xmltooling/impl
 
 ioincludedir = $(includedir)/xmltooling/io
@@ -15,83 +17,112 @@ utilincludedir = $(includedir)/xmltooling/util
 valincludedir = $(includedir)/xmltooling/validation
 
 libxmltoolinginclude_HEADERS = \
-    AbstractAttributeExtensibleXMLObject.h \
-    AbstractDOMCachingXMLObject.h \
-    AbstractElementProxy.h \
-    AbstractXMLObject.h \
-    AttributeExtensibleXMLObject.h \
-    base.h \
-    config_pub.h \
-    ElementProxy.h \
-    exceptions.h \
-    ILockable.h \
-    Namespace.h \
-    QName.h \
-    unicode.h \
-    version.h \
-    XMLObject.h \
-    XMLObjectBuilder.h \
-    XMLToolingConfig.h
+	AbstractAttributeExtensibleXMLObject.h \
+	AbstractChildlessElement.h \
+	AbstractComplexElement.h \
+	AbstractDOMCachingXMLObject.h \
+	AbstractElementProxy.h \
+	AbstractSimpleElement.h \
+	AbstractXMLObject.h \
+	AttributeExtensibleXMLObject.h \
+	base.h \
+	config_pub.h \
+	ElementProxy.h \
+	exceptions.h \
+	Lockable.h \
+	Namespace.h \
+	PluginManager.h \
+	QName.h \
+	SimpleElement.h \
+	unicode.h \
+	version.h \
+	XMLObject.h \
+	XMLObjectBuilder.h \
+	XMLToolingConfig.h
+
+encinclude_HEADERS = \
+	encryption/Decrypter.h \
+	encryption/EncryptedKeyResolver.h \
+	encryption/Encrypter.h \
+	encryption/Encryption.h
 
 implinclude_HEADERS = \
-    impl/AnyElement.h \
-    impl/UnknownElement.h
+	impl/AnyElement.h \
+	impl/UnknownElement.h
 
 ioinclude_HEADERS = \
-    io/AbstractXMLObjectMarshaller.h \
-    io/AbstractXMLObjectUnmarshaller.h
+	io/AbstractXMLObjectMarshaller.h \
+	io/AbstractXMLObjectUnmarshaller.h
 
 siginclude_HEADERS = \
-    signature/KeyInfo.h \
-    signature/Signature.h \
-    signature/SigningContext.h \
-    signature/VerifyingContext.h
+	signature/ContentReference.h \
+	signature/KeyInfo.h \
+	signature/KeyResolver.h \
+	signature/Signature.h \
+	signature/SignatureValidator.h
 
 utilinclude_HEADERS = \
-    util/NDC.h \
-    util/ParserPool.h \
-    util/XMLConstants.h \
-    util/XMLHelper.h \
-    util/XMLObjectChildrenList.h
+	util/DateTime.h \
+	util/NDC.h \
+	util/ParserPool.h \
+	util/Threads.h \
+	util/XMLConstants.h \
+	util/XMLHelper.h \
+	util/XMLObjectChildrenList.h
 
 valinclude_HEADERS = \
-    validation/AbstractValidatingXMLObject.h \
-    validation/ValidatingXMLObject.h \
-    validation/Validator.h
+	validation/AbstractValidatingXMLObject.h \
+	validation/ValidatingXMLObject.h \
+	validation/Validator.h
 
 noinst_HEADERS = \
-    internal.h
+	internal.h
 
 if BUILD_XMLSEC
 xmlsec_sources = \
-    signature/impl/XMLSecSignatureImpl.cpp
+	encryption/impl/Decrypter.cpp \
+	encryption/impl/Encrypter.cpp \
+	signature/impl/SignatureValidator.cpp \
+	signature/impl/XMLSecSignatureImpl.cpp
 else
 xmlsec_sources =
 endif
 
+if BUILD_PTHREAD
+thread_sources = PThread.cpp
+else
+thread_sources =
+endif
+
 libxmltooling_la_SOURCES = \
-    AbstractAttributeExtensibleXMLObject.cpp \
-    AbstractDOMCachingXMLObject.cpp \
-    AbstractElementProxy.cpp \
-    AbstractXMLObject.cpp \
-    exceptions.cpp \
-    Namespace.cpp \
-    QName.cpp \
-    unicode.cpp \
-    XMLObjectBuilder.cpp \
-    XMLToolingConfig.cpp \
-    impl/AnyElement.cpp \
-    impl/UnknownElement.cpp \
-    io/AbstractXMLObjectMarshaller.cpp \
-    io/AbstractXMLObjectUnmarshaller.cpp \
-    signature/impl/KeyInfoImpl.cpp \
-    util/NDC.cpp \
-    util/ParserPool.cpp \
-    util/XMLConstants.cpp \
-    util/XMLHelper.cpp \
-    validation/AbstractValidatingXMLObject.cpp \
-    validation/Validator.cpp \
-    ${xmlsec_sources}
+	AbstractAttributeExtensibleXMLObject.cpp \
+	AbstractChildlessElement.cpp \
+	AbstractComplexElement.cpp \
+	AbstractDOMCachingXMLObject.cpp \
+	AbstractXMLObject.cpp \
+	exceptions.cpp \
+	Namespace.cpp \
+	QName.cpp \
+	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 \
+	util/DateTime.cpp \
+	util/NDC.cpp \
+	util/ParserPool.cpp \
+	util/XMLConstants.cpp \
+	util/XMLHelper.cpp \
+	validation/AbstractValidatingXMLObject.cpp \
+	validation/Validator.cpp \
+	${xmlsec_sources} \
+	$(thread_sources)
 
 # this is different from the project version
 # http://sources.redhat.com/autobook/autobook/autobook_91.html