[Libreoffice-commits] .: Repository.mk xmlsecurity/Library_xsec_xmlsec.mk

[Caolán McNamara]

 Repository.mk                      |   11 +++++++++++
 xmlsecurity/Library_xsec_xmlsec.mk |    9 ++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

New commits:
commit c85c4bd785eb4704e7c356dfb8ae35a8d4ede2a6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Aug 16 14:47:11 2011 +0100

    park this as close to linking

diff --git a/Repository.mk b/Repository.mk
index d57c126..dfad57d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -232,9 +232,20 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
     toolshelpers \
 	vclmain \
 	writerperfect \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+	xmlsec1 \
+	xmlsec1-nss \
+	xmlsec1-mscrypto \
+))
+else
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
 	xmlsec1 \
 	xmlsec1-nss \
 	xmlsec1-mscrypto \
 ))
+endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk
index d067927..f51fd9d 100644
--- a/xmlsecurity/Library_xsec_xmlsec.mk
+++ b/xmlsecurity/Library_xsec_xmlsec.mk
@@ -52,9 +52,16 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\
 	-DXMLSEC_NO_XSLT \
 ))
 
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,xsec_xmlsec,\
+	xmlsec1 \
+))
+else
 $(eval $(call gb_Library_add_linked_static_libs,xsec_xmlsec,\
 	xmlsec1 \
 ))
+endif
+
 
 $(eval $(call gb_Library_add_linked_libs,xsec_xmlsec,\
 	comphelper \
@@ -94,7 +101,7 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\
 	-DXMLSEC_CRYPTO_MSCRYPTO \
 ))
 
-$(eval $(call gb_Library_add_linked_static_libs,xsec_xmlsec,\
+$(eval $(call gb_Library_add_linked_libs,xsec_xmlsec,\
 	xmlsec1-mscrypto \
 ))