From a53586f4efe26b8875107d04001f4ecec760c343 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Sat, 26 Jan 2013 21:19:13 +0100
Subject: 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
---
 scripting/Library_basprov.mk         | 2 ++
 scripting/Library_dlgprov.mk         | 2 ++
 scripting/Library_protocolhandler.mk | 2 ++
 scripting/Library_scriptframe.mk     | 2 ++
 scripting/Library_stringresource.mk  | 2 ++
 scripting/Library_vbaevents.mk       | 2 ++
 6 files changed, 12 insertions(+)

(limited to 'scripting')

diff --git a/scripting/Library_basprov.mk b/scripting/Library_basprov.mk
index 602aa1df85af..afa4d2bf7214 100644
--- a/scripting/Library_basprov.mk
+++ b/scripting/Library_basprov.mk
@@ -35,6 +35,8 @@ $(eval $(call gb_Library_set_include,basprov,\
 	-I$(SRCDIR)/scripting/source/inc \
 ))
 
+$(eval $(call gb_Library_use_external,basprov,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,basprov))
 
 $(eval $(call gb_Library_use_libraries,basprov,\
diff --git a/scripting/Library_dlgprov.mk b/scripting/Library_dlgprov.mk
index 3219003f9566..a5511fbd50f6 100644
--- a/scripting/Library_dlgprov.mk
+++ b/scripting/Library_dlgprov.mk
@@ -35,6 +35,8 @@ $(eval $(call gb_Library_set_include,dlgprov,\
 	-I$(SRCDIR)/scripting/source/inc \
 ))
 
+$(eval $(call gb_Library_use_external,dlgprov,boost_headers))
+
 $(eval $(call gb_Library_use_api,dlgprov,\
 	offapi \
 	oovbaapi \
diff --git a/scripting/Library_protocolhandler.mk b/scripting/Library_protocolhandler.mk
index d2a684ab852f..eeef9c399f24 100644
--- a/scripting/Library_protocolhandler.mk
+++ b/scripting/Library_protocolhandler.mk
@@ -35,6 +35,8 @@ $(eval $(call gb_Library_set_include,protocolhandler,\
 	-I$(SRCDIR)/scripting/source/inc \
 ))
 
+$(eval $(call gb_Library_use_external,protocolhandler,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,protocolhandler))
 
 $(eval $(call gb_Library_use_libraries,protocolhandler,\
diff --git a/scripting/Library_scriptframe.mk b/scripting/Library_scriptframe.mk
index 2ecc9ec70a48..c3642f64a5c3 100644
--- a/scripting/Library_scriptframe.mk
+++ b/scripting/Library_scriptframe.mk
@@ -35,6 +35,8 @@ $(eval $(call gb_Library_set_include,scriptframe,\
 	-I$(SRCDIR)/scripting/source/inc \
 ))
 
+$(eval $(call gb_Library_use_external,scriptframe,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,scriptframe))
 
 $(eval $(call gb_Library_use_libraries,scriptframe,\
diff --git a/scripting/Library_stringresource.mk b/scripting/Library_stringresource.mk
index 29c5eb9e0a3b..f0f49dcf999d 100644
--- a/scripting/Library_stringresource.mk
+++ b/scripting/Library_stringresource.mk
@@ -35,6 +35,8 @@ $(eval $(call gb_Library_set_include,stringresource,\
 	-I$(SRCDIR)/scripting/source/inc \
 ))
 
+$(eval $(call gb_Library_use_external,stringresource,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,stringresource))
 
 $(eval $(call gb_Library_use_libraries,stringresource,\
diff --git a/scripting/Library_vbaevents.mk b/scripting/Library_vbaevents.mk
index acab48fe2811..ae9e58118ef8 100644
--- a/scripting/Library_vbaevents.mk
+++ b/scripting/Library_vbaevents.mk
@@ -35,6 +35,8 @@ $(eval $(call gb_Library_set_include,vbaevents,\
 	-I$(SRCDIR)/scripting/source/inc \
 ))
 
+$(eval $(call gb_Library_use_external,vbaevents,boost_headers))
+
 $(eval $(call gb_Library_use_api,vbaevents,\
 	offapi \
 	oovbaapi \
-- 
cgit v1.2.3