Author: damjan
Date: Wed Jan 4 09:22:16 2017
New Revision: 1777270
URL: http://svn.apache.org/viewvc?rev=1777270&view=rev
Log:
Add curl to RepositoryExternal.mk and use this to link to ucbftp1 to it.
Patch by: me
Modified:
openoffice/trunk/main/RepositoryExternal.mk
openoffice/trunk/main/ucb/Library_ucpftp1.mk
Modified: openoffice/trunk/main/RepositoryExternal.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/RepositoryExternal.mk?rev=1777270&r1=1777269&r2=1777270&view=diff
==============================================================================
--- openoffice/trunk/main/RepositoryExternal.mk (original)
+++ openoffice/trunk/main/RepositoryExternal.mk Wed Jan 4 09:22:16 2017
@@ -458,4 +458,32 @@ endef
endif # SYSTEM_SERF
+ifeq ($(SYSTEM_CURL),YES)
+
+define gb_LinkTarget__use_curl
+$(call gb_LinkTarget_add_defs,$(1),\
+ -DSYSTEM_CURL \
+)
+$(call gb_LinkTarget_set_include,$(1),\
+ $$(INCLUDE) \
+ $(CURL_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(CURL_LIBS))
+endef
+
+else # !SYSTEM_CURL
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+ curl \
+))
+
+define gb_LinkTarget__use_curl
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+ curl \
+)
+endef
+
+endif # SYSTEM_CURL
+
+
# vim: set noet sw=4 ts=4:
Modified: openoffice/trunk/main/ucb/Library_ucpftp1.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/ucb/Library_ucpftp1.mk?rev=1777270&r1=1777269&r2=1777270&view=diff
==============================================================================
--- openoffice/trunk/main/ucb/Library_ucpftp1.mk (original)
+++ openoffice/trunk/main/ucb/Library_ucpftp1.mk Wed Jan 4 09:22:16 2017
@@ -31,11 +31,6 @@ $(eval $(call gb_Library_set_include,ucp
$$(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
$(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 \
