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

10 files changed, 12 insertions, 12 deletions

diff --git a/l10ntools/Executable_cfgex.mk b/l10ntools/Executable_cfgex.mk
index 74ed3f81753c..824860821437 100644
--- a/l10ntools/Executable_cfgex.mk
+++ b/l10ntools/Executable_cfgex.mk
@@ -35,8 +35,6 @@ $(eval $(call gb_Executable_use_libraries,cfgex,\
     sal \
 ))
 
-$(eval $(call gb_Executable_use_external,cfgex,boost_headers))
-
 $(eval $(call gb_Executable_add_scanners,cfgex,\
     l10ntools/source/cfglex \
 ))
@@ -50,6 +48,7 @@ $(eval $(call gb_Executable_add_exception_objects,cfgex,\
 ))
 
 $(eval $(call gb_Executable_use_externals,cfgex,\
+    boost_headers \
     icuuc \
     icui18n \
 ))
diff --git a/l10ntools/Executable_helpex.mk b/l10ntools/Executable_helpex.mk
index 0652b642943e..d52a7c9d46b1 100644
--- a/l10ntools/Executable_helpex.mk
+++ b/l10ntools/Executable_helpex.mk
@@ -39,6 +39,9 @@ $(eval $(call gb_Executable_use_externals,helpex,\
 	expat_utf8 \
 	boost_headers \
 	icu_headers \
+    libxml2 \
+    icuuc \
+    icui18n \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,helpex,\
@@ -51,10 +54,4 @@ $(eval $(call gb_Executable_add_exception_objects,helpex,\
     l10ntools/source/helpmerge \
 ))
 
-$(eval $(call gb_Executable_use_externals,helpex,\
-    libxml2 \
-    icuuc \
-    icui18n \
-))
-
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/l10ntools/Executable_localize.mk b/l10ntools/Executable_localize.mk
index 5e55eee665e7..a55024d2470c 100644
--- a/l10ntools/Executable_localize.mk
+++ b/l10ntools/Executable_localize.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_Executable_add_exception_objects,localize,\
 ))
 
 $(eval $(call gb_Executable_use_externals,localize,\
+    boost_headers \
     icuuc \
     icui18n \
 ))
diff --git a/l10ntools/Executable_propex.mk b/l10ntools/Executable_propex.mk
index f97f7a14d0be..f98706f6810f 100644
--- a/l10ntools/Executable_propex.mk
+++ b/l10ntools/Executable_propex.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Executable_add_exception_objects,propex,\
 ))
 
 $(eval $(call gb_Executable_use_externals,propex,\
+    boost_headers \
     icuuc \
     icui18n \
 ))
diff --git a/l10ntools/Executable_renewpo.mk b/l10ntools/Executable_renewpo.mk
index cfdb923dd057..acea0193f01f 100644
--- a/l10ntools/Executable_renewpo.mk
+++ b/l10ntools/Executable_renewpo.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Executable_add_exception_objects,renewpo,\
 ))
 
 $(eval $(call gb_Executable_use_externals,renewpo,\
+    boost_headers \
     icuuc \
     icui18n \
 ))
diff --git a/l10ntools/Executable_stringex.mk b/l10ntools/Executable_stringex.mk
index f20a9f8fddad..9545dd582e73 100644
--- a/l10ntools/Executable_stringex.mk
+++ b/l10ntools/Executable_stringex.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Executable_add_exception_objects,stringex,\
 ))
 
 $(eval $(call gb_Executable_use_externals,stringex,\
+    boost_headers \
     libxml2 \
     icuuc \
     icui18n \
diff --git a/l10ntools/Executable_transex3.mk b/l10ntools/Executable_transex3.mk
index 132e8a1b750d..364f386fdab0 100644
--- a/l10ntools/Executable_transex3.mk
+++ b/l10ntools/Executable_transex3.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_Executable_add_exception_objects,transex3,\
 ))
 
 $(eval $(call gb_Executable_use_externals,transex3,\
+    boost_headers \
     icuuc \
     icui18n \
     icu_headers \
diff --git a/l10ntools/Executable_treex.mk b/l10ntools/Executable_treex.mk
index 988e78046803..c8ff48c72275 100644
--- a/l10ntools/Executable_treex.mk
+++ b/l10ntools/Executable_treex.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Executable_add_exception_objects,treex,\
 ))
 
 $(eval $(call gb_Executable_use_externals,treex,\
+    boost_headers \
     libxml2 \
     icuuc \
     icui18n \
diff --git a/l10ntools/Executable_ulfex.mk b/l10ntools/Executable_ulfex.mk
index 0ee4d44cb4c1..dc1268120eed 100644
--- a/l10ntools/Executable_ulfex.mk
+++ b/l10ntools/Executable_ulfex.mk
@@ -35,8 +35,6 @@ $(eval $(call gb_Executable_use_libraries,ulfex,\
     sal \
 ))
 
-$(eval $(call gb_Executable_use_external,ulfex,boost_headers))
-
 $(eval $(call gb_Executable_use_static_libraries,ulfex,\
     transex \
 ))
@@ -47,6 +45,7 @@ $(eval $(call gb_Executable_add_exception_objects,ulfex,\
 ))
 
 $(eval $(call gb_Executable_use_externals,ulfex,\
+    boost_headers \
     icuuc \
     icui18n \
 ))
diff --git a/l10ntools/Executable_xrmex.mk b/l10ntools/Executable_xrmex.mk
index f11f33d46434..3eef3376f657 100644
--- a/l10ntools/Executable_xrmex.mk
+++ b/l10ntools/Executable_xrmex.mk
@@ -35,8 +35,6 @@ $(eval $(call gb_Executable_use_libraries,xrmex,\
     sal \
 ))
 
-$(eval $(call gb_Executable_use_external,xrmex,boost_headers))
-
 $(eval $(call gb_Executable_add_scanners,xrmex,\
     l10ntools/source/xrmlex \
 ))
@@ -50,6 +48,7 @@ $(eval $(call gb_Executable_add_exception_objects,xrmex,\
 ))
 
 $(eval $(call gb_Executable_use_externals,xrmex,\
+    boost_headers \
     libxml2 \
     icuuc \
     icui18n \