Refactored simple content and child-handling into mixin classes.

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

diff --git a/xmltooling/Makefile.am b/xmltooling/Makefile.am
index ab0661b..315412f 100644 (file)
--- a/xmltooling/Makefile.am
+++ b/xmltooling/Makefile.am
@@ -4,6 +4,8 @@ lib_LTLIBRARIES = libxmltooling.la
 
 libxmltoolingincludedir = $(includedir)/xmltooling
 
+implincludedir = $(includedir)/xmltooling/impl
+
 ioincludedir = $(includedir)/xmltooling/io
 
 sigincludedir = $(includedir)/xmltooling/signature
@@ -14,21 +16,22 @@ valincludedir = $(includedir)/xmltooling/validation
 
 libxmltoolinginclude_HEADERS = \
     AbstractAttributeExtensibleXMLObject.h \
+    AbstractChildlessElement.h \
+    AbstractComplexElement.h \
     AbstractDOMCachingXMLObject.h \
     AbstractElementProxy.h \
-    AbstractValidatingXMLObject.h \
+    AbstractSimpleElement.h \
     AbstractXMLObject.h \
     AttributeExtensibleXMLObject.h \
     base.h \
     config_pub.h \
-    DOMCachingXMLObject.h \
     ElementProxy.h \
     exceptions.h \
     ILockable.h \
     Namespace.h \
     QName.h \
+    SimpleElement.h \
     unicode.h \
-    ValidatingXMLObject.h \
     version.h \
     XMLObject.h \
     XMLObjectBuilder.h \
@@ -39,9 +42,11 @@ implinclude_HEADERS = \
     impl/UnknownElement.h
 
 ioinclude_HEADERS = \
-    io/AbstractXMLObjectUnmarshaller.h \
+    io/AbstractXMLObjectMarshaller.h \
+    io/AbstractXMLObjectUnmarshaller.h
 
 siginclude_HEADERS = \
+    signature/KeyInfo.h \
     signature/Signature.h \
     signature/SigningContext.h \
     signature/VerifyingContext.h
@@ -54,24 +59,27 @@ utilinclude_HEADERS = \
     util/XMLObjectChildrenList.h
 
 valinclude_HEADERS = \
+    validation/AbstractValidatingXMLObject.h \
+    validation/ValidatingXMLObject.h \
     validation/Validator.h
 
 noinst_HEADERS = \
-    internal.h \
-    signature/impl/XMLSecSignature.h
+    internal.h
 
 if BUILD_XMLSEC
 xmlsec_sources = \
-    signature/impl/XMLSecSignature.cpp
+    signature/impl/XMLSecSignatureImpl.cpp
 else
 xmlsec_sources =
 endif
 
 libxmltooling_la_SOURCES = \
     AbstractAttributeExtensibleXMLObject.cpp \
+    AbstractChildlessElement.cpp \
+    AbstractComplexElement.cpp \
     AbstractDOMCachingXMLObject.cpp \
-    AbstractElementProxy.cpp \
     AbstractXMLObject.cpp \
+    exceptions.cpp \
     Namespace.cpp \
     QName.cpp \
     unicode.cpp \
@@ -81,6 +89,7 @@ libxmltooling_la_SOURCES = \
     impl/UnknownElement.cpp \
     io/AbstractXMLObjectMarshaller.cpp \
     io/AbstractXMLObjectUnmarshaller.cpp \
+    signature/impl/KeyInfoImpl.cpp \
     util/NDC.cpp \
     util/ParserPool.cpp \
     util/XMLConstants.cpp \