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 da42fa2..315412f 100644 (file)
--- a/xmltooling/Makefile.am
+++ b/xmltooling/Makefile.am
@@ -16,9 +16,11 @@ 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 \
@@ -28,8 +30,8 @@ libxmltoolinginclude_HEADERS = \
     ILockable.h \
     Namespace.h \
     QName.h \
+    SimpleElement.h \
     unicode.h \
-    ValidatingXMLObject.h \
     version.h \
     XMLObject.h \
     XMLObjectBuilder.h \
@@ -40,7 +42,8 @@ implinclude_HEADERS = \
     impl/UnknownElement.h
 
 ioinclude_HEADERS = \
-    io/AbstractXMLObjectUnmarshaller.h \
+    io/AbstractXMLObjectMarshaller.h \
+    io/AbstractXMLObjectUnmarshaller.h
 
 siginclude_HEADERS = \
     signature/KeyInfo.h \
@@ -56,16 +59,15 @@ utilinclude_HEADERS = \
     util/XMLObjectChildrenList.h
 
 valinclude_HEADERS = \
+    validation/AbstractValidatingXMLObject.h \
+    validation/ValidatingXMLObject.h \
     validation/Validator.h
 
 noinst_HEADERS = \
-    internal.h \
-    signature/impl/KeyInfoImpl.h \
-    signature/impl/XMLSecSignatureImpl.h \
+    internal.h
 
 if BUILD_XMLSEC
 xmlsec_sources = \
-    signature/impl/KeyInfoImpl.cpp \
     signature/impl/XMLSecSignatureImpl.cpp
 else
 xmlsec_sources =
@@ -73,8 +75,9 @@ endif
 
 libxmltooling_la_SOURCES = \
     AbstractAttributeExtensibleXMLObject.cpp \
+    AbstractChildlessElement.cpp \
+    AbstractComplexElement.cpp \
     AbstractDOMCachingXMLObject.cpp \
-    AbstractElementProxy.cpp \
     AbstractXMLObject.cpp \
     exceptions.cpp \
     Namespace.cpp \
@@ -86,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 \