summaryrefslogtreecommitdiff
path: root/ucb
diff options
context:
space:
mode:
authorDamjan Jovanovic <damjan@apache.org>2017-01-04 09:22:16 +0000
committerDamjan Jovanovic <damjan@apache.org>2017-01-04 09:22:16 +0000
commitf52a13b81e8fd8cf31c4e51a66a1d9b3df7da432 (patch)
treea6f77baf0de2f6df68b08dd73117822c0c5de333 /ucb
parent6c02c2dab9317c118a5cc3e23b3dfd773c9a437a (diff)
Add curl to RepositoryExternal.mk and use this to link to ucbftp1 to it.
Patch by: me
Notes
Notes: ignore: obsolete
Diffstat (limited to 'ucb')
-rw-r--r--ucb/Library_ucpftp1.mk9
1 files changed, 1 insertions, 8 deletions
diff --git a/ucb/Library_ucpftp1.mk b/ucb/Library_ucpftp1.mk
index 03ff1df714b8..c6d4cfccddec 100644
--- a/ucb/Library_ucpftp1.mk
+++ b/ucb/Library_ucpftp1.mk
@@ -31,11 +31,6 @@ $(eval $(call gb_Library_set_include,ucpftp1,\
$$(INCLUDE) \
-I$(SRCDIR)/ucb/inc/pch \
-I$(SRCDIR)/ucb/source/inc \
- $(filter -I%,$(CURL_CFLAGS)) \
-))
-
-$(eval $(call gb_Library_add_cflags,ucpftp1,\
- $(filter-out -I%,$(CURL_CFLAGS)) \
))
$(eval $(call gb_Library_add_api,ucpftp1,\
@@ -52,9 +47,7 @@ $(eval $(call gb_Library_add_linked_libs,ucpftp1,\
$(gb_STDLIBS) \
))
-$(eval $(call gb_Library_add_libs,ucpftp1,\
- $(CURL_LIBS) \
-))
+$(call gb_Library_use_external,ucpftp1,curl)
$(eval $(call gb_Library_add_exception_objects,ucpftp1,\
ucb/source/ucp/ftp/ftpservices \