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 /svtools | |
| 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 'svtools')
| -rw-r--r-- | svtools/Executable_bmp.mk | 2 | ||||
| -rw-r--r-- | svtools/Executable_bmpsum.mk | 2 | ||||
| -rw-r--r-- | svtools/Executable_g2g.mk | 2 | ||||
| -rw-r--r-- | svtools/Executable_langsupport.mk | 2 | ||||
| -rw-r--r-- | svtools/Library_hatchwindowfactory.mk | 2 | ||||
| -rw-r--r-- | svtools/Library_svt.mk | 1 |
6 files changed, 11 insertions, 0 deletions
diff --git a/svtools/Executable_bmp.mk b/svtools/Executable_bmp.mk index 527c4492ecd5..7723b4b82b56 100644 --- a/svtools/Executable_bmp.mk +++ b/svtools/Executable_bmp.mk @@ -26,6 +26,8 @@ $(eval $(call gb_Executable_set_include,bmp,\ -I$(SRCDIR)/svtools/source/inc \ )) +$(eval $(call gb_Executable_use_external,bmp,boost_headers)) + $(eval $(call gb_Executable_use_sdk_api,bmp)) $(eval $(call gb_Executable_use_libraries,bmp,\ diff --git a/svtools/Executable_bmpsum.mk b/svtools/Executable_bmpsum.mk index a833f4c7687c..f4ebdd6177ff 100644 --- a/svtools/Executable_bmpsum.mk +++ b/svtools/Executable_bmpsum.mk @@ -25,6 +25,8 @@ $(eval $(call gb_Executable_set_include,bmpsum,\ -I$(SRCDIR)/svtools/inc/svtools \ )) +$(eval $(call gb_Executable_use_external,bmpsum,boost_headers)) + $(eval $(call gb_Executable_use_sdk_api,bmpsum)) $(eval $(call gb_Executable_use_libraries,bmpsum,\ diff --git a/svtools/Executable_g2g.mk b/svtools/Executable_g2g.mk index 196afac926f7..5b7fc074faa6 100644 --- a/svtools/Executable_g2g.mk +++ b/svtools/Executable_g2g.mk @@ -25,6 +25,8 @@ $(eval $(call gb_Executable_set_include,g2g,\ -I$(SRCDIR)/svtools/inc/svtools \ )) +$(eval $(call gb_Executable_use_external,g2g,boost_headers)) + $(eval $(call gb_Executable_use_sdk_api,g2g)) $(eval $(call gb_Executable_use_libraries,g2g,\ diff --git a/svtools/Executable_langsupport.mk b/svtools/Executable_langsupport.mk index 71db2aeb7d0e..512c8a18d30b 100644 --- a/svtools/Executable_langsupport.mk +++ b/svtools/Executable_langsupport.mk @@ -36,6 +36,8 @@ $(eval $(call gb_Executable_set_include,langsupport,\ -I$(SRCDIR)/svtools/source/inc \ )) +$(eval $(call gb_Executable_use_external,langsupport,boost_headers)) + $(eval $(call gb_Executable_use_sdk_api,langsupport)) $(eval $(call gb_Executable_use_libraries,langsupport,\ diff --git a/svtools/Library_hatchwindowfactory.mk b/svtools/Library_hatchwindowfactory.mk index afaad47c5e28..7511eceddef9 100644 --- a/svtools/Library_hatchwindowfactory.mk +++ b/svtools/Library_hatchwindowfactory.mk @@ -26,6 +26,8 @@ $(eval $(call gb_Library_set_include,hatchwindowfactory,\ -I$(SRCDIR)/svtools/inc \ )) +$(eval $(call gb_Library_use_external,hatchwindowfactory,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,hatchwindowfactory)) $(eval $(call gb_Library_use_libraries,hatchwindowfactory,\ diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index 014807f2fcff..3331de6e55bf 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -59,6 +59,7 @@ $(eval $(call gb_Library_use_libraries,svt,\ )) $(eval $(call gb_Library_use_externals,svt,\ + boost_headers \ icuuc \ icu_headers \ )) |