Skip to content

C
core
Kaydet (Commit) 5cf22053 authored tarafından Michael Stahl's avatar Michael Stahl
Dosyalara gözat
Seçenekler

ucb: move APR dependencies to gb_LinkTarget__use_apr 

Change-Id: I6768e5f2400f3020d85c48b80d58e13a3f6f07e9
üst acaf8eb3
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 5 deletions
RepositoryExternal.mk
Dosyayı görüntüle @ 5cf22053
...@@ -1041,6 +1041,8 @@ $(call gb_LinkTarget_set_include,$(1),\ ...@@ -1041,6 +1041,8 @@ $(call gb_LinkTarget_set_include,$(1),\
) )
$(call gb_LinkTarget_add_libs,$(1),\ $(call gb_LinkTarget_add_libs,$(1),\
$(APR_LIBS) \ $(APR_LIBS) \
$(if $(filter $(OS),LINUX),-lpthread) \
$(if $(filter $(OS),MACOSX),-liconv) \
) )
ifeq ($(SYSTEM_APR),) ifeq ($(SYSTEM_APR),)
......
ucb/Library_ucpdav1.mk
Dosyayı görüntüle @ 5cf22053
...@@ -67,11 +67,6 @@ $(eval $(call gb_Library_use_externals,ucpdav1,\ ...@@ -67,11 +67,6 @@ $(eval $(call gb_Library_use_externals,ucpdav1,\
zlib \ 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,\ $(eval $(call gb_Library_add_exception_objects,ucpdav1,\
ucb/source/ucp/webdav/AprEnv \ ucb/source/ucp/webdav/AprEnv \
ucb/source/ucp/webdav/ContentProperties \ ucb/source/ucp/webdav/ContentProperties \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment