RepositoryExternal.mk | 2 ++
ucb/Library_ucpdav1.mk | 5 -----
2 files changed, 2 insertions(+), 5 deletions(-)
New commits:
commit 5cf2205387a8df61329196241397dfde42d85f7c
Author: Michael Stahl <mst...@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 \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
