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

9 files changed, 17 insertions, 0 deletions

diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk
index b9c93e21dff3..f27639000dae 100644
--- a/canvas/Library_cairocanvas.mk
+++ b/canvas/Library_cairocanvas.mk
@@ -90,6 +90,7 @@ $(eval $(call gb_Library_add_exception_objects,cairocanvas,\
 ))
 
 $(eval $(call gb_Library_use_externals,cairocanvas,\
+	boost_headers \
 	cairo \
 ))
 
diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk
index bda2146ee0d2..def28e256b5a 100644
--- a/canvas/Library_canvasfactory.mk
+++ b/canvas/Library_canvasfactory.mk
@@ -39,6 +39,8 @@ $(eval $(call gb_Library_set_include,canvasfactory,\
 	-I$(SRCDIR)/canvas/inc \
 ))
 
+$(eval $(call gb_Library_use_external,canvasfactory,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,canvasfactory))
 
 $(eval $(call gb_Library_use_libraries,canvasfactory,\
diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk
index 752c02befcaf..825a3f62aae4 100644
--- a/canvas/Library_canvastools.mk
+++ b/canvas/Library_canvastools.mk
@@ -41,6 +41,8 @@ $(eval $(call gb_Library_add_defs,canvastools,\
 	-DCANVASTOOLS_DLLIMPLEMENTATION \
 ))
 
+$(eval $(call gb_Library_use_external,canvastools,boost_headers))
+
 $(eval $(call gb_Library_use_libraries,canvastools,\
 	basegfx \
 	comphelper \
diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk
index 6fcba4e002cb..98300e15eca5 100644
--- a/canvas/Library_directx9canvas.mk
+++ b/canvas/Library_directx9canvas.mk
@@ -49,6 +49,8 @@ $(eval $(call gb_Library_add_defs,directx9canvas,\
 ))
 endif
 
+$(eval $(call gb_Library_use_external,directx9canvas,boost_headers))
+
 $(eval $(call gb_Library_use_libraries,directx9canvas,\
 	cppu \
 	tk \
diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk
index b20ac69fb276..c320ab2ab040 100644
--- a/canvas/Library_gdipluscanvas.mk
+++ b/canvas/Library_gdipluscanvas.mk
@@ -35,6 +35,8 @@ $(eval $(call gb_Library_set_include,gdipluscanvas,\
 	-I$(SRCDIR)/canvas/inc \
 ))
 
+$(eval $(call gb_Library_use_external,gdipluscanvas,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,gdipluscanvas))
 
 # clear NOMINMAX because GdiplusTypes.h uses those macros :(
diff --git a/canvas/Library_nullcanvas.mk b/canvas/Library_nullcanvas.mk
index 0032336e2867..5b8c305be7a1 100644
--- a/canvas/Library_nullcanvas.mk
+++ b/canvas/Library_nullcanvas.mk
@@ -35,6 +35,8 @@ $(eval $(call gb_Library_set_include,nullcanvas,\
 	-I$(SRCDIR)/canvas/inc \
 ))
 
+$(eval $(call gb_Library_use_external,nullcanvas,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,nullcanvas))
 
 $(eval $(call gb_Library_use_libraries,nullcanvas,\
diff --git a/canvas/Library_simplecanvas.mk b/canvas/Library_simplecanvas.mk
index 02587dd0b3f7..c5f5b75166cf 100644
--- a/canvas/Library_simplecanvas.mk
+++ b/canvas/Library_simplecanvas.mk
@@ -35,6 +35,8 @@ $(eval $(call gb_Library_set_include,simplecanvas,\
 	-I$(SRCDIR)/canvas/inc \
 ))
 
+$(eval $(call gb_Library_use_external,simplecanvas,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,simplecanvas))
 
 $(eval $(call gb_Library_use_libraries,simplecanvas,\
diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk
index e22d0dcc7e90..0a27cead22ac 100644
--- a/canvas/Library_vclcanvas.mk
+++ b/canvas/Library_vclcanvas.mk
@@ -35,6 +35,8 @@ $(eval $(call gb_Library_set_include,vclcanvas,\
 	-I$(SRCDIR)/canvas/inc \
 ))
 
+$(eval $(call gb_Library_use_external,vclcanvas,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,vclcanvas))
 
 $(eval $(call gb_Library_use_libraries,vclcanvas,\
diff --git a/canvas/StaticLibrary_directxcanvas.mk b/canvas/StaticLibrary_directxcanvas.mk
index fed7f87e8cd8..2d87c9fe2951 100644
--- a/canvas/StaticLibrary_directxcanvas.mk
+++ b/canvas/StaticLibrary_directxcanvas.mk
@@ -32,6 +32,8 @@ $(eval $(call gb_StaticLibrary_set_include,directxcanvas,\
 	-I$(SRCDIR)/canvas/inc \
 ))
 
+$(eval $(call gb_StaticLibrary_use_external,directxcanvas,boost_headers))
+
 $(eval $(call gb_StaticLibrary_use_api,directxcanvas,\
     offapi \
     udkapi \