You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by sc...@apache.org on 2010/10/02 00:21:01 UTC

svn commit: r1003680 - in /santuario/trunk/c: Makefile.am bin/ configure.ac include/ lib/ xsec/Makefile.am

Author: scantor
Date: Fri Oct  1 22:21:01 2010
New Revision: 1003680

URL: http://svn.apache.org/viewvc?rev=1003680&view=rev
Log:
Move bin and lib makefile content over to xsec tree.

Added:
    santuario/trunk/c/xsec/Makefile.am
      - copied, changed from r1003677, santuario/trunk/c/lib/Makefile.am
Removed:
    santuario/trunk/c/bin/
    santuario/trunk/c/include/
    santuario/trunk/c/lib/
Modified:
    santuario/trunk/c/Makefile.am
    santuario/trunk/c/configure.ac

Modified: santuario/trunk/c/Makefile.am
URL: http://svn.apache.org/viewvc/santuario/trunk/c/Makefile.am?rev=1003680&r1=1003679&r2=1003680&view=diff
==============================================================================
--- santuario/trunk/c/Makefile.am (original)
+++ santuario/trunk/c/Makefile.am Fri Oct  1 22:21:01 2010
@@ -17,7 +17,7 @@
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = lib bin
+SUBDIRS = xsec
 
 EXTRA_DIST = \
 	CHANGELOG.txt \

Modified: santuario/trunk/c/configure.ac
URL: http://svn.apache.org/viewvc/santuario/trunk/c/configure.ac?rev=1003680&r1=1003679&r2=1003680&view=diff
==============================================================================
--- santuario/trunk/c/configure.ac (original)
+++ santuario/trunk/c/configure.ac Fri Oct  1 22:21:01 2010
@@ -41,7 +41,7 @@ fi
 
 # Define the files we wish to generate
 
-AC_CONFIG_FILES([Makefile lib/Makefile bin/Makefile])
+AC_CONFIG_FILES([Makefile xsec/Makefile])
 AC_CONFIG_HEADERS([xsec/framework/XSECConfig.hpp])
 AH_BOTTOM([#include <xsec/framework/XSECVersion.hpp>])
 

Copied: santuario/trunk/c/xsec/Makefile.am (from r1003677, santuario/trunk/c/lib/Makefile.am)
URL: http://svn.apache.org/viewvc/santuario/trunk/c/xsec/Makefile.am?p2=santuario/trunk/c/xsec/Makefile.am&p1=santuario/trunk/c/lib/Makefile.am&r1=1003677&r2=1003680&rev=1003680&view=diff
==============================================================================
--- santuario/trunk/c/lib/Makefile.am (original)
+++ santuario/trunk/c/xsec/Makefile.am Fri Oct  1 22:21:01 2010
@@ -14,6 +14,98 @@
 # limitations under the License.
 #
 
+AUTOMAKE_OPTIONS = foreign
+
+noinst_PROGRAMS = ${samples}
+bin_PROGRAMS = ${tools}
+LDADD = libxml-security-c.la
+
+#
+# The following are sample programs.  They are NOT installed
+#
+
+samples =
+
+# HMAC sign
+
+samples += simpleHMAC
+simpleHMAC_SOURCES = \
+  samples/simpleHMAC.cpp \
+  samples/IOStreamOutputter.cpp \
+  samples/IOStreamOutputter.hpp
+
+# HMAC validate
+
+samples += simpleValidate
+simpleValidate_SOURCES = \
+  samples/simpleValidate.cpp \
+  samples/IOStreamOutputter.cpp \
+  samples/IOStreamOutputter.hpp
+
+# Encrypt
+
+samples += simpleEncrypt
+simpleEncrypt_SOURCES = \
+  samples/simpleEncrypt.cpp \
+  samples/IOStreamOutputter.cpp \
+  samples/IOStreamOutputter.hpp
+
+# Decrypt
+
+samples += simpleDecrypt
+simpleDecrypt_SOURCES = \
+  samples/simpleDecrypt.cpp \
+  samples/IOStreamOutputter.cpp \
+  samples/IOStreamOutputter.hpp
+
+#
+# Finally we compile the tools that can be used to manipulate
+# XML Security inputs and outputs
+#
+
+tools =
+
+# xtest
+
+tools += xtest
+xtest_SOURCES = \
+  tools/xtest/xtest.cpp
+
+tools += c14n
+c14n_SOURCES = \
+  tools/c14n/c14n.cpp
+
+tools += checksig
+checksig_SOURCES = \
+  tools/checksig/checksig.cpp \
+  tools/checksig/AnonymousResolver.hpp \
+  tools/checksig/AnonymousResolver.cpp \
+  tools/checksig/InteropResolver.hpp \
+  tools/checksig/InteropResolver.cpp
+
+tools += templatesign
+templatesign_SOURCES = \
+  tools/templatesign/templatesign.cpp
+
+tools += txfmout
+txfmout_SOURCES = \
+  tools/txfmout/txfmout.cpp
+
+tools += siginf
+siginf_SOURCES = \
+  tools/siginf/siginf.cpp
+
+tools += cipher
+cipher_SOURCES = \
+  tools/cipher/cipher.cpp \
+  tools/cipher/XencInteropResolver.hpp \
+  tools/cipher/XencInteropResolver.cpp
+
+tools += xklient
+xklient_SOURCES = \
+  tools/xklient/xklient.cpp
+
+
 lib_LTLIBRARIES = libxml-security-c.la
 
 xsecincludedir = $(includedir)/xsec
@@ -40,181 +132,181 @@ xkmsincludedir = $(includedir)/xsec/xkms
 # Canon
 
 xsecinclude_HEADERS = \
-  xsec/canon/XSECXMLNSStack.hpp \
-  xsec/canon/XSECCanon.hpp \
-  xsec/canon/XSECC14n20010315.hpp
+  canon/XSECXMLNSStack.hpp \
+  canon/XSECCanon.hpp \
+  canon/XSECC14n20010315.hpp
 
 # enc
 
 encinclude_HEADERS = \
-  xsec/enc/XSECCryptoKeyHMAC.hpp \
-  xsec/enc/XSECCryptoX509.hpp \
-  xsec/enc/XSECCryptoKeyDSA.hpp \
-  xsec/enc/XSECCryptoKeyEC.hpp \
-  xsec/enc/XSECKeyInfoResolver.hpp \
-  xsec/enc/XSECCryptoHash.hpp \
-  xsec/enc/XSECCryptoBase64.hpp \
-  xsec/enc/XSECCryptoSymmetricKey.hpp \
-  xsec/enc/XSECCryptoKey.hpp \
-  xsec/enc/XSECCryptoProvider.hpp \
-  xsec/enc/XSECKeyInfoResolverDefault.hpp \
-  xsec/enc/XSECCryptoKeyRSA.hpp \
-  xsec/enc/XSECCryptoException.hpp \
-  xsec/enc/XSECCryptoUtils.hpp
+  enc/XSECCryptoKeyHMAC.hpp \
+  enc/XSECCryptoX509.hpp \
+  enc/XSECCryptoKeyDSA.hpp \
+  enc/XSECCryptoKeyEC.hpp \
+  enc/XSECKeyInfoResolver.hpp \
+  enc/XSECCryptoHash.hpp \
+  enc/XSECCryptoBase64.hpp \
+  enc/XSECCryptoSymmetricKey.hpp \
+  enc/XSECCryptoKey.hpp \
+  enc/XSECCryptoProvider.hpp \
+  enc/XSECKeyInfoResolverDefault.hpp \
+  enc/XSECCryptoKeyRSA.hpp \
+  enc/XSECCryptoException.hpp \
+  enc/XSECCryptoUtils.hpp
 
 xscryptinclude_HEADERS = \
-  xsec/enc/XSCrypt/XSCryptCryptoBase64.hpp
+  enc/XSCrypt/XSCryptCryptoBase64.hpp
 
 opensslinclude_HEADERS = \
-  xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp \
-  xsec/enc/OpenSSL/OpenSSLCryptoSymmetricKey.hpp \
-  xsec/enc/OpenSSL/OpenSSLCryptoProvider.hpp \
-  xsec/enc/OpenSSL/OpenSSLCryptoKeyRSA.hpp \
-  xsec/enc/OpenSSL/OpenSSLCryptoX509.hpp \
-  xsec/enc/OpenSSL/OpenSSLCryptoHashHMAC.hpp \
-  xsec/enc/OpenSSL/OpenSSLCryptoKeyDSA.hpp \
-  xsec/enc/OpenSSL/OpenSSLCryptoKeyEC.hpp \
-  xsec/enc/OpenSSL/OpenSSLCryptoKeyHMAC.hpp \
-  xsec/enc/OpenSSL/OpenSSLCryptoHash.hpp 
+  enc/OpenSSL/OpenSSLCryptoBase64.hpp \
+  enc/OpenSSL/OpenSSLCryptoSymmetricKey.hpp \
+  enc/OpenSSL/OpenSSLCryptoProvider.hpp \
+  enc/OpenSSL/OpenSSLCryptoKeyRSA.hpp \
+  enc/OpenSSL/OpenSSLCryptoX509.hpp \
+  enc/OpenSSL/OpenSSLCryptoHashHMAC.hpp \
+  enc/OpenSSL/OpenSSLCryptoKeyDSA.hpp \
+  enc/OpenSSL/OpenSSLCryptoKeyEC.hpp \
+  enc/OpenSSL/OpenSSLCryptoKeyHMAC.hpp \
+  enc/OpenSSL/OpenSSLCryptoHash.hpp 
 
 nssinclude_HEADERS = \
-  xsec/enc/NSS/NSSCryptoX509.hpp \
-  xsec/enc/NSS/NSSCryptoHashHMAC.hpp \
-  xsec/enc/NSS/NSSCryptoKeyDSA.hpp \
-  xsec/enc/NSS/NSSCryptoKeyHMAC.hpp \
-  xsec/enc/NSS/NSSCryptoHash.hpp \
-  xsec/enc/NSS/NSSCryptoSymmetricKey.hpp \
-  xsec/enc/NSS/NSSCryptoProvider.hpp \
-  xsec/enc/NSS/NSSCryptoKeyRSA.hpp 
+  enc/NSS/NSSCryptoX509.hpp \
+  enc/NSS/NSSCryptoHashHMAC.hpp \
+  enc/NSS/NSSCryptoKeyDSA.hpp \
+  enc/NSS/NSSCryptoKeyHMAC.hpp \
+  enc/NSS/NSSCryptoHash.hpp \
+  enc/NSS/NSSCryptoSymmetricKey.hpp \
+  enc/NSS/NSSCryptoProvider.hpp \
+  enc/NSS/NSSCryptoKeyRSA.hpp 
 
 dsiginclude_HEADERS = \
-  xsec/dsig/DSIGKeyInfoSPKIData.hpp \
-  xsec/dsig/DSIGXPathHere.hpp \
-  xsec/dsig/DSIGAlgorithmHandlerDefault.hpp \
-  xsec/dsig/DSIGXPathFilterExpr.hpp \
-  xsec/dsig/DSIGKeyInfoX509.hpp \
-  xsec/dsig/DSIGKeyInfoList.hpp \
-  xsec/dsig/DSIGKeyInfoValue.hpp \
-  xsec/dsig/DSIGKeyInfoDEREncoded.hpp \
-  xsec/dsig/DSIGTransformC14n.hpp \
-  xsec/dsig/DSIGTransformXSL.hpp \
-  xsec/dsig/DSIGKeyInfo.hpp \
-  xsec/dsig/DSIGKeyInfoPGPData.hpp \
-  xsec/dsig/DSIGKeyInfoExt.hpp \
-  xsec/dsig/DSIGObject.hpp \
-  xsec/dsig/DSIGTransformList.hpp \
-  xsec/dsig/DSIGTransform.hpp \
-  xsec/dsig/DSIGTransformBase64.hpp \
-  xsec/dsig/DSIGTransformXPath.hpp \
-  xsec/dsig/DSIGKeyInfoMgmtData.hpp \
-  xsec/dsig/DSIGSignedInfo.hpp \
-  xsec/dsig/DSIGTransformXPathFilter.hpp \
-  xsec/dsig/DSIGReferenceList.hpp \
-  xsec/dsig/DSIGReference.hpp \
-  xsec/dsig/DSIGSignature.hpp \
-  xsec/dsig/DSIGKeyInfoName.hpp \
-  xsec/dsig/DSIGTransformEnvelope.hpp \
-  xsec/dsig/DSIGConstants.hpp
+  dsig/DSIGKeyInfoSPKIData.hpp \
+  dsig/DSIGXPathHere.hpp \
+  dsig/DSIGAlgorithmHandlerDefault.hpp \
+  dsig/DSIGXPathFilterExpr.hpp \
+  dsig/DSIGKeyInfoX509.hpp \
+  dsig/DSIGKeyInfoList.hpp \
+  dsig/DSIGKeyInfoValue.hpp \
+  dsig/DSIGKeyInfoDEREncoded.hpp \
+  dsig/DSIGTransformC14n.hpp \
+  dsig/DSIGTransformXSL.hpp \
+  dsig/DSIGKeyInfo.hpp \
+  dsig/DSIGKeyInfoPGPData.hpp \
+  dsig/DSIGKeyInfoExt.hpp \
+  dsig/DSIGObject.hpp \
+  dsig/DSIGTransformList.hpp \
+  dsig/DSIGTransform.hpp \
+  dsig/DSIGTransformBase64.hpp \
+  dsig/DSIGTransformXPath.hpp \
+  dsig/DSIGKeyInfoMgmtData.hpp \
+  dsig/DSIGSignedInfo.hpp \
+  dsig/DSIGTransformXPathFilter.hpp \
+  dsig/DSIGReferenceList.hpp \
+  dsig/DSIGReference.hpp \
+  dsig/DSIGSignature.hpp \
+  dsig/DSIGKeyInfoName.hpp \
+  dsig/DSIGTransformEnvelope.hpp \
+  dsig/DSIGConstants.hpp
 
 frameworkinclude_HEADERS = \
-  xsec/framework/XSECAlgorithmHandler.hpp \
-  xsec/framework/XSECURIResolver.hpp \
-  xsec/framework/XSECDefs.hpp \
-  xsec/framework/XSECEnv.hpp \
-  xsec/framework/XSECException.hpp \
-  xsec/framework/XSECError.hpp \
-  xsec/framework/XSECProvider.hpp \
-  xsec/framework/XSECConfig.hpp \
-  xsec/framework/XSECURIResolverXerces.hpp \
-  xsec/framework/XSECAlgorithmMapper.hpp \
-  xsec/framework/XSECW32Config.hpp \
-  xsec/framework/XSECVersion.hpp
+  framework/XSECAlgorithmHandler.hpp \
+  framework/XSECURIResolver.hpp \
+  framework/XSECDefs.hpp \
+  framework/XSECEnv.hpp \
+  framework/XSECException.hpp \
+  framework/XSECError.hpp \
+  framework/XSECProvider.hpp \
+  framework/XSECConfig.hpp \
+  framework/XSECURIResolverXerces.hpp \
+  framework/XSECAlgorithmMapper.hpp \
+  framework/XSECW32Config.hpp \
+  framework/XSECVersion.hpp
 
 transformersinclude_HEADERS = \
-  xsec/transformers/TXFMXPathFilter.hpp \
-  xsec/transformers/TXFMSHA1.hpp \
-  xsec/transformers/TXFMParser.hpp \
-  xsec/transformers/TXFMOutputFile.hpp \
-  xsec/transformers/TXFMURL.hpp \
-  xsec/transformers/TXFMBase.hpp \
-  xsec/transformers/TXFMCipher.hpp \
-  xsec/transformers/TXFMEnvelope.hpp \
-  xsec/transformers/TXFMChain.hpp \
-  xsec/transformers/TXFMMD5.hpp \
-  xsec/transformers/TXFMDocObject.hpp \
-  xsec/transformers/TXFMConcatChains.hpp \
-  xsec/transformers/TXFMSB.hpp \
-  xsec/transformers/TXFMC14n.hpp \
-  xsec/transformers/TXFMXSL.hpp \
-  xsec/transformers/TXFMXPath.hpp \
-  xsec/transformers/TXFMBase64.hpp
+  transformers/TXFMXPathFilter.hpp \
+  transformers/TXFMSHA1.hpp \
+  transformers/TXFMParser.hpp \
+  transformers/TXFMOutputFile.hpp \
+  transformers/TXFMURL.hpp \
+  transformers/TXFMBase.hpp \
+  transformers/TXFMCipher.hpp \
+  transformers/TXFMEnvelope.hpp \
+  transformers/TXFMChain.hpp \
+  transformers/TXFMMD5.hpp \
+  transformers/TXFMDocObject.hpp \
+  transformers/TXFMConcatChains.hpp \
+  transformers/TXFMSB.hpp \
+  transformers/TXFMC14n.hpp \
+  transformers/TXFMXSL.hpp \
+  transformers/TXFMXPath.hpp \
+  transformers/TXFMBase64.hpp
 
 utilsinclude_HEADERS = \
-  xsec/utils/XSECSafeBuffer.hpp \
-  xsec/utils/XSECSOAPRequestor.hpp \
-  xsec/utils/XSECTXFMInputSource.hpp \
-  xsec/utils/XSECNameSpaceExpander.hpp \
-  xsec/utils/XSECSOAPRequestorSimple.hpp \
-  xsec/utils/XSECXPathNodeList.hpp \
-  xsec/utils/XSECSafeBufferFormatter.hpp \
-  xsec/utils/XSECDOMUtils.hpp \
-  xsec/utils/XSECBinTXFMInputStream.hpp \
-  xsec/utils/XSECPlatformUtils.hpp 
+  utils/XSECSafeBuffer.hpp \
+  utils/XSECSOAPRequestor.hpp \
+  utils/XSECTXFMInputSource.hpp \
+  utils/XSECNameSpaceExpander.hpp \
+  utils/XSECSOAPRequestorSimple.hpp \
+  utils/XSECXPathNodeList.hpp \
+  utils/XSECSafeBufferFormatter.hpp \
+  utils/XSECDOMUtils.hpp \
+  utils/XSECBinTXFMInputStream.hpp \
+  utils/XSECPlatformUtils.hpp 
 
 unixutilsinclude_HEADERS = \
-  xsec/utils/unixutils/XSECURIResolverGenericUnix.hpp \
-  xsec/utils/unixutils/XSECBinHTTPURIInputStream.hpp
+  utils/unixutils/XSECURIResolverGenericUnix.hpp \
+  utils/unixutils/XSECBinHTTPURIInputStream.hpp
 
 xencinclude_HEADERS = \
-  xsec/xenc/XENCEncryptionMethod.hpp \
-  xsec/xenc/XENCEncryptedType.hpp \
-  xsec/xenc/XENCCipherData.hpp \
-  xsec/xenc/XENCEncryptedKey.hpp \
-  xsec/xenc/XENCCipherValue.hpp \
-  xsec/xenc/XENCEncryptedData.hpp \
-  xsec/xenc/XENCCipherReference.hpp \
-  xsec/xenc/XENCCipher.hpp
+  xenc/XENCEncryptionMethod.hpp \
+  xenc/XENCEncryptedType.hpp \
+  xenc/XENCCipherData.hpp \
+  xenc/XENCEncryptedKey.hpp \
+  xenc/XENCCipherValue.hpp \
+  xenc/XENCEncryptedData.hpp \
+  xenc/XENCCipherReference.hpp \
+  xenc/XENCCipher.hpp
 
 xkmsinclude_HEADERS = \
-  xsec/xkms/XKMSNotBoundAuthentication.hpp \
-  xsec/xkms/XKMSValidateResult.hpp \
-  xsec/xkms/XKMSValidityInterval.hpp \
-  xsec/xkms/XKMSStatusRequest.hpp \
-  xsec/xkms/XKMSRegisterRequest.hpp \
-  xsec/xkms/XKMSPendingRequest.hpp \
-  xsec/xkms/XKMSCompoundRequest.hpp \
-  xsec/xkms/XKMSUseKeyWith.hpp \
-  xsec/xkms/XKMSValidateRequest.hpp \
-  xsec/xkms/XKMSUnverifiedKeyBinding.hpp \
-  xsec/xkms/XKMSLocateResult.hpp \
-  xsec/xkms/XKMSRespondWith.hpp \
-  xsec/xkms/XKMSQueryKeyBinding.hpp \
-  xsec/xkms/XKMSPrototypeKeyBinding.hpp \
-  xsec/xkms/XKMSKeyBindingAbstractType.hpp \
-  xsec/xkms/XKMSMessageAbstractType.hpp \
-  xsec/xkms/XKMSMessageFactory.hpp \
-  xsec/xkms/XKMSConstants.hpp \
-  xsec/xkms/XKMSRequestAbstractType.hpp \
-  xsec/xkms/XKMSResult.hpp \
-  xsec/xkms/XKMSAuthentication.hpp \
-  xsec/xkms/XKMSLocateRequest.hpp \
-  xsec/xkms/XKMSResultType.hpp \
-  xsec/xkms/XKMSStatusResult.hpp \
-  xsec/xkms/XKMSKeyBinding.hpp \
-  xsec/xkms/XKMSCompoundResult.hpp \
-  xsec/xkms/XKMSRegisterResult.hpp \
-  xsec/xkms/XKMSResponseMechanism.hpp \
-  xsec/xkms/XKMSStatus.hpp \
-  xsec/xkms/XKMSRevokeRequest.hpp \
-  xsec/xkms/XKMSRevokeResult.hpp \
-  xsec/xkms/XKMSRecoverKeyBinding.hpp \
-  xsec/xkms/XKMSRevokeKeyBinding.hpp \
-  xsec/xkms/XKMSRSAKeyPair.hpp \
-  xsec/xkms/XKMSRecoverResult.hpp \
-  xsec/xkms/XKMSReissueResult.hpp \
-  xsec/xkms/XKMSRecoverRequest.hpp \
-  xsec/xkms/XKMSReissueRequest.hpp \
-  xsec/xkms/XKMSReissueKeyBinding.hpp
+  xkms/XKMSNotBoundAuthentication.hpp \
+  xkms/XKMSValidateResult.hpp \
+  xkms/XKMSValidityInterval.hpp \
+  xkms/XKMSStatusRequest.hpp \
+  xkms/XKMSRegisterRequest.hpp \
+  xkms/XKMSPendingRequest.hpp \
+  xkms/XKMSCompoundRequest.hpp \
+  xkms/XKMSUseKeyWith.hpp \
+  xkms/XKMSValidateRequest.hpp \
+  xkms/XKMSUnverifiedKeyBinding.hpp \
+  xkms/XKMSLocateResult.hpp \
+  xkms/XKMSRespondWith.hpp \
+  xkms/XKMSQueryKeyBinding.hpp \
+  xkms/XKMSPrototypeKeyBinding.hpp \
+  xkms/XKMSKeyBindingAbstractType.hpp \
+  xkms/XKMSMessageAbstractType.hpp \
+  xkms/XKMSMessageFactory.hpp \
+  xkms/XKMSConstants.hpp \
+  xkms/XKMSRequestAbstractType.hpp \
+  xkms/XKMSResult.hpp \
+  xkms/XKMSAuthentication.hpp \
+  xkms/XKMSLocateRequest.hpp \
+  xkms/XKMSResultType.hpp \
+  xkms/XKMSStatusResult.hpp \
+  xkms/XKMSKeyBinding.hpp \
+  xkms/XKMSCompoundResult.hpp \
+  xkms/XKMSRegisterResult.hpp \
+  xkms/XKMSResponseMechanism.hpp \
+  xkms/XKMSStatus.hpp \
+  xkms/XKMSRevokeRequest.hpp \
+  xkms/XKMSRevokeResult.hpp \
+  xkms/XKMSRecoverKeyBinding.hpp \
+  xkms/XKMSRevokeKeyBinding.hpp \
+  xkms/XKMSRSAKeyPair.hpp \
+  xkms/XKMSRecoverResult.hpp \
+  xkms/XKMSReissueResult.hpp \
+  xkms/XKMSRecoverRequest.hpp \
+  xkms/XKMSReissueRequest.hpp \
+  xkms/XKMSReissueKeyBinding.hpp
 
 
 libxml_security_c_la_SOURCES = ${lib_sources}
@@ -272,79 +364,79 @@ endif
 # canon
 
 canon_sources = \
-  ../xsec/canon/XSECC14n20010315.cpp \
-  ../xsec/canon/XSECXMLNSStack.cpp \
-  ../xsec/canon/XSECCanon.cpp
+  canon/XSECC14n20010315.cpp \
+  canon/XSECXMLNSStack.cpp \
+  canon/XSECCanon.cpp
 
 # Signature
 
 dsig_sources = \
-  ../xsec/dsig/DSIGKeyInfoPGPData.cpp \
-  ../xsec/dsig/DSIGReferenceList.cpp \
-  ../xsec/dsig/DSIGKeyInfoValue.cpp \
-  ../xsec/dsig/DSIGKeyInfoDEREncoded.cpp \
-  ../xsec/dsig/DSIGXPathHere.cpp \
-  ../xsec/dsig/DSIGAlgorithmHandlerDefault.cpp \
-  ../xsec/dsig/DSIGXPathFilterExpr.cpp \
-  ../xsec/dsig/DSIGKeyInfoMgmtData.cpp \
-  ../xsec/dsig/DSIGTransformXPathFilter.cpp \
-  ../xsec/dsig/DSIGSignedInfo.cpp \
-  ../xsec/dsig/DSIGKeyInfoList.cpp \
-  ../xsec/dsig/DSIGConstants.cpp \
-  ../xsec/dsig/DSIGSignature.cpp \
-  ../xsec/dsig/DSIGTransformXSL.cpp \
-  ../xsec/dsig/DSIGObject.cpp \
-  ../xsec/dsig/DSIGTransformXPath.cpp \
-  ../xsec/dsig/DSIGTransformEnvelope.cpp \
-  ../xsec/dsig/DSIGKeyInfoName.cpp \
-  ../xsec/dsig/DSIGTransformBase64.cpp \
-  ../xsec/dsig/DSIGReference.cpp \
-  ../xsec/dsig/DSIGKeyInfoSPKIData.cpp \
-  ../xsec/dsig/DSIGTransformList.cpp \
-  ../xsec/dsig/DSIGKeyInfoX509.cpp \
-  ../xsec/dsig/DSIGKeyInfoExt.cpp \
-  ../xsec/dsig/DSIGTransform.cpp \
-  ../xsec/dsig/DSIGTransformC14n.cpp
+  dsig/DSIGKeyInfoPGPData.cpp \
+  dsig/DSIGReferenceList.cpp \
+  dsig/DSIGKeyInfoValue.cpp \
+  dsig/DSIGKeyInfoDEREncoded.cpp \
+  dsig/DSIGXPathHere.cpp \
+  dsig/DSIGAlgorithmHandlerDefault.cpp \
+  dsig/DSIGXPathFilterExpr.cpp \
+  dsig/DSIGKeyInfoMgmtData.cpp \
+  dsig/DSIGTransformXPathFilter.cpp \
+  dsig/DSIGSignedInfo.cpp \
+  dsig/DSIGKeyInfoList.cpp \
+  dsig/DSIGConstants.cpp \
+  dsig/DSIGSignature.cpp \
+  dsig/DSIGTransformXSL.cpp \
+  dsig/DSIGObject.cpp \
+  dsig/DSIGTransformXPath.cpp \
+  dsig/DSIGTransformEnvelope.cpp \
+  dsig/DSIGKeyInfoName.cpp \
+  dsig/DSIGTransformBase64.cpp \
+  dsig/DSIGReference.cpp \
+  dsig/DSIGKeyInfoSPKIData.cpp \
+  dsig/DSIGTransformList.cpp \
+  dsig/DSIGKeyInfoX509.cpp \
+  dsig/DSIGKeyInfoExt.cpp \
+  dsig/DSIGTransform.cpp \
+  dsig/DSIGTransformC14n.cpp
 
 # Main Crypto interface routines
 
 enc_sources = \
-  ../xsec/enc/XSECCryptoX509.cpp \
-  ../xsec/enc/XSECKeyInfoResolverDefault.cpp \
-  ../xsec/enc/XSECCryptoUtils.cpp \
-  ../xsec/enc/XSECCryptoBase64.cpp \
-  ../xsec/enc/XSCrypt/XSCryptCryptoBase64.cpp \
-  ../xsec/enc/XSECCryptoProvider.cpp \
-  ../xsec/enc/XSECCryptoException.cpp
+  enc/XSECCryptoX509.cpp \
+  enc/XSECKeyInfoResolverDefault.cpp \
+  enc/XSECCryptoUtils.cpp \
+  enc/XSECCryptoBase64.cpp \
+  enc/XSCrypt/XSCryptCryptoBase64.cpp \
+  enc/XSECCryptoProvider.cpp \
+  enc/XSECCryptoException.cpp
 
 # Framework files
 
 framework_sources = \
-  ../xsec/framework/XSECError.cpp \
-  ../xsec/framework/XSECAlgorithmMapper.cpp \
-  ../xsec/framework/XSECEnv.cpp \
-  ../xsec/framework/XSECProvider.cpp \
-  ../xsec/framework/XSECException.cpp \
-  ../xsec/framework/XSECURIResolverXerces.cpp
+  framework/XSECError.cpp \
+  framework/XSECAlgorithmMapper.cpp \
+  framework/XSECEnv.cpp \
+  framework/XSECProvider.cpp \
+  framework/XSECException.cpp \
+  framework/XSECURIResolverXerces.cpp
 
 txfm_sources = \
-  ../xsec/transformers/TXFMBase.cpp \
-  ../xsec/transformers/TXFMChain.cpp \
-  ../xsec/transformers/TXFMCipher.cpp \
-  ../xsec/transformers/TXFMParser.cpp \
-  ../xsec/transformers/TXFMSB.cpp \
-  ../xsec/transformers/TXFMEnvelope.cpp \
-  ../xsec/transformers/TXFMBase64.cpp \
-  ../xsec/transformers/TXFMXPathFilter.cpp \
-  ../xsec/transformers/TXFMSHA1.cpp \
-  ../xsec/transformers/TXFMC14n.cpp \
-  ../xsec/transformers/TXFMURL.cpp \
-  ../xsec/transformers/TXFMOutputFile.cpp \
-  ../xsec/transformers/TXFMXPath.cpp \
-  ../xsec/transformers/TXFMXSL.cpp \
-  ../xsec/transformers/TXFMDocObject.cpp \
-  ../xsec/transformers/TXFMConcatChains.cpp \
-  ../xsec/transformers/TXFMMD5.cpp
+  transformers/TXFMBase.cpp \
+  transformers/TXFMChain.cpp \
+  transformers/TXFMCipher.cpp \
+  transformers/TXFMParser.cpp \
+  transformers/TXFMSB.cpp \
+  transformers/TXFMEnvelope.cpp \
+  transformers/TXFMBase64.cpp \
+  transformers/TXFMXPathFilter.cpp \
+  transformers/TXFMSHA1.cpp \
+  transformers/TXFMC14n.cpp \
+  transformers/TXFMURL.cpp \
+  transformers/TXFMOutputFile.cpp \
+  transformers/TXFMXPath.cpp \
+  transformers/TXFMXSL.cpp \
+  transformers/TXFMDocObject.cpp \
+  transformers/TXFMConcatChains.cpp \
+  transformers/TXFMMD5.cpp
 
 # Utility files.  Note we don't worry about checking
 # if the UNIX stuff is necessary - we just assume that
@@ -352,18 +444,18 @@ txfm_sources = \
 # make.  Cygwin compiles use the UNIX utilities, not windows
 
 utils_sources = \
-  ../xsec/utils/unixutils/XSECSOAPRequestorSimpleUnix.cpp \
-  ../xsec/utils/unixutils/XSECURIResolverGenericUnix.cpp \
-  ../xsec/utils/unixutils/XSECBinHTTPURIInputStream.cpp \
-  ../xsec/utils/XSECBinTXFMInputStream.cpp \
-  ../xsec/utils/XSECXPathNodeList.cpp \
-  ../xsec/utils/XSECSafeBuffer.cpp \
-  ../xsec/utils/XSECTXFMInputSource.cpp \
-  ../xsec/utils/XSECDOMUtils.cpp \
-  ../xsec/utils/XSECSafeBufferFormatter.cpp \
-  ../xsec/utils/XSECSOAPRequestorSimple.cpp \
-  ../xsec/utils/XSECNameSpaceExpander.cpp \
-  ../xsec/utils/XSECPlatformUtils.cpp
+  utils/unixutils/XSECSOAPRequestorSimpleUnix.cpp \
+  utils/unixutils/XSECURIResolverGenericUnix.cpp \
+  utils/unixutils/XSECBinHTTPURIInputStream.cpp \
+  utils/XSECBinTXFMInputStream.cpp \
+  utils/XSECXPathNodeList.cpp \
+  utils/XSECSafeBuffer.cpp \
+  utils/XSECTXFMInputSource.cpp \
+  utils/XSECDOMUtils.cpp \
+  utils/XSECSafeBufferFormatter.cpp \
+  utils/XSECSOAPRequestorSimple.cpp \
+  utils/XSECNameSpaceExpander.cpp \
+  utils/XSECPlatformUtils.cpp
 
 # XML Encryption
 
@@ -469,53 +561,56 @@ xkms_sources = \
 # Conditional crypto routines
 
 openssl_sources = \
-  ../xsec/enc/OpenSSL/OpenSSLCryptoHashHMAC.cpp \
-  ../xsec/enc/OpenSSL/OpenSSLCryptoKeyRSA.cpp \
-  ../xsec/enc/OpenSSL/OpenSSLCryptoHash.cpp \
-  ../xsec/enc/OpenSSL/OpenSSLCryptoProvider.cpp \
-  ../xsec/enc/OpenSSL/OpenSSLCryptoX509.cpp \
-  ../xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp \
-  ../xsec/enc/OpenSSL/OpenSSLCryptoKeyDSA.cpp \
-  ../xsec/enc/OpenSSL/OpenSSLCryptoKeyEC.cpp \
-  ../xsec/enc/OpenSSL/OpenSSLCryptoSymmetricKey.cpp \
-  ../xsec/enc/OpenSSL/OpenSSLCryptoKeyHMAC.cpp
+  enc/OpenSSL/OpenSSLCryptoHashHMAC.cpp \
+  enc/OpenSSL/OpenSSLCryptoKeyRSA.cpp \
+  enc/OpenSSL/OpenSSLCryptoHash.cpp \
+  enc/OpenSSL/OpenSSLCryptoProvider.cpp \
+  enc/OpenSSL/OpenSSLCryptoX509.cpp \
+  enc/OpenSSL/OpenSSLCryptoBase64.cpp \
+  enc/OpenSSL/OpenSSLCryptoKeyDSA.cpp \
+  enc/OpenSSL/OpenSSLCryptoKeyEC.cpp \
+  enc/OpenSSL/OpenSSLCryptoSymmetricKey.cpp \
+  enc/OpenSSL/OpenSSLCryptoKeyHMAC.cpp
   
 nss_sources = \
-  ../xsec/enc/NSS/NSSCryptoX509.cpp \
-  ../xsec/enc/NSS/NSSCryptoHashHMAC.cpp \
-  ../xsec/enc/NSS/NSSCryptoHash.cpp \
-  ../xsec/enc/NSS/NSSCryptoKeyDSA.cpp \
-  ../xsec/enc/NSS/NSSCryptoProvider.cpp \
-  ../xsec/enc/NSS/NSSCryptoSymmetricKey.cpp \
-  ../xsec/enc/NSS/NSSCryptoKeyRSA.cpp \
-  ../xsec/enc/NSS/NSSCryptoKeyHMAC.cpp
-
-EXTRA_DIST = \
-  ../xsec/utils/winutils/XSECURIResolverGenericWin32.cpp \
-  ../xsec/utils/winutils/XSECSOAPRequestorSimpleWin32.cpp \
-  ../xsec/utils/winutils/XSECBinHTTPURIInputStream.cpp \
-  ../xsec/utils/winutils/XSECURIResolverGenericWin32.hpp \
-  ../xsec/utils/winutils/XSECBinHTTPURIInputStream.hpp \
-  ../xsec/enc/WinCAPI/WinCAPICryptoProvider.cpp \
-  ../xsec/enc/WinCAPI/WinCAPICryptoKeyHMAC.hpp \
-  ../xsec/enc/WinCAPI/WinCAPICryptoHash.cpp \
-  ../xsec/enc/WinCAPI/WinCAPICryptoKeyDSA.cpp \
-  ../xsec/enc/WinCAPI/WinCAPICryptoHashHMAC.hpp \
-  ../xsec/enc/WinCAPI/WinCAPICryptoKeyDSA.hpp \
-  ../xsec/enc/WinCAPI/WinCAPICryptoSymmetricKey.hpp \
-  ../xsec/enc/WinCAPI/WinCAPICryptoX509.hpp \
-  ../xsec/enc/WinCAPI/WinCAPICryptoKeyRSA.hpp \
-  ../xsec/enc/WinCAPI/WinCAPICryptoX509.cpp \
-  ../xsec/enc/WinCAPI/WinCAPICryptoHashHMAC.cpp \
-  ../xsec/enc/WinCAPI/WinCAPICryptoHash.hpp \
-  ../xsec/enc/WinCAPI/WinCAPICryptoKeyRSA.cpp \
-  ../xsec/enc/WinCAPI/WinCAPICryptoProvider.hpp \
-  ../xsec/enc/WinCAPI/WinCAPICryptoSymmetricKey.cpp \
-  ../xsec/enc/WinCAPI/WinCAPICryptoKeyHMAC.cpp
+  enc/NSS/NSSCryptoX509.cpp \
+  enc/NSS/NSSCryptoHashHMAC.cpp \
+  enc/NSS/NSSCryptoHash.cpp \
+  enc/NSS/NSSCryptoKeyDSA.cpp \
+  enc/NSS/NSSCryptoProvider.cpp \
+  enc/NSS/NSSCryptoSymmetricKey.cpp \
+  enc/NSS/NSSCryptoKeyRSA.cpp \
+  enc/NSS/NSSCryptoKeyHMAC.cpp
 
 #
 # Now the library specific build items
 #
-
-INCLUDES = -I$(top_srcdir)/include
 libxml_security_c_la_LDFLAGS = -version-info 16:0:0
+
+install-exec-hook:
+	for la in $(lib_LTLIBRARIES) ; do rm -f $(DESTDIR)$(libdir)/$$la ; done
+
+EXTRA_DIST = \
+  utils/winutils/XSECURIResolverGenericWin32.cpp \
+  utils/winutils/XSECSOAPRequestorSimpleWin32.cpp \
+  utils/winutils/XSECBinHTTPURIInputStream.cpp \
+  utils/winutils/XSECURIResolverGenericWin32.hpp \
+  utils/winutils/XSECBinHTTPURIInputStream.hpp \
+  enc/WinCAPI/WinCAPICryptoProvider.cpp \
+  enc/WinCAPI/WinCAPICryptoKeyHMAC.hpp \
+  enc/WinCAPI/WinCAPICryptoHash.cpp \
+  enc/WinCAPI/WinCAPICryptoKeyDSA.cpp \
+  enc/WinCAPI/WinCAPICryptoHashHMAC.hpp \
+  enc/WinCAPI/WinCAPICryptoKeyDSA.hpp \
+  enc/WinCAPI/WinCAPICryptoSymmetricKey.hpp \
+  enc/WinCAPI/WinCAPICryptoX509.hpp \
+  enc/WinCAPI/WinCAPICryptoKeyRSA.hpp \
+  enc/WinCAPI/WinCAPICryptoX509.cpp \
+  enc/WinCAPI/WinCAPICryptoHashHMAC.cpp \
+  enc/WinCAPI/WinCAPICryptoHash.hpp \
+  enc/WinCAPI/WinCAPICryptoKeyRSA.cpp \
+  enc/WinCAPI/WinCAPICryptoProvider.hpp \
+  enc/WinCAPI/WinCAPICryptoSymmetricKey.cpp \
+  enc/WinCAPI/WinCAPICryptoKeyHMAC.cpp
+
+	
\ No newline at end of file