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
---
 unoxml/Library_unordf.mk | 1 +
 unoxml/Library_unoxml.mk | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'unoxml')

diff --git a/unoxml/Library_unordf.mk b/unoxml/Library_unordf.mk
index 60f5b96f9823..2ef670e1e858 100644
--- a/unoxml/Library_unordf.mk
+++ b/unoxml/Library_unordf.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Library_use_libraries,unordf,\
 ))
 
 $(eval $(call gb_Library_use_externals,unordf,\
+	boost_headers \
 	librdf \
 	redland_headers \
 	raptor_headers \
diff --git a/unoxml/Library_unoxml.mk b/unoxml/Library_unoxml.mk
index 502537750478..a974c33a9fd4 100644
--- a/unoxml/Library_unoxml.mk
+++ b/unoxml/Library_unoxml.mk
@@ -37,7 +37,10 @@ $(eval $(call gb_Library_use_libraries,unoxml,\
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_Library_use_external,unoxml,libxml2))
+$(eval $(call gb_Library_use_externals,unoxml,\
+	boost_headers \
+	libxml2 \
+))
 
 $(eval $(call gb_Library_add_exception_objects,unoxml,\
     unoxml/source/dom/node \
-- 
cgit