Unix porting fixes

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

diff --git a/xmltooling/Makefile.am b/xmltooling/Makefile.am
index d9765bb..5b4e2bc 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
@@ -16,7 +18,6 @@ libxmltoolinginclude_HEADERS = \
     AbstractAttributeExtensibleXMLObject.h \
     AbstractDOMCachingXMLObject.h \
     AbstractElementProxy.h \
-    AbstractValidatingXMLObject.h \
     AbstractXMLObject.h \
     AttributeExtensibleXMLObject.h \
     base.h \
@@ -27,7 +28,6 @@ libxmltoolinginclude_HEADERS = \
     Namespace.h \
     QName.h \
     unicode.h \
-    ValidatingXMLObject.h \
     version.h \
     XMLObject.h \
     XMLObjectBuilder.h \
@@ -38,7 +38,8 @@ implinclude_HEADERS = \
     impl/UnknownElement.h
 
 ioinclude_HEADERS = \
-    io/AbstractXMLObjectUnmarshaller.h \
+    io/AbstractXMLObjectMarshaller.h \
+    io/AbstractXMLObjectUnmarshaller.h
 
 siginclude_HEADERS = \
     signature/KeyInfo.h \
@@ -54,16 +55,17 @@ 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 \
+    signature/impl/XMLSecSignatureImpl.h
 
 if BUILD_XMLSEC
 xmlsec_sources = \
-    signature/impl/KeyInfoImpl.cpp \
     signature/impl/XMLSecSignatureImpl.cpp
 else
 xmlsec_sources =
@@ -84,6 +86,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 \