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 2796597..e90aca3 100644 (file)
--- a/xmltooling/Makefile.am
+++ b/xmltooling/Makefile.am
@@ -34,13 +34,11 @@ libxmltoolinginclude_HEADERS = \
 
 ioinclude_HEADERS = \
     io/AbstractXMLObjectUnmarshaller.h \
-    io/Marshaller.h \
-    io/Unmarshaller.h
 
 siginclude_HEADERS = \
-    signature/KeyInfo.h \
     signature/Signature.h \
-    signature/SigningContext.h
+    signature/SigningContext.h \
+    signature/VerifyingContext.h
 
 utilinclude_HEADERS = \
     util/NDC.h \
@@ -57,10 +55,18 @@ noinst_HEADERS = \
     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 \
     AbstractElementProxy.cpp \
+    AbstractXMLObject.cpp \
     Namespace.cpp \
     QName.cpp \
     unicode.cpp \
@@ -69,14 +75,12 @@ libxmltooling_la_SOURCES = \
     impl/UnknownElement.cpp \
     io/AbstractXMLObjectMarshaller.cpp \
     io/AbstractXMLObjectUnmarshaller.cpp \
-    io/Marshaller.cpp \
-    io/Unmarshaller.cpp \
-    signature/impl/XMLSecSignature.cpp \
     util/NDC.cpp \
     util/ParserPool.cpp \
     util/XMLConstants.cpp \
     util/XMLHelper.cpp \
-    validation/Validator.cpp
+    validation/Validator.cpp \
+    ${xmlsec_sources}
 
 # this is different from the project version
 # http://sources.redhat.com/autobook/autobook/autobook_91.html