diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-06-05 13:35:14 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-06-05 14:46:31 +0300 |
| commit | d1820ecefc5f28e854f9ff8ae1045732bbe23503 (patch) | |
| tree | 380c18e4ca72e938545a4cb402edc4d9722a0226 | |
| parent | 1b09c2439087cbe827c8470cb6fd7a045e5e4a76 (diff) | |
ucb: move APR dependencies to gb_LinkTarget__use_apr
Change-Id: I6768e5f2400f3020d85c48b80d58e13a3f6f07e9
| -rw-r--r-- | RepositoryExternal.mk | 2 | ||||
| -rw-r--r-- | ucb/Library_ucpdav1.mk | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 9e20991c7c3e..640452df5b9b 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 0dae22fe35cb..f6e8a62c514c 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 \ |