[Libreoffice-commits] core.git: 2 commits - RepositoryExternal.mk

[Michael Stahl]

 RepositoryExternal.mk |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 83c4ebbe673f992661a12283c845499c4f053c7d
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Oct 24 00:32:33 2013 +0200

    remove pointless use_libraries
    
    Change-Id: I5cf4170867fe40a59f5809c466c0be2255c151d2

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f1b75c5..e740609 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2694,11 +2694,6 @@ endef
 
 define gb_ExternalProject__use_nss3
 $(call gb_ExternalProject_use_package,$(1),nss)
-$(call gb_ExternalProject_use_libraries,$(1),\
-	nspr4 \
-	nss3 \
-	smime3 \
-)
 
 endef
 
commit 714b93b4ec16d951d72037d1ccfcb4a225f06eec
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Oct 24 00:32:04 2013 +0200

    fix curl for MSC
    
    Change-Id: I61316f0912e4d70c0a28bfa055c07018c39a6b10

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 968d326..f1b75c5 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1940,7 +1940,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 )
 
 ifeq ($(COM),MSC)
-$(call gb_LinkTarget_use_libraries,$(1),\
+$(call gb_LinkTarget_add_libs,$(1),\
 	$(call gb_UnpackedTarball_get_dir,curl)/lib/libcurl.lib \
 )
 else