diff options
374 files changed, 730 insertions, 98 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index dbdf4a996186..aa739373c16e 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -476,6 +476,10 @@ endef define gb_LinkTarget__use_boost_headers $(call gb_LinkTarget_use_unpacked,$(1),boost) +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,boost) \ + $$(INCLUDE) \ +) endef diff --git a/accessibility/Library_acc.mk b/accessibility/Library_acc.mk index d0a0e360c117..2c1bda134a79 100644 --- a/accessibility/Library_acc.mk +++ b/accessibility/Library_acc.mk @@ -33,6 +33,8 @@ $(eval $(call gb_Library_set_include,acc,\ -I$(SRCDIR)/accessibility/source/inc \ )) +$(eval $(call gb_Library_use_external,acc,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,acc)) $(eval $(call gb_Library_use_libraries,acc,\ diff --git a/accessibility/Library_java_uno_accessbridge.mk b/accessibility/Library_java_uno_accessbridge.mk index 3b4c27c39b96..b9eec59b9cdc 100644 --- a/accessibility/Library_java_uno_accessbridge.mk +++ b/accessibility/Library_java_uno_accessbridge.mk @@ -29,6 +29,8 @@ $(eval $(call gb_Library_Library,java_uno_accessbridge)) $(eval $(call gb_Library_use_custom_headers,java_uno_accessbridge,accessibility/bridge/inc)) +$(eval $(call gb_Library_use_external,java_uno_accessbridge,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,java_uno_accessbridge,)) $(eval $(call gb_Library_use_libraries,java_uno_accessbridge,\ diff --git a/animations/Library_animcore.mk b/animations/Library_animcore.mk index 9f4d5b4912bf..5a50d94dae4e 100644 --- a/animations/Library_animcore.mk +++ b/animations/Library_animcore.mk @@ -28,6 +28,8 @@ $(eval $(call gb_Library_Library,animcore)) +$(eval $(call gb_Library_use_external,animcore,boost_headers)) + $(eval $(call gb_Library_use_packages,animcore,\ animations_inc \ comphelper_inc \ diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk index 2dfd7c6d6c59..f77da34842aa 100644 --- a/avmedia/Library_avmedia.mk +++ b/avmedia/Library_avmedia.mk @@ -44,6 +44,8 @@ $(eval $(call gb_Library_add_defs,avmedia,\ -DAVMEDIA_DLLIMPLEMENTATION \ )) +$(eval $(call gb_Library_use_external,avmedia,boost_headers)) + $(eval $(call gb_Library_use_libraries,avmedia,\ comphelper \ ucbhelper \ diff --git a/avmedia/Library_avmediaQuickTime.mk b/avmedia/Library_avmediaQuickTime.mk index defe843ab900..0e72034f9a2c 100644 --- a/avmedia/Library_avmediaQuickTime.mk +++ b/avmedia/Library_avmediaQuickTime.mk @@ -35,6 +35,8 @@ $(eval $(call gb_Library_set_include,avmediaQuickTime,\ -I$(SRCDIR)/avmedia/source/inc \ )) +$(eval $(call gb_Library_use_external,avmediaQuickTime,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,avmediaQuickTime)); $(eval $(call gb_Library_use_libraries,avmediaQuickTime,\ diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk index 1e0b5fc5f839..3ea54e88cc4d 100644 --- a/avmedia/Library_avmediagst.mk +++ b/avmedia/Library_avmediagst.mk @@ -37,6 +37,8 @@ $(eval $(call gb_Library_set_include,avmediagst,\ )) $(eval $(call gb_Library_add_libs,avmediagst,$(GSTREAMER_LIBS))) +$(eval $(call gb_Library_use_external,avmediagst,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,avmediagst)) ifeq ($(OS),WNT) diff --git a/avmedia/Library_avmediagst_0_10.mk b/avmedia/Library_avmediagst_0_10.mk index 91ce2fa0e9ba..da3460610d2b 100644 --- a/avmedia/Library_avmediagst_0_10.mk +++ b/avmedia/Library_avmediagst_0_10.mk @@ -36,6 +36,8 @@ $(eval $(call gb_Library_set_include,avmediagst_0_10,\ $(GSTREAMER_0_10_CFLAGS) \ )) +$(eval $(call gb_Library_use_external,avmediagst_0_10,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,avmediagst_0_10)) ifeq ($(OS),WNT) diff --git a/avmedia/Library_avmediawin.mk b/avmedia/Library_avmediawin.mk index 5d6649c37baa..62b071f32e78 100644 --- a/avmedia/Library_avmediawin.mk +++ b/avmedia/Library_avmediawin.mk @@ -30,6 +30,8 @@ $(eval $(call gb_Library_Library,avmediawin)) $(eval $(call gb_Library_set_componentfile,avmediawin,avmedia/source/win/avmediawin)) +$(eval $(call gb_Library_use_external,avmediawin,boost_headers)) + $(eval $(call gb_Library_set_include,avmediawin,\ $$(INCLUDE) \ -I$(SRCDIR)/avmedia/source/inc \ diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk index ce7cbb77696b..14154cc0e54a 100644 --- a/basctl/Library_basctl.mk +++ b/basctl/Library_basctl.mk @@ -38,6 +38,8 @@ $(eval $(call gb_Library_set_include,basctl,\ -I$(WORKDIR)/SdiTarget/basctl/sdi \ )) +$(eval $(call gb_Library_use_external,basctl,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,basctl)) $(eval $(call gb_Library_use_libraries,basctl,\ diff --git a/basebmp/CppunitTest_basebmp.mk b/basebmp/CppunitTest_basebmp.mk index 4879303502de..ff20ac09ae1c 100644 --- a/basebmp/CppunitTest_basebmp.mk +++ b/basebmp/CppunitTest_basebmp.mk @@ -14,6 +14,8 @@ $(eval $(call gb_CppunitTest_set_include,basebmp_cpputest,\ $$(INCLUDE) \ )) +$(eval $(call gb_CppunitTest_use_external,basebmp_cpputest,boost_headers)) + ifeq ($(OS),ANDROID) $(eval $(call gb_CppunitTest_use_static_libraries,basebmp_cpputest,\ basebmp \ diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk index 5f3de82840ff..3587d35c8ce5 100644 --- a/basebmp/Library_basebmp.mk +++ b/basebmp/Library_basebmp.mk @@ -13,7 +13,10 @@ $(eval $(call gb_Library_use_package,basebmp,basebmp_inc)) $(eval $(call gb_Library_use_sdk_api,basebmp)) -$(eval $(call gb_Library_use_external,basebmp,vigra_headers)) +$(eval $(call gb_Library_use_externals,basebmp,\ + boost_headers \ + vigra_headers \ +)) $(eval $(call gb_Library_use_libraries,basebmp,\ basegfx \ diff --git a/basegfx/CppunitTest_basegfx.mk b/basegfx/CppunitTest_basegfx.mk index e9c3bb887ea4..e502885ab735 100644 --- a/basegfx/CppunitTest_basegfx.mk +++ b/basegfx/CppunitTest_basegfx.mk @@ -9,6 +9,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,basegfx_cpputest)) +$(eval $(call gb_CppunitTest_use_external,basegfx_cpputest,boost_headers)) + $(eval $(call gb_CppunitTest_use_api,basegfx_cpputest,\ offapi \ udkapi \ diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk index 8cc7a86b7ae9..303d4376f434 100644 --- a/basegfx/Library_basegfx.mk +++ b/basegfx/Library_basegfx.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Library_Library,basegfx)) +$(eval $(call gb_Library_use_external,basegfx,boost_headers)) + $(eval $(call gb_Library_use_packages,basegfx,\ basegfx_inc \ comphelper_inc \ diff --git a/basic/CppunitTest_basic_coverage.mk b/basic/CppunitTest_basic_coverage.mk index 1d337b5f90a1..99aec22b98d2 100644 --- a/basic/CppunitTest_basic_coverage.mk +++ b/basic/CppunitTest_basic_coverage.mk @@ -8,6 +8,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,basic_coverage)) +$(eval $(call gb_CppunitTest_use_external,basic_coverage,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,basic_coverage, \ basic/qa/cppunit/basic_coverage \ )) diff --git a/basic/CppunitTest_basic_enable.mk b/basic/CppunitTest_basic_enable.mk index 7a1c3da5a8cf..1e3f6195bda1 100644 --- a/basic/CppunitTest_basic_enable.mk +++ b/basic/CppunitTest_basic_enable.mk @@ -8,6 +8,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,basic_enable)) +$(eval $(call gb_CppunitTest_use_external,basic_enable,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,basic_enable, \ basic/qa/cppunit/test_append \ )) diff --git a/basic/CppunitTest_basic_nested_struct.mk b/basic/CppunitTest_basic_nested_struct.mk index f7db5a1d1d5e..fcb4583d5a4c 100644 --- a/basic/CppunitTest_basic_nested_struct.mk +++ b/basic/CppunitTest_basic_nested_struct.mk @@ -9,6 +9,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,basic_nested_struct)) +$(eval $(call gb_CppunitTest_use_external,basic_nested_struct,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,basic_nested_struct, \ basic/qa/cppunit/test_nested_struct \ )) diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk index 8597b21de439..8412735d6d89 100644 --- a/basic/Library_sb.mk +++ b/basic/Library_sb.mk @@ -29,6 +29,8 @@ $(eval $(call gb_Library_set_include,sb,\ -I$(SRCDIR)/basic/source/inc \ )) +$(eval $(call gb_Library_use_external,sb,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,sb)) $(eval $(call gb_Library_use_api,sb,oovbaapi)) diff --git a/binaryurp/CppunitTest_binaryurp_test-cache.mk b/binaryurp/CppunitTest_binaryurp_test-cache.mk index 93b716ca5990..c2a7ffb1f3c9 100644 --- a/binaryurp/CppunitTest_binaryurp_test-cache.mk +++ b/binaryurp/CppunitTest_binaryurp_test-cache.mk @@ -28,6 +28,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,binaryurp_test-cache)) +$(eval $(call gb_CppunitTest_use_external,binaryurp_test-cache,boost_headers)) + $(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-cache,\ sal \ $(gb_UWINAPI) \ diff --git a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk index 09fbcce439fa..6eefea75c677 100644 --- a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk +++ b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk @@ -28,6 +28,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,binaryurp_test-unmarshal)) +$(eval $(call gb_CppunitTest_use_external,binaryurp_test-unmarshal,boost_headers)) + $(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-unmarshal,\ cppu \ cppuhelper \ diff --git a/binaryurp/Library_binaryurp.mk b/binaryurp/Library_binaryurp.mk index 223d9c8113d5..37b96e77ec4a 100644 --- a/binaryurp/Library_binaryurp.mk +++ b/binaryurp/Library_binaryurp.mk @@ -32,6 +32,8 @@ $(eval $(call gb_Library_set_componentfile,binaryurp,binaryurp/source/binaryurp) $(eval $(call gb_Library_use_sdk_api,binaryurp)) +$(eval $(call gb_Library_use_external,binaryurp,boost_headers)) + $(eval $(call gb_Library_use_libraries,binaryurp,\ cppu \ cppuhelper \ diff --git a/boost/StaticLibrary_boostdatetime.mk b/boost/StaticLibrary_boostdatetime.mk index 1328d559ffad..bea82da1cf31 100644 --- a/boost/StaticLibrary_boostdatetime.mk +++ b/boost/StaticLibrary_boostdatetime.mk @@ -16,7 +16,7 @@ $(eval $(call gb_StaticLibrary_add_defs,boostdatetime,\ -DBOOST_ALL_NO_LIB \ )) -$(eval $(call gb_StaticLibrary_use_unpacked,boostdatetime,boost)) +$(eval $(call gb_StaticLibrary_use_external,boostdatetime,boost_headers)) $(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boostdatetime,cpp)) diff --git a/boost/StaticLibrary_boostthread.mk b/boost/StaticLibrary_boostthread.mk index 3aa4859cbcbe..41b6765e2da3 100644 --- a/boost/StaticLibrary_boostthread.mk +++ b/boost/StaticLibrary_boostthread.mk @@ -16,7 +16,7 @@ $(eval $(call gb_StaticLibrary_add_defs,boostthread,\ -DBOOST_ALL_NO_LIB \ )) -$(eval $(call gb_StaticLibrary_use_unpacked,boostthread,boost)) +$(eval $(call gb_StaticLibrary_use_external,boostthread,boost_headers)) $(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boostthread,cpp)) diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk index 4db9aef35f0e..2fcae8c25810 100644 --- a/boost/UnpackedTarball_boost.mk +++ b/boost/UnpackedTarball_boost.mk @@ -62,8 +62,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,boost,\ $(foreach patch,$(boost_patches),boost/$(patch)) \ )) -$(eval $(call gb_UnpackedTarball_copy_header_files,boost,\ - boost \ -)) - # vim: set noet sw=4 ts=4: diff --git a/bridges/Library_cc50_solaris_intel.mk b/bridges/Library_cc50_solaris_intel.mk index 8472c9d70ee9..7e3565de112c 100644 --- a/bridges/Library_cc50_solaris_intel.mk +++ b/bridges/Library_cc50_solaris_intel.mk @@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := cc50_solaris_intel $(eval $(call gb_Library_Library,sunpro5_uno)) +$(eval $(call gb_Library_use_external,sunpro5_uno,boost_headers)) + $(eval $(call gb_Library_use_internal_comprehensive_api,sunpro5_uno,\ udkapi \ )) diff --git a/bridges/Library_cc50_solaris_sparc.mk b/bridges/Library_cc50_solaris_sparc.mk index b3efb0ebb0a5..2e6ca9cfffaa 100644 --- a/bridges/Library_cc50_solaris_sparc.mk +++ b/bridges/Library_cc50_solaris_sparc.mk @@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := cc50_solaris_sparc $(eval $(call gb_Library_Library,sunpro5_uno)) +$(eval $(call gb_Library_use_external,sunpro5_uno,boost_headers)) + $(eval $(call gb_Library_use_internal_comprehensive_api,sunpro5_uno,\ udkapi \ )) diff --git a/bridges/Library_cc5_solaris_sparc64.mk b/bridges/Library_cc5_solaris_sparc64.mk index e29e0170c107..2c12767ad93f 100644 --- a/bridges/Library_cc5_solaris_sparc64.mk +++ b/bridges/Library_cc5_solaris_sparc64.mk @@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := cc5_solaris_sparc64 $(eval $(call gb_Library_Library,sunpro5_uno)) +$(eval $(call gb_Library_use_external,sunpro5_uno,boost_headers)) + $(eval $(call gb_Library_use_internal_comprehensive_api,sunpro5_uno,\ udkapi \ )) diff --git a/bridges/Library_gcc3_aix_powerpc.mk b/bridges/Library_gcc3_aix_powerpc.mk index 0b541926e2b1..e27df57f4ecf 100644 --- a/bridges/Library_gcc3_aix_powerpc.mk +++ b/bridges/Library_gcc3_aix_powerpc.mk @@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_aix_powerpc $(eval $(call gb_Library_Library,gcc3_uno)) +$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers)) + $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\ udkapi \ )) diff --git a/bridges/Library_gcc3_ios_arm.mk b/bridges/Library_gcc3_ios_arm.mk index 4f5d7ffa42e0..314a5891c784 100644 --- a/bridges/Library_gcc3_ios_arm.mk +++ b/bridges/Library_gcc3_ios_arm.mk @@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_ios_arm $(eval $(call gb_Library_Library,gcc3_uno)) +$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers)) + $(eval $(call gb_Library_use_custom_headers,gcc3_uno,\ bridges/source/cpp_uno/gcc3_ios_arm \ )) diff --git a/bridges/Library_gcc3_linux_alpha.mk b/bridges/Library_gcc3_linux_alpha.mk index 77d331d390c3..35e196482dc1 100644 --- a/bridges/Library_gcc3_linux_alpha.mk +++ b/bridges/Library_gcc3_linux_alpha.mk @@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_alpha $(eval $(call gb_Library_Library,gcc3_uno)) +$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers)) + $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\ udkapi \ )) diff --git a/bridges/Library_gcc3_linux_arm.mk b/bridges/Library_gcc3_linux_arm.mk index 94711eaecbab..95c85d2c6e65 100644 --- a/bridges/Library_gcc3_linux_arm.mk +++ b/bridges/Library_gcc3_linux_arm.mk @@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_arm $(eval $(call gb_Library_Library,gcc3_uno)) +$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers)) + $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\ udkapi \ )) diff --git a/bridges/Library_gcc3_linux_hppa.mk b/bridges/Library_gcc3_linux_hppa.mk index fea698d9f4ad..bb2e90d456bc 100644 --- a/bridges/Library_gcc3_linux_hppa.mk +++ b/bridges/Library_gcc3_linux_hppa.mk @@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_hppa $(eval $(call gb_Library_Library,gcc3_uno)) +$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers)) + $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\ udkapi \ )) diff --git a/bridges/Library_gcc3_linux_ia64.mk b/bridges/Library_gcc3_linux_ia64.mk index 6f71829dc9f3..8944948411cf 100644 --- a/bridges/Library_gcc3_linux_ia64.mk +++ b/bridges/Library_gcc3_linux_ia64.mk @@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_ia64 $(eval $(call gb_Library_Library,gcc3_uno)) +$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers)) + $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\ udkapi \ )) diff --git a/bridges/Library_gcc3_linux_intel.mk b/bridges/Library_gcc3_linux_intel.mk index 502093241a98..02a033b5515a 100644 --- a/bridges/Library_gcc3_linux_intel.mk +++ b/bridges/Library_gcc3_linux_intel.mk @@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_intel $(eval $(call gb_Library_Library,gcc3_uno)) +$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers)) + $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\ udkapi \ )) diff --git a/bridges/Library_gcc3_linux_m68k.mk b/bridges/Library_gcc3_linux_m68k.mk index 5175d374246b..015764e81288 100644 --- a/bridges/Library_gcc3_linux_m68k.mk +++ b/bridges/Library_gcc3_linux_m68k.mk @@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_m68k $(eval $(call gb_Library_Library,gcc3_uno)) +$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers)) + $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\ udkapi \ )) diff --git a/bridges/Library_gcc3_linux_mips.mk b/bridges/Library_gcc3_linux_mips.mk index a5dfe34b0f7c..37ca9b0b14cd 100644 --- a/bridges/Library_gcc3_linux_mips.mk +++ b/bridges/Library_gcc3_linux_mips.mk @@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_mips $(eval $(call gb_Library_Library,gcc3_uno)) +$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers)) + $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\ udkapi \ )) diff --git a/bridges/Library_gcc3_linux_powerpc.mk b/bridges/Library_gcc3_linux_powerpc.mk index cbf62694e062..c9c79c4aa3e6 100644 --- a/bridges/Library_gcc3_linux_powerpc.mk +++ b/bridges/Library_gcc3_linux_powerpc.mk @@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_powerpc $(eval $(call gb_Library_Library,gcc3_uno)) +$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers)) + $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\ udkapi \ )) diff --git a/bridges/Library_gcc3_linux_powerpc64.mk b/bridges/Library_gcc3_linux_powerpc64.mk index acb1f3f1a3c9..baf6bf30d98f 100644 --- a/bridges/Library_gcc3_linux_powerpc64.mk +++ b/bridges/Library_gcc3_linux_powerpc64.mk @@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_powerpc64 $(eval $(call gb_Library_Library,gcc3_uno)) +$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers)) + $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\ udkapi \ )) diff --git a/bridges/Library_gcc3_linux_s390.mk b/bridges/Library_gcc3_linux_s390.mk index 2624e9e176d5..388ef817c69d 100644 --- a/bridges/Library_gcc3_linux_s390.mk +++ b/bridges/Library_gcc3_linux_s390.mk @@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_s390 $(eval $(call gb_Library_Library,gcc3_uno)) +$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers)) + $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\ udkapi \ )) diff --git a/bridges/Library_gcc3_linux_s390x.mk b/bridges/Library_gcc3_linux_s390x.mk index d2400e98b157..4216d3c23601 100644 --- a/bridges/Library_gcc3_linux_s390x.mk +++ b/bridges/Library_gcc3_linux_s390x.mk @@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_s390x $(eval $(call gb_Library_Library,gcc3_uno)) +$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers)) + $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\ udkapi \ )) diff --git a/bridges/Library_gcc3_linux_sparc.mk b/bridges/Library_gcc3_linux_sparc.mk index 5b2a9dc5bc19..0240316c7135 100644 --- a/bridges/Library_gcc3_linux_sparc.mk +++ b/bridges/Library_gcc3_linux_sparc.mk @@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_sparc $(eval $(call gb_Library_Library,gcc3_uno)) +$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers)) + $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\ udkapi \ )) diff --git a/bridges/Library_gcc3_linux_x86-64.mk b/bridges/Library_gcc3_linux_x86-64.mk index b1e596778730..93b5d2ad1913 100644 --- a/bridges/Library_gcc3_linux_x86-64.mk +++ b/bridges/Library_gcc3_linux_x86-64.mk @@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_linux_x86-64 $(eval $(call gb_Library_Library,gcc3_uno)) +$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers)) + $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\ udkapi \ )) diff --git a/bridges/Library_gcc3_macosx_intel.mk b/bridges/Library_gcc3_macosx_intel.mk index 2dc7dc02ce10..48078538491c 100644 --- a/bridges/Library_gcc3_macosx_intel.mk +++ b/bridges/Library_gcc3_macosx_intel.mk @@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_macosx_intel $(eval $(call gb_Library_Library,gcc3_uno)) +$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers)) + $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\ udkapi \ )) diff --git a/bridges/Library_gcc3_macosx_powerpc.mk b/bridges/Library_gcc3_macosx_powerpc.mk index 450ebe7d476b..67b8b696ce7d 100644 --- a/bridges/Library_gcc3_macosx_powerpc.mk +++ b/bridges/Library_gcc3_macosx_powerpc.mk @@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_macosx_powerpc $(eval $(call gb_Library_Library,gcc3_uno)) +$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers)) + $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\ udkapi \ )) diff --git a/bridges/Library_gcc3_macosx_x86-64.mk b/bridges/Library_gcc3_macosx_x86-64.mk index 309d672092e7..2a05faa48119 100644 --- a/bridges/Library_gcc3_macosx_x86-64.mk +++ b/bridges/Library_gcc3_macosx_x86-64.mk @@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_macosx_x86-64 $(eval $(call gb_Library_Library,gcc3_uno)) +$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers)) + $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\ udkapi \ )) diff --git a/bridges/Library_gcc3_solaris_intel.mk b/bridges/Library_gcc3_solaris_intel.mk index f3175faea884..8cdababd472f 100644 --- a/bridges/Library_gcc3_solaris_intel.mk +++ b/bridges/Library_gcc3_solaris_intel.mk @@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_solaris_intel $(eval $(call gb_Library_Library,gcc3_uno)) +$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers)) + $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\ udkapi \ )) diff --git a/bridges/Library_gcc3_solaris_sparc.mk b/bridges/Library_gcc3_solaris_sparc.mk index 5dab7c0345d0..456717ae420f 100644 --- a/bridges/Library_gcc3_solaris_sparc.mk +++ b/bridges/Library_gcc3_solaris_sparc.mk @@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := gcc3_solaris_sparc $(eval $(call gb_Library_Library,gcc3_uno)) +$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers)) + $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\ udkapi \ )) diff --git a/bridges/Library_java_uno.mk b/bridges/Library_java_uno.mk index 178a008192eb..758b6da5d0b3 100644 --- a/bridges/Library_java_uno.mk +++ b/bridges/Library_java_uno.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Library_Library,java_uno)) +$(eval $(call gb_Library_use_external,java_uno,boost_headers)) + ifeq ($(OS)$(COM),WNTGCC) ifeq ($(EXCEPTIONS),sjlj) $(eval $(call gb_Library_add_defs,java_uno,\ diff --git a/bridges/Library_mingw_intel.mk b/bridges/Library_mingw_intel.mk index 98b95897706a..2a57d28e7ff6 100644 --- a/bridges/Library_mingw_intel.mk +++ b/bridges/Library_mingw_intel.mk @@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := mingw_intel $(eval $(call gb_Library_Library,gcc3_uno)) +$(eval $(call gb_Library_use_external,gcc3_uno,boost_headers)) + $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\ udkapi \ )) diff --git a/bridges/Library_msvc_win32_intel.mk b/bridges/Library_msvc_win32_intel.mk index b8c098d69ff5..aa51b9cd2ec6 100644 --- a/bridges/Library_msvc_win32_intel.mk +++ b/bridges/Library_msvc_win32_intel.mk @@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := msvc_win32_intel $(eval $(call gb_Library_Library,msci_uno)) +$(eval $(call gb_Library_use_external,msci_uno,boost_headers)) + $(eval $(call gb_Library_use_internal_comprehensive_api,msci_uno,\ udkapi \ )) diff --git a/bridges/Library_msvc_win32_x86-64.mk b/bridges/Library_msvc_win32_x86-64.mk index 86c9d3c308c8..cf34370080bf 100644 --- a/bridges/Library_msvc_win32_x86-64.mk +++ b/bridges/Library_msvc_win32_x86-64.mk @@ -14,6 +14,8 @@ bridges_SELECTED_BRIDGE := msvc_win32_x86-64 $(eval $(call gb_Library_Library,mscx_uno)) +$(eval $(call gb_Library_use_external,mscx_uno,boost_headers)) + $(eval $(call gb_Library_use_internal_comprehensive_api,mscx_uno,\ udkapi \ )) diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk index b9c93e21dff3..f27639000dae 100644 --- a/canvas/Library_cairocanvas.mk +++ b/canvas/Library_cairocanvas.mk @@ -90,6 +90,7 @@ $(eval $(call gb_Library_add_exception_objects,cairocanvas,\ )) $(eval $(call gb_Library_use_externals,cairocanvas,\ + boost_headers \ cairo \ )) diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk index bda2146ee0d2..def28e256b5a 100644 --- a/canvas/Library_canvasfactory.mk +++ b/canvas/Library_canvasfactory.mk @@ -39,6 +39,8 @@ $(eval $(call gb_Library_set_include,canvasfactory,\ -I$(SRCDIR)/canvas/inc \ )) +$(eval $(call gb_Library_use_external,canvasfactory,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,canvasfactory)) $(eval $(call gb_Library_use_libraries,canvasfactory,\ diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk index 752c02befcaf..825a3f62aae4 100644 --- a/canvas/Library_canvastools.mk +++ b/canvas/Library_canvastools.mk @@ -41,6 +41,8 @@ $(eval $(call gb_Library_add_defs,canvastools,\ -DCANVASTOOLS_DLLIMPLEMENTATION \ )) +$(eval $(call gb_Library_use_external,canvastools,boost_headers)) + $(eval $(call gb_Library_use_libraries,canvastools,\ basegfx \ comphelper \ diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk index 6fcba4e002cb..98300e15eca5 100644 --- a/canvas/Library_directx9canvas.mk +++ b/canvas/Library_directx9canvas.mk @@ -49,6 +49,8 @@ $(eval $(call gb_Library_add_defs,directx9canvas,\ )) endif +$(eval $(call gb_Library_use_external,directx9canvas,boost_headers)) + $(eval $(call gb_Library_use_libraries,directx9canvas,\ cppu \ tk \ diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk index b20ac69fb276..c320ab2ab040 100644 --- a/canvas/Library_gdipluscanvas.mk +++ b/canvas/Library_gdipluscanvas.mk @@ -35,6 +35,8 @@ $(eval $(call gb_Library_set_include,gdipluscanvas,\ -I$(SRCDIR)/canvas/inc \ )) +$(eval $(call gb_Library_use_external,gdipluscanvas,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,gdipluscanvas)) # clear NOMINMAX because GdiplusTypes.h uses those macros :( diff --git a/canvas/Library_nullcanvas.mk b/canvas/Library_nullcanvas.mk index 0032336e2867..5b8c305be7a1 100644 --- a/canvas/Library_nullcanvas.mk +++ b/canvas/Library_nullcanvas.mk @@ -35,6 +35,8 @@ $(eval $(call gb_Library_set_include,nullcanvas,\ -I$(SRCDIR)/canvas/inc \ )) +$(eval $(call gb_Library_use_external,nullcanvas,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,nullcanvas)) $(eval $(call gb_Library_use_libraries,nullcanvas,\ diff --git a/canvas/Library_simplecanvas.mk b/canvas/Library_simplecanvas.mk index 02587dd0b3f7..c5f5b75166cf 100644 --- a/canvas/Library_simplecanvas.mk +++ b/canvas/Library_simplecanvas.mk @@ -35,6 +35,8 @@ $(eval $(call gb_Library_set_include,simplecanvas,\ -I$(SRCDIR)/canvas/inc \ )) +$(eval $(call gb_Library_use_external,simplecanvas,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,simplecanvas)) $(eval $(call gb_Library_use_libraries,simplecanvas,\ diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk index e22d0dcc7e90..0a27cead22ac 100644 --- a/canvas/Library_vclcanvas.mk +++ b/canvas/Library_vclcanvas.mk @@ -35,6 +35,8 @@ $(eval $(call gb_Library_set_include,vclcanvas,\ -I$(SRCDIR)/canvas/inc \ )) +$(eval $(call gb_Library_use_external,vclcanvas,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,vclcanvas)) $(eval $(call gb_Library_use_libraries,vclcanvas,\ diff --git a/canvas/StaticLibrary_directxcanvas.mk b/canvas/StaticLibrary_directxcanvas.mk index fed7f87e8cd8..2d87c9fe2951 100644 --- a/canvas/StaticLibrary_directxcanvas.mk +++ b/canvas/StaticLibrary_directxcanvas.mk @@ -32,6 +32,8 @@ $(eval $(call gb_StaticLibrary_set_include,directxcanvas,\ -I$(SRCDIR)/canvas/inc \ )) +$(eval $(call gb_StaticLibrary_use_external,directxcanvas,boost_headers)) + $(eval $(call gb_StaticLibrary_use_api,directxcanvas,\ offapi \ udkapi \ diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk index 3f5a4204c99c..702516672503 100644 --- a/chart2/Library_chartcontroller.mk +++ b/chart2/Library_chartcontroller.mk @@ -33,6 +33,8 @@ $(eval $(call gb_Library_set_include,chartcontroller,\ -I$(SRCDIR)/chart2/source/inc \ )) +$(eval $(call gb_Library_use_external,chartcontroller,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,chartcontroller)) $(eval $(call gb_Library_use_libraries,chartcontroller,\ diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk index 15b6226acd60..4ccb9c70116f 100644 --- a/chart2/Library_chartcore.mk +++ b/chart2/Library_chartcore.mk @@ -22,6 +22,8 @@ $(eval $(call gb_Library_add_defs,chartcore,\ -DOOO_DLLIMPLEMENTATION_CHARTVIEW \ )) +$(eval $(call gb_Library_use_external,chartcore,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,chartcore)) $(eval $(call gb_Library_use_libraries,chartcore,\ diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk index 38156d6d6712..5c7fcd5a8c9a 100644 --- a/comphelper/Library_comphelper.mk +++ b/comphelper/Library_comphelper.mk @@ -35,6 +35,8 @@ $(eval $(call gb_Library_add_defs,comphelper,\ -DCOMPHELPER_DLLIMPLEMENTATION \ )) +$(eval $(call gb_Library_use_external,comphelper,boost_headers)) + $(eval $(call gb_Library_use_libraries,comphelper,\ cppu \ cppuhelper \ diff --git a/configmgr/Library_configmgr.mk b/configmgr/Library_configmgr.mk index f7e39baa373a..3cd2ff1cdd0c 100644 --- a/configmgr/Library_configmgr.mk +++ b/configmgr/Library_configmgr.mk @@ -63,6 +63,8 @@ $(eval $(call gb_Library_add_exception_objects,configmgr, \ configmgr/source/xmldata \ )) +$(eval $(call gb_Library_use_external,configmgr,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,configmgr)) $(eval $(call gb_Library_use_libraries,configmgr, \ diff --git a/connectivity/CppunitTest_connectivity_ado.mk b/connectivity/CppunitTest_connectivity_ado.mk index 784aa7864533..e8e5a01f6531 100644 --- a/connectivity/CppunitTest_connectivity_ado.mk +++ b/connectivity/CppunitTest_connectivity_ado.mk @@ -15,6 +15,8 @@ $(eval $(call gb_CppunitTest_set_include,connectivity_ado,\ $$(INCLUDE) \ )) +$(eval $(call gb_CppunitTest_use_external,connectivity_ado,boost_headers)) + $(eval $(call gb_CppunitTest_use_api,connectivity_ado,\ udkapi \ offapi \ diff --git a/connectivity/CppunitTest_connectivity_mork.mk b/connectivity/CppunitTest_connectivity_mork.mk index 987dd5773fa6..68420d9249ac 100644 --- a/connectivity/CppunitTest_connectivity_mork.mk +++ b/connectivity/CppunitTest_connectivity_mork.mk @@ -15,6 +15,8 @@ $(eval $(call gb_CppunitTest_set_include,connectivity_mork,\ $$(INCLUDE) \ )) +$(eval $(call gb_CppunitTest_use_external,connectivity_mork,boost_headers)) + $(eval $(call gb_CppunitTest_use_api,connectivity_mork,\ udkapi \ offapi \ diff --git a/connectivity/Library_calc.mk b/connectivity/Library_calc.mk index aedd21bb3347..3f5ce099b668 100644 --- a/connectivity/Library_calc.mk +++ b/connectivity/Library_calc.mk @@ -29,6 +29,8 @@ $(eval $(call gb_Library_Library,calc)) $(eval $(call gb_Library_set_componentfile,calc,connectivity/source/drivers/calc/calc)) +$(eval $(call gb_Library_use_external,calc,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,calc)) $(eval $(call gb_Library_set_include,calc,\ diff --git a/connectivity/Library_dbase.mk b/connectivity/Library_dbase.mk index 0dbb517bd6ae..35c7f797d4f3 100644 --- a/connectivity/Library_dbase.mk +++ b/connectivity/Library_dbase.mk @@ -29,6 +29,8 @@ $(eval $(call gb_Library_Library,dbase)) $(eval $(call gb_Library_set_componentfile,dbase,connectivity/source/drivers/dbase/dbase)) +$(eval $(call gb_Library_use_external,dbase,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,dbase)) $(eval $(call gb_Library_set_include,dbase,\ diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk index 964f9f372950..1e063eacd2a9 100644 --- a/connectivity/Library_dbtools.mk +++ b/connectivity/Library_dbtools.mk @@ -43,6 +43,8 @@ $(eval $(call gb_Library_set_include,dbtools,\ -I$(SRCDIR)/connectivity/source/inc \ )) +$(eval $(call gb_Library_use_external,dbtools,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,dbtools)) $(eval $(call gb_Library_use_libraries,dbtools,\ diff --git a/connectivity/Library_evoab.mk b/connectivity/Library_evoab.mk index 687245571f13..fe6ee4703d7c 100644 --- a/connectivity/Library_evoab.mk +++ b/connectivity/Library_evoab.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_set_include,evoab,\ )) $(eval $(call gb_Library_use_externals,evoab,\ + boost_headers \ gtk \ gobject \ )) diff --git a/connectivity/Library_file.mk b/connectivity/Library_file.mk index 551b6cdbcc6a..47a3f072e95a 100644 --- a/connectivity/Library_file.mk +++ b/connectivity/Library_file.mk @@ -39,6 +39,8 @@ $(eval $(call gb_Library_set_include,file,\ -I$(SRCDIR)/connectivity/source/inc \ )) +$(eval $(call gb_Library_use_external,file,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,file)) $(eval $(call gb_Library_use_libraries,file,\ diff --git a/connectivity/Library_flat.mk b/connectivity/Library_flat.mk index 2eba9652567f..a5bc6e78e71e 100644 --- a/connectivity/Library_flat.mk +++ b/connectivity/Library_flat.mk @@ -29,6 +29,8 @@ $(eval $(call gb_Library_Library,flat)) $(eval $(call gb_Library_set_componentfile,flat,connectivity/source/drivers/flat/flat)) +$(eval $(call gb_Library_use_external,flat,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,flat)) $(eval $(call gb_Library_set_precompiled_header,flat,$(SRCDIR)/connectivity/inc/pch/precompiled_flat)) diff --git a/connectivity/Library_hsqldb.mk b/connectivity/Library_hsqldb.mk index 8521ae3107d9..37655e7b8d31 100644 --- a/connectivity/Library_hsqldb.mk +++ b/connectivity/Library_hsqldb.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_set_include,hsqldb,\ )) $(eval $(call gb_Library_use_externals,hsqldb,\ + boost_headers \ hsqldb \ )) diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk index 23b755374e55..248470483c80 100644 --- a/connectivity/Library_jdbc.mk +++ b/connectivity/Library_jdbc.mk @@ -29,6 +29,8 @@ $(eval $(call gb_Library_Library,jdbc)) $(eval $(call gb_Library_set_componentfile,jdbc,connectivity/source/drivers/jdbc/jdbc)) +$(eval $(call gb_Library_use_external,jdbc,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,jdbc)) $(eval $(call gb_Library_set_include,jdbc,\ diff --git a/connectivity/Library_mork.mk b/connectivity/Library_mork.mk index 1e565e81e281..be18decf5af8 100644 --- a/connectivity/Library_mork.mk +++ b/connectivity/Library_mork.mk @@ -20,6 +20,8 @@ $(eval $(call gb_Library_set_include,mork,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_use_external,mork,boost_headers)) + $(eval $(call gb_Library_use_libraries,mork, \ comphelper \ cppu \ diff --git a/connectivity/Library_mozab.mk b/connectivity/Library_mozab.mk index 4b4b78927229..74ed37a9f95b 100644 --- a/connectivity/Library_mozab.mk +++ b/connectivity/Library_mozab.mk @@ -34,6 +34,8 @@ $(eval $(call gb_Library_set_include,mozab2,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_use_external,mozab2,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,mozab2)) $(eval $(call gb_Library_use_libraries,mozab2,\ diff --git a/connectivity/Library_mozabdrv.mk b/connectivity/Library_mozabdrv.mk index 99944b372162..b5b2f3ae5995 100644 --- a/connectivity/Library_mozabdrv.mk +++ b/connectivity/Library_mozabdrv.mk @@ -46,6 +46,7 @@ $(eval $(call gb_Library_use_libraries,mozabdrv,\ )) $(eval $(call gb_Library_use_externals,mozabdrv,\ + boost_headers \ mozilla \ nss3 \ )) diff --git a/connectivity/Library_mysql.mk b/connectivity/Library_mysql.mk index 4e05e402e1e1..9d2d09589b9e 100644 --- a/connectivity/Library_mysql.mk +++ b/connectivity/Library_mysql.mk @@ -29,6 +29,8 @@ $(eval $(call gb_Library_Library,mysql)) $(eval $(call gb_Library_set_componentfile,mysql,connectivity/source/drivers/mysql/mysql)) +$(eval $(call gb_Library_use_external,mysql,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,mysql)) $(eval $(call gb_Library_set_include,mysql,\ diff --git a/connectivity/Library_odbcbase.mk b/connectivity/Library_odbcbase.mk index 8335f7e0b1b5..3e4066ce0ec0 100644 --- a/connectivity/Library_odbcbase.mk +++ b/connectivity/Library_odbcbase.mk @@ -41,7 +41,10 @@ $(eval $(call gb_Library_add_defs,odbcbase,\ -DOOO_DLLIMPLEMENTATION_ODBCBASE \ )) -$(eval $(call gb_Library_use_external,odbcbase,odbc_headers)) +$(eval $(call gb_Library_use_externals,odbcbase,\ + boost_headers \ + odbc_headers \ +)) $(eval $(call gb_Library_use_libraries,odbcbase,\ cppu \ diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index a69e3d86256a..37c40746c7cf 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -58,6 +58,7 @@ endif endif $(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\ + boost_headers \ postgresql \ )) diff --git a/connectivity/Library_sdbc2.mk b/connectivity/Library_sdbc2.mk index 7f030f1d53cd..c79c2ad1431c 100644 --- a/connectivity/Library_sdbc2.mk +++ b/connectivity/Library_sdbc2.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Library_Library,sdbc2)) $(eval $(call gb_Library_set_componentfile,sdbc2,connectivity/source/manager/sdbc2)) +$(eval $(call gb_Library_use_external,sdbc2,boost_headers)) $(eval $(call gb_Library_use_sdk_api,sdbc2)) diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk index bd6f8742514c..57c394eee39e 100644 --- a/cppcanvas/Library_cppcanvas.mk +++ b/cppcanvas/Library_cppcanvas.mk @@ -32,6 +32,8 @@ $(eval $(call gb_Library_add_defs,cppcanvas,\ -DCPPCANVAS_DLLIMPLEMENTATION \ )) +$(eval $(call gb_Library_use_external,cppcanvas,boost_headers)) + $(eval $(call gb_Library_use_libraries,cppcanvas,\ basegfx \ canvastools \ diff --git a/cppcanvas/Library_mtfrenderer.mk b/cppcanvas/Library_mtfrenderer.mk index f479b84e5f37..4a33ac0c6eda 100644 --- a/cppcanvas/Library_mtfrenderer.mk +++ b/cppcanvas/Library_mtfrenderer.mk @@ -21,6 +21,8 @@ $(eval $(call gb_Library_Library,mtfrenderer)) $(eval $(call gb_Library_set_componentfile,mtfrenderer,cppcanvas/source/uno/mtfrenderer)) +$(eval $(call gb_Library_use_external,mtfrenderer,boost_headers)) + $(eval $(call gb_Library_use_libraries,mtfrenderer,\ sal \ cppu \ diff --git a/cppu/CppunitTest_cppu_qa_any.mk b/cppu/CppunitTest_cppu_qa_any.mk index 0a0342e5162a..6fbd6af6d0cc 100644 --- a/cppu/CppunitTest_cppu_qa_any.mk +++ b/cppu/CppunitTest_cppu_qa_any.mk @@ -31,6 +31,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_any, \ cppu/qa/test_any \ )) +$(eval $(call gb_CppunitTest_use_external,cppu_qa_any,boost_headers)) + $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_any, \ cppu \ sal \ diff --git a/cppu/CppunitTest_cppu_test_cppumaker.mk b/cppu/CppunitTest_cppu_test_cppumaker.mk index f235be8f122a..6a8b1979ac44 100644 --- a/cppu/CppunitTest_cppu_test_cppumaker.mk +++ b/cppu/CppunitTest_cppu_test_cppumaker.mk @@ -31,6 +31,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_test_cppumaker, \ cppu/qa/cppumaker/test_cppumaker \ )) +$(eval $(call gb_CppunitTest_use_external,cppu_test_cppumaker,boost_headers)) + $(eval $(call gb_CppunitTest_use_libraries,cppu_test_cppumaker, \ cppu \ sal \ diff --git a/cppu/Library_cppu.mk b/cppu/Library_cppu.mk index d6dbc58c66ed..4ab71b8f5e7c 100644 --- a/cppu/Library_cppu.mk +++ b/cppu/Library_cppu.mk @@ -37,6 +37,8 @@ $(eval $(call gb_Library_add_defs,cppu,\ -DCPPU_DLLIMPLEMENTATION \ )) +$(eval $(call gb_Library_use_external,cppu,boost_headers)) + $(eval $(call gb_Library_use_libraries,cppu,\ sal \ salhelper \ diff --git a/cppu/Library_log_uno.mk b/cppu/Library_log_uno.mk index e70d16b20fcb..53e92af062f1 100644 --- a/cppu/Library_log_uno.mk +++ b/cppu/Library_log_uno.mk @@ -27,6 +27,8 @@ $(eval $(call gb_Library_Library,log_uno)) +$(eval $(call gb_Library_use_external,log_uno,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,log_uno)) $(eval $(call gb_Library_use_libraries,log_uno,\ diff --git a/cppuhelper/Library_cppuhelper.mk b/cppuhelper/Library_cppuhelper.mk index 81baa3428614..500bac39e401 100644 --- a/cppuhelper/Library_cppuhelper.mk +++ b/cppuhelper/Library_cppuhelper.mk @@ -38,6 +38,8 @@ $(eval $(call gb_Library_add_defs,cppuhelper,\ -DCPPUHELPER_DLLIMPLEMENTATION \ )) +$(eval $(call gb_Library_use_external,cppuhelper,boost_headers)) + $(eval $(call gb_Library_use_libraries,cppuhelper,\ cppu \ reg \ diff --git a/crashrep/Executable_crashrep.mk b/crashrep/Executable_crashrep.mk index eea1b051d054..a9173ef87b85 100644 --- a/crashrep/Executable_crashrep.mk +++ b/crashrep/Executable_crashrep.mk @@ -13,6 +13,8 @@ $(eval $(call gb_Executable_add_defs,crashrep,\ -D_INPATH=\"$(INPATH)\" \ )) +$(eval $(call gb_Executable_use_external,crashrep,boost_headers)) + ifeq ($(OS),WNT) $(eval $(call gb_Executable_add_exception_objects,crashrep,\ diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index 2d21cfc6f634..6e830b7aac95 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -73,6 +73,7 @@ $(eval $(call gb_Library_use_libraries,cui,\ )) $(eval $(call gb_Library_use_externals,cui,\ + boost_headers \ icuuc \ )) diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk index 40a075ea10a3..2ed400957d1c 100644 --- a/dbaccess/Library_dba.mk +++ b/dbaccess/Library_dba.mk @@ -42,6 +42,8 @@ $(eval $(call gb_Library_add_defs,dba,\ -DOOO_DLLIMPLEMENTATION_DBA \ )) +$(eval $(call gb_Library_use_external,dba,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,dba)) $(eval $(call gb_Library_use_libraries,dba,\ diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk index 821852218459..73d6e2bd9d57 100644 --- a/dbaccess/Library_dbaxml.mk +++ b/dbaccess/Library_dbaxml.mk @@ -32,6 +32,8 @@ $(eval $(call gb_Library_set_include,dbaxml,\ -I$(SRCDIR)/dbaccess/source/inc \ )) +$(eval $(call gb_Library_use_external,dbaxml,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,dbaxml)) $(eval $(call gb_Library_use_libraries,dbaxml,\ diff --git a/dbaccess/Library_dbmm.mk b/dbaccess/Library_dbmm.mk index dd0a73b9b179..1749f24d5ec2 100644 --- a/dbaccess/Library_dbmm.mk +++ b/dbaccess/Library_dbmm.mk @@ -36,6 +36,8 @@ $(eval $(call gb_Library_set_include,dbmm,\ -I$(SRCDIR)/dbaccess/inc \ )) +$(eval $(call gb_Library_use_external,dbmm,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,dbmm)) $(eval $(call gb_Library_use_libraries,dbmm,\ diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk index c8da4e080140..1ca0f82589d9 100644 --- a/dbaccess/Library_dbu.mk +++ b/dbaccess/Library_dbu.mk @@ -49,7 +49,10 @@ $(eval $(call gb_Library_add_cxxflags,dbu,\ )) endif -$(eval $(call gb_Library_use_external,dbu,odbc_headers)) +$(eval $(call gb_Library_use_externals,dbu,\ + boost_headers \ + odbc_headers \ +)) $(eval $(call gb_Library_use_libraries,dbu,\ comphelper \ diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk index 5e4faa314cee..2ff4dd01baa4 100644 --- a/dbaccess/Library_sdbt.mk +++ b/dbaccess/Library_sdbt.mk @@ -39,6 +39,8 @@ $(eval $(call gb_Library_set_include,sdbt,\ -I$(SRCDIR)/dbaccess/source/sdbtools/inc \ )) +$(eval $(call gb_Library_use_external,sdbt,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,sdbt)) $(eval $(call gb_Library_use_libraries,sdbt,\ diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk index b5f2abdae651..a0256744f379 100644 --- a/desktop/Library_deployment.mk +++ b/desktop/Library_deployment.mk @@ -34,6 +34,8 @@ $(eval $(call gb_Library_set_include,deployment,\ -I$(SRCDIR)/desktop/source/deployment/registry/inc \ )) +$(eval $(call gb_Library_use_external,deployment,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,deployment)) $(eval $(call gb_Library_use_libraries,deployment,\ diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk index a7955115d3f8..0dfa88f0e016 100644 --- a/desktop/Library_deploymentgui.mk +++ b/desktop/Library_deploymentgui.mk @@ -34,6 +34,8 @@ $(eval $(call gb_Library_set_include,deploymentgui,\ -I$(SRCDIR)/desktop/source/inc \ )) +$(eval $(call gb_Library_use_external,deploymentgui,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,deploymentgui)) $(eval $(call gb_Library_use_libraries,deploymentgui,\ diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk index 4779ff30b39d..544ebc348589 100644 --- a/desktop/Library_deploymentmisc.mk +++ b/desktop/Library_deploymentmisc.mk @@ -33,6 +33,8 @@ $(eval $(call gb_Library_set_include,deploymentmisc,\ -I$(SRCDIR)/desktop/source/deployment/inc \ )) +$(eval $(call gb_Library_use_external,deploymentmisc,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,deploymentmisc)) $(eval $(call gb_Library_add_defs,deploymentmisc,\ diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk index 1698be961ae6..769df8b11cd1 100644 --- a/desktop/Library_migrationoo2.mk +++ b/desktop/Library_migrationoo2.mk @@ -31,6 +31,8 @@ $(eval $(call gb_Library_set_include,migrationoo2,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_use_external,migrationoo2,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,migrationoo2)) $(eval $(call gb_Library_use_libraries,migrationoo2,\ diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index e37db8f6456e..2a635b5953c9 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -34,6 +34,8 @@ $(eval $(call gb_Library_set_include,sofficeapp,\ -I$(SRCDIR)/desktop/source/deployment/inc \ )) +$(eval $(call gb_Library_use_external,sofficeapp,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,sofficeapp)) $(eval $(call gb_Library_add_defs,sofficeapp,\ diff --git a/desktop/Library_spl.mk b/desktop/Library_spl.mk index cc5086db0f68..6301c6bfdbc2 100644 --- a/desktop/Library_spl.mk +++ b/desktop/Library_spl.mk @@ -32,6 +32,8 @@ $(eval $(call gb_Library_set_include,spl,\ -I$(SRCDIR)/desktop/inc \ )) +$(eval $(call gb_Library_use_external,spl,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,spl)) $(eval $(call gb_Library_use_libraries,spl,\ diff --git a/desktop/Library_unopkgapp.mk b/desktop/Library_unopkgapp.mk index 5ce00afd5de6..a0f678ab162b 100644 --- a/desktop/Library_unopkgapp.mk +++ b/desktop/Library_unopkgapp.mk @@ -34,6 +34,8 @@ $(eval $(call gb_Library_set_include,unopkgapp,\ -I$(SRCDIR)/desktop/source/inc \ )) +$(eval $(call gb_Library_use_external,unopkgapp,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,unopkgapp)) $(eval $(call gb_Library_add_defs,unopkgapp,\ diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk index 5bab1bb2f4f3..e913601c5f7a 100644 --- a/drawinglayer/Library_drawinglayer.mk +++ b/drawinglayer/Library_drawinglayer.mk @@ -43,10 +43,7 @@ $(eval $(call gb_Library_set_componentfile,drawinglayer,drawinglayer/drawinglaye $(eval $(call gb_Library_use_sdk_api,drawinglayer)) $(eval $(call gb_Library_use_externals,drawinglayer,\ - libxml2 \ -)) - -$(eval $(call gb_Library_use_externals,drawinglayer,\ + boost_headers \ libxml2 \ )) diff --git a/editeng/CppunitTest_editeng_borderline.mk b/editeng/CppunitTest_editeng_borderline.mk index 096bda99552b..554ac68d811d 100644 --- a/editeng/CppunitTest_editeng_borderline.mk +++ b/editeng/CppunitTest_editeng_borderline.mk @@ -47,6 +47,7 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_borderline, \ )) $(eval $(call gb_CppunitTest_use_externals,editeng_borderline,\ + boost_headers \ icuuc \ )) diff --git a/editeng/CppunitTest_editeng_core.mk b/editeng/CppunitTest_editeng_core.mk index d98ddc76e2dd..6db6082ccfe7 100644 --- a/editeng/CppunitTest_editeng_core.mk +++ b/editeng/CppunitTest_editeng_core.mk @@ -61,6 +61,7 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_core, \ )) $(eval $(call gb_CppunitTest_use_externals,editeng_core,\ + boost_headers \ icuuc \ )) diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk index 3391ed9de5c1..d21e9a1d0729 100644 --- a/editeng/Library_editeng.mk +++ b/editeng/Library_editeng.mk @@ -145,6 +145,7 @@ $(eval $(call gb_Library_use_libraries,editeng,\ )) $(eval $(call gb_Library_use_externals,editeng,\ + boost_headers \ icuuc \ icu_headers \ )) diff --git a/embeddedobj/Library_embobj.mk b/embeddedobj/Library_embobj.mk index f3e1d51bbff6..bfe7176f0fa8 100644 --- a/embeddedobj/Library_embobj.mk +++ b/embeddedobj/Library_embobj.mk @@ -38,6 +38,8 @@ $(eval $(call gb_Library_set_include,embobj,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_use_external,embobj,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,embobj)) $(eval $(call gb_Library_use_libraries,embobj,\ diff --git a/embeddedobj/Library_emboleobj.mk b/embeddedobj/Library_emboleobj.mk index 32dfe09731ce..771448cbf07b 100644 --- a/embeddedobj/Library_emboleobj.mk +++ b/embeddedobj/Library_emboleobj.mk @@ -34,6 +34,8 @@ $(eval $(call gb_Library_set_include,emboleobj,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_use_external,emboleobj,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,emboleobj)) $(eval $(call gb_Library_use_libraries,emboleobj,\ diff --git a/embedserv/Library_emser.mk b/embedserv/Library_emser.mk index 25d265bfa046..a4377f424ec5 100644 --- a/embedserv/Library_emser.mk +++ b/embedserv/Library_emser.mk @@ -39,6 +39,8 @@ $(eval $(call gb_Library_add_defs,emser,\ -UNOMINMAX \ )) +$(eval $(call gb_Library_use_external,emser,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,emser)) $(eval $(call gb_Library_use_libraries,emser,\ diff --git a/extensions/Executable_nsplugin.mk b/extensions/Executable_nsplugin.mk index bbfb56fe1eea..9e833e99bc5c 100644 --- a/extensions/Executable_nsplugin.mk +++ b/extensions/Executable_nsplugin.mk @@ -36,6 +36,8 @@ $(eval $(call gb_Executable_use_packages,nsplugin,\ tools_inc \ )) +$(eval $(call gb_Executable_use_external,nsplugin,boost_headers)) + $(eval $(call gb_Executable_use_sdk_api,nsplugin)) $(eval $(call gb_Executable_add_exception_objects,nsplugin,\ diff --git a/extensions/Library_abp.mk b/extensions/Library_abp.mk index 49195c09de58..8aa4569ba401 100644 --- a/extensions/Library_abp.mk +++ b/extensions/Library_abp.mk @@ -53,6 +53,8 @@ $(eval $(call gb_Library_add_defs,abp,\ -DCOMPMOD_RESPREFIX=abp \ )) +$(eval $(call gb_Library_use_external,abp,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,abp)) $(eval $(call gb_Library_add_exception_objects,abp,\ diff --git a/extensions/Library_bib.mk b/extensions/Library_bib.mk index cd0cc2fcc6de..320dbd9b0460 100644 --- a/extensions/Library_bib.mk +++ b/extensions/Library_bib.mk @@ -43,6 +43,8 @@ $(eval $(call gb_Library_set_include,bib,\ -I$(SRCDIR)/extensions/inc \ )) +$(eval $(call gb_Library_use_external,bib,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,bib)) $(eval $(call gb_Library_add_exception_objects,bib,\ diff --git a/extensions/Library_dbp.mk b/extensions/Library_dbp.mk index 47b64e5ed832..0c3ca370cf6f 100644 --- a/extensions/Library_dbp.mk +++ b/extensions/Library_dbp.mk @@ -42,6 +42,8 @@ $(eval $(call gb_Library_add_defs,dbp,\ -DCOMPMOD_NAMESPACE=dbp \ )) +$(eval $(call gb_Library_use_external,dbp,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,dbp)) $(eval $(call gb_Library_add_exception_objects,dbp,\ diff --git a/extensions/Library_log.mk b/extensions/Library_log.mk index 05a5186c03bb..8dd0a6eadd13 100644 --- a/extensions/Library_log.mk +++ b/extensions/Library_log.mk @@ -36,6 +36,8 @@ $(eval $(call gb_Library_use_packages,log,\ $(eval $(call gb_Library_set_componentfile,log,extensions/source/logging/log)) +$(eval $(call gb_Library_use_external,log,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,log)) $(eval $(call gb_Library_add_exception_objects,log,\ diff --git a/extensions/Library_oleautobridge.mk b/extensions/Library_oleautobridge.mk index adbf359271c9..7aec0c2231f9 100644 --- a/extensions/Library_oleautobridge.mk +++ b/extensions/Library_oleautobridge.mk @@ -42,6 +42,8 @@ $(eval $(call gb_Library_add_ldflags,oleautobridge,\ -LIBPATH:$(ATL_LIB) \ )) +$(eval $(call gb_Library_use_external,oleautobridge,boost_headers)) + $(eval $(call gb_Library_use_libraries,oleautobridge,\ comphelper \ cppuhelper \ diff --git a/extensions/Library_oleautobridge2.mk b/extensions/Library_oleautobridge2.mk index b6fee4918d9c..7a609f876832 100644 --- a/extensions/Library_oleautobridge2.mk +++ b/extensions/Library_oleautobridge2.mk @@ -46,6 +46,8 @@ $(eval $(call gb_Library_add_ldflags,oleautobridge2,\ -LIBPATH:$(ATL_LIB) \ )) +$(eval $(call gb_Library_use_external,oleautobridge2,boost_headers)) + $(eval $(call gb_Library_use_libraries,oleautobridge2,\ comphelper \ cppuhelper \ diff --git a/extensions/Library_pcr.mk b/extensions/Library_pcr.mk index 690a3cd28256..1502ce1e6c95 100644 --- a/extensions/Library_pcr.mk +++ b/extensions/Library_pcr.mk @@ -37,6 +37,8 @@ $(eval $(call gb_Library_set_include,pcr,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_use_external,pcr,boost_headers)) + $(eval $(call gb_Library_use_libraries,pcr,\ svx \ svxcore \ diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk index 92e707faf2d5..9d885469af39 100644 --- a/extensions/Library_pl.mk +++ b/extensions/Library_pl.mk @@ -34,7 +34,10 @@ $(eval $(call gb_Library_set_componentfile,pl,extensions/source/plugin/pl)) $(eval $(call gb_Library_use_package,pl,np_sdk_inc)) -$(eval $(call gb_Library_use_external,pl,npapi_headers)) +$(eval $(call gb_Library_use_externals,pl,\ + boost_headers \ + npapi_headers \ +)) $(eval $(call gb_Library_set_include,pl,\ $$(INCLUDE) \ diff --git a/extensions/Library_res.mk b/extensions/Library_res.mk index 3297b14200dd..8dd2064cb483 100644 --- a/extensions/Library_res.mk +++ b/extensions/Library_res.mk @@ -32,6 +32,8 @@ $(eval $(call gb_Library_Library,res)) $(eval $(call gb_Library_set_componentfile,res,extensions/source/resource/res)) +$(eval $(call gb_Library_use_external,res,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,res)) $(eval $(call gb_Library_use_libraries,res,\ diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk index d64c16d60ff6..aec8e251b767 100644 --- a/extensions/Library_scn.mk +++ b/extensions/Library_scn.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Library_Library,scn)) $(eval $(call gb_Library_use_externals,scn,\ + boost_headers \ sane_headers \ )) diff --git a/extensions/Library_updatecheckui.mk b/extensions/Library_updatecheckui.mk index 4ddad271c8a6..623239204980 100644 --- a/extensions/Library_updatecheckui.mk +++ b/extensions/Library_updatecheckui.mk @@ -34,6 +34,8 @@ $(eval $(call gb_Library_use_packages,updatecheckui,\ sfx2_inc \ )) +$(eval $(call gb_Library_use_external,updatecheckui,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,updatecheckui)) $(eval $(call gb_Library_use_libraries,updatecheckui,\ diff --git a/extensions/Library_updchk.mk b/extensions/Library_updchk.mk index 602d43474109..182f7f5a8d66 100644 --- a/extensions/Library_updchk.mk +++ b/extensions/Library_updchk.mk @@ -60,7 +60,10 @@ $(eval $(call gb_Library_add_exception_objects,updchk,\ )) endif # OS WNT -$(eval $(call gb_Library_use_external,updchk,curl)) +$(eval $(call gb_Library_use_external,updchk,\ + boost_headers \ + curl \ +)) $(eval $(call gb_Library_add_exception_objects,updchk,\ extensions/source/update/check/download \ diff --git a/extensions/StaticLibrary_plugcon.mk b/extensions/StaticLibrary_plugcon.mk index bb073e7d2f7d..4779f419be83 100644 --- a/extensions/StaticLibrary_plugcon.mk +++ b/extensions/StaticLibrary_plugcon.mk @@ -42,7 +42,10 @@ $(eval $(call gb_StaticLibrary_use_packages,plugcon,\ vcl_inc \ )) -$(eval $(call gb_StaticLibrary_use_external,plugcon,npapi_headers)) +$(eval $(call gb_StaticLibrary_use_externals,plugcon,\ + boost_headers \ + npapi_headers \ +)) $(eval $(call gb_StaticLibrary_set_include,plugcon,\ $$(INCLUDE) \ diff --git a/filter/CppunitTest_filter_pict_test.mk b/filter/CppunitTest_filter_pict_test.mk index 082ea8c53e9f..a3fabd1615a9 100644 --- a/filter/CppunitTest_filter_pict_test.mk +++ b/filter/CppunitTest_filter_pict_test.mk @@ -8,6 +8,8 @@ # $(eval $(call gb_CppunitTest_CppunitTest,filter_pict_test)) +$(eval $(call gb_CppunitTest_use_external,filter_pict_test,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,filter_pict_test, \ filter/qa/cppunit/filters-pict-test \ )) diff --git a/filter/CppunitTest_filter_tga_test.mk b/filter/CppunitTest_filter_tga_test.mk index 2829dbd17005..53725bbb257c 100644 --- a/filter/CppunitTest_filter_tga_test.mk +++ b/filter/CppunitTest_filter_tga_test.mk @@ -27,6 +27,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,filter_tga_test)) +$(eval $(call gb_CppunitTest_use_external,filter_tga_test,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,filter_tga_test, \ filter/qa/cppunit/filters-tga-test \ )) diff --git a/filter/CppunitTest_filter_tiff_test.mk b/filter/CppunitTest_filter_tiff_test.mk index 1fe899c228a9..bbc257a10403 100644 --- a/filter/CppunitTest_filter_tiff_test.mk +++ b/filter/CppunitTest_filter_tiff_test.mk @@ -27,6 +27,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,filter_tiff_test)) +$(eval $(call gb_CppunitTest_use_external,filter_tiff_test,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,filter_tiff_test, \ filter/qa/cppunit/filters-tiff-test \ )) diff --git a/filter/Executable_svg2odf.mk b/filter/Executable_svg2odf.mk index ca0b39b4ddd5..59ae87bd92c5 100644 --- a/filter/Executable_svg2odf.mk +++ b/filter/Executable_svg2odf.mk @@ -29,6 +29,8 @@ $(eval $(call gb_Executable_Executable,svg2odf)) $(eval $(call gb_Executable_set_targettype_gui,svg2odf,YES)) +$(eval $(call gb_Executable_use_external,svg2odf,boost_headers)) + $(eval $(call gb_Executable_use_sdk_api,svg2odf)) $(eval $(call gb_Executable_set_include,svg2odf,\ diff --git a/filter/Library_egi.mk b/filter/Library_egi.mk index f45d61f06b37..59dd7682d152 100644 --- a/filter/Library_egi.mk +++ b/filter/Library_egi.mk @@ -19,6 +19,8 @@ $(eval $(call gb_Library_Library,egi)) +$(eval $(call gb_Library_use_external,egi,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,egi)) $(eval $(call gb_Library_set_include,egi,\ diff --git a/filter/Library_eme.mk b/filter/Library_eme.mk index 8d32f2f6a0de..a62f16a0ce1c 100644 --- a/filter/Library_eme.mk +++ b/filter/Library_eme.mk @@ -19,6 +19,8 @@ $(eval $(call gb_Library_Library,eme)) +$(eval $(call gb_Library_use_external,eme,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,eme)) $(eval $(call gb_Library_set_include,eme,\ diff --git a/filter/Library_epb.mk b/filter/Library_epb.mk index 84e7bc67a18a..1e9bd20a716c 100644 --- a/filter/Library_epb.mk +++ b/filter/Library_epb.mk @@ -19,6 +19,8 @@ $(eval $(call gb_Library_Library,epb)) +$(eval $(call gb_Library_use_external,epb,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,epb)) $(eval $(call gb_Library_set_include,epb,\ diff --git a/filter/Library_epg.mk b/filter/Library_epg.mk index 268fd8f2efcb..4a97a0000f4b 100644 --- a/filter/Library_epg.mk +++ b/filter/Library_epg.mk @@ -19,6 +19,8 @@ $(eval $(call gb_Library_Library,epg)) +$(eval $(call gb_Library_use_external,epg,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,epg)) $(eval $(call gb_Library_set_include,epg,\ diff --git a/filter/Library_epp.mk b/filter/Library_epp.mk index 3c16074597e5..bd9c4d9d4dab 100644 --- a/filter/Library_epp.mk +++ b/filter/Library_epp.mk @@ -19,6 +19,8 @@ $(eval $(call gb_Library_Library,epp)) +$(eval $(call gb_Library_use_external,epp,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,epp)) $(eval $(call gb_Library_set_include,epp,\ diff --git a/filter/Library_eps.mk b/filter/Library_eps.mk index ac699afba778..664ccef1766b 100644 --- a/filter/Library_eps.mk +++ b/filter/Library_eps.mk @@ -19,6 +19,8 @@ $(eval $(call gb_Library_Library,eps)) +$(eval $(call gb_Library_use_external,eps,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,eps)) $(eval $(call gb_Library_set_include,eps,\ diff --git a/filter/Library_ept.mk b/filter/Library_ept.mk index c8229c1b5836..9f0a442db78e 100644 --- a/filter/Library_ept.mk +++ b/filter/Library_ept.mk @@ -19,6 +19,8 @@ $(eval $(call gb_Library_Library,ept)) +$(eval $(call gb_Library_use_external,ept,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,ept)) $(eval $(call gb_Library_set_include,ept,\ diff --git a/filter/Library_era.mk b/filter/Library_era.mk index d5e2ed5f1bc9..3a963a1dd4b0 100644 --- a/filter/Library_era.mk +++ b/filter/Library_era.mk @@ -19,6 +19,8 @@ $(eval $(call gb_Library_Library,era)) +$(eval $(call gb_Library_use_external,era,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,era)) $(eval $(call gb_Library_set_include,era,\ diff --git a/filter/Library_eti.mk b/filter/Library_eti.mk index 47f113f570cf..9f934f68eb33 100644 --- a/filter/Library_eti.mk +++ b/filter/Library_eti.mk @@ -19,6 +19,8 @@ $(eval $(call gb_Library_Library,eti)) +$(eval $(call gb_Library_use_external,eti,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,eti)) $(eval $(call gb_Library_set_include,eti,\ diff --git a/filter/Library_exp.mk b/filter/Library_exp.mk index d2c184bd84b5..628e636e4618 100644 --- a/filter/Library_exp.mk +++ b/filter/Library_exp.mk @@ -19,6 +19,8 @@ $(eval $(call gb_Library_Library,exp)) +$(eval $(call gb_Library_use_external,exp,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,exp)) $(eval $(call gb_Library_set_include,exp,\ diff --git a/filter/Library_filterconfig.mk b/filter/Library_filterconfig.mk index 0b7b047c2946..1a2af91e9f38 100644 --- a/filter/Library_filterconfig.mk +++ b/filter/Library_filterconfig.mk @@ -21,6 +21,8 @@ $(eval $(call gb_Library_Library,filterconfig)) $(eval $(call gb_Library_set_componentfile,filterconfig,filter/source/config/cache/filterconfig1)) +$(eval $(call gb_Library_use_external,filterconfig,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,filterconfig)) $(eval $(call gb_Library_set_include,filterconfig,\ diff --git a/filter/Library_flash.mk b/filter/Library_flash.mk index 1f309090c6ad..97dd310905b1 100644 --- a/filter/Library_flash.mk +++ b/filter/Library_flash.mk @@ -41,7 +41,10 @@ $(eval $(call gb_Library_use_libraries,flash,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_use_externals,flash,zlib)) +$(eval $(call gb_Library_use_externals,flash,\ + boost_headers \ + zlib \ +)) $(eval $(call gb_Library_add_exception_objects,flash,\ filter/source/flash/impswfdialog \ diff --git a/filter/Library_icd.mk b/filter/Library_icd.mk index 29080f54c83e..bc4ec54a3465 100644 --- a/filter/Library_icd.mk +++ b/filter/Library_icd.mk @@ -19,6 +19,8 @@ $(eval $(call gb_Library_Library,icd)) +$(eval $(call gb_Library_use_external,icd,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,icd)) $(eval $(call gb_Library_set_include,icd,\ diff --git a/filter/Library_icg.mk b/filter/Library_icg.mk index 21bd077522f7..43362ad2865b 100644 --- a/filter/Library_icg.mk +++ b/filter/Library_icg.mk @@ -19,6 +19,8 @@ $(eval $(call gb_Library_Library,icg)) +$(eval $(call gb_Library_use_external,icg,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,icg)) $(eval $(call gb_Library_set_include,icg,\ diff --git a/filter/Library_idx.mk b/filter/Library_idx.mk index 0ec557d89a90..69b1cd73cc95 100644 --- a/filter/Library_idx.mk +++ b/filter/Library_idx.mk @@ -19,6 +19,8 @@ $(eval $(call gb_Library_Library,idx)) +$(eval $(call gb_Library_use_external,idx,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,idx)) $(eval $(call gb_Library_set_include,idx,\ diff --git a/filter/Library_ime.mk b/filter/Library_ime.mk index 1fa0bae70f24..f7a37cc15f2c 100644 --- a/filter/Library_ime.mk +++ b/filter/Library_ime.mk @@ -19,6 +19,8 @@ $(eval $(call gb_Library_Library,ime)) +$(eval $(call gb_Library_use_external,ime,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,ime)) $(eval $(call gb_Library_set_include,ime,\ diff --git a/filter/Library_ipb.mk b/filter/Library_ipb.mk index a50df6f042f9..a972a53b898a 100644 --- a/filter/Library_ipb.mk +++ b/filter/Library_ipb.mk @@ -19,6 +19,8 @@ $(eval $(call gb_Library_Library,ipb)) +$(eval $(call gb_Library_use_external,ipb,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,ipb)) $(eval $(call gb_Library_set_include,ipb,\ diff --git a/filter/Library_ipd.mk b/filter/Library_ipd.mk index ba1fad809e8e..264cec6db538 100644 --- a/filter/Library_ipd.mk +++ b/filter/Library_ipd.mk @@ -19,6 +19,8 @@ $(eval $(call gb_Library_Library,ipd)) +$(eval $(call gb_Library_use_external,ipd,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,ipd)) $(eval $(call gb_Library_set_include,ipd,\ diff --git a/filter/Library_ips.mk b/filter/Library_ips.mk index 9ca7b2371418..ba4d5361a956 100644 --- a/filter/Library_ips.mk +++ b/filter/Library_ips.mk @@ -19,6 +19,8 @@ $(eval $(call gb_Library_Library,ips)) +$(eval $(call gb_Library_use_external,ips,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,ips)) $(eval $(call gb_Library_set_include,ips,\ diff --git a/filter/Library_ipt.mk b/filter/Library_ipt.mk index ffb3e695a2bb..283cf8a34aef 100644 --- a/filter/Library_ipt.mk +++ b/filter/Library_ipt.mk @@ -19,6 +19,8 @@ $(eval $(call gb_Library_Library,ipt)) +$(eval $(call gb_Library_use_external,ipt,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,ipt)) $(eval $(call gb_Library_set_include,ipt,\ diff --git a/filter/Library_ipx.mk b/filter/Library_ipx.mk index 708e49f32fcc..9eeb5fd4eec5 100644 --- a/filter/Library_ipx.mk +++ b/filter/Library_ipx.mk @@ -19,6 +19,8 @@ $(eval $(call gb_Library_Library,ipx)) +$(eval $(call gb_Library_use_external,ipx,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,ipx)) $(eval $(call gb_Library_set_include,ipx,\ diff --git a/filter/Library_ira.mk b/filter/Library_ira.mk index 61f0b359ab20..4df5243e2922 100644 --- a/filter/Library_ira.mk +++ b/filter/Library_ira.mk @@ -19,6 +19,8 @@ $(eval $(call gb_Library_Library,ira)) +$(eval $(call gb_Library_use_external,ira,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,ira)) $(eval $(call gb_Library_set_include,ira,\ diff --git a/filter/Library_itg.mk b/filter/Library_itg.mk index eb2690a224f1..282199691c74 100644 --- a/filter/Library_itg.mk +++ b/filter/Library_itg.mk @@ -19,6 +19,8 @@ $(eval $(call gb_Library_Library,itg)) +$(eval $(call gb_Library_use_external,itg,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,itg)) $(eval $(call gb_Library_set_include,itg,\ diff --git a/filter/Library_iti.mk b/filter/Library_iti.mk index 2fa9101af0f0..05cdac1fb01d 100644 --- a/filter/Library_iti.mk +++ b/filter/Library_iti.mk @@ -19,6 +19,8 @@ $(eval $(call gb_Library_Library,iti)) +$(eval $(call gb_Library_use_external,iti,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,iti)) $(eval $(call gb_Library_set_include,iti,\ diff --git a/filter/Library_msfilter.mk b/filter/Library_msfilter.mk index 410e9e8be46d..c4dfb2eaf84a 100644 --- a/filter/Library_msfilter.mk +++ b/filter/Library_msfilter.mk @@ -23,6 +23,8 @@ $(eval $(call gb_Library_use_package,msfilter,filter_inc)) $(eval $(call gb_Library_set_componentfile,msfilter,filter/source/msfilter/msfilter)) +$(eval $(call gb_Library_use_external,msfilter,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,msfilter)) $(eval $(call gb_Library_set_include,msfilter,\ diff --git a/filter/Library_pdffilter.mk b/filter/Library_pdffilter.mk index d20e33d3c845..e1fb40af6ec1 100644 --- a/filter/Library_pdffilter.mk +++ b/filter/Library_pdffilter.mk @@ -21,6 +21,8 @@ $(eval $(call gb_Library_Library,pdffilter)) $(eval $(call gb_Library_set_componentfile,pdffilter,filter/source/pdf/pdffilter)) +$(eval $(call gb_Library_use_external,pdffilter,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,pdffilter)) $(eval $(call gb_Library_set_include,pdffilter,\ diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk index 4d54c1007ea9..b635c8850f51 100644 --- a/filter/Library_svgfilter.mk +++ b/filter/Library_svgfilter.mk @@ -54,7 +54,10 @@ $(eval $(call gb_Library_use_libraries,svgfilter,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_use_externals,svgfilter,libxml2)) +$(eval $(call gb_Library_use_externals,svgfilter,\ + boost_headers \ + libxml2 \ +)) $(eval $(call gb_Library_add_exception_objects,svgfilter,\ filter/source/svg/b2dellipse \ diff --git a/filter/Library_xmlfa.mk b/filter/Library_xmlfa.mk index 141e10529e38..d8dec8d15f03 100644 --- a/filter/Library_xmlfa.mk +++ b/filter/Library_xmlfa.mk @@ -21,6 +21,8 @@ $(eval $(call gb_Library_Library,xmlfa)) $(eval $(call gb_Library_set_componentfile,xmlfa,filter/source/xmlfilteradaptor/xmlfa)) +$(eval $(call gb_Library_use_external,xmlfa,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,xmlfa)) $(eval $(call gb_Library_set_include,xmlfa,\ diff --git a/filter/Library_xsltdlg.mk b/filter/Library_xsltdlg.mk index 8e9a5d7e067d..0c59e013e13b 100644 --- a/filter/Library_xsltdlg.mk +++ b/filter/Library_xsltdlg.mk @@ -21,6 +21,8 @@ $(eval $(call gb_Library_Library,xsltdlg)) $(eval $(call gb_Library_set_componentfile,xsltdlg,filter/source/xsltdialog/xsltdlg)) +$(eval $(call gb_Library_use_external,xsltdlg,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,xsltdlg)) $(eval $(call gb_Library_set_include,xsltdlg,\ diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk index 88e1c0ed9b08..c7b0f5e2ca26 100644 --- a/forms/Library_frm.mk +++ b/forms/Library_frm.mk @@ -61,6 +61,7 @@ $(eval $(call gb_Library_use_libraries,frm,\ )) $(eval $(call gb_Library_use_externals,frm,\ + boost_headers \ icui18n \ icuuc \ icu_headers \ diff --git a/formula/Library_for.mk b/formula/Library_for.mk index 1bbd199d8d5f..9145f5235de2 100644 --- a/formula/Library_for.mk +++ b/formula/Library_for.mk @@ -40,6 +40,8 @@ $(eval $(call gb_Library_add_defs,for,\ -DFORMULA_DLLIMPLEMENTATION \ )) +$(eval $(call gb_Library_use_external,for,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,for)) $(eval $(call gb_Library_use_libraries,for,\ diff --git a/formula/Library_forui.mk b/formula/Library_forui.mk index 07ff194f14dc..130e621ba893 100644 --- a/formula/Library_forui.mk +++ b/formula/Library_forui.mk @@ -37,6 +37,8 @@ $(eval $(call gb_Library_add_defs,forui,\ -DFORMULA_DLLIMPLEMENTATION \ )) +$(eval $(call gb_Library_use_external,forui,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,forui)) $(eval $(call gb_Library_use_libraries,forui,\ diff --git a/fpicker/Library_fpicker.mk b/fpicker/Library_fpicker.mk index a5cfbb7cf66c..d120d28cc986 100644 --- a/fpicker/Library_fpicker.mk +++ b/fpicker/Library_fpicker.mk @@ -29,6 +29,8 @@ $(eval $(call gb_Library_Library,fpicker)) $(eval $(call gb_Library_set_componentfile,fpicker,fpicker/source/generic/fpicker)) +$(eval $(call gb_Library_use_external,fpicker,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,fpicker)) $(eval $(call gb_Library_use_libraries,fpicker,\ diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk index b6b30571f73d..6311b856b00c 100644 --- a/fpicker/Library_fps.mk +++ b/fpicker/Library_fps.mk @@ -35,6 +35,8 @@ $(eval $(call gb_Library_use_packages,fps,\ vcl_inc \ )) +$(eval $(call gb_Library_use_external,fps,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,fps)) $(eval $(call gb_Library_add_defs,fps,\ diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk index 241be777d272..4684b252f390 100644 --- a/fpicker/Library_fps_aqua.mk +++ b/fpicker/Library_fps_aqua.mk @@ -33,6 +33,8 @@ $(eval $(call gb_Library_use_packages,fps_aqua,\ vcl_inc \ )) +$(eval $(call gb_Library_use_external,fps_aqua,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,fps_aqua)) $(eval $(call gb_Library_use_system_darwin_frameworks,fps_aqua,\ diff --git a/fpicker/Library_fps_office.mk b/fpicker/Library_fps_office.mk index 58e3011fe7b6..10b6d065f9c5 100644 --- a/fpicker/Library_fps_office.mk +++ b/fpicker/Library_fps_office.mk @@ -29,6 +29,8 @@ $(eval $(call gb_Library_Library,fps_office)) $(eval $(call gb_Library_set_componentfile,fps_office,fpicker/source/office/fps_office)) +$(eval $(call gb_Library_use_external,fps_office,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,fps_office)) $(eval $(call gb_Library_set_include,fps_office,\ diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk index ebbfc1709c03..9fd6ec8b0824 100644 --- a/framework/Library_fwe.mk +++ b/framework/Library_fwe.mk @@ -31,6 +31,8 @@ $(eval $(call gb_Library_add_defs,fwe,\ $(eval $(call gb_Library_use_sdk_api,fwe)) +$(eval $(call gb_Library_use_external,fwe,boost_headers)) + $(eval $(call gb_Library_use_libraries,fwe,\ comphelper \ cppu \ diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk index 55e142da0990..150bd0c56342 100644 --- a/framework/Library_fwi.mk +++ b/framework/Library_fwi.mk @@ -33,6 +33,8 @@ $(eval $(call gb_Library_set_include,fwi,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_use_external,fwi,boost_headers)) + $(eval $(call gb_Library_use_libraries,fwi,\ comphelper \ cppu \ diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk index b401806e5208..bf9a3970936c 100644 --- a/framework/Library_fwk.mk +++ b/framework/Library_fwk.mk @@ -27,6 +27,8 @@ $(eval $(call gb_Library_set_include,fwk,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_use_external,fwk,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,fwk)) $(eval $(call gb_Library_use_libraries,fwk,\ diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk index 17ba3ebf1a81..1ef509946574 100644 --- a/framework/Library_fwl.mk +++ b/framework/Library_fwl.mk @@ -27,6 +27,8 @@ $(eval $(call gb_Library_set_include,fwl,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_use_external,fwl,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,fwl)) $(eval $(call gb_Library_use_libraries,fwl,\ diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk index e7501cb5350f..176b65b474a3 100644 --- a/framework/Library_fwm.mk +++ b/framework/Library_fwm.mk @@ -27,6 +27,8 @@ $(eval $(call gb_Library_set_include,fwm,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_use_external,fwm,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,fwm)) $(eval $(call gb_Library_use_libraries,fwm,\ diff --git a/helpcompiler/Executable_helplinker.mk b/helpcompiler/Executable_helplinker.mk index dbad161b805a..0068dd9db370 100644 --- a/helpcompiler/Executable_helplinker.mk +++ b/helpcompiler/Executable_helplinker.mk @@ -36,6 +36,7 @@ $(eval $(call gb_Executable_use_libraries,HelpLinker,\ )) $(eval $(call gb_Executable_use_externals,HelpLinker,\ + boost_headers \ expat_utf8 \ libxslt \ libxml2 \ diff --git a/helpcompiler/Library_helplinker.mk b/helpcompiler/Library_helplinker.mk index 405ad80d4fa4..6820c3b69e3c 100644 --- a/helpcompiler/Library_helplinker.mk +++ b/helpcompiler/Library_helplinker.mk @@ -46,6 +46,7 @@ $(eval $(call gb_Library_use_libraries,helplinker,\ )) $(eval $(call gb_Library_use_externals,helplinker,\ + boost_headers \ expat_utf8 \ libxslt \ libxml2 \ diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk index ac3779f4b391..572258da7a01 100644 --- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk +++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk @@ -30,6 +30,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,hwpfilter_test_hwpfilter)) +$(eval $(call gb_CppunitTest_use_external,hwpfilter_test_hwpfilter,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,hwpfilter_test_hwpfilter, \ hwpfilter/qa/cppunit/test_hwpfilter \ )) diff --git a/hwpfilter/Library_hwp.mk b/hwpfilter/Library_hwp.mk index 2681f966ab08..f6b6159dc7c1 100644 --- a/hwpfilter/Library_hwp.mk +++ b/hwpfilter/Library_hwp.mk @@ -41,7 +41,10 @@ $(eval $(call gb_Library_use_libraries,hwp,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_use_external,hwp,zlib)) +$(eval $(call gb_Library_use_externals,hwp,\ + boost_headers \ + zlib \ +)) ifeq ($(OS),WNT) diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk index 0c23f47b2447..cd7b0ec7de15 100644 --- a/i18npool/Library_i18npool.mk +++ b/i18npool/Library_i18npool.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,i18npool,\ )) $(eval $(call gb_Library_use_externals,i18npool,\ + boost_headers \ icui18n \ icuuc \ icu_headers \ diff --git a/i18nutil/Library_i18nutil.mk b/i18nutil/Library_i18nutil.mk index da469d58846b..07c5de212c43 100644 --- a/i18nutil/Library_i18nutil.mk +++ b/i18nutil/Library_i18nutil.mk @@ -20,7 +20,10 @@ $(eval $(call gb_Library_Library,i18nutil)) $(eval $(call gb_Library_use_package,i18nutil,i18nutil_inc)) -$(eval $(call gb_Library_use_external,i18nutil,icu_headers)) +$(eval $(call gb_Library_use_externals,i18nutil,\ + boost_headers \ + icu_headers \ +)) $(eval $(call gb_Library_use_sdk_api,i18nutil)) diff --git a/idl/Executable_svidl.mk b/idl/Executable_svidl.mk index 8ae41a5894f9..5c69651fdc0b 100644 --- a/idl/Executable_svidl.mk +++ b/idl/Executable_svidl.mk @@ -28,6 +28,8 @@ $(eval $(call gb_Executable_Executable,svidl)) +$(eval $(call gb_Executable_use_external,svidl,boost_headers)) + $(eval $(call gb_Executable_set_include,svidl,\ $$(INCLUDE) \ -I$(SRCDIR)/idl/inc \ diff --git a/idlc/Executable_idlc.mk b/idlc/Executable_idlc.mk index 9239c3d74c16..71971bafe729 100644 --- a/idlc/Executable_idlc.mk +++ b/idlc/Executable_idlc.mk @@ -32,6 +32,8 @@ $(eval $(call gb_Executable_set_include,idlc,\ $$(INCLUDE) \ )) +$(eval $(call gb_Executable_use_external,idlc,boost_headers)) + $(eval $(call gb_Executable_use_libraries,idlc,\ reg \ sal \ diff --git a/io/Library_acceptor.mk b/io/Library_acceptor.mk index 07a702576f2c..f1ac846edf7e 100644 --- a/io/Library_acceptor.mk +++ b/io/Library_acceptor.mk @@ -27,6 +27,8 @@ $(eval $(call gb_Library_Library,acceptor)) +$(eval $(call gb_Library_use_external,acceptor,boost_headers)) + $(eval $(call gb_Library_use_udk_api,acceptor)) $(eval $(call gb_Library_use_libraries,acceptor,\ diff --git a/io/Library_connector.mk b/io/Library_connector.mk index 10e8e8aa1634..064dec80073f 100644 --- a/io/Library_connector.mk +++ b/io/Library_connector.mk @@ -27,6 +27,8 @@ $(eval $(call gb_Library_Library,connector)) +$(eval $(call gb_Library_use_external,connector,boost_headers)) + $(eval $(call gb_Library_use_udk_api,connector)) $(eval $(call gb_Library_use_libraries,connector,\ diff --git a/io/Library_streams.mk b/io/Library_streams.mk index 6ba413c8ddd9..97d1e03c7e96 100644 --- a/io/Library_streams.mk +++ b/io/Library_streams.mk @@ -27,6 +27,8 @@ $(eval $(call gb_Library_Library,streams)) +$(eval $(call gb_Library_use_external,streams,boost_headers)) + $(eval $(call gb_Library_use_udk_api,streams)) $(eval $(call gb_Library_use_libraries,streams,\ diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk index 697642c4479f..66521e303ec6 100644 --- a/jvmfwk/Library_jvmfwk.mk +++ b/jvmfwk/Library_jvmfwk.mk @@ -54,6 +54,7 @@ $(eval $(call gb_Library_use_system_win32_libs,jvmfwk,\ endif $(eval $(call gb_Library_use_externals,jvmfwk,\ + boost_headers \ libxml2 \ )) diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk index 2d7326c4d1db..fcec133fb319 100644 --- a/jvmfwk/Library_sunjavaplugin.mk +++ b/jvmfwk/Library_sunjavaplugin.mk @@ -66,6 +66,7 @@ $(eval $(call gb_Library_use_system_win32_libs,sunjavaplugin,\ endif $(eval $(call gb_Library_use_externals,sunjavaplugin,\ + boost_headers \ valgrind \ )) diff --git a/l10ntools/Executable_cfgex.mk b/l10ntools/Executable_cfgex.mk index 74ed3f81753c..824860821437 100644 --- a/l10ntools/Executable_cfgex.mk +++ b/l10ntools/Executable_cfgex.mk @@ -35,8 +35,6 @@ $(eval $(call gb_Executable_use_libraries,cfgex,\ sal \ )) -$(eval $(call gb_Executable_use_external,cfgex,boost_headers)) - $(eval $(call gb_Executable_add_scanners,cfgex,\ l10ntools/source/cfglex \ )) @@ -50,6 +48,7 @@ $(eval $(call gb_Executable_add_exception_objects,cfgex,\ )) $(eval $(call gb_Executable_use_externals,cfgex,\ + boost_headers \ icuuc \ icui18n \ )) diff --git a/l10ntools/Executable_helpex.mk b/l10ntools/Executable_helpex.mk index 0652b642943e..d52a7c9d46b1 100644 --- a/l10ntools/Executable_helpex.mk +++ b/l10ntools/Executable_helpex.mk @@ -39,6 +39,9 @@ $(eval $(call gb_Executable_use_externals,helpex,\ expat_utf8 \ boost_headers \ icu_headers \ + libxml2 \ + icuuc \ + icui18n \ )) $(eval $(call gb_Executable_use_static_libraries,helpex,\ @@ -51,10 +54,4 @@ $(eval $(call gb_Executable_add_exception_objects,helpex,\ l10ntools/source/helpmerge \ )) -$(eval $(call gb_Executable_use_externals,helpex,\ - libxml2 \ - icuuc \ - icui18n \ -)) - # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/l10ntools/Executable_localize.mk b/l10ntools/Executable_localize.mk index 5e55eee665e7..a55024d2470c 100644 --- a/l10ntools/Executable_localize.mk +++ b/l10ntools/Executable_localize.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Executable_add_exception_objects,localize,\ )) $(eval $(call gb_Executable_use_externals,localize,\ + boost_headers \ icuuc \ icui18n \ )) diff --git a/l10ntools/Executable_propex.mk b/l10ntools/Executable_propex.mk index f97f7a14d0be..f98706f6810f 100644 --- a/l10ntools/Executable_propex.mk +++ b/l10ntools/Executable_propex.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Executable_add_exception_objects,propex,\ )) $(eval $(call gb_Executable_use_externals,propex,\ + boost_headers \ icuuc \ icui18n \ )) diff --git a/l10ntools/Executable_renewpo.mk b/l10ntools/Executable_renewpo.mk index cfdb923dd057..acea0193f01f 100644 --- a/l10ntools/Executable_renewpo.mk +++ b/l10ntools/Executable_renewpo.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Executable_add_exception_objects,renewpo,\ )) $(eval $(call gb_Executable_use_externals,renewpo,\ + boost_headers \ icuuc \ icui18n \ )) diff --git a/l10ntools/Executable_stringex.mk b/l10ntools/Executable_stringex.mk index f20a9f8fddad..9545dd582e73 100644 --- a/l10ntools/Executable_stringex.mk +++ b/l10ntools/Executable_stringex.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Executable_add_exception_objects,stringex,\ )) $(eval $(call gb_Executable_use_externals,stringex,\ + boost_headers \ libxml2 \ icuuc \ icui18n \ diff --git a/l10ntools/Executable_transex3.mk b/l10ntools/Executable_transex3.mk index 132e8a1b750d..364f386fdab0 100644 --- a/l10ntools/Executable_transex3.mk +++ b/l10ntools/Executable_transex3.mk @@ -50,6 +50,7 @@ $(eval $(call gb_Executable_add_exception_objects,transex3,\ )) $(eval $(call gb_Executable_use_externals,transex3,\ + boost_headers \ icuuc \ icui18n \ icu_headers \ diff --git a/l10ntools/Executable_treex.mk b/l10ntools/Executable_treex.mk index 988e78046803..c8ff48c72275 100644 --- a/l10ntools/Executable_treex.mk +++ b/l10ntools/Executable_treex.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Executable_add_exception_objects,treex,\ )) $(eval $(call gb_Executable_use_externals,treex,\ + boost_headers \ libxml2 \ icuuc \ icui18n \ diff --git a/l10ntools/Executable_ulfex.mk b/l10ntools/Executable_ulfex.mk index 0ee4d44cb4c1..dc1268120eed 100644 --- a/l10ntools/Executable_ulfex.mk +++ b/l10ntools/Executable_ulfex.mk @@ -35,8 +35,6 @@ $(eval $(call gb_Executable_use_libraries,ulfex,\ sal \ )) -$(eval $(call gb_Executable_use_external,ulfex,boost_headers)) - $(eval $(call gb_Executable_use_static_libraries,ulfex,\ transex \ )) @@ -47,6 +45,7 @@ $(eval $(call gb_Executable_add_exception_objects,ulfex,\ )) $(eval $(call gb_Executable_use_externals,ulfex,\ + boost_headers \ icuuc \ icui18n \ )) diff --git a/l10ntools/Executable_xrmex.mk b/l10ntools/Executable_xrmex.mk index f11f33d46434..3eef3376f657 100644 --- a/l10ntools/Executable_xrmex.mk +++ b/l10ntools/Executable_xrmex.mk @@ -35,8 +35,6 @@ $(eval $(call gb_Executable_use_libraries,xrmex,\ sal \ )) -$(eval $(call gb_Executable_use_external,xrmex,boost_headers)) - $(eval $(call gb_Executable_add_scanners,xrmex,\ l10ntools/source/xrmlex \ )) @@ -50,6 +48,7 @@ $(eval $(call gb_Executable_add_exception_objects,xrmex,\ )) $(eval $(call gb_Executable_use_externals,xrmex,\ + boost_headers \ libxml2 \ icuuc \ icui18n \ diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk index 595049ba916e..aea4c87f185f 100644 --- a/liborcus/ExternalProject_liborcus.mk +++ b/liborcus/ExternalProject_liborcus.mk @@ -22,7 +22,7 @@ ifeq ($(OS)$(COM),WNTMSC) ifeq ($(VCVER),90) $(call gb_ExternalProject_get_state_target,liborcus,build) : cd $(EXTERNAL_WORKDIR)/vsprojects/liborcus-static-nozip \ - && export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \ && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ && export BOOST_LIB_DIR=$(OUTDIR)/lib \ && $(COMPATH)/vcpackages/vcbuild.exe liborcus-static-nozip.vcproj "Release|Win32" \ @@ -30,7 +30,7 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : else ifeq ($(VCVER),100) $(call gb_ExternalProject_get_state_target,liborcus,build) : cd $(EXTERNAL_WORKDIR)/vsprojects/liborcus-static-nozip \ - && export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \ && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ && export BOOST_LIB_DIR=$(OUTDIR)/lib \ && MSBuild.exe liborcus-static-nozip.vcxproj /p:Configuration=Release /p:OutDir=Release/ /p:TargetName=orcus /p:WholeProgramOptimization=no \ @@ -38,7 +38,7 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : else $(call gb_ExternalProject_get_state_target,liborcus,build) : cd $(EXTERNAL_WORKDIR)/vsprojects/liborcus-static-nozip \ - && export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \ && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ && export BOOST_LIB_DIR=$(OUTDIR)/lib \ && MSBuild.exe liborcus-static-nozip.vcxproj /p:PlatformToolset=v110 /p:VisualStudioVersion=11.0 /p:Configuration=Release /p:OutDir=Release/ /p:TargetName=orcus /p:WholeProgramOptimization=no \ @@ -60,7 +60,7 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : --disable-spreadsheet-model \ --disable-werror \ $(if $(filter LINUX FREEBSD OPENBSD NETBSD DRAGONFLY ANDROID,$(OS)),$(if $(gb_ENABLE_DBGUTIL),CPPFLAGS=-D_GLIBCXX_DEBUG)) \ - $(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(OUTDIR)/inc/external) \ + $(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(call gb_UnpackedTarball_get_dir,boost)) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ && touch $@ diff --git a/libvisio/ExternalProject_libvisio.mk b/libvisio/ExternalProject_libvisio.mk index 3ad16c56c0bf..94f1b1d3ce9b 100644 --- a/libvisio/ExternalProject_libvisio.mk +++ b/libvisio/ExternalProject_libvisio.mk @@ -26,6 +26,7 @@ ifeq ($(OS)$(COM),WNTMSC) ifeq ($(VCVER),90) $(call gb_ExternalProject_get_state_target,libvisio,build) : cd $(EXTERNAL_WORKDIR)/build/win32 \ + && export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \ && export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ && export LIBXML_INCLUDE_DIR=$(OUTDIR)/inc/external \ @@ -35,6 +36,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) : else ifeq ($(VCVER),100) $(call gb_ExternalProject_get_state_target,libvisio,build) : cd $(EXTERNAL_WORKDIR)/build/win32 \ + && export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \ && export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ && export LIBXML_INCLUDE_DIR=$(OUTDIR)/inc/extrenal \ @@ -44,6 +46,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) : else $(call gb_ExternalProject_get_state_target,libvisio,build) : cd $(EXTERNAL_WORKDIR)/build/win32 \ + && export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \ && export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ && export LIBXML_INCLUDE_DIR=$(OUTDIR)/inc/external \ @@ -64,7 +67,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) : --without-docs \ --disable-debug \ --disable-werror \ - $(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(OUTDIR)/inc/external) \ + $(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(call gb_UnpackedTarball_get_dir,boost)) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \ && touch $@ diff --git a/lingucomponent/Library_hyphen.mk b/lingucomponent/Library_hyphen.mk index 2d6d76b6c49e..73ede7673e81 100644 --- a/lingucomponent/Library_hyphen.mk +++ b/lingucomponent/Library_hyphen.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_static_libraries,hyphen,\ )) $(eval $(call gb_Library_use_externals,hyphen,\ + boost_headers \ hunspell \ hyphen \ )) diff --git a/lingucomponent/Library_lnth.mk b/lingucomponent/Library_lnth.mk index 9615d5a20655..14ccf6b0eb0b 100644 --- a/lingucomponent/Library_lnth.mk +++ b/lingucomponent/Library_lnth.mk @@ -53,6 +53,7 @@ $(eval $(call gb_Library_use_static_libraries,lnth,\ )) $(eval $(call gb_Library_use_externals,lnth,\ + boost_headers \ hunspell \ mythes \ )) diff --git a/lingucomponent/Library_spell.mk b/lingucomponent/Library_spell.mk index 96e2abdc6c8c..850c088e1836 100644 --- a/lingucomponent/Library_spell.mk +++ b/lingucomponent/Library_spell.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_static_libraries,spell,\ )) $(eval $(call gb_Library_use_externals,spell,\ + boost_headers \ hunspell \ icuuc \ )) diff --git a/lingucomponent/StaticLibrary_ulingu.mk b/lingucomponent/StaticLibrary_ulingu.mk index 9767efa4e67a..98bfed361e57 100644 --- a/lingucomponent/StaticLibrary_ulingu.mk +++ b/lingucomponent/StaticLibrary_ulingu.mk @@ -50,6 +50,7 @@ $(eval $(call gb_StaticLibrary_add_defs,ulingu,\ endif $(eval $(call gb_StaticLibrary_use_externals,ulingu,\ + boost_headers \ hunspell \ )) diff --git a/linguistic/Library_lng.mk b/linguistic/Library_lng.mk index 3658062b0169..9d520cddf036 100644 --- a/linguistic/Library_lng.mk +++ b/linguistic/Library_lng.mk @@ -59,6 +59,7 @@ $(eval $(call gb_Library_use_libraries,lng,\ )) $(eval $(call gb_Library_use_externals,lng,\ + boost_headers \ icuuc \ icu_headers \ )) diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk index 123e382c76e5..f5c7990a32db 100644 --- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk +++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk @@ -30,6 +30,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,lotuswordpro_test_lotuswordpro)) +$(eval $(call gb_CppunitTest_use_external,lotuswordpro_test_lotuswordpro,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,lotuswordpro_test_lotuswordpro, \ lotuswordpro/qa/cppunit/test_lotuswordpro \ )) diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk index 361cf7d382bc..c6f2a7803939 100644 --- a/lotuswordpro/Library_lwpft.mk +++ b/lotuswordpro/Library_lwpft.mk @@ -51,6 +51,7 @@ $(eval $(call gb_Library_use_libraries,lwpft,\ )) $(eval $(call gb_Library_use_externals,lwpft,\ + boost_headers \ icui18n \ icuuc \ icu_headers \ diff --git a/mysqlc/source/makefile.mk b/mysqlc/source/makefile.mk index 1ee4c87eab29..6402e13a2b90 100644 --- a/mysqlc/source/makefile.mk +++ b/mysqlc/source/makefile.mk @@ -123,6 +123,7 @@ CDEFS += -DCPPCONN_LIB=\"$(DLLPRE)mysqlcppconn$(DLLPOST)\" .ENDIF CFLAGS+=-I..$/..$/inc $(MYSQL_INC) \ + -I$(WORKDIR)/UnpackedTarball/boost \ -DMYSQLC_VERSION_MAJOR=$(MYSQLC_VERSION_MAJOR) \ -DMYSQLC_VERSION_MINOR=$(MYSQLC_VERSION_MINOR) \ -DMYSQLC_VERSION_MICRO=$(MYSQLC_VERSION_MICRO) \ diff --git a/mysqlcppconn/mysql_config.pmk b/mysqlcppconn/mysql_config.pmk index 43a7ab80aad0..65a866db985e 100644 --- a/mysqlcppconn/mysql_config.pmk +++ b/mysqlcppconn/mysql_config.pmk @@ -45,5 +45,5 @@ CFLAGS+=-DCPPDBC_WIN32 -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS MYSQL_INC+=-I$(LIBMYSQL_PATH)$/include .ENDIF -CFLAGS+=-I$(PRJINC) -I$(PRJINC)$/cppconn $(MYSQL_INC) -DCPPCONN_LIB_BUILD +CFLAGS+=-I$(PRJINC) -I$(PRJINC)$/cppconn -I$(WORKDIR)/UnpackedTarball/boost $(MYSQL_INC) -DCPPCONN_LIB_BUILD diff --git a/o3tl/CppunitTest_o3tl_tests.mk b/o3tl/CppunitTest_o3tl_tests.mk index 361e7ecc044d..02fcaf938926 100644 --- a/o3tl/CppunitTest_o3tl_tests.mk +++ b/o3tl/CppunitTest_o3tl_tests.mk @@ -30,6 +30,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,o3tl_tests)) $(eval $(call gb_CppunitTest_use_package,o3tl_tests,o3tl_inc)) +$(eval $(call gb_CppunitTest_use_external,o3tl_tests,boost_headers)) + $(eval $(call gb_CppunitTest_use_libraries,o3tl_tests,\ sal \ $(gb_UWINAPI) \ diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index 58d7718e901a..303b21f25a7e 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -82,6 +82,7 @@ $(eval $(call gb_Library_use_libraries,oox,\ )) $(eval $(call gb_Library_use_externals,oox,\ + boost_headers \ openssl \ openssl_headers \ )) diff --git a/package/Library_package2.mk b/package/Library_package2.mk index 72fb5f5ead99..407150be1ccf 100644 --- a/package/Library_package2.mk +++ b/package/Library_package2.mk @@ -54,6 +54,7 @@ $(eval $(call gb_Library_use_libraries,package2,\ )) $(eval $(call gb_Library_use_externals,package2,\ + boost_headers \ zlib \ )) diff --git a/package/Library_xstor.mk b/package/Library_xstor.mk index 45c03ad5ca20..d600f1b415be 100644 --- a/package/Library_xstor.mk +++ b/package/Library_xstor.mk @@ -35,6 +35,8 @@ $(eval $(call gb_Library_set_include,xstor,\ -I$(SRCDIR)/package/inc \ )) +$(eval $(call gb_Library_use_external,xstor,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,xstor)) $(eval $(call gb_Library_use_libraries,xstor,\ diff --git a/padmin/Executable_spadmin.bin.mk b/padmin/Executable_spadmin.bin.mk index af674ea30f76..25fa903a588c 100644 --- a/padmin/Executable_spadmin.bin.mk +++ b/padmin/Executable_spadmin.bin.mk @@ -23,6 +23,8 @@ $(eval $(call gb_Executable_set_include,spadmin.bin,\ $$(INCLUDE) \ )) +$(eval $(call gb_Executable_use_external,spadmin.bin,boost_headers)) + $(eval $(call gb_Executable_use_static_libraries,spadmin.bin,\ vclmain \ )) diff --git a/padmin/Library_spa.mk b/padmin/Library_spa.mk index 65df95fdb755..2eb912b90d86 100644 --- a/padmin/Library_spa.mk +++ b/padmin/Library_spa.mk @@ -23,6 +23,8 @@ $(eval $(call gb_Library_add_defs,spa,\ -DSPA_DLLIMPLEMENTATION \ )) +$(eval $(call gb_Library_use_external,spa,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,spa)) $(eval $(call gb_Library_use_libraries,spa,\ diff --git a/pyuno/Library_pyuno.mk b/pyuno/Library_pyuno.mk index 8ecda3dbc64a..f3bc282a9be6 100644 --- a/pyuno/Library_pyuno.mk +++ b/pyuno/Library_pyuno.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,pyuno,\ )) $(eval $(call gb_Library_use_externals,pyuno,\ + boost_headers \ python \ )) diff --git a/registry/Library_reg.mk b/registry/Library_reg.mk index b8eae85b98ac..375f162a5a91 100644 --- a/registry/Library_reg.mk +++ b/registry/Library_reg.mk @@ -37,6 +37,8 @@ $(eval $(call gb_Library_add_defs,reg,\ -DREG_DLLIMPLEMENTATION \ )) +$(eval $(call gb_Library_use_external,reg,boost_headers)) + $(eval $(call gb_Library_use_libraries,reg,\ sal \ store \ diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk index f6db9c2c8684..511da92a2d4b 100644 --- a/reportdesign/Library_rpt.mk +++ b/reportdesign/Library_rpt.mk @@ -38,6 +38,8 @@ $(eval $(call gb_Library_add_defs,rpt,\ -DREPORTDESIGN_DLLIMPLEMENTATION \ )) +$(eval $(call gb_Library_use_external,rpt,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,rpt)) $(eval $(call gb_Library_use_libraries,rpt,\ diff --git a/reportdesign/Library_rptui.mk b/reportdesign/Library_rptui.mk index 695b06ed3a34..5426367b9652 100644 --- a/reportdesign/Library_rptui.mk +++ b/reportdesign/Library_rptui.mk @@ -34,6 +34,8 @@ $(eval $(call gb_Library_set_include,rptui,\ -I$(SRCDIR)/reportdesign/source/ui/inc \ )) +$(eval $(call gb_Library_use_external,rptui,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,rptui)) $(eval $(call gb_Library_use_libraries,rptui,\ diff --git a/reportdesign/Library_rptxml.mk b/reportdesign/Library_rptxml.mk index ba8c96a65324..8ab669a0691b 100644 --- a/reportdesign/Library_rptxml.mk +++ b/reportdesign/Library_rptxml.mk @@ -33,6 +33,8 @@ $(eval $(call gb_Library_set_include,rptxml,\ -I$(SRCDIR)/reportdesign/source/inc \ )) +$(eval $(call gb_Library_use_external,rptxml,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,rptxml)) $(eval $(call gb_Library_use_libraries,rptxml,\ diff --git a/rsc/Executable_rsc.mk b/rsc/Executable_rsc.mk index f191867d325c..e7a182293549 100644 --- a/rsc/Executable_rsc.mk +++ b/rsc/Executable_rsc.mk @@ -28,6 +28,8 @@ $(eval $(call gb_Executable_Executable,rsc)) +$(eval $(call gb_Executable_use_external,rsc,boost_headers)) + $(eval $(call gb_Executable_set_include,rsc,\ $$(INCLUDE) \ -I$(SRCDIR)/rsc/inc \ diff --git a/sal/CppunitTest_sal_checkapi.mk b/sal/CppunitTest_sal_checkapi.mk index 06e42a997987..b21f1ecbd974 100644 --- a/sal/CppunitTest_sal_checkapi.mk +++ b/sal/CppunitTest_sal_checkapi.mk @@ -36,6 +36,8 @@ $(eval $(call gb_CppunitTest_set_include,sal_checkapi,\ -I$(SRCDIR)/sal/inc \ )) +$(eval $(call gb_CppunitTest_use_external,sal_checkapi,boost_headers)) + # strings.cxx includes generated strings.hxx $(call gb_CxxObject_get_target,sal/qa/checkapi/strings) : \ INCLUDE += -I$(call gb_CustomTarget_get_workdir,sal/allheaders) diff --git a/sal/CppunitTest_sal_osl_file.mk b/sal/CppunitTest_sal_osl_file.mk index 9b70af7e1e34..1010f4a8a94c 100644 --- a/sal/CppunitTest_sal_osl_file.mk +++ b/sal/CppunitTest_sal_osl_file.mk @@ -31,6 +31,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_file,\ sal/qa/osl/file/osl_File \ )) +$(eval $(call gb_CppunitTest_use_external,sal_osl_file,boost_headers)) + $(eval $(call gb_CppunitTest_use_libraries,sal_osl_file,\ sal \ $(gb_UWINAPI) \ diff --git a/sal/CppunitTest_sal_osl_setthreadname.mk b/sal/CppunitTest_sal_osl_setthreadname.mk index b0c055f34227..88ff01775efd 100644 --- a/sal/CppunitTest_sal_osl_setthreadname.mk +++ b/sal/CppunitTest_sal_osl_setthreadname.mk @@ -32,6 +32,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_setthreadname, \ sal/qa/osl/setthreadname/test-setthreadname \ )) +$(eval $(call gb_CppunitTest_use_external,sal_osl_setthreadname,boost_headers)) + $(eval $(call gb_CppunitTest_use_libraries,sal_osl_setthreadname, \ sal \ $(gb_UWINAPI) \ diff --git a/sal/Executable_cppunittester.mk b/sal/Executable_cppunittester.mk index b5826942378f..40a399b21f77 100644 --- a/sal/Executable_cppunittester.mk +++ b/sal/Executable_cppunittester.mk @@ -37,7 +37,10 @@ $(eval $(call gb_Executable_use_libraries,cppunit/cppunittester,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_use_external,cppunit/cppunittester,cppunit)) +$(eval $(call gb_Executable_use_externals,cppunit/cppunittester,\ + boost_headers \ + cppunit \ +)) $(eval $(call gb_Executable_add_exception_objects,cppunit/cppunittester,\ sal/cppunittester/cppunittester \ diff --git a/sal/Library_sal_textenc.mk b/sal/Library_sal_textenc.mk index 972f0ee5d405..27e6660a0cb8 100644 --- a/sal/Library_sal_textenc.mk +++ b/sal/Library_sal_textenc.mk @@ -27,6 +27,8 @@ $(eval $(call gb_Library_Library,sal_textenc)) +$(eval $(call gb_Library_use_external,sal_textenc,boost_headers)) + $(eval $(call gb_Library_use_libraries,sal_textenc,\ sal \ $(gb_UWINAPI) \ diff --git a/salhelper/CppunitTest_salhelper_checkapi.mk b/salhelper/CppunitTest_salhelper_checkapi.mk index 08c820836bea..dd5a08e357d7 100644 --- a/salhelper/CppunitTest_salhelper_checkapi.mk +++ b/salhelper/CppunitTest_salhelper_checkapi.mk @@ -27,6 +27,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,salhelper_checkapi)) +$(eval $(call gb_CppunitTest_use_external,salhelper_checkapi,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,salhelper_checkapi,\ salhelper/qa/checkapi/strings \ )) diff --git a/salhelper/CppunitTest_salhelper_testapi.mk b/salhelper/CppunitTest_salhelper_testapi.mk index 606827a868d7..1943c1b54a09 100644 --- a/salhelper/CppunitTest_salhelper_testapi.mk +++ b/salhelper/CppunitTest_salhelper_testapi.mk @@ -24,6 +24,8 @@ $(eval $(call gb_CppunitTest_set_include,salhelper_testapi,\ -I$(SRCDIR)/salhelper/inc \ )) +$(eval $(call gb_CppunitTest_use_external,salhelper_testapi,boost_headers)) + $(eval $(call gb_CppunitTest_use_libraries,salhelper_testapi,\ salhelper \ sal \ diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk index 37411b3575b5..02c0f7c30c6e 100644 --- a/sax/Library_fastsax.mk +++ b/sax/Library_fastsax.mk @@ -19,6 +19,7 @@ $(eval $(call gb_Library_set_include,fastsax,\ $(eval $(call gb_Library_use_sdk_api,fastsax)) $(eval $(call gb_Library_use_externals,fastsax,\ + boost_headers \ expat_utf8 \ zlib \ )) diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk index 6083db3d1685..af8a75c223b6 100644 --- a/sax/Library_sax.mk +++ b/sax/Library_sax.mk @@ -18,6 +18,8 @@ $(eval $(call gb_Library_set_include,sax,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_use_external,sax,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,sax)) $(eval $(call gb_Library_use_libraries,sax,\ diff --git a/sc/CppunitTest_sc_annotationobj.mk b/sc/CppunitTest_sc_annotationobj.mk index 16b2d489db26..7f8b9330b9cc 100644 --- a/sc/CppunitTest_sc_annotationobj.mk +++ b/sc/CppunitTest_sc_annotationobj.mk @@ -30,6 +30,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_annotationobj)) +$(eval $(call gb_CppunitTest_use_external,sc_annotationobj,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,sc_annotationobj, \ sc/qa/extras/scannotationobj \ )) diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk b/sc/CppunitTest_sc_annotationshapeobj.mk index 841b34a450a9..c85f6fd73f19 100644 --- a/sc/CppunitTest_sc_annotationshapeobj.mk +++ b/sc/CppunitTest_sc_annotationshapeobj.mk @@ -30,6 +30,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_annonationshapeobj)) +$(eval $(call gb_CppunitTest_use_external,sc_annonationshapeobj,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,sc_annonationshapeobj, \ sc/qa/extras/scannotationshapeobj \ )) diff --git a/sc/CppunitTest_sc_annotationsobj.mk b/sc/CppunitTest_sc_annotationsobj.mk index bfd82bc7eeb9..5304cd6d2c75 100644 --- a/sc/CppunitTest_sc_annotationsobj.mk +++ b/sc/CppunitTest_sc_annotationsobj.mk @@ -30,6 +30,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_annotationsobj)) +$(eval $(call gb_CppunitTest_use_external,sc_annotationsobj,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,sc_annotationsobj, \ sc/qa/extras/scannotationsobj \ )) diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk index b0a63217668a..4f1aaf34207c 100644 --- a/sc/CppunitTest_sc_cellrangeobj.mk +++ b/sc/CppunitTest_sc_cellrangeobj.mk @@ -30,6 +30,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_cellrangesbase)) +$(eval $(call gb_CppunitTest_use_external,sc_cellrangesbase,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,sc_cellrangesbase, \ sc/qa/extras/sccellrangeobj\ )) diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk index b1fd1bc89872..7d616737142e 100644 --- a/sc/CppunitTest_sc_databaserangeobj.mk +++ b/sc/CppunitTest_sc_databaserangeobj.mk @@ -30,6 +30,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_databaserangeobj)) +$(eval $(call gb_CppunitTest_use_external,sc_databaserangeobj,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,sc_databaserangeobj, \ sc/qa/extras/scdatabaserangeobj \ )) diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk index 7d86cb573941..74ced87da3e6 100644 --- a/sc/CppunitTest_sc_datapilotfieldobj.mk +++ b/sc/CppunitTest_sc_datapilotfieldobj.mk @@ -30,6 +30,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_datapilotfieldobj)) +$(eval $(call gb_CppunitTest_use_external,sc_datapilotfieldobj,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,sc_datapilotfieldobj, \ sc/qa/extras/scdatapilotfieldobj \ )) diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk index 33207173b07a..ce86c01117f3 100644 --- a/sc/CppunitTest_sc_datapilottableobj.mk +++ b/sc/CppunitTest_sc_datapilottableobj.mk @@ -30,6 +30,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_datapilottableobj)) +$(eval $(call gb_CppunitTest_use_external,sc_datapilottableobj,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,sc_datapilottableobj, \ sc/qa/extras/scdatapilottableobj \ )) diff --git a/sc/CppunitTest_sc_editfieldobj_cell.mk b/sc/CppunitTest_sc_editfieldobj_cell.mk index b4f80621f9f6..f499daa03411 100644 --- a/sc/CppunitTest_sc_editfieldobj_cell.mk +++ b/sc/CppunitTest_sc_editfieldobj_cell.mk @@ -30,6 +30,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_editfieldobj_cell)) +$(eval $(call gb_CppunitTest_use_external,sc_editfieldobj_cell,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,sc_editfieldobj_cell, \ sc/qa/extras/sceditfieldobj-cell \ )) diff --git a/sc/CppunitTest_sc_editfieldobj_header.mk b/sc/CppunitTest_sc_editfieldobj_header.mk index ba55b6515208..d92a4782f23f 100644 --- a/sc/CppunitTest_sc_editfieldobj_header.mk +++ b/sc/CppunitTest_sc_editfieldobj_header.mk @@ -30,6 +30,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_editfieldobj_header)) +$(eval $(call gb_CppunitTest_use_external,sc_editfieldobj_header,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,sc_editfieldobj_header, \ sc/qa/extras/sceditfieldobj-header \ )) diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk index e058a5505d29..59b577ad39b0 100644 --- a/sc/CppunitTest_sc_filters_test.mk +++ b/sc/CppunitTest_sc_filters_test.mk @@ -38,6 +38,7 @@ $(eval $(call gb_CppunitTest_add_defs,sc_filters_test,\ endif $(eval $(call gb_CppunitTest_use_externals,sc_filters_test, \ + boost_headers \ mdds_headers \ orcus \ )) diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk index d6c812ccb5ae..362a65e7ea49 100644 --- a/sc/CppunitTest_sc_macros_test.mk +++ b/sc/CppunitTest_sc_macros_test.mk @@ -27,6 +27,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_macros_test)) +$(eval $(call gb_CppunitTest_use_external,sc_macros_test,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,sc_macros_test, \ sc/qa/extras/macros-test \ )) diff --git a/sc/CppunitTest_sc_modelobj.mk b/sc/CppunitTest_sc_modelobj.mk index de62eb6475d4..9f8308f79916 100644 --- a/sc/CppunitTest_sc_modelobj.mk +++ b/sc/CppunitTest_sc_modelobj.mk @@ -30,6 +30,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_modelobj)) +$(eval $(call gb_CppunitTest_use_external,sc_modelobj,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,sc_modelobj, \ sc/qa/extras/scmodelobj \ )) diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk index c2f1d438dd09..b9acb355652c 100644 --- a/sc/CppunitTest_sc_namedrangeobj.mk +++ b/sc/CppunitTest_sc_namedrangeobj.mk @@ -30,6 +30,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_namedrangeobj)) +$(eval $(call gb_CppunitTest_use_external,sc_namedrangeobj,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,sc_namedrangeobj, \ sc/qa/extras/scnamedrangeobj \ )) diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk index 84d7f371c5a3..0d80f8d70c9f 100644 --- a/sc/CppunitTest_sc_namedrangesobj.mk +++ b/sc/CppunitTest_sc_namedrangesobj.mk @@ -30,6 +30,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_namedrangesobj)) +$(eval $(call gb_CppunitTest_use_external,sc_namedrangesobj,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,sc_namedrangesobj, \ sc/qa/extras/scnamedrangesobj \ )) diff --git a/sc/CppunitTest_sc_outlineobj.mk b/sc/CppunitTest_sc_outlineobj.mk index 78170354015b..c43dc51c8e5f 100644 --- a/sc/CppunitTest_sc_outlineobj.mk +++ b/sc/CppunitTest_sc_outlineobj.mk @@ -34,6 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_outlineobj, \ sc/qa/extras/scoutlineobj \ )) +$(eval $(call gb_CppunitTest_use_external,sc_outlineobj,boost_headers)) + $(eval $(call gb_CppunitTest_use_libraries,sc_outlineobj, \ avmedia \ basegfx \ diff --git a/sc/CppunitTest_sc_rangelst_test.mk b/sc/CppunitTest_sc_rangelst_test.mk index 44c6b5266696..3aac87cc45f8 100644 --- a/sc/CppunitTest_sc_rangelst_test.mk +++ b/sc/CppunitTest_sc_rangelst_test.mk @@ -27,6 +27,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_rangelst_test)) +$(eval $(call gb_CppunitTest_use_external,sc_rangelst_test,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,sc_rangelst_test, \ sc/qa/unit/rangelst_test \ )) diff --git a/sc/CppunitTest_sc_subsequent_export_test.mk b/sc/CppunitTest_sc_subsequent_export_test.mk index 41a6855d061f..d64832d9cff1 100644 --- a/sc/CppunitTest_sc_subsequent_export_test.mk +++ b/sc/CppunitTest_sc_subsequent_export_test.mk @@ -32,6 +32,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_subsequent_export_test, \ )) $(eval $(call gb_CppunitTest_use_externals,sc_subsequent_export_test, \ + boost_headers \ mdds_headers \ orcus \ )) diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk index 68e943d0d811..63ebc938fc77 100644 --- a/sc/CppunitTest_sc_subsequent_filters_test.mk +++ b/sc/CppunitTest_sc_subsequent_filters_test.mk @@ -32,6 +32,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_subsequent_filters_test, \ )) $(eval $(call gb_CppunitTest_use_externals,sc_subsequent_filters_test, \ + boost_headers \ mdds_headers \ orcus \ )) diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk index 067ed9eea0ef..efa20b605833 100644 --- a/sc/CppunitTest_sc_tablesheetobj.mk +++ b/sc/CppunitTest_sc_tablesheetobj.mk @@ -34,6 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_spreadsheetobj, \ sc/qa/extras/sctablesheetobj \ )) +$(eval $(call gb_CppunitTest_use_external,sc_spreadsheetobj,boost_headers)) + $(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheetobj, \ avmedia \ basegfx \ diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk index 60cb6f1ea73d..2244f13b8aea 100644 --- a/sc/CppunitTest_sc_tablesheetsobj.mk +++ b/sc/CppunitTest_sc_tablesheetsobj.mk @@ -34,6 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_spreadsheetsobj, \ sc/qa/extras/sctablesheetsobj \ )) +$(eval $(call gb_CppunitTest_use_external,sc_spreadsheetsobj,boost_headers)) + $(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheetsobj, \ avmedia \ basegfx \ diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index 28bf1bc4c310..762e35798049 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -37,13 +37,13 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_ucalc, \ $(eval $(call gb_CppunitTest_use_library_objects,sc_ucalc,sc)) -$(eval $(call gb_CppunitTest_use_external,sc_ucalc,mdds_headers)) - ifeq ($(ENABLE_TELEPATHY),TRUE) $(eval $(call gb_CppunitTest_use_libraries,sc_ucalc,tubes)) endif $(eval $(call gb_CppunitTest_use_externals,sc_ucalc,\ + boost_headers \ + mdds_headers \ orcus \ )) diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index e83d11057cf5..865f5f0c3e6e 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -49,6 +49,7 @@ $(eval $(call gb_Library_use_packages,sc,\ $(eval $(call gb_Library_use_sdk_api,sc)) $(eval $(call gb_Library_use_externals,sc,\ + boost_headers \ mdds_headers \ )) diff --git a/sc/Library_scd.mk b/sc/Library_scd.mk index 25e2a6e1badf..815ce7d26d70 100644 --- a/sc/Library_scd.mk +++ b/sc/Library_scd.mk @@ -29,6 +29,8 @@ $(eval $(call gb_Library_set_include,scd,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_use_external,scd,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,scd)) $(eval $(call gb_Library_use_libraries,scd,\ diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk index 39010911eeb6..72910ecdabbb 100644 --- a/sc/Library_scfilt.mk +++ b/sc/Library_scfilt.mk @@ -34,7 +34,10 @@ $(eval $(call gb_Library_set_include,scfilt,\ $(eval $(call gb_Library_use_sdk_api,scfilt)) -$(eval $(call gb_Library_use_external,scfilt,mdds_headers)) +$(eval $(call gb_Library_use_externals,scfilt,\ + boost_headers \ + mdds_headers \ +)) $(eval $(call gb_Library_use_libraries,scfilt,\ basegfx \ diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk index b1eb7720f247..4db5d8142749 100644 --- a/sc/Library_scui.mk +++ b/sc/Library_scui.mk @@ -33,7 +33,10 @@ $(eval $(call gb_Library_set_include,scui,\ $(eval $(call gb_Library_use_sdk_api,scui)) -$(eval $(call gb_Library_use_external,scui,mdds_headers)) +$(eval $(call gb_Library_use_externals,scui,\ + boost_headers \ + mdds_headers \ +)) $(eval $(call gb_Library_use_libraries,scui,\ comphelper \ diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk index 6272d2238220..42c76b3d3e1e 100644 --- a/sc/Library_vbaobj.mk +++ b/sc/Library_vbaobj.mk @@ -32,6 +32,8 @@ $(eval $(call gb_Library_set_include,vbaobj,\ $(eval $(call gb_Library_set_componentfile,vbaobj,sc/util/vbaobj)) +$(eval $(call gb_Library_use_external,vbaobj,boost_headers)) + $(eval $(call gb_Library_use_api,vbaobj,\ offapi \ oovbaapi \ diff --git a/scaddins/Library_analysis.mk b/scaddins/Library_analysis.mk index 6b351da0cdc8..2b91e97bbc15 100644 --- a/scaddins/Library_analysis.mk +++ b/scaddins/Library_analysis.mk @@ -30,6 +30,8 @@ $(eval $(call gb_Library_Library,analysis)) $(eval $(call gb_Library_set_componentfile,analysis,scaddins/source/analysis/analysis)) +$(eval $(call gb_Library_use_external,analysis,boost_headers)) + $(eval $(call gb_Library_use_internal_comprehensive_api,analysis,\ offapi \ scaddins \ diff --git a/scaddins/Library_date.mk b/scaddins/Library_date.mk index 03730e0afe7f..008212dfec50 100644 --- a/scaddins/Library_date.mk +++ b/scaddins/Library_date.mk @@ -30,6 +30,8 @@ $(eval $(call gb_Library_Library,date)) $(eval $(call gb_Library_set_componentfile,date,scaddins/source/datefunc/date)) +$(eval $(call gb_Library_use_external,date,boost_headers)) + $(eval $(call gb_Library_use_internal_comprehensive_api,date,\ offapi \ scaddins \ diff --git a/scaddins/Library_pricing.mk b/scaddins/Library_pricing.mk index d8ef4bb55931..d03a90b936aa 100644 --- a/scaddins/Library_pricing.mk +++ b/scaddins/Library_pricing.mk @@ -30,6 +30,8 @@ $(eval $(call gb_Library_Library,pricing)) $(eval $(call gb_Library_set_componentfile,pricing,scaddins/source/pricing/pricing)) +$(eval $(call gb_Library_use_external,pricing,boost_headers)) + $(eval $(call gb_Library_use_internal_comprehensive_api,pricing,\ offapi \ scaddins \ diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk index 52f99ccc980f..d0a56c222636 100644 --- a/sccomp/Library_solver.mk +++ b/sccomp/Library_solver.mk @@ -41,7 +41,10 @@ $(eval $(call gb_Library_use_libraries,solver,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_use_external,solver,lpsolve)) +$(eval $(call gb_Library_use_externals,solver,\ + boost_headers \ + lpsolve \ +)) $(eval $(call gb_Library_add_exception_objects,solver,\ sccomp/source/solver/solver \ diff --git a/scripting/Library_basprov.mk b/scripting/Library_basprov.mk index 602aa1df85af..afa4d2bf7214 100644 --- a/scripting/Library_basprov.mk +++ b/scripting/Library_basprov.mk @@ -35,6 +35,8 @@ $(eval $(call gb_Library_set_include,basprov,\ -I$(SRCDIR)/scripting/source/inc \ )) +$(eval $(call gb_Library_use_external,basprov,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,basprov)) $(eval $(call gb_Library_use_libraries,basprov,\ diff --git a/scripting/Library_dlgprov.mk b/scripting/Library_dlgprov.mk index 3219003f9566..a5511fbd50f6 100644 --- a/scripting/Library_dlgprov.mk +++ b/scripting/Library_dlgprov.mk @@ -35,6 +35,8 @@ $(eval $(call gb_Library_set_include,dlgprov,\ -I$(SRCDIR)/scripting/source/inc \ )) +$(eval $(call gb_Library_use_external,dlgprov,boost_headers)) + $(eval $(call gb_Library_use_api,dlgprov,\ offapi \ oovbaapi \ diff --git a/scripting/Library_protocolhandler.mk b/scripting/Library_protocolhandler.mk index d2a684ab852f..eeef9c399f24 100644 --- a/scripting/Library_protocolhandler.mk +++ b/scripting/Library_protocolhandler.mk @@ -35,6 +35,8 @@ $(eval $(call gb_Library_set_include,protocolhandler,\ -I$(SRCDIR)/scripting/source/inc \ )) +$(eval $(call gb_Library_use_external,protocolhandler,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,protocolhandler)) $(eval $(call gb_Library_use_libraries,protocolhandler,\ diff --git a/scripting/Library_scriptframe.mk b/scripting/Library_scriptframe.mk index 2ecc9ec70a48..c3642f64a5c3 100644 --- a/scripting/Library_scriptframe.mk +++ b/scripting/Library_scriptframe.mk @@ -35,6 +35,8 @@ $(eval $(call gb_Library_set_include,scriptframe,\ -I$(SRCDIR)/scripting/source/inc \ )) +$(eval $(call gb_Library_use_external,scriptframe,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,scriptframe)) $(eval $(call gb_Library_use_libraries,scriptframe,\ diff --git a/scripting/Library_stringresource.mk b/scripting/Library_stringresource.mk index 29c5eb9e0a3b..f0f49dcf999d 100644 --- a/scripting/Library_stringresource.mk +++ b/scripting/Library_stringresource.mk @@ -35,6 +35,8 @@ $(eval $(call gb_Library_set_include,stringresource,\ -I$(SRCDIR)/scripting/source/inc \ )) +$(eval $(call gb_Library_use_external,stringresource,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,stringresource)) $(eval $(call gb_Library_use_libraries,stringresource,\ diff --git a/scripting/Library_vbaevents.mk b/scripting/Library_vbaevents.mk index acab48fe2811..ae9e58118ef8 100644 --- a/scripting/Library_vbaevents.mk +++ b/scripting/Library_vbaevents.mk @@ -35,6 +35,8 @@ $(eval $(call gb_Library_set_include,vbaevents,\ -I$(SRCDIR)/scripting/source/inc \ )) +$(eval $(call gb_Library_use_external,vbaevents,boost_headers)) + $(eval $(call gb_Library_use_api,vbaevents,\ offapi \ oovbaapi \ diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk index 132980a0be8f..1f3858b50d43 100644 --- a/sd/CppunitTest_sd_filters_test.mk +++ b/sd/CppunitTest_sd_filters_test.mk @@ -29,6 +29,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sd_filters_test)) +$(eval $(call gb_CppunitTest_use_external,sd_filters_test,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,sd_filters_test, \ sd/qa/unit/filters-test \ )) diff --git a/sd/CppunitTest_sd_regression_test.mk b/sd/CppunitTest_sd_regression_test.mk index 078eff10812d..607c2e398cac 100644 --- a/sd/CppunitTest_sd_regression_test.mk +++ b/sd/CppunitTest_sd_regression_test.mk @@ -29,6 +29,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sd_regression_test)) +$(eval $(call gb_CppunitTest_use_external,sd_regression_test,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,sd_regression_test, \ sd/qa/unit/regression-test \ )) diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk index 9adef1d401a9..f41a4fb90fe5 100644 --- a/sd/CppunitTest_sd_uimpress.mk +++ b/sd/CppunitTest_sd_uimpress.mk @@ -82,6 +82,7 @@ $(eval $(call gb_CppunitTest_use_system_win32_libs,sd_uimpress,\ endif $(eval $(call gb_CppunitTest_use_externals,sd_uimpress,\ + boost_headers \ gtk \ dbus \ )) diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 19adf059c66d..e2640dd79804 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -109,8 +109,9 @@ $(eval $(call gb_Library_use_libraries,sd,\ )) $(eval $(call gb_Library_use_externals,sd,\ - libxml2 \ - dbus \ + boost_headers \ + libxml2 \ + dbus \ )) ifeq ($(OS),WNT) diff --git a/sd/Library_sdd.mk b/sd/Library_sdd.mk index f0c23cd51c49..7ecba8fcb79c 100644 --- a/sd/Library_sdd.mk +++ b/sd/Library_sdd.mk @@ -32,6 +32,8 @@ $(eval $(call gb_Library_set_include,sdd,\ -I$(SRCDIR)/sd/inc \ )) +$(eval $(call gb_Library_use_external,sdd,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,sdd)) $(eval $(call gb_Library_use_libraries,sdd,\ diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk index 1c4c152bc4b6..5a3dddd58747 100644 --- a/sd/Library_sdfilt.mk +++ b/sd/Library_sdfilt.mk @@ -42,6 +42,8 @@ $(eval $(call gb_Library_add_defs,sdfilt,\ )) endif +$(eval $(call gb_Library_use_external,sdfilt,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,sdfilt)) $(eval $(call gb_Library_use_libraries,sdfilt,\ diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk index e80316f2c82e..601fb2a7077f 100644 --- a/sd/Library_sdui.mk +++ b/sd/Library_sdui.mk @@ -50,6 +50,8 @@ endif endif +$(eval $(call gb_Library_use_external,sdui,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,sdui)) $(eval $(call gb_Library_use_libraries,sdui,\ diff --git a/sdext/Library_pdfimport.mk b/sdext/Library_pdfimport.mk index ed23a80ce83d..77a4c033a774 100644 --- a/sdext/Library_pdfimport.mk +++ b/sdext/Library_pdfimport.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_static_libraries,pdfimport,\ )) $(eval $(call gb_Library_use_externals,pdfimport,\ + boost_headers \ zlib \ )) 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 \ diff --git a/shell/Library_desktopbe.mk b/shell/Library_desktopbe.mk index f52735eeaa64..4d5eb75b8c9f 100644 --- a/shell/Library_desktopbe.mk +++ b/shell/Library_desktopbe.mk @@ -27,6 +27,8 @@ $(eval $(call gb_Library_Library,desktopbe1)) +$(eval $(call gb_Library_use_external,desktopbe1,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,desktopbe1)) $(eval $(call gb_Library_use_libraries,desktopbe1,\ diff --git a/shell/Library_gconfbe.mk b/shell/Library_gconfbe.mk index 7ec447b38005..53c469eed6f3 100644 --- a/shell/Library_gconfbe.mk +++ b/shell/Library_gconfbe.mk @@ -36,6 +36,7 @@ endif $(eval $(call gb_Library_use_sdk_api,gconfbe1)) $(eval $(call gb_Library_use_externals,gconfbe1,\ + boost_headers \ gconf \ )) diff --git a/shell/Library_kde4be.mk b/shell/Library_kde4be.mk index b7053cb0401d..25f2124ba5af 100644 --- a/shell/Library_kde4be.mk +++ b/shell/Library_kde4be.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Library_Library,kde4be1)) $(eval $(call gb_Library_use_sdk_api,kde4be1)) $(eval $(call gb_Library_use_externals,kde4be1,\ + boost_headers \ kde4 \ )) diff --git a/shell/Library_kdebe.mk b/shell/Library_kdebe.mk index 13dd3530bfce..863f7e2fd361 100644 --- a/shell/Library_kdebe.mk +++ b/shell/Library_kdebe.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Library_add_libs,kdebe1,\ $(eval $(call gb_Library_use_sdk_api,kdebe1)) $(eval $(call gb_Library_use_externals,kdebe1,\ + boost_headers \ kde \ )) diff --git a/shell/Library_losessioninstall.mk b/shell/Library_losessioninstall.mk index 65dee35586e6..8874a3a8f949 100644 --- a/shell/Library_losessioninstall.mk +++ b/shell/Library_losessioninstall.mk @@ -24,6 +24,7 @@ $(eval $(call gb_Library_use_libraries,losessioninstall,\ )) $(eval $(call gb_Library_use_externals,losessioninstall,\ + boost_headers \ dbus \ gio \ )) diff --git a/shell/Library_macbe.mk b/shell/Library_macbe.mk index 3aab6ea02292..46bd895748c5 100644 --- a/shell/Library_macbe.mk +++ b/shell/Library_macbe.mk @@ -27,6 +27,8 @@ $(eval $(call gb_Library_Library,macbe1)) +$(eval $(call gb_Library_use_external,macbe1,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,macbe1)) $(eval $(call gb_Library_use_system_darwin_frameworks,macbe1,\ diff --git a/shell/Library_tdebe.mk b/shell/Library_tdebe.mk index de6d19810532..bf675826d46e 100644 --- a/shell/Library_tdebe.mk +++ b/shell/Library_tdebe.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Library_use_packages,tdebe1,\ $(eval $(call gb_Library_use_sdk_api,tdebe1)) $(eval $(call gb_Library_use_externals,tdebe1,\ + boost_headers \ tde \ )) 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,\ diff --git a/smoketest/CppunitTest_smoketest.mk b/smoketest/CppunitTest_smoketest.mk index b99c160dc844..ee0d8156c791 100644 --- a/smoketest/CppunitTest_smoketest.mk +++ b/smoketest/CppunitTest_smoketest.mk @@ -33,6 +33,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,smoketest,\ smoketest/smoketest_too \ )) +$(eval $(call gb_CppunitTest_use_external,smoketest,boost_headers)) + $(eval $(call gb_CppunitTest_use_api,smoketest,\ offapi \ udkapi \ diff --git a/smoketest/Library_smoketest.mk b/smoketest/Library_smoketest.mk index 5832bd471e0c..17d0d9b7562d 100644 --- a/smoketest/Library_smoketest.mk +++ b/smoketest/Library_smoketest.mk @@ -42,7 +42,10 @@ $(eval $(call gb_Library_use_libraries,smoketest,\ unotest \ )) -$(eval $(call gb_Library_use_external,smoketest,cppunit)) +$(eval $(call gb_Library_use_externals,smoketest,\ + boost_headers \ + cppunit \ +)) $(eval $(call gb_Library_add_exception_objects,smoketest,\ smoketest/smoketest \ diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c index 19e4c9ad7f77..2a0889de4e6b 100644 --- a/solenv/bin/concat-deps.c +++ b/solenv/bin/concat-deps.c @@ -717,8 +717,7 @@ static inline void eat_space(char ** token) * gnumake startup time, and shrink the disk-space footprint. */ static inline int -elide_dependency(const char* key, int key_len, - int *boost_count, const char **unpacked_end) +elide_dependency(const char* key, int key_len, const char **unpacked_end) { #if 0 { @@ -733,30 +732,12 @@ elide_dependency(const char* key, int key_len, /* boost brings a plague of header files */ int i; - int boost = 0; int unpacked = 0; /* walk down path elements */ for (i = 0; i < key_len - 1; i++) { if (key[i] == '/') { - if (internal_boost) - { - if (0 == boost) - { - if (!PATHNCMP(key + i + 1, "solver/", 7)) - { - boost++; - continue; - } - } - else if (!PATHNCMP(key + i + 1, "inc/external/boost/", 19)) - { - if (boost_count) - (*boost_count)++; - return 1; - } - } if (0 == unpacked) { if (!PATHNCMP(key + i + 1, "workdir/", 8)) @@ -826,23 +807,30 @@ static inline void print_fullpaths(char* line) } int token_len = end - token; if (target_seen && - elide_dependency(token, token_len, &boost_count, &unpacked_end)) + elide_dependency(token, token_len, &unpacked_end)) { if (unpacked_end) { - emit_unpacked_target(token, unpacked_end); + if (internal_boost && !PATHNCMP(unpacked_end - 5, "boost", 5)) + { + ++boost_count; + if (boost_count == 1) + emit_single_boost_header(); + else + { + /* don't output, and swallow trailing \\\n if any */ + token = end; + eat_space(&token); + if (token[0] == '\\' && token[1] == '\n') + end = token + 2; + } + } + else + { + emit_unpacked_target(token, unpacked_end); + } unpacked_end = 0; } - else if (boost_count == 1) - emit_single_boost_header(); - else - { - /* don't output, and swallow trailing \\\n if any */ - token = end; - eat_space(&token); - if (token[0] == '\\' && token[1] == '\n') - end = token + 2; - } } else { @@ -938,7 +926,7 @@ off_t size; * duplicate out */ int key_len = eat_space_at_end(cursor_out) - base; - if (!elide_dependency(base,key_len + 1, NULL, NULL) + if (!elide_dependency(base,key_len + 1, NULL) && hash_store(dep_hash, base, key_len)) { /* DO NOT modify base after it has been added @@ -984,7 +972,7 @@ off_t size; if(last_ns == ':') { int key_len = eat_space_at_end(cursor_out) - base; - if (!elide_dependency(base,key_len + 1, NULL, NULL) && + if (!elide_dependency(base,key_len + 1, NULL) && hash_store(dep_hash, base, key_len)) { puts(base); diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk index dd0723cb70ea..b6eb6b7dd093 100644 --- a/sot/Library_sot.mk +++ b/sot/Library_sot.mk @@ -32,9 +32,7 @@ $(eval $(call gb_Library_use_package,sot,sot_inc)) $(eval $(call gb_Library_set_componentfile,sot,sot/util/sot)) -$(eval $(call gb_Library_set_include,sot,\ - $$(INCLUDE) \ -)) +$(eval $(call gb_Library_use_external,sot,boost_headers)) $(eval $(call gb_Library_use_sdk_api,sot)) diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk index 7d19bf8073e4..5b2c5a2c0506 100644 --- a/starmath/CppunitTest_starmath_qa_cppunit.mk +++ b/starmath/CppunitTest_starmath_qa_cppunit.mk @@ -32,6 +32,8 @@ $(eval $(call gb_CppunitTest_set_include,starmath_qa_cppunit,\ -I$(SRCDIR)/starmath/inc \ )) +$(eval $(call gb_CppunitTest_use_external,starmath_qa_cppunit,boost_headers)) + $(eval $(call gb_CppunitTest_use_api,starmath_qa_cppunit,\ offapi \ udkapi \ diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk index e9978d606475..c44d12d3a6ea 100644 --- a/starmath/Library_sm.mk +++ b/starmath/Library_sm.mk @@ -32,6 +32,8 @@ $(eval $(call gb_Library_set_include,sm,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_use_external,sm,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,sm)) $(eval $(call gb_Library_use_libraries,sm,\ diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk index 92961c7b01f6..353fc8f99bed 100644 --- a/starmath/Library_smd.mk +++ b/starmath/Library_smd.mk @@ -34,6 +34,8 @@ $(eval $(call gb_Library_set_include,smd,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_use_external,smd,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,smd)) $(eval $(call gb_Library_use_libraries,smd,\ diff --git a/stoc/Library_bootstrap.mk b/stoc/Library_bootstrap.mk index e68ddfaaca6b..b7f2a5e77a3f 100644 --- a/stoc/Library_bootstrap.mk +++ b/stoc/Library_bootstrap.mk @@ -42,6 +42,8 @@ $(eval $(call gb_Library_set_include,bootstrap,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_use_external,bootstrap,boost_headers)) + $(eval $(call gb_Library_use_internal_bootstrap_api,bootstrap,\ udkapi \ )) diff --git a/stoc/Library_introspection.mk b/stoc/Library_introspection.mk index be2eaf6711e2..fe4bc3dd5464 100644 --- a/stoc/Library_introspection.mk +++ b/stoc/Library_introspection.mk @@ -27,6 +27,8 @@ $(eval $(call gb_Library_Library,introspection)) +$(eval $(call gb_Library_use_external,introspection,boost_headers)) + $(eval $(call gb_Library_use_udk_api,introspection)) $(eval $(call gb_Library_use_libraries,introspection,\ diff --git a/stoc/Library_invocadapt.mk b/stoc/Library_invocadapt.mk index 81165cd9fc40..e053e53eb91c 100644 --- a/stoc/Library_invocadapt.mk +++ b/stoc/Library_invocadapt.mk @@ -27,6 +27,8 @@ $(eval $(call gb_Library_Library,invocadapt)) +$(eval $(call gb_Library_use_external,invocadapt,boost_headers)) + $(eval $(call gb_Library_use_udk_api,invocadapt)) $(eval $(call gb_Library_use_libraries,invocadapt,\ diff --git a/stoc/Library_invocation.mk b/stoc/Library_invocation.mk index e5970024345d..46ca5c37b4db 100644 --- a/stoc/Library_invocation.mk +++ b/stoc/Library_invocation.mk @@ -27,6 +27,8 @@ $(eval $(call gb_Library_Library,invocation)) +$(eval $(call gb_Library_use_external,invocation,boost_headers)) + $(eval $(call gb_Library_use_udk_api,invocation)) $(eval $(call gb_Library_use_libraries,invocation,\ diff --git a/stoc/Library_javavm.mk b/stoc/Library_javavm.mk index 78d018cf9cc3..592ca6ae10c5 100644 --- a/stoc/Library_javavm.mk +++ b/stoc/Library_javavm.mk @@ -27,6 +27,8 @@ $(eval $(call gb_Library_Library,javavm)) +$(eval $(call gb_Library_use_external,javavm,boost_headers)) + $(eval $(call gb_Library_use_udk_api,javavm)) $(eval $(call gb_Library_use_libraries,javavm,\ diff --git a/stoc/Library_namingservice.mk b/stoc/Library_namingservice.mk index 0b049f5aefa3..8dda20d9c1a8 100644 --- a/stoc/Library_namingservice.mk +++ b/stoc/Library_namingservice.mk @@ -27,6 +27,8 @@ $(eval $(call gb_Library_Library,namingservice)) +$(eval $(call gb_Library_use_external,namingservice,boost_headers)) + $(eval $(call gb_Library_use_udk_api,namingservice)) $(eval $(call gb_Library_use_libraries,namingservice,\ diff --git a/stoc/Library_reflection.mk b/stoc/Library_reflection.mk index 71fd2cdbc81f..f2d6f57f0c21 100644 --- a/stoc/Library_reflection.mk +++ b/stoc/Library_reflection.mk @@ -27,6 +27,8 @@ $(eval $(call gb_Library_Library,reflection)) +$(eval $(call gb_Library_use_external,reflection,boost_headers)) + $(eval $(call gb_Library_use_udk_api,reflection)) $(eval $(call gb_Library_use_libraries,reflection,\ diff --git a/svgio/Library_svgio.mk b/svgio/Library_svgio.mk index 0e4250d7761a..21312d6f76eb 100644 --- a/svgio/Library_svgio.mk +++ b/svgio/Library_svgio.mk @@ -25,6 +25,8 @@ $(eval $(call gb_Library_set_include,svgio,\ -I$(SRCDIR)/svgio/inc \ )) +$(eval $(call gb_Library_use_external,svgio,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,svgio)) $(eval $(call gb_Library_use_libraries,svgio,\ diff --git a/svl/CppunitTest_svl_urihelper.mk b/svl/CppunitTest_svl_urihelper.mk index 7fd8da9916b1..1df1cb7d13da 100644 --- a/svl/CppunitTest_svl_urihelper.mk +++ b/svl/CppunitTest_svl_urihelper.mk @@ -28,6 +28,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,svl_urihelper)) +$(eval $(call gb_CppunitTest_use_external,svl_urihelper,boost_headers)) + $(eval $(call gb_CppunitTest_use_api,svl_urihelper, \ offapi \ udkapi \ diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk index 06423e41911b..6ccd8bd81c09 100644 --- a/svl/Library_fsstorage.mk +++ b/svl/Library_fsstorage.mk @@ -37,6 +37,8 @@ $(eval $(call gb_Library_set_include,fsstorage,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_use_external,fsstorage,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,fsstorage)) $(eval $(call gb_Library_use_libraries,fsstorage,\ diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index 8bf19ab2e7b6..30c402921eed 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.mk @@ -28,6 +28,8 @@ $(eval $(call gb_Library_Library,svl)) +$(eval $(call gb_Library_use_external,svl,boost_headers)) + $(eval $(call gb_Library_use_packages,svl,\ rsc_inc \ svl_inc \ 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 \ )) diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk index d830811450c6..10955f9f1bc5 100644 --- a/svx/Executable_gengal.bin.mk +++ b/svx/Executable_gengal.bin.mk @@ -39,6 +39,8 @@ $(eval $(call gb_Executable_add_cxxflags,$(svx_GENGALBIN),\ $$(CXXFLAGS) \ )) +$(eval $(call gb_Executable_use_external,$(svx_GENGALBIN),boost_headers)) + $(eval $(call gb_Executable_use_libraries,$(svx_GENGALBIN),\ sal \ tl \ diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index b331a2636637..169c01c3ca88 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -62,6 +62,7 @@ $(eval $(call gb_Library_use_libraries,svx,\ )) $(eval $(call gb_Library_use_externals,svx,\ + boost_headers \ icuuc \ icu_headers \ )) diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index f59a724cd6dd..918cf389f680 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -78,7 +78,10 @@ $(eval $(call gb_Library_use_libraries,svxcore,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_use_external,svxcore,icuuc)) +$(eval $(call gb_Library_use_externals,svxcore,\ + boost_headers \ + icuuc \ +)) $(eval $(call gb_Library_add_exception_objects,svxcore,\ svx/source/core/coreservices \ diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk index 2a0fdcd4207b..50db32b3af33 100644 --- a/svx/Library_textconversiondlgs.mk +++ b/svx/Library_textconversiondlgs.mk @@ -30,6 +30,8 @@ $(eval $(call gb_Library_set_include,textconversiondlgs,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_use_external,textconversiondlgs,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,textconversiondlgs)) $(eval $(call gb_Library_use_libraries,textconversiondlgs,\ diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk index af0936331f80..23e8e752810d 100644 --- a/sw/CppunitTest_sw_filters_test.mk +++ b/sw/CppunitTest_sw_filters_test.mk @@ -29,7 +29,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sw_filters_test)) -$(eval $(call gb_CppunitTest_use_externals,sw_filters_test, +$(eval $(call gb_CppunitTest_use_externals,sw_filters_test,\ + boost_headers \ libxml2 \ )) diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk index a321a29935e2..c42174c655d4 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -29,6 +29,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sw_macros_test)) +$(eval $(call gb_CppunitTest_use_external,sw_macros_test,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,sw_macros_test, \ sw/qa/core/macros-test \ )) diff --git a/sw/CppunitTest_sw_subsequent_odfexport.mk b/sw/CppunitTest_sw_subsequent_odfexport.mk index 604db89a3d9f..14ebcf18130b 100644 --- a/sw/CppunitTest_sw_subsequent_odfexport.mk +++ b/sw/CppunitTest_sw_subsequent_odfexport.mk @@ -49,6 +49,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfexport, \ )) $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_odfexport,\ + boost_headers \ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_odfimport.mk b/sw/CppunitTest_sw_subsequent_odfimport.mk index e634356025d7..5c22725b01ab 100644 --- a/sw/CppunitTest_sw_subsequent_odfimport.mk +++ b/sw/CppunitTest_sw_subsequent_odfimport.mk @@ -48,6 +48,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfimport, \ )) $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_odfimport,\ + boost_headers \ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_ooxmlexport.mk b/sw/CppunitTest_sw_subsequent_ooxmlexport.mk index ea355bc96074..868001a04206 100644 --- a/sw/CppunitTest_sw_subsequent_ooxmlexport.mk +++ b/sw/CppunitTest_sw_subsequent_ooxmlexport.mk @@ -49,6 +49,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlexport, \ )) $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ooxmlexport,\ + boost_headers \ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_ooxmlimport.mk b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk index eefba78146e6..567e8c7ca036 100644 --- a/sw/CppunitTest_sw_subsequent_ooxmlimport.mk +++ b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk @@ -47,6 +47,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlimport, \ )) $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ooxmlimport,\ + boost_headers \ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_rtfexport.mk b/sw/CppunitTest_sw_subsequent_rtfexport.mk index 9883141845cc..94c94456c8f3 100644 --- a/sw/CppunitTest_sw_subsequent_rtfexport.mk +++ b/sw/CppunitTest_sw_subsequent_rtfexport.mk @@ -48,6 +48,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfexport, \ )) $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_rtfexport,\ + boost_headers \ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_rtfimport.mk b/sw/CppunitTest_sw_subsequent_rtfimport.mk index 2bcd4296ee7c..88fad7eec5f0 100644 --- a/sw/CppunitTest_sw_subsequent_rtfimport.mk +++ b/sw/CppunitTest_sw_subsequent_rtfimport.mk @@ -50,6 +50,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfimport, \ )) $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_rtfimport,\ + boost_headers \ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_ww8export.mk b/sw/CppunitTest_sw_subsequent_ww8export.mk index ebf6d1334a3d..5575c5058a84 100644 --- a/sw/CppunitTest_sw_subsequent_ww8export.mk +++ b/sw/CppunitTest_sw_subsequent_ww8export.mk @@ -49,6 +49,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8export, \ )) $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ww8export,\ + boost_headers \ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_ww8import.mk b/sw/CppunitTest_sw_subsequent_ww8import.mk index 39d8e84d7018..cb2031f905f1 100644 --- a/sw/CppunitTest_sw_subsequent_ww8import.mk +++ b/sw/CppunitTest_sw_subsequent_ww8import.mk @@ -46,6 +46,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8import, \ )) $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ww8import,\ + boost_headers \ libxml2 \ )) diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk index 0ca803822503..0be24f3e953a 100644 --- a/sw/CppunitTest_sw_swdoc_test.mk +++ b/sw/CppunitTest_sw_swdoc_test.mk @@ -71,6 +71,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_swdoc_test, \ )) $(eval $(call gb_CppunitTest_use_externals,sw_swdoc_test,\ + boost_headers \ icuuc \ libxml2 \ )) diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index 23c5e7adc2ff..761800b88bed 100644 --- a/sw/Library_msword.mk +++ b/sw/Library_msword.mk @@ -64,6 +64,7 @@ $(eval $(call gb_Library_use_libraries,msword,\ )) $(eval $(call gb_Library_use_externals,msword,\ + boost_headers \ icuuc \ icu_headers \ libxml2 \ diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index e31e1192f678..264e35a707e4 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -73,6 +73,7 @@ $(eval $(call gb_Library_use_libraries,sw,\ )) $(eval $(call gb_Library_use_externals,sw,\ + boost_headers \ icuuc \ icu_headers \ libxml2 \ diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk index 53a3bbf99b50..477bcea915bc 100644 --- a/sw/Library_swd.mk +++ b/sw/Library_swd.mk @@ -29,6 +29,8 @@ $(eval $(call gb_Library_set_include,swd,\ -I$(SRCDIR)/sw/source/ui/inc \ )) +$(eval $(call gb_Library_use_external,swd,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,swd)) $(eval $(call gb_Library_add_defs,swd,\ diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk index 4a445fd380c0..771ddfac1f6e 100644 --- a/sw/Library_swui.mk +++ b/sw/Library_swui.mk @@ -28,6 +28,8 @@ $(eval $(call gb_Library_set_include,swui,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_use_external,swui,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,swui)) ifeq ($(SYSTEM_LIBXML),YES) diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk index a02e935b5900..61d273b71305 100644 --- a/sw/Library_vbaswobj.mk +++ b/sw/Library_vbaswobj.mk @@ -58,6 +58,7 @@ $(eval $(call gb_Library_use_libraries,vbaswobj,\ )) $(eval $(call gb_Library_use_externals,vbaswobj,\ + boost_headers \ libxml2 \ )) diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk index e58011772158..7fd5958ddbdc 100644 --- a/test/Library_subsequenttest.mk +++ b/test/Library_subsequenttest.mk @@ -54,7 +54,10 @@ $(call gb_Library_get_target,subsequenttest) : \ endif -$(eval $(call gb_Library_use_external,subsequenttest,cppunit)) +$(eval $(call gb_Library_use_externals,subsequenttest,\ + boost_headers \ + cppunit \ +)) $(eval $(call gb_Library_add_exception_objects,subsequenttest,\ test/source/unoapi_test \ diff --git a/test/Library_test.mk b/test/Library_test.mk index 4b395be0f009..ca0eff6c4460 100644 --- a/test/Library_test.mk +++ b/test/Library_test.mk @@ -36,6 +36,8 @@ $(eval $(call gb_Library_add_defs,test,\ $(eval $(call gb_Library_use_sdk_api,test)) $(eval $(call gb_Library_use_externals,test,\ + boost_headers \ + cppunit \ libxml2 \ )) @@ -60,8 +62,6 @@ $(call gb_Library_get_target,test) : \ endif -$(eval $(call gb_Library_use_external,test,cppunit)) - $(eval $(call gb_Library_add_exception_objects,test,\ test/source/bootstrapfixture \ test/source/diff/diff \ diff --git a/testtools/Library_bridgetest.mk b/testtools/Library_bridgetest.mk index 283521f78c4e..6a3063f1b333 100644 --- a/testtools/Library_bridgetest.mk +++ b/testtools/Library_bridgetest.mk @@ -40,6 +40,8 @@ $(eval $(call gb_Library_use_static_libraries,testtools_bridgetest,\ testtools_bridgetest_s \ )) +$(eval $(call gb_Library_use_external,testtools_bridgetest,boost_headers)) + $(eval $(call gb_Library_use_libraries,testtools_bridgetest,\ cppu \ cppuhelper \ diff --git a/testtools/Library_cppobj.mk b/testtools/Library_cppobj.mk index 0bbdf231fc9b..1d5fbe62658f 100644 --- a/testtools/Library_cppobj.mk +++ b/testtools/Library_cppobj.mk @@ -41,6 +41,8 @@ $(eval $(call gb_Library_use_api,testtools_cppobj,\ udkapi \ )) +$(eval $(call gb_Library_use_external,testtools_cppobj,boost_headers)) + $(eval $(call gb_Library_use_static_libraries,testtools_cppobj,\ testtools_bridgetest_s \ )) diff --git a/testtools/StaticLibrary_bridgetest.mk b/testtools/StaticLibrary_bridgetest.mk index 23254e7f13a8..5f943035f6ca 100644 --- a/testtools/StaticLibrary_bridgetest.mk +++ b/testtools/StaticLibrary_bridgetest.mk @@ -27,6 +27,8 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,testtools_bridgetest_s)) +$(eval $(call gb_StaticLibrary_use_external,testtools_bridgetest_s,boost_headers)) + $(eval $(call gb_StaticLibrary_use_packages,testtools_bridgetest_s,\ cppu_inc \ cppuhelper_inc \ diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index a7d562e58c00..9ddda1a66238 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -30,6 +30,8 @@ $(eval $(call gb_Library_Library,tk)) $(eval $(call gb_Library_set_componentfile,tk,toolkit/util/tk)) +$(eval $(call gb_Library_use_external,tk,boost_headers)) + $(eval $(call gb_Library_use_package,tk,toolkit_inc)) $(eval $(call gb_Library_set_include,tk,\ diff --git a/tools/CppunitTest_tools_test.mk b/tools/CppunitTest_tools_test.mk index e753f49220d0..ccd83a324ad2 100644 --- a/tools/CppunitTest_tools_test.mk +++ b/tools/CppunitTest_tools_test.mk @@ -30,6 +30,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,tools_test)) +$(eval $(call gb_CppunitTest_use_external,tools_test,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,tools_test, \ tools/qa/cppunit/test_inetmime \ tools/qa/cppunit/test_pathutils \ diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index ae274e32aa50..9ac7f16f7209 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -102,7 +102,10 @@ $(eval $(call gb_Library_add_exception_objects,tl,\ )) endif -$(eval $(call gb_Library_use_external,tl,zlib)) +$(eval $(call gb_Library_use_externals,tl,\ + boost_headers \ + zlib \ +)) ifeq ($(OS),WNT) diff --git a/ucb/Library_ucb1.mk b/ucb/Library_ucb1.mk index 5dabe48bbd4a..601c75b7d1ca 100644 --- a/ucb/Library_ucb1.mk +++ b/ucb/Library_ucb1.mk @@ -34,6 +34,8 @@ $(eval $(call gb_Library_set_include,ucb1,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_use_external,ucb1,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,ucb1)) $(eval $(call gb_Library_use_libraries,ucb1,\ diff --git a/ucb/Library_ucpcmis1.mk b/ucb/Library_ucpcmis1.mk index a19f10be8853..e90000ab077b 100644 --- a/ucb/Library_ucpcmis1.mk +++ b/ucb/Library_ucpcmis1.mk @@ -43,10 +43,11 @@ $(eval $(call gb_Library_use_libraries,ucpcmis1,\ )) $(eval $(call gb_Library_use_externals,ucpcmis1,\ + boost_headers \ + boostdatetime \ cmis \ curl \ libxml2 \ - boostdatetime \ )) $(eval $(call gb_Library_add_exception_objects,ucpcmis1,\ diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk index 2bdb4a66b910..e9094471f214 100644 --- a/ucb/Library_ucpdav1.mk +++ b/ucb/Library_ucpdav1.mk @@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,ucpdav1,\ )) $(eval $(call gb_Library_use_externals,ucpdav1,\ + boost_headers \ libxml2 \ neon \ openssl \ diff --git a/ucb/Library_ucpext.mk b/ucb/Library_ucpext.mk index 889c7351c099..5e1b19523881 100644 --- a/ucb/Library_ucpext.mk +++ b/ucb/Library_ucpext.mk @@ -33,6 +33,8 @@ $(eval $(call gb_Library_use_packages,ucpext,\ $(eval $(call gb_Library_set_componentfile,ucpext,ucb/source/ucp/ext/ucpext)) +$(eval $(call gb_Library_use_external,ucpext,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,ucpext)) $(eval $(call gb_Library_use_libraries,ucpext,\ diff --git a/ucb/Library_ucpfile1.mk b/ucb/Library_ucpfile1.mk index 12890b1e70fe..e4f2f8dd26c1 100644 --- a/ucb/Library_ucpfile1.mk +++ b/ucb/Library_ucpfile1.mk @@ -29,6 +29,8 @@ $(eval $(call gb_Library_Library,ucpfile1)) $(eval $(call gb_Library_set_componentfile,ucpfile1,ucb/source/ucp/file/ucpfile1)) +$(eval $(call gb_Library_use_external,ucpfile1,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,ucpfile1)) $(eval $(call gb_Library_use_libraries,ucpfile1,\ diff --git a/ucb/Library_ucphier1.mk b/ucb/Library_ucphier1.mk index 83798585807c..3947ebf413ae 100644 --- a/ucb/Library_ucphier1.mk +++ b/ucb/Library_ucphier1.mk @@ -29,6 +29,8 @@ $(eval $(call gb_Library_Library,ucphier1)) $(eval $(call gb_Library_set_componentfile,ucphier1,ucb/source/ucp/hierarchy/ucphier1)) +$(eval $(call gb_Library_use_external,ucphier1,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,ucphier1)) $(eval $(call gb_Library_use_libraries,ucphier1,\ diff --git a/ucb/Library_ucppkg1.mk b/ucb/Library_ucppkg1.mk index c3c3671f082d..cd56609b7e3b 100644 --- a/ucb/Library_ucppkg1.mk +++ b/ucb/Library_ucppkg1.mk @@ -29,6 +29,8 @@ $(eval $(call gb_Library_Library,ucppkg1)) $(eval $(call gb_Library_set_componentfile,ucppkg1,ucb/source/ucp/package/ucppkg1)) +$(eval $(call gb_Library_use_external,ucppkg1,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,ucppkg1)) $(eval $(call gb_Library_use_libraries,ucppkg1,\ diff --git a/ucbhelper/Library_ucbhelper.mk b/ucbhelper/Library_ucbhelper.mk index 7197485a4ea4..49a1b2a8df0e 100644 --- a/ucbhelper/Library_ucbhelper.mk +++ b/ucbhelper/Library_ucbhelper.mk @@ -13,6 +13,8 @@ $(eval $(call gb_Library_use_package,ucbhelper,ucbhelper_inc)) $(eval $(call gb_Library_use_sdk_api,ucbhelper)) +$(eval $(call gb_Library_use_external,ucbhelper,boost_headers)) + $(eval $(call gb_Library_use_libraries,ucbhelper,\ cppu \ cppuhelper \ diff --git a/unodevtools/Executable_skeletonmaker.mk b/unodevtools/Executable_skeletonmaker.mk index e06a656aa6fa..40fae4e1b5df 100644 --- a/unodevtools/Executable_skeletonmaker.mk +++ b/unodevtools/Executable_skeletonmaker.mk @@ -26,6 +26,8 @@ $(eval $(call gb_Executable_Executable,uno-skeletonmaker)) +$(eval $(call gb_Executable_use_external,uno-skeletonmaker,boost_headers)) + $(eval $(call gb_Executable_use_api,uno-skeletonmaker,\ udkapi \ )) diff --git a/unotest/Library_unobootstrapprotector.mk b/unotest/Library_unobootstrapprotector.mk index 1d1e0e127d79..0ba1e9352907 100644 --- a/unotest/Library_unobootstrapprotector.mk +++ b/unotest/Library_unobootstrapprotector.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,unobootstrapprotector,\ )) $(eval $(call gb_Library_use_externals,unobootstrapprotector,\ + boost_headers \ cppunit \ )) diff --git a/unotest/Library_unoexceptionprotector.mk b/unotest/Library_unoexceptionprotector.mk index f5ed3f9f2486..40534d28e1a8 100644 --- a/unotest/Library_unoexceptionprotector.mk +++ b/unotest/Library_unoexceptionprotector.mk @@ -39,6 +39,7 @@ $(eval $(call gb_Library_use_libraries,unoexceptionprotector,\ )) $(eval $(call gb_Library_use_externals,unoexceptionprotector,\ + boost_headers \ cppunit \ )) diff --git a/unotest/Library_unotest.mk b/unotest/Library_unotest.mk index 178777fca719..d86ec273c538 100644 --- a/unotest/Library_unotest.mk +++ b/unotest/Library_unotest.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,unotest,\ )) $(eval $(call gb_Library_use_externals,unotest,\ + boost_headers \ cppunit \ )) diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk index 6a83b55f32f0..c24c28a1a929 100644 --- a/unotools/Library_utl.mk +++ b/unotools/Library_utl.mk @@ -29,6 +29,8 @@ # utl is the name of the library as it is found in Repository.mk $(eval $(call gb_Library_Library,utl)) +$(eval $(call gb_Library_use_external,utl,boost_headers)) + # declare packages that will be delivered before compilation of utl # learn more about TYPE in the Package.mk template $(eval $(call gb_Library_use_package,utl,unotools_inc)) 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 \ diff --git a/uui/Library_uui.mk b/uui/Library_uui.mk index bc075f99ae1a..0e489e13865b 100644 --- a/uui/Library_uui.mk +++ b/uui/Library_uui.mk @@ -30,6 +30,8 @@ $(eval $(call gb_Library_Library,uui)) $(eval $(call gb_Library_set_componentfile,uui,uui/util/uui)) +$(eval $(call gb_Library_use_external,uui,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,uui)) $(eval $(call gb_Library_use_libraries,uui,\ diff --git a/vbahelper/Library_msforms.mk b/vbahelper/Library_msforms.mk index 63d0f67aeb5c..40b4c94ccc5f 100644 --- a/vbahelper/Library_msforms.mk +++ b/vbahelper/Library_msforms.mk @@ -40,6 +40,8 @@ $(eval $(call gb_Library_set_include,msforms,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_use_external,msforms,boost_headers)) + $(eval $(call gb_Library_use_api,msforms,\ udkapi \ offapi \ diff --git a/vbahelper/Library_vbahelper.mk b/vbahelper/Library_vbahelper.mk index 1da2b8e07dae..0537489ec8f0 100644 --- a/vbahelper/Library_vbahelper.mk +++ b/vbahelper/Library_vbahelper.mk @@ -42,6 +42,8 @@ $(eval $(call gb_Library_add_defs,vbahelper,\ -DVBAHELPER_DLLIMPLEMENTATION \ )) +$(eval $(call gb_Library_use_external,vbahelper,boost_headers)) + $(eval $(call gb_Library_use_api,vbahelper,\ udkapi \ offapi \ diff --git a/vcl/CppunitTest_vcl_filters_test.mk b/vcl/CppunitTest_vcl_filters_test.mk index 8cce39f1a436..55cb8c56120d 100644 --- a/vcl/CppunitTest_vcl_filters_test.mk +++ b/vcl/CppunitTest_vcl_filters_test.mk @@ -37,6 +37,8 @@ $(eval $(call gb_CppunitTest_add_defs,vcl_filters_test,\ )) endif +$(eval $(call gb_CppunitTest_use_external,vcl_filters_test,boost_headers)) + $(eval $(call gb_CppunitTest_use_libraries,vcl_filters_test, \ comphelper \ cppu \ diff --git a/vcl/Executable_ui-previewer.mk b/vcl/Executable_ui-previewer.mk index 51d12d027827..71ed93c838ea 100644 --- a/vcl/Executable_ui-previewer.mk +++ b/vcl/Executable_ui-previewer.mk @@ -31,6 +31,8 @@ $(eval $(call gb_Executable_set_include,ui-previewer,\ $$(INCLUDE) \ )) +$(eval $(call gb_Executable_use_external,ui-previewer,boost_headers)) + $(eval $(call gb_Executable_use_api,ui-previewer,\ offapi \ udkapi \ diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk index e4dc320f56f9..88902b4eb940 100644 --- a/vcl/Library_desktop_detector.mk +++ b/vcl/Library_desktop_detector.mk @@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,desktop_detector,\ )) $(eval $(call gb_Library_use_externals,desktop_detector,\ + boost_headers \ icule \ icuuc \ )) diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 2454fc3f7b0a..c71543de585b 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -97,6 +97,7 @@ $(eval $(call gb_Library_use_libraries,vcl,\ endif $(eval $(call gb_Library_use_externals,vcl,\ + boost_headers \ icule \ icuuc \ icu_headers \ diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 007a75a8da0d..d864a32bf54e 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -43,6 +43,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_gen,\ )) $(eval $(call gb_Library_use_externals,vclplug_gen,\ + boost_headers \ cairo \ graphite \ icule \ diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index 153498c037ee..e0f9b0ac4187 100644 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -57,6 +57,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk,\ )) $(eval $(call gb_Library_use_externals,vclplug_gtk,\ + boost_headers \ cairo \ dbus \ gio \ diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk index 1523b90e9f0d..da60f73b5b75 100644 --- a/vcl/Library_vclplug_gtk3.mk +++ b/vcl/Library_vclplug_gtk3.mk @@ -67,6 +67,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk3,\ )) $(eval $(call gb_Library_use_externals,vclplug_gtk3,\ + boost_headers \ dbus \ )) diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk index 70ee7f906da5..249fcb3e01c1 100644 --- a/vcl/Library_vclplug_kde.mk +++ b/vcl/Library_vclplug_kde.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde,\ )) $(eval $(call gb_Library_use_externals,vclplug_kde,\ + boost_headers \ icule \ icuuc \ kde \ diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk index f32d2b402204..1079d848d049 100644 --- a/vcl/Library_vclplug_kde4.mk +++ b/vcl/Library_vclplug_kde4.mk @@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde4,\ )) $(eval $(call gb_Library_use_externals,vclplug_kde4,\ + boost_headers \ icule \ icuuc \ kde4 \ diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk index e8460d4261e0..c35bddaf0473 100644 --- a/vcl/Library_vclplug_svp.mk +++ b/vcl/Library_vclplug_svp.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_svp,\ )) $(eval $(call gb_Library_use_externals,vclplug_svp,\ + boost_headers \ icule \ icuuc \ )) diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk index 600f00a9aa35..4a078ac10aaa 100644 --- a/vcl/Library_vclplug_tde.mk +++ b/vcl/Library_vclplug_tde.mk @@ -70,6 +70,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_tde,\ )) $(eval $(call gb_Library_use_externals,vclplug_tde,\ + boost_headers \ icule \ icuuc \ )) diff --git a/vcl/StaticLibrary_headless.mk b/vcl/StaticLibrary_headless.mk index a3dc220a83cd..1dc5b0c97a64 100644 --- a/vcl/StaticLibrary_headless.mk +++ b/vcl/StaticLibrary_headless.mk @@ -41,6 +41,8 @@ $(eval $(call gb_StaticLibrary_use_packages,headless,\ unotools_inc \ )) +$(eval $(call gb_StaticLibrary_use_external,headless,boost_headers)) + $(eval $(call gb_StaticLibrary_use_api,headless,\ offapi \ udkapi \ diff --git a/writerfilter/CppunitTest_writerfilter_doctok.mk b/writerfilter/CppunitTest_writerfilter_doctok.mk index 26b89a1ceb54..11a1462fc093 100644 --- a/writerfilter/CppunitTest_writerfilter_doctok.mk +++ b/writerfilter/CppunitTest_writerfilter_doctok.mk @@ -28,6 +28,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,writerfilter_doctok)) +$(eval $(call gb_CppunitTest_use_external,writerfilter_doctok,boost_headers)) +k $(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_doctok, \ writerfilter/qa/cppunittests/doctok/testdoctok \ )) diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk index ae981d84b8ba..7930df5fe38c 100644 --- a/writerfilter/CppunitTest_writerfilter_rtftok.mk +++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk @@ -30,6 +30,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,writerfilter_rtftok)) +$(eval $(call gb_CppunitTest_use_external,writerfilter_rtftok,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_rtftok, \ writerfilter/qa/cppunittests/rtftok/testrtftok \ )) diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index 9220fa588f1e..872e6339cc4b 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -85,7 +85,10 @@ $(eval $(call gb_Library_use_libraries,writerfilter,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_use_external,writerfilter,libxml2)) +$(eval $(call gb_Library_use_externals,writerfilter,\ + boost_headers \ + libxml2 \ +)) $(eval $(call gb_Library_add_exception_objects,writerfilter,\ writerfilter/source/rtftok/rtfcharsets \ diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk index bf4759c2ddcc..c3d1dde1b9c0 100644 --- a/writerperfect/Library_wpftwriter.mk +++ b/writerperfect/Library_wpftwriter.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_static_libraries,wpftwriter,\ )) $(eval $(call gb_Library_use_externals,wpftwriter,\ + boost_headers \ wpd \ wpg \ wps \ diff --git a/writerperfect/StaticLibrary_writerperfect.mk b/writerperfect/StaticLibrary_writerperfect.mk index 995b1bab2f35..e5dbbf58d4b0 100644 --- a/writerperfect/StaticLibrary_writerperfect.mk +++ b/writerperfect/StaticLibrary_writerperfect.mk @@ -35,6 +35,7 @@ $(eval $(call gb_StaticLibrary_set_include,writerperfect,\ )) $(eval $(call gb_StaticLibrary_use_externals,writerperfect,\ + boost_headers \ wpd \ wpg \ )) diff --git a/xmlhelp/Library_tvhlp1.mk b/xmlhelp/Library_tvhlp1.mk index d9ad22fcfe30..5607920dfc13 100644 --- a/xmlhelp/Library_tvhlp1.mk +++ b/xmlhelp/Library_tvhlp1.mk @@ -32,6 +32,7 @@ $(eval $(call gb_Library_set_componentfile,tvhlp1,xmlhelp/source/treeview/tvhlp1 $(eval $(call gb_Library_use_sdk_api,tvhlp1)) $(eval $(call gb_Library_use_externals,tvhlp1,\ + boost_headers \ expat_utf8 \ )) diff --git a/xmlhelp/Library_ucpchelp1.mk b/xmlhelp/Library_ucpchelp1.mk index 92bb38964f53..5472eaa7a2f5 100644 --- a/xmlhelp/Library_ucpchelp1.mk +++ b/xmlhelp/Library_ucpchelp1.mk @@ -56,6 +56,7 @@ $(eval $(call gb_Library_set_include,ucpchelp1,\ $(eval $(call gb_Library_use_sdk_api,ucpchelp1)) $(eval $(call gb_Library_use_externals,ucpchelp1,\ + boost_headers \ clucene \ expat_utf8 \ libxml2 \ diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk index b8164826f2df..a24b6fd27812 100644 --- a/xmloff/Library_xo.mk +++ b/xmloff/Library_xo.mk @@ -34,6 +34,8 @@ $(eval $(call gb_Library_add_defs,xo,\ -DXMLOFF_DLLIMPLEMENTATION \ )) +$(eval $(call gb_Library_use_external,xo,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,xo)) $(eval $(call gb_Library_use_libraries,xo,\ diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk index 8a4513960dee..6ecb34e76191 100644 --- a/xmloff/Library_xof.mk +++ b/xmloff/Library_xof.mk @@ -26,6 +26,8 @@ $(eval $(call gb_Library_set_include,xof,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_use_external,xof,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,xof)) $(eval $(call gb_Library_use_libraries,xof,\ diff --git a/xmlreader/Library_xmlreader.mk b/xmlreader/Library_xmlreader.mk index b9b16e864b52..63d4b5ff9dbb 100644 --- a/xmlreader/Library_xmlreader.mk +++ b/xmlreader/Library_xmlreader.mk @@ -34,6 +34,8 @@ $(eval $(call gb_Library_add_defs,xmlreader,\ -DOOO_DLLIMPLEMENTATION_XMLREADER \ )) +$(eval $(call gb_Library_use_external,xmlreader,boost_headers)) + $(eval $(call gb_Library_use_libraries,xmlreader,\ cppu \ sal \ diff --git a/xmlscript/Library_xmlscript.mk b/xmlscript/Library_xmlscript.mk index c7c77557f630..b27fdf58fafc 100644 --- a/xmlscript/Library_xmlscript.mk +++ b/xmlscript/Library_xmlscript.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Library_Library,xmlscript)) +$(eval $(call gb_Library_use_external,xmlscript,boost_headers)) + $(eval $(call gb_Library_use_packages,xmlscript,\ tools_inc \ xmlscript_inc \ diff --git a/xmlsecurity/Library_xmlsecurity.mk b/xmlsecurity/Library_xmlsecurity.mk index 097e016aa3af..45f7f7d54d09 100644 --- a/xmlsecurity/Library_xmlsecurity.mk +++ b/xmlsecurity/Library_xmlsecurity.mk @@ -35,6 +35,8 @@ $(eval $(call gb_Library_set_include,xmlsecurity,\ -I$(SRCDIR)/xmlsecurity/inc \ )) +$(eval $(call gb_Library_use_external,xmlsecurity,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,xmlsecurity)) $(eval $(call gb_Library_use_libraries,xmlsecurity,\ diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index 4a9ca4d0d313..22786cbb2722 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -73,6 +73,7 @@ $(eval $(call gb_Library_use_packages,xsec_xmlsec,\ xmlsec \ )) $(eval $(call gb_Library_use_externals,xsec_xmlsec,\ + boost_headers \ libxml2 \ nss3 \ )) |