[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 2 commits - RepositoryExternal.mk ucb/Library_ucpdav1.mk

[Michael Stahl]

 RepositoryExternal.mk  |    2 ++
 ucb/Library_ucpdav1.mk |    4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit d1820ecefc5f28e854f9ff8ae1045732bbe23503
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jun 5 13:35:14 2014 +0200

    ucb: move APR dependencies to gb_LinkTarget__use_apr
    
    Change-Id: I6768e5f2400f3020d85c48b80d58e13a3f6f07e9

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 9e20991..640452d 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1041,6 +1041,8 @@ $(call gb_LinkTarget_set_include,$(1),\
 )
 $(call gb_LinkTarget_add_libs,$(1),\
 	$(APR_LIBS) \
+	$(if $(filter $(OS),LINUX),-lpthread) \
+	$(if $(filter $(OS),MACOSX),-liconv) \
 )
 
 ifeq ($(SYSTEM_APR),)
diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk
index 0dae22f..f6e8a62 100644
--- a/ucb/Library_ucpdav1.mk
+++ b/ucb/Library_ucpdav1.mk
@@ -67,11 +67,6 @@ $(eval $(call gb_Library_use_externals,ucpdav1,\
 	zlib \
 ))
 
-$(eval $(call gb_Library_add_libs,ucpdav1,\
-	$(if $(filter $(OS),LINUX),-lpthread) \
-	$(if $(filter $(OS),MACOSX),-liconv) \
-))
-
 $(eval $(call gb_Library_add_exception_objects,ucpdav1,\
 	ucb/source/ucp/webdav/AprEnv \
 	ucb/source/ucp/webdav/ContentProperties \
commit 1b09c2439087cbe827c8470cb6fd7a045e5e4a76
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Jun 5 11:57:49 2014 +0300

    apr uses iconv
    
    Change-Id: Ic92ab1c2b5298cd1611bc9786647fe30ad0847a9

diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk
index 51225d2..0dae22f 100644
--- a/ucb/Library_ucpdav1.mk
+++ b/ucb/Library_ucpdav1.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_Library_use_externals,ucpdav1,\
 
 $(eval $(call gb_Library_add_libs,ucpdav1,\
 	$(if $(filter $(OS),LINUX),-lpthread) \
+	$(if $(filter $(OS),MACOSX),-liconv) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,ucpdav1,\