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
---
 framework/Library_fwe.mk | 2 ++
 framework/Library_fwi.mk | 2 ++
 framework/Library_fwk.mk | 2 ++
 framework/Library_fwl.mk | 2 ++
 framework/Library_fwm.mk | 2 ++
 5 files changed, 10 insertions(+)

(limited to 'framework')

diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
index ebbfc1709c03..9fd6ec8b0824 100644
--- a/framework/Library_fwe.mk
+++ b/framework/Library_fwe.mk
@@ -31,6 +31,8 @@ $(eval $(call gb_Library_add_defs,fwe,\
 
 $(eval $(call gb_Library_use_sdk_api,fwe))
 
+$(eval $(call gb_Library_use_external,fwe,boost_headers))
+
 $(eval $(call gb_Library_use_libraries,fwe,\
     comphelper \
     cppu \
diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk
index 55e142da0990..150bd0c56342 100644
--- a/framework/Library_fwi.mk
+++ b/framework/Library_fwi.mk
@@ -33,6 +33,8 @@ $(eval $(call gb_Library_set_include,fwi,\
     $$(INCLUDE) \
 ))
 
+$(eval $(call gb_Library_use_external,fwi,boost_headers))
+
 $(eval $(call gb_Library_use_libraries,fwi,\
     comphelper \
     cppu \
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index b401806e5208..bf9a3970936c 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -27,6 +27,8 @@ $(eval $(call gb_Library_set_include,fwk,\
     $$(INCLUDE) \
 ))
 
+$(eval $(call gb_Library_use_external,fwk,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,fwk))
 
 $(eval $(call gb_Library_use_libraries,fwk,\
diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk
index 17ba3ebf1a81..1ef509946574 100644
--- a/framework/Library_fwl.mk
+++ b/framework/Library_fwl.mk
@@ -27,6 +27,8 @@ $(eval $(call gb_Library_set_include,fwl,\
     $$(INCLUDE) \
 ))
 
+$(eval $(call gb_Library_use_external,fwl,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,fwl))
 
 $(eval $(call gb_Library_use_libraries,fwl,\
diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk
index e7501cb5350f..176b65b474a3 100644
--- a/framework/Library_fwm.mk
+++ b/framework/Library_fwm.mk
@@ -27,6 +27,8 @@ $(eval $(call gb_Library_set_include,fwm,\
     $$(INCLUDE) \
 ))
 
+$(eval $(call gb_Library_use_external,fwm,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,fwm))
 
 $(eval $(call gb_Library_use_libraries,fwm,\
-- 
cgit