diff options
author | Michael Stahl <mstahl@redhat.com> | 2013-01-26 21:19:13 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-01-26 22:20:06 +0100 |
commit | a53586f4efe26b8875107d04001f4ecec760c343 (patch) | |
tree | 9b19f0ecf5b5a08cc056e3274a2eaba96894dec8 /sfx2 | |
parent | 20773c2bb04631d9bfd60167ed091752f0deecee (diff) |
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
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/CppunitTest_sfx2_metadatable.mk | 4 | ||||
-rw-r--r-- | sfx2/Library_qstart.mk | 1 | ||||
-rw-r--r-- | sfx2/Library_sfx.mk | 5 |
3 files changed, 6 insertions, 4 deletions
diff --git a/sfx2/CppunitTest_sfx2_metadatable.mk b/sfx2/CppunitTest_sfx2_metadatable.mk index c06dcac4bb2e..d02a6441a283 100644 --- a/sfx2/CppunitTest_sfx2_metadatable.mk +++ b/sfx2/CppunitTest_sfx2_metadatable.mk @@ -33,8 +33,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sfx2_metadatable, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_set_include,sfx2_metadatable,\ - $$(INCLUDE) \ -)) +$(eval $(call gb_CppunitTest_use_external,sfx2_metadatable,boost_headers)) # vim: set noet sw=4 ts=4: diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk index 3ecdb9cd263d..ce8df30f3ee6 100644 --- a/sfx2/Library_qstart.mk +++ b/sfx2/Library_qstart.mk @@ -56,6 +56,7 @@ $(eval $(call gb_Library_use_libraries,qstart_gtk,\ )) $(eval $(call gb_Library_use_externals,qstart_gtk,\ + boost_headers \ gio \ gtk \ libxml2 \ diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index bab643a6be30..032d7c4e2f7f 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -74,7 +74,10 @@ $(eval $(call gb_Library_use_libraries,sfx,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_use_external,sfx,libxml2)) +$(eval $(call gb_Library_use_externals,sfx,\ + boost_headers \ + libxml2 \ +)) $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/appl/app \ |