[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - RepositoryExternal.mk ucb/Library_ucpftp1.mk

[Damjan Jovanovic]

 RepositoryExternal.mk  |   40 ++++++++++++++++++++++++++++++++++++++++
 ucb/Library_ucpftp1.mk |    9 +--------
 2 files changed, 41 insertions(+), 8 deletions(-)

New commits:
commit f52a13b81e8fd8cf31c4e51a66a1d9b3df7da432
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Wed Jan 4 09:22:16 2017 +0000

    Add curl to RepositoryExternal.mk and use this to link to ucbftp1 to it.
    
    Patch by: me

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index bf65f16..0196868 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -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:
diff --git a/ucb/Library_ucpftp1.mk b/ucb/Library_ucpftp1.mk
index 03ff1df..c6d4cfc 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 \
commit 6c02c2dab9317c118a5cc3e23b3dfd773c9a437a
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Tue Jan 3 20:40:48 2017 +0000

    Deliver some missing header files for internal apr-util, such as
    
    apu_version.h needed by main/ucb, and use the correct include paths for
    internal apr and apr-util.
    
    Patch by: me

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index cd79ed8..bf65f16 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -382,6 +382,10 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
 ))
 
 define gb_LinkTarget__use_apr
+$(call gb_LinkTarget_set_include,$(1),\
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc/apr \
+)
 $(call gb_LinkTarget_add_linked_libs,$(1),\
     apr-1 \
 )
@@ -410,6 +414,10 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
 ))
 
 define gb_LinkTarget__use_apr_util
+$(call gb_LinkTarget_set_include,$(1),\
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc/apr-util \
+)
 $(call gb_LinkTarget_add_linked_libs,$(1),\
     aprutil-1 \
 )
commit 32fd3b74e69a958de95da2c9eda17bf805d84446
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Tue Jan 3 20:19:25 2017 +0000

    Use the right include directory for internal serf.
    
    Patch by: me

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e5c270f..cd79ed8 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -438,6 +438,10 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
 ))
 
 define gb_LinkTarget__use_serf
+$(call gb_LinkTarget_set_include,$(1),\
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc/serf \
+)
 $(call gb_LinkTarget_add_linked_libs,$(1),\
     serf-1 \
 )