diff options
| -rw-r--r-- | RepositoryExternal.mk | 6 | ||||
| -rw-r--r-- | codemaker/Executable_cppumaker.mk | 2 | ||||
| -rw-r--r-- | codemaker/Executable_javamaker.mk | 2 | ||||
| -rw-r--r-- | codemaker/StaticLibrary_codemaker.mk | 2 | ||||
| -rw-r--r-- | codemaker/StaticLibrary_codemaker_cpp.mk | 6 | ||||
| -rw-r--r-- | codemaker/StaticLibrary_codemaker_java.mk | 4 | ||||
| -rw-r--r-- | l10ntools/Executable_cfgex.mk | 2 | ||||
| -rw-r--r-- | l10ntools/Executable_gsicheck.mk | 2 | ||||
| -rw-r--r-- | l10ntools/Executable_helpex.mk | 6 | ||||
| -rw-r--r-- | l10ntools/Executable_uiex.mk | 3 | ||||
| -rw-r--r-- | l10ntools/Executable_ulfex.mk | 2 | ||||
| -rw-r--r-- | l10ntools/Executable_xrmex.mk | 2 | ||||
| -rw-r--r-- | l10ntools/StaticLibrary_transex.mk | 2 | ||||
| -rw-r--r-- | sal/Library_sal.mk | 5 |
14 files changed, 25 insertions, 21 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index dd666a6330dd..9808e1470fe1 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -416,6 +416,7 @@ $(call gb_LinkTarget_add_libs,$(1),\ endef +gb_LinkTarget__use_boost_headers:= gb_ExternalProject__use_boost_headers:= else # !SYSTEM_BOOST @@ -452,6 +453,11 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ endef +define gb_LinkTarget__use_boost_headers +$(call gb_LinkTarget_get_preparation_target,$(1)) : $(call gb_UnpackedTarball_get_target,boost) + +endef + define gb_ExternalProject__use_boost_headers $(call gb_ExternalProject_get_preparation_target,$(1)) : $(call gb_UnpackedTarball_get_target,boost) diff --git a/codemaker/Executable_cppumaker.mk b/codemaker/Executable_cppumaker.mk index 074c539dad90..a508fd203371 100644 --- a/codemaker/Executable_cppumaker.mk +++ b/codemaker/Executable_cppumaker.mk @@ -26,7 +26,7 @@ $(eval $(call gb_Executable_Executable,cppumaker)) -$(eval $(call gb_Executable_use_unpacked,cppumaker,boost)) +$(eval $(call gb_Executable_use_external,cppumaker,boost_headers)) $(eval $(call gb_Executable_use_libraries,cppumaker,\ reg \ diff --git a/codemaker/Executable_javamaker.mk b/codemaker/Executable_javamaker.mk index 22d89fd18097..a79a76e43509 100644 --- a/codemaker/Executable_javamaker.mk +++ b/codemaker/Executable_javamaker.mk @@ -26,7 +26,7 @@ $(eval $(call gb_Executable_Executable,javamaker)) -$(eval $(call gb_Executable_use_unpacked,javamaker,boost)) +$(eval $(call gb_Executable_use_external,javamaker,boost_headers)) $(eval $(call gb_Executable_use_libraries,javamaker,\ reg \ diff --git a/codemaker/StaticLibrary_codemaker.mk b/codemaker/StaticLibrary_codemaker.mk index a3005185e943..510b2c569b41 100644 --- a/codemaker/StaticLibrary_codemaker.mk +++ b/codemaker/StaticLibrary_codemaker.mk @@ -27,7 +27,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,codemaker)) -$(eval $(call gb_StaticLibrary_use_unpacked,codemaker,boost)) +$(eval $(call gb_StaticLibrary_use_external,codemaker,boost_headers)) $(eval $(call gb_StaticLibrary_use_packages,codemaker,\ codemaker_inc \ diff --git a/codemaker/StaticLibrary_codemaker_cpp.mk b/codemaker/StaticLibrary_codemaker_cpp.mk index 627f731b9868..2ee9c4ecb4bd 100644 --- a/codemaker/StaticLibrary_codemaker_cpp.mk +++ b/codemaker/StaticLibrary_codemaker_cpp.mk @@ -27,11 +27,11 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,codemaker_cpp)) -$(eval $(call gb_StaticLibrary_use_unpacked,codemaker_cpp,boost)) +$(eval $(call gb_StaticLibrary_use_external,codemaker_cpp,boost_headers)) $(eval $(call gb_StaticLibrary_use_packages,codemaker_cpp,\ - codemaker_inc \ - registry_inc \ + codemaker_inc \ + registry_inc \ sal_generated \ sal_inc \ )) diff --git a/codemaker/StaticLibrary_codemaker_java.mk b/codemaker/StaticLibrary_codemaker_java.mk index b6eb705c9650..1bcdb2552a89 100644 --- a/codemaker/StaticLibrary_codemaker_java.mk +++ b/codemaker/StaticLibrary_codemaker_java.mk @@ -27,10 +27,10 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,codemaker_java)) -$(eval $(call gb_StaticLibrary_use_unpacked,codemaker_java,boost)) +$(eval $(call gb_StaticLibrary_use_external,codemaker_java,boost_headers)) $(eval $(call gb_StaticLibrary_use_packages,codemaker_java,\ - codemaker_inc \ + codemaker_inc \ registry_inc \ sal_generated \ sal_inc \ diff --git a/l10ntools/Executable_cfgex.mk b/l10ntools/Executable_cfgex.mk index 5531606abc86..a2c8d6cb3bbc 100644 --- a/l10ntools/Executable_cfgex.mk +++ b/l10ntools/Executable_cfgex.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Executable_use_libraries,cfgex,\ sal \ )) -$(eval $(call gb_Executable_use_unpacked,cfgex,boost)) +$(eval $(call gb_Executable_use_external,cfgex,boost_headers)) $(eval $(call gb_Executable_add_scanners,cfgex,\ l10ntools/source/cfglex \ diff --git a/l10ntools/Executable_gsicheck.mk b/l10ntools/Executable_gsicheck.mk index 829a0296939f..a99dc3048b2a 100644 --- a/l10ntools/Executable_gsicheck.mk +++ b/l10ntools/Executable_gsicheck.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Executable_use_libraries,gsicheck,\ sal \ )) -$(eval $(call gb_Executable_use_unpacked,gsicheck,boost)) +$(eval $(call gb_Executable_use_external,gsicheck,boost_headers)) $(eval $(call gb_Executable_add_exception_objects,gsicheck,\ l10ntools/source/gsicheck \ diff --git a/l10ntools/Executable_helpex.mk b/l10ntools/Executable_helpex.mk index f1d447c92bed..085fd94b9e99 100644 --- a/l10ntools/Executable_helpex.mk +++ b/l10ntools/Executable_helpex.mk @@ -35,8 +35,10 @@ $(eval $(call gb_Executable_use_libraries,helpex,\ sal \ )) -$(eval $(call gb_Executable_use_external,helpex,expat_utf8)) -$(eval $(call gb_Executable_use_unpacked,helpex,boost)) +$(eval $(call gb_Executable_use_externals,helpex,\ + expat_utf8 \ + boost_headers \ +)) $(eval $(call gb_Executable_use_static_libraries,helpex,\ transex \ diff --git a/l10ntools/Executable_uiex.mk b/l10ntools/Executable_uiex.mk index 03699f67a505..064b2078479e 100644 --- a/l10ntools/Executable_uiex.mk +++ b/l10ntools/Executable_uiex.mk @@ -18,8 +18,6 @@ $(eval $(call gb_Executable_use_libraries,uiex,\ sal \ )) -$(eval $(call gb_Executable_use_unpacked,uiex,boost)) - $(eval $(call gb_Executable_use_static_libraries,uiex,\ transex \ )) @@ -32,6 +30,7 @@ $(eval $(call gb_Executable_use_externals,uiex,\ libexslt \ libxml2 \ libxslt \ + boost_headers \ )) # vim: set noet sw=4 ts=4: diff --git a/l10ntools/Executable_ulfex.mk b/l10ntools/Executable_ulfex.mk index c045eb11e4a9..f0b134ef2264 100644 --- a/l10ntools/Executable_ulfex.mk +++ b/l10ntools/Executable_ulfex.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Executable_use_libraries,ulfex,\ sal \ )) -$(eval $(call gb_Executable_use_unpacked,ulfex,boost)) +$(eval $(call gb_Executable_use_external,ulfex,boost_headers)) $(eval $(call gb_Executable_use_static_libraries,ulfex,\ transex \ diff --git a/l10ntools/Executable_xrmex.mk b/l10ntools/Executable_xrmex.mk index 1aeef2121b7a..3cbcd8861a50 100644 --- a/l10ntools/Executable_xrmex.mk +++ b/l10ntools/Executable_xrmex.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Executable_use_libraries,xrmex,\ sal \ )) -$(eval $(call gb_Executable_use_unpacked,xrmex,boost)) +$(eval $(call gb_Executable_use_external,xrmex,boost_headers)) $(eval $(call gb_Executable_add_scanners,xrmex,\ l10ntools/source/xrmlex \ diff --git a/l10ntools/StaticLibrary_transex.mk b/l10ntools/StaticLibrary_transex.mk index da2414ab57f0..4e7780120d1d 100644 --- a/l10ntools/StaticLibrary_transex.mk +++ b/l10ntools/StaticLibrary_transex.mk @@ -37,7 +37,7 @@ $(eval $(call gb_StaticLibrary_set_include,transex,\ $$(INCLUDE) \ )) -$(eval $(call gb_StaticLibrary_use_unpacked,transex,boost)) +$(eval $(call gb_StaticLibrary_use_external,transex,boost_headers)) $(eval $(call gb_StaticLibrary_add_exception_objects,transex,\ l10ntools/source/export2 \ diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index 237fe3f5cfb8..d537bc0947a5 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -59,12 +59,9 @@ $(eval $(call gb_Library_use_libraries,sal,\ $(gb_UWINAPI) \ )) -ifneq ($(SYSTEM_BOOST),YES) -$(eval $(call gb_Library_use_unpacked,sal,boost)) -endif - $(eval $(call gb_Library_use_externals,sal,\ valgrind \ + boost_headers \ )) $(eval $(call gb_Library_use_system_win32_libs,sal,\ |