gbuild: do not copy boost headers around

- do not use gb_UnpackedTarball_copy_header_files for boost
- adapt the optimization in concat-deps.c for new path
- use boost_headers in all LinkTargets that require it
- add explicit include paths to mysqlc, mysqlcppconn, libvisio, liborcus

Change-Id: I0c43e73ed43cc9d2e6bce8faf55e992d655a0bb9

7 files changed, 14 insertions, 0 deletions

diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk
index b5f2abdae651..a0256744f379 100644
--- a/desktop/Library_deployment.mk
+++ b/desktop/Library_deployment.mk
@@ -34,6 +34,8 @@ $(eval $(call gb_Library_set_include,deployment,\
     -I$(SRCDIR)/desktop/source/deployment/registry/inc \
 ))
 
+$(eval $(call gb_Library_use_external,deployment,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,deployment))
 
 $(eval $(call gb_Library_use_libraries,deployment,\
diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk
index a7955115d3f8..0dfa88f0e016 100644
--- a/desktop/Library_deploymentgui.mk
+++ b/desktop/Library_deploymentgui.mk
@@ -34,6 +34,8 @@ $(eval $(call gb_Library_set_include,deploymentgui,\
     -I$(SRCDIR)/desktop/source/inc \
 ))
 
+$(eval $(call gb_Library_use_external,deploymentgui,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,deploymentgui))
 
 $(eval $(call gb_Library_use_libraries,deploymentgui,\
diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk
index 4779ff30b39d..544ebc348589 100644
--- a/desktop/Library_deploymentmisc.mk
+++ b/desktop/Library_deploymentmisc.mk
@@ -33,6 +33,8 @@ $(eval $(call gb_Library_set_include,deploymentmisc,\
     -I$(SRCDIR)/desktop/source/deployment/inc \
 ))
 
+$(eval $(call gb_Library_use_external,deploymentmisc,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,deploymentmisc))
 
 $(eval $(call gb_Library_add_defs,deploymentmisc,\
diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk
index 1698be961ae6..769df8b11cd1 100644
--- a/desktop/Library_migrationoo2.mk
+++ b/desktop/Library_migrationoo2.mk
@@ -31,6 +31,8 @@ $(eval $(call gb_Library_set_include,migrationoo2,\
     $$(INCLUDE) \
 ))
 
+$(eval $(call gb_Library_use_external,migrationoo2,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,migrationoo2))
 
 $(eval $(call gb_Library_use_libraries,migrationoo2,\
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index e37db8f6456e..2a635b5953c9 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -34,6 +34,8 @@ $(eval $(call gb_Library_set_include,sofficeapp,\
     -I$(SRCDIR)/desktop/source/deployment/inc \
 ))
 
+$(eval $(call gb_Library_use_external,sofficeapp,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,sofficeapp))
 
 $(eval $(call gb_Library_add_defs,sofficeapp,\
diff --git a/desktop/Library_spl.mk b/desktop/Library_spl.mk
index cc5086db0f68..6301c6bfdbc2 100644
--- a/desktop/Library_spl.mk
+++ b/desktop/Library_spl.mk
@@ -32,6 +32,8 @@ $(eval $(call gb_Library_set_include,spl,\
     -I$(SRCDIR)/desktop/inc \
 ))
 
+$(eval $(call gb_Library_use_external,spl,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,spl))
 
 $(eval $(call gb_Library_use_libraries,spl,\
diff --git a/desktop/Library_unopkgapp.mk b/desktop/Library_unopkgapp.mk
index 5ce00afd5de6..a0f678ab162b 100644
--- a/desktop/Library_unopkgapp.mk
+++ b/desktop/Library_unopkgapp.mk
@@ -34,6 +34,8 @@ $(eval $(call gb_Library_set_include,unopkgapp,\
     -I$(SRCDIR)/desktop/source/inc \
 ))
 
+$(eval $(call gb_Library_use_external,unopkgapp,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,unopkgapp))
 
 $(eval $(call gb_Library_add_defs,unopkgapp,\