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
---
 slideshow/Library_OGLTrans.mk  | 5 ++++-
 slideshow/Library_slideshow.mk | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'slideshow')

diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk
index 7240ae75115d..701b37727411 100644
--- a/slideshow/Library_OGLTrans.mk
+++ b/slideshow/Library_OGLTrans.mk
@@ -56,7 +56,10 @@ $(eval $(call gb_Library_use_libraries,OGLTrans,\
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_Library_use_external,OGLTrans,mesa_headers))
+$(eval $(call gb_Library_use_externals,OGLTrans,\
+	boost_headers \
+	mesa_headers \
+))
 
 $(eval $(call gb_Library_set_componentfile,OGLTrans,slideshow/source/engine/OGLTrans/ogltrans))
 
diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk
index 3813ce364c14..81476e4713ae 100644
--- a/slideshow/Library_slideshow.mk
+++ b/slideshow/Library_slideshow.mk
@@ -47,6 +47,8 @@ $(eval $(call gb_Library_add_defs,slideshow,\
 ))
 endif
 
+$(eval $(call gb_Library_use_external,slideshow,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,slideshow))
 
 $(eval $(call gb_Library_use_libraries,slideshow,\
-- 
cgit