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

5 files changed, 12 insertions, 1 deletions

diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk
index 40a075ea10a3..2ed400957d1c 100644
--- a/dbaccess/Library_dba.mk
+++ b/dbaccess/Library_dba.mk
@@ -42,6 +42,8 @@ $(eval $(call gb_Library_add_defs,dba,\
     -DOOO_DLLIMPLEMENTATION_DBA \
 ))
 
+$(eval $(call gb_Library_use_external,dba,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,dba))
 
 $(eval $(call gb_Library_use_libraries,dba,\
diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk
index 821852218459..73d6e2bd9d57 100644
--- a/dbaccess/Library_dbaxml.mk
+++ b/dbaccess/Library_dbaxml.mk
@@ -32,6 +32,8 @@ $(eval $(call gb_Library_set_include,dbaxml,\
     -I$(SRCDIR)/dbaccess/source/inc \
 ))
 
+$(eval $(call gb_Library_use_external,dbaxml,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,dbaxml))
 
 $(eval $(call gb_Library_use_libraries,dbaxml,\
diff --git a/dbaccess/Library_dbmm.mk b/dbaccess/Library_dbmm.mk
index dd0a73b9b179..1749f24d5ec2 100644
--- a/dbaccess/Library_dbmm.mk
+++ b/dbaccess/Library_dbmm.mk
@@ -36,6 +36,8 @@ $(eval $(call gb_Library_set_include,dbmm,\
 	-I$(SRCDIR)/dbaccess/inc \
 ))
 
+$(eval $(call gb_Library_use_external,dbmm,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,dbmm))
 
 $(eval $(call gb_Library_use_libraries,dbmm,\
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index c8da4e080140..1ca0f82589d9 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -49,7 +49,10 @@ $(eval $(call gb_Library_add_cxxflags,dbu,\
 ))
 endif
 
-$(eval $(call gb_Library_use_external,dbu,odbc_headers))
+$(eval $(call gb_Library_use_externals,dbu,\
+	boost_headers \
+	odbc_headers \
+))
 
 $(eval $(call gb_Library_use_libraries,dbu,\
     comphelper \
diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk
index 5e4faa314cee..2ff4dd01baa4 100644
--- a/dbaccess/Library_sdbt.mk
+++ b/dbaccess/Library_sdbt.mk
@@ -39,6 +39,8 @@ $(eval $(call gb_Library_set_include,sdbt,\
 	-I$(SRCDIR)/dbaccess/source/sdbtools/inc \
 ))
 
+$(eval $(call gb_Library_use_external,sdbt,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,sdbt))
 
 $(eval $(call gb_Library_use_libraries,sdbt,\