diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-01 00:06:38 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-01 10:39:56 +0200 |
| commit | cb177b6d798ce244ac35923f34fb93e8c8839ee3 (patch) | |
| tree | 3b6c22fc026064531c14a746b2d2c247c784aa7b /xmlsecurity | |
| parent | 2df9a25563b93ac0526725effec2a9b5b2de9d4f (diff) | |
libxmlsec: stop delivering static and import libraries
... and also check COM instead of CROSS_COMPILING.
Change-Id: I049c9211d4b6eabe4012f66d39d86c7b025dc18c
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/Library_xsec_xmlsec.mk | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index 164bec2a983b..890ffc9dd66c 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -70,15 +70,16 @@ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\ xmlsecurity/source/xmlsec/nss/xsec_nss \ )) -ifeq ($(OS)$(CROSS_COMPILING),WNT) +ifeq ($(OS)-$(COM),WNT-MSC) $(eval $(call gb_Library_add_defs,xsec_xmlsec,\ -DXMLSEC_CRYPTO_MSCRYPTO \ )) -$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ - xmlsec1 \ - xmlsec1-mscrypto \ + +$(eval $(call gb_Library_add_libs,xsec_xmlsec,\ + $(call gb_UnpackedTarball_get_dir,xmlsec)/win32/binaries/libxmlsec-mscrypto.lib \ + $(call gb_UnpackedTarball_get_dir,xmlsec)/win32/binaries/libxmlsec.lib \ )) $(eval $(call gb_Library_use_system_win32_libs,xsec_xmlsec,\ @@ -103,10 +104,15 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\ -DXMLSEC_CRYPTO_NSS \ )) -ifeq ($(OS)$(CROSS_COMPILING),WNTYES) -$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ - xmlsec1 \ - xmlsec1-nss \ +ifeq ($(OS)-$(COM),WNT-GCC) +$(eval $(call gb_Library_add_libs,xsec_xmlsec,\ + $(call gb_UnpackedTarball_get_dir,xmlsec)/src/nss/.libs/libxmlsec1-nss.dll.a \ + $(call gb_UnpackedTarball_get_dir,xmlsec)/src/.libs/libxmlsec1.dll.a \ +)) +else ifeq ($(OS),ANDROID) +$(eval $(call gb_Library_add_libs,xsec_xmlsec,\ + $(call gb_UnpackedTarball_get_dir,xmlsec)/src/openssl/.libs/libxmlsec1-openssl.a \ + $(call gb_UnpackedTarball_get_dir,xmlsec)/src/.libs/libxmlsec1.a \ )) else $(eval $(call gb_Library_add_libs,xsec_xmlsec,\ @@ -130,7 +136,7 @@ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\ xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl \ )) -endif # ifeq ($(OS)$(CROSS_COMPILING),WNT) +endif # ifeq ($(OS)-$(COM),WNT-GCC) ifeq ($(OS),SOLARIS) $(eval $(call gb_Library_add_libs,xsec_xmlsec,\ |