Moved in request/response interfaces from opensaml.

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

diff --git a/xmltooling/Makefile.am b/xmltooling/Makefile.am
index 63e6274..a2ae0dc 100644 (file)
--- a/xmltooling/Makefile.am
+++ b/xmltooling/Makefile.am
@@ -1,6 +1,10 @@
 AUTOMAKE_OPTIONS = foreign
 
+if BUILD_XMLSEC
+lib_LTLIBRARIES = libxmltooling-lite.la libxmltooling.la
+else
 lib_LTLIBRARIES = libxmltooling-lite.la
+endif
 
 libxmltoolingincludedir = $(includedir)/xmltooling
 
@@ -54,7 +58,11 @@ implinclude_HEADERS = \
 
 ioinclude_HEADERS = \
        io/AbstractXMLObjectMarshaller.h \
-       io/AbstractXMLObjectUnmarshaller.h
+       io/AbstractXMLObjectUnmarshaller.h \
+       io/GenericRequest.h \
+       io/GenericResponse.h \
+       io/HTTPRequest.h \
+       io/HTTPResponse.h
 
 secinclude_HEADERS = \
        security/AbstractPKIXTrustEngine.h \
@@ -125,7 +133,8 @@ xmlsec_sources = \
        security/impl/TrustEngine.cpp \
        security/impl/XSECCryptoX509CRL.cpp \
        signature/impl/SignatureValidator.cpp \
-       signature/impl/XMLSecSignatureImpl.cpp
+       signature/impl/XMLSecSignatureImpl.cpp \
+       soap/impl/CURLSOAPTransport.cpp
 
 if BUILD_PTHREAD
 thread_sources = util/PThreads.cpp
@@ -157,7 +166,6 @@ common_sources = \
        soap/impl/SOAPClient.cpp \
        soap/impl/SOAPImpl.cpp \
        soap/impl/SOAPSchemaValidators.cpp \
-       soap/impl/CURLSOAPTransport.cpp \
        util/DateTime.cpp \
        util/NDC.cpp \
        util/ParserPool.cpp \
@@ -168,22 +176,19 @@ common_sources = \
        util/URLEncoder.cpp \
        util/XMLConstants.cpp \
        util/XMLHelper.cpp \
-       validation/ValidatorSuite.cpp \
-       ${xmlsec_sources} \
+       validation/ValidatorSuite.cpp \ 
        $(thread_sources)
 
-libxmltooling-lite_la_SOURCES = \
+libxmltooling_lite_la_SOURCES = \
        ${common_sources}
-
-libxmltooling-lite_la_LDFLAGS = -version-info 1:0:0
+libxmltooling_lite_la_CPPFLAGS = -DXMLTOOLING_LITE
+libxmltooling_lite_la_LDFLAGS = -version-info 1:0:0
 
 if BUILD_XMLSEC
-lib_LTLIBRARIES = libxmltooling.la
+libxmltooling_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 1:0:0
 libxmltooling_la_SOURCES = \
        ${common_sources} \
-       ${xmlsec_sources} \
-       $(thread_sources)
-libxmltooling_la_LDFLAGS = -version-info 1:0:0
+       ${xmlsec_sources}
 endif
 
 install-exec-hook: