summaryrefslogtreecommitdiff
path: root/libxmlsec
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-10-01 00:06:38 +0200
committerMichael Stahl <mstahl@redhat.com>2013-10-01 10:39:56 +0200
commitcb177b6d798ce244ac35923f34fb93e8c8839ee3 (patch)
tree3b6c22fc026064531c14a746b2d2c247c784aa7b /libxmlsec
parent2df9a25563b93ac0526725effec2a9b5b2de9d4f (diff)
libxmlsec: stop delivering static and import libraries
... and also check COM instead of CROSS_COMPILING. Change-Id: I049c9211d4b6eabe4012f66d39d86c7b025dc18c
Diffstat (limited to 'libxmlsec')
-rw-r--r--libxmlsec/ExternalPackage_xmlsec.mk12
1 files changed, 0 insertions, 12 deletions
diff --git a/libxmlsec/ExternalPackage_xmlsec.mk b/libxmlsec/ExternalPackage_xmlsec.mk
index ca438c57a4ab..0655e9716ceb 100644
--- a/libxmlsec/ExternalPackage_xmlsec.mk
+++ b/libxmlsec/ExternalPackage_xmlsec.mk
@@ -13,24 +13,12 @@ $(eval $(call gb_ExternalPackage_use_external_project,xmlsec,xmlsec))
ifeq ($(OS),WNT)
ifeq ($(COM),GCC)
-$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1.dll.a,src/.libs/libxmlsec1.dll.a))
-$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1-nss.dll.a,src/nss/.libs/libxmlsec1-nss.dll.a))
$(eval $(call gb_ExternalPackage_add_library_for_install,xmlsec,lib/libxmlsec1.dll,src/.libs/libxmlsec1.dll))
$(eval $(call gb_ExternalPackage_add_library_for_install,xmlsec,lib/libxmlsec1-nss.dll,src/nss/.libs/libxmlsec1-nss.dll))
else
-$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec-mscrypto.lib,win32/binaries/libxmlsec-mscrypto.lib))
-$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec.lib,win32/binaries/libxmlsec.lib))
$(eval $(call gb_ExternalPackage_add_library_for_install,xmlsec,bin/libxmlsec-mscrypto.dll,win32/binaries/libxmlsec-mscrypto.dll))
$(eval $(call gb_ExternalPackage_add_library_for_install,xmlsec,bin/libxmlsec.dll,win32/binaries/libxmlsec.dll))
endif
-else ifeq ($(OS),ANDROID)
-$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1.a,src/.libs/libxmlsec1.a))
-ifneq ($(DISABLE_OPENSSL),YES)
-$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1-openssl.a,src/openssl/.libs/libxmlsec1-openssl.a))
-endif # DISABLE_OPENSSL
-else
-$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1.a,src/.libs/libxmlsec1.a))
-$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1-nss.a,src/nss/.libs/libxmlsec1-nss.a))
endif
# vim: set noet sw=4 ts=4: