Merged marshalling/unmarshalling methods into core interface.

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

diff --git a/xmltooling/Makefile.am b/xmltooling/Makefile.am
index 37f7c40..e90aca3 100644 (file)
--- a/xmltooling/Makefile.am
+++ b/xmltooling/Makefile.am
@@ -2,20 +2,27 @@ AUTOMAKE_OPTIONS = foreign
 
 lib_LTLIBRARIES = libxmltooling.la
 
-libxmltoolingincludedir = \
-    $(includedir)/xmltooling
+libxmltoolingincludedir = $(includedir)/xmltooling
+
+ioincludedir = $(includedir)/xmltooling/io
+
+sigincludedir = $(includedir)/xmltooling/signature
+
+utilincludedir = $(includedir)/xmltooling/util
+
+valincludedir = $(includedir)/xmltooling/validation
 
 libxmltoolinginclude_HEADERS = \
     AbstractAttributeExtensibleXMLObject.h \
     AbstractDOMCachingXMLObject.h \
-    AbstractExtensibleXMLObject.h \
+    AbstractElementProxy.h \
     AbstractXMLObject.h \
     AttributeExtensibleXMLObject.h \
     base.h \
     config_pub.h \
     DOMCachingXMLObject.h \
+    ElementProxy.h \
     exceptions.h \
-    ExtensibleXMLObject.h \
     ILockable.h \
     Namespace.h \
     QName.h \
@@ -25,8 +32,13 @@ libxmltoolinginclude_HEADERS = \
     XMLObjectBuilder.h \
     XMLToolingConfig.h
 
-utilincludedir = \
-    $(includedir)/xmltooling/util
+ioinclude_HEADERS = \
+    io/AbstractXMLObjectUnmarshaller.h \
+
+siginclude_HEADERS = \
+    signature/Signature.h \
+    signature/SigningContext.h \
+    signature/VerifyingContext.h
 
 utilinclude_HEADERS = \
     util/NDC.h \
@@ -35,22 +47,26 @@ utilinclude_HEADERS = \
     util/XMLHelper.h \
     util/XMLObjectChildrenList.h
 
-ioincludedir = \
-    $(includedir)/xmltooling/io
-
-ioinclude_HEADERS = \
-    io/AbstractXMLObjectUnmarshaller.h \
-    io/Marshaller.h \
-    io/Unmarshaller.h
+valinclude_HEADERS = \
+    validation/Validator.h
 
 noinst_HEADERS = \
     internal.h \
-    impl/UnknownElement.h
+    impl/UnknownElement.h \
+    signature/impl/XMLSecSignature.h
+
+if BUILD_XMLSEC
+xmlsec_sources = \
+    signature/impl/XMLSecSignature.cpp
+else
+xmlsec_sources =
+endif
 
 libxmltooling_la_SOURCES = \
     AbstractAttributeExtensibleXMLObject.cpp \
     AbstractDOMCachingXMLObject.cpp \
-    AbstractExtensibleXMLObject.cpp \
+    AbstractElementProxy.cpp \
+    AbstractXMLObject.cpp \
     Namespace.cpp \
     QName.cpp \
     unicode.cpp \
@@ -59,12 +75,12 @@ libxmltooling_la_SOURCES = \
     impl/UnknownElement.cpp \
     io/AbstractXMLObjectMarshaller.cpp \
     io/AbstractXMLObjectUnmarshaller.cpp \
-    io/Marshaller.cpp \
-    io/Unmarshaller.cpp \
     util/NDC.cpp \
     util/ParserPool.cpp \
     util/XMLConstants.cpp \
-    util/XMLHelper.cpp
+    util/XMLHelper.cpp \
+    validation/Validator.cpp \
+    ${xmlsec_sources}
 
 # this is different from the project version
 # http://sources.redhat.com/autobook/autobook/autobook_91.html