From ab95ed2c4b1eddc2188bd455653a77140aa3816c Mon Sep 17 00:00:00 2001 From: Gabor Kelemen Date: Tue, 5 Mar 2024 22:35:50 +0100 Subject: Use less boost_headers in low level libraries Most of these don't use boost themselves, nor do they need it transitively since the use of boost::optional was removed Change-Id: Ic9dee1c4e160b313ec5b91677b02ffdea6c5779d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164440 Tested-by: Jenkins Reviewed-by: Thorsten Behrens --- animations/Library_animcore.mk | 2 -- basegfx/CppunitTest_basegfx.mk | 2 -- binaryurp/CppunitTest_binaryurp_test-cache.mk | 2 -- binaryurp/CppunitTest_binaryurp_test-unmarshal.mk | 2 -- binaryurp/Library_binaryurp.mk | 2 -- comphelper/CppunitTest_comphelper_parallelsort_test.mk | 6 +----- comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk | 4 ---- comphelper/CppunitTest_comphelper_threadpool_test.mk | 4 ---- comphelper/CppunitTest_comphelper_variadictemplates_test.mk | 4 ---- cppu/CppunitTest_cppu_qa_any.mk | 2 -- cppu/CppunitTest_cppu_qa_reference.mk | 2 -- cppu/CppunitTest_cppu_test_cppumaker.mk | 2 -- cppu/Library_cppu.mk | 2 -- cppu/Library_log_uno_uno.mk | 2 -- helpcompiler/Executable_HelpLinker.mk | 1 - helpcompiler/Library_helplinker.mk | 1 - hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk | 2 -- hwpfilter/Library_hwp.mk | 1 - i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk | 2 -- i18nlangtag/Library_i18nlangtag.mk | 1 - i18npool/CppunitTest_i18npool_defaultnumberingprovider.mk | 4 ---- i18npool/Library_i18npool.mk | 1 - i18nutil/Library_i18nutil.mk | 1 - io/Library_io.mk | 2 -- jvmfwk/Library_jvmfwk.mk | 1 - o3tl/CppunitTest_o3tl_tests.mk | 2 -- opencl/Library_opencl.mk | 1 - package/Library_package2.mk | 1 - pyuno/Library_pythonloader.mk | 1 - pyuno/Library_pyuno.mk | 1 - registry/Library_reg.mk | 2 -- salhelper/CppunitTest_salhelper_testapi.mk | 2 -- sax/CppunitTest_sax.mk | 2 -- sax/CppunitTest_sax_parser.mk | 4 ---- sax/CppunitTest_sax_xmlimport.mk | 4 ---- sax/Library_sax.mk | 3 --- scaddins/Library_analysis.mk | 2 -- scaddins/Library_date.mk | 2 -- scaddins/Library_pricing.mk | 2 -- sccomp/CppunitTest_sccomp_solver.mk | 4 ---- sccomp/CppunitTest_sccomp_swarmsolvertest.mk | 4 ---- sccomp/Library_solver.mk | 1 - sot/Library_sot.mk | 2 -- store/Library_store.mk | 2 -- unotools/CppunitTest_unotools_fontcvt.mk | 2 -- unotools/CppunitTest_unotools_fontdefs.mk | 2 -- xmlhelp/Library_ucpchelp1.mk | 1 - xmlreader/Library_xmlreader.mk | 2 -- 48 files changed, 1 insertion(+), 103 deletions(-) diff --git a/animations/Library_animcore.mk b/animations/Library_animcore.mk index ff35201c19d0..f0c8dab926ff 100644 --- a/animations/Library_animcore.mk +++ b/animations/Library_animcore.mk @@ -19,8 +19,6 @@ $(eval $(call gb_Library_Library,animcore)) -$(eval $(call gb_Library_use_external,animcore,boost_headers)) - $(eval $(call gb_Library_set_componentfile,animcore,animations/source/animcore/animcore,services)) $(eval $(call gb_Library_use_sdk_api,animcore)) diff --git a/basegfx/CppunitTest_basegfx.mk b/basegfx/CppunitTest_basegfx.mk index 219025e8e3e6..dde57afb7a62 100644 --- a/basegfx/CppunitTest_basegfx.mk +++ b/basegfx/CppunitTest_basegfx.mk @@ -9,8 +9,6 @@ $(eval $(call gb_CppunitTest_CppunitTest,basegfx)) -$(eval $(call gb_CppunitTest_use_external,basegfx,boost_headers)) - $(eval $(call gb_CppunitTest_use_sdk_api,basegfx)) $(eval $(call gb_CppunitTest_use_libraries,basegfx,\ diff --git a/binaryurp/CppunitTest_binaryurp_test-cache.mk b/binaryurp/CppunitTest_binaryurp_test-cache.mk index 97f5b78f081d..50f3d1b4c02d 100644 --- a/binaryurp/CppunitTest_binaryurp_test-cache.mk +++ b/binaryurp/CppunitTest_binaryurp_test-cache.mk @@ -9,8 +9,6 @@ $(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 \ )) diff --git a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk index 11c70f5b9db0..03823614e99e 100644 --- a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk +++ b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk @@ -9,8 +9,6 @@ $(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 439f1f7d41aa..74205c9e66a2 100644 --- a/binaryurp/Library_binaryurp.mk +++ b/binaryurp/Library_binaryurp.mk @@ -13,8 +13,6 @@ $(eval $(call gb_Library_set_componentfile,binaryurp,binaryurp/source/binaryurp, $(eval $(call gb_Library_use_udk_api,binaryurp)) -$(eval $(call gb_Library_use_external,binaryurp,boost_headers)) - $(eval $(call gb_Library_use_libraries,binaryurp,\ cppu \ cppuhelper \ diff --git a/comphelper/CppunitTest_comphelper_parallelsort_test.mk b/comphelper/CppunitTest_comphelper_parallelsort_test.mk index e1d2eab9ec36..1eac7d5276b4 100644 --- a/comphelper/CppunitTest_comphelper_parallelsort_test.mk +++ b/comphelper/CppunitTest_comphelper_parallelsort_test.mk @@ -13,10 +13,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,comphelper_parallelsort_test, comphelper/qa/unit/parallelsorttest \ )) -$(eval $(call gb_CppunitTest_use_externals,comphelper_parallelsort_test,\ - boost_headers \ -)) - $(eval $(call gb_CppunitTest_use_sdk_api,comphelper_parallelsort_test)) $(eval $(call gb_CppunitTest_use_libraries,comphelper_parallelsort_test, \ @@ -27,4 +23,4 @@ $(eval $(call gb_CppunitTest_use_libraries,comphelper_parallelsort_test, \ tl \ )) -# vim: set noet sw=4 ts=4: \ No newline at end of file +# vim: set noet sw=4 ts=4: diff --git a/comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk b/comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk index 0ca808051a80..ab2ff0f143b2 100644 --- a/comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk +++ b/comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk @@ -13,10 +13,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,comphelper_syntaxhighlight_te comphelper/qa/unit/syntaxhighlighttest \ )) -$(eval $(call gb_CppunitTest_use_externals,comphelper_syntaxhighlight_test,\ - boost_headers \ -)) - $(eval $(call gb_CppunitTest_use_sdk_api,comphelper_syntaxhighlight_test)) $(eval $(call gb_CppunitTest_use_libraries,comphelper_syntaxhighlight_test, \ diff --git a/comphelper/CppunitTest_comphelper_threadpool_test.mk b/comphelper/CppunitTest_comphelper_threadpool_test.mk index 24467c898f80..5e2391fdeddb 100644 --- a/comphelper/CppunitTest_comphelper_threadpool_test.mk +++ b/comphelper/CppunitTest_comphelper_threadpool_test.mk @@ -13,10 +13,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,comphelper_threadpool_test, \ comphelper/qa/unit/threadpooltest \ )) -$(eval $(call gb_CppunitTest_use_externals,comphelper_threadpool_test,\ - boost_headers \ -)) - $(eval $(call gb_CppunitTest_use_sdk_api,comphelper_threadpool_test)) $(eval $(call gb_CppunitTest_use_libraries,comphelper_threadpool_test, \ diff --git a/comphelper/CppunitTest_comphelper_variadictemplates_test.mk b/comphelper/CppunitTest_comphelper_variadictemplates_test.mk index 03ded85270fc..50ee76cacc42 100644 --- a/comphelper/CppunitTest_comphelper_variadictemplates_test.mk +++ b/comphelper/CppunitTest_comphelper_variadictemplates_test.mk @@ -15,10 +15,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,comphelper_variadictemplates_ $(eval $(call gb_CppunitTest_use_sdk_api,comphelper_variadictemplates_test)) -$(eval $(call gb_CppunitTest_use_externals,comphelper_variadictemplates_test, \ - boost_headers \ -)) - $(eval $(call gb_CppunitTest_use_libraries,comphelper_variadictemplates_test, \ comphelper \ cppuhelper \ diff --git a/cppu/CppunitTest_cppu_qa_any.mk b/cppu/CppunitTest_cppu_qa_any.mk index d565b0fd369c..a21dd5b05d08 100644 --- a/cppu/CppunitTest_cppu_qa_any.mk +++ b/cppu/CppunitTest_cppu_qa_any.mk @@ -14,8 +14,6 @@ $(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_qa_reference.mk b/cppu/CppunitTest_cppu_qa_reference.mk index 426902b5a8de..38af7b806eab 100644 --- a/cppu/CppunitTest_cppu_qa_reference.mk +++ b/cppu/CppunitTest_cppu_qa_reference.mk @@ -14,8 +14,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_reference, \ cppu/qa/test_reference \ )) -$(eval $(call gb_CppunitTest_use_external,cppu_qa_reference,boost_headers)) - $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_reference, \ cppu \ sal \ diff --git a/cppu/CppunitTest_cppu_test_cppumaker.mk b/cppu/CppunitTest_cppu_test_cppumaker.mk index c812d94de8ac..55fb8f2df609 100644 --- a/cppu/CppunitTest_cppu_test_cppumaker.mk +++ b/cppu/CppunitTest_cppu_test_cppumaker.mk @@ -14,8 +14,6 @@ $(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 d1874822bd97..5f3caeded328 100644 --- a/cppu/Library_cppu.mk +++ b/cppu/Library_cppu.mk @@ -20,8 +20,6 @@ $(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_uno.mk b/cppu/Library_log_uno_uno.mk index 92d287ea7192..dc8fbbb00afd 100644 --- a/cppu/Library_log_uno_uno.mk +++ b/cppu/Library_log_uno_uno.mk @@ -10,8 +10,6 @@ $(eval $(call gb_Library_Library,log_uno_uno)) -$(eval $(call gb_Library_use_external,log_uno_uno,boost_headers)) - $(eval $(call gb_Library_use_udk_api,log_uno_uno)) $(eval $(call gb_Library_use_libraries,log_uno_uno,\ diff --git a/helpcompiler/Executable_HelpLinker.mk b/helpcompiler/Executable_HelpLinker.mk index 2825aadf3b2e..96f739a8fee4 100644 --- a/helpcompiler/Executable_HelpLinker.mk +++ b/helpcompiler/Executable_HelpLinker.mk @@ -20,7 +20,6 @@ $(eval $(call gb_Executable_use_libraries,HelpLinker,\ )) $(eval $(call gb_Executable_use_externals,HelpLinker,\ - boost_headers \ expat \ libxslt \ libxml2 \ diff --git a/helpcompiler/Library_helplinker.mk b/helpcompiler/Library_helplinker.mk index cd45eb020277..9529295ecd58 100644 --- a/helpcompiler/Library_helplinker.mk +++ b/helpcompiler/Library_helplinker.mk @@ -31,7 +31,6 @@ $(eval $(call gb_Library_use_internal_api,helplinker,\ $(eval $(call gb_Library_use_externals,helplinker,\ - boost_headers \ expat \ libxslt \ libxml2 \ diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk index b62abefd7a8a..a930abbaed8a 100644 --- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk +++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk @@ -9,8 +9,6 @@ $(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 f2419a8d8d6b..159770b78012 100644 --- a/hwpfilter/Library_hwp.mk +++ b/hwpfilter/Library_hwp.mk @@ -21,7 +21,6 @@ $(eval $(call gb_Library_use_libraries,hwp,\ )) $(eval $(call gb_Library_use_externals,hwp,\ - boost_headers \ zlib \ )) diff --git a/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk b/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk index 271aa7f21558..f83da8ebcd6f 100644 --- a/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk +++ b/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk @@ -9,8 +9,6 @@ $(eval $(call gb_CppunitTest_CppunitTest,i18nlangtag_test_languagetag)) -$(eval $(call gb_CppunitTest_use_external,i18nlangtag_test_languagetag,boost_headers)) - $(eval $(call gb_CppunitTest_use_sdk_api,i18nlangtag_test_languagetag)) $(eval $(call gb_CppunitTest_use_libraries,i18nlangtag_test_languagetag,\ diff --git a/i18nlangtag/Library_i18nlangtag.mk b/i18nlangtag/Library_i18nlangtag.mk index a68a5940344d..c1dae1706d6b 100644 --- a/i18nlangtag/Library_i18nlangtag.mk +++ b/i18nlangtag/Library_i18nlangtag.mk @@ -20,7 +20,6 @@ $(eval $(call gb_Library_use_libraries,i18nlangtag,\ )) $(eval $(call gb_Library_use_externals,i18nlangtag,\ - boost_headers \ icu_headers \ icuuc \ )) diff --git a/i18npool/CppunitTest_i18npool_defaultnumberingprovider.mk b/i18npool/CppunitTest_i18npool_defaultnumberingprovider.mk index 421affb90b35..562cb8d68b02 100644 --- a/i18npool/CppunitTest_i18npool_defaultnumberingprovider.mk +++ b/i18npool/CppunitTest_i18npool_defaultnumberingprovider.mk @@ -11,10 +11,6 @@ $(eval $(call gb_CppunitTest_CppunitTest,i18npool_defaultnumberingprovider)) -$(eval $(call gb_CppunitTest_use_externals,i18npool_defaultnumberingprovider,\ - boost_headers \ -)) - $(eval $(call gb_CppunitTest_add_exception_objects,i18npool_defaultnumberingprovider, \ i18npool/qa/cppunit/test_defaultnumberingprovider \ )) diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk index 8971eb388921..bd945d9329dc 100644 --- a/i18npool/Library_i18npool.mk +++ b/i18npool/Library_i18npool.mk @@ -36,7 +36,6 @@ $(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 2a255e41d2b2..fd6518a4173f 100644 --- a/i18nutil/Library_i18nutil.mk +++ b/i18nutil/Library_i18nutil.mk @@ -19,7 +19,6 @@ $(eval $(call gb_Library_Library,i18nutil)) $(eval $(call gb_Library_use_externals,i18nutil,\ - boost_headers \ icu_headers \ icui18n \ icuuc \ diff --git a/io/Library_io.mk b/io/Library_io.mk index d2c60b303984..2b66a56abf90 100644 --- a/io/Library_io.mk +++ b/io/Library_io.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Library_Library,io)) -$(eval $(call gb_Library_use_external,io,boost_headers)) - $(eval $(call gb_Library_use_udk_api,io)) $(eval $(call gb_Library_use_libraries,io,\ diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk index 64a6b9d8e396..aae288e30b6a 100644 --- a/jvmfwk/Library_jvmfwk.mk +++ b/jvmfwk/Library_jvmfwk.mk @@ -48,7 +48,6 @@ $(eval $(call gb_Library_use_system_win32_libs,jvmfwk,\ endif $(eval $(call gb_Library_use_externals,jvmfwk,\ - boost_headers \ libxml2 \ valgrind \ )) diff --git a/o3tl/CppunitTest_o3tl_tests.mk b/o3tl/CppunitTest_o3tl_tests.mk index 4f7ab02b1da1..2a5440736033 100644 --- a/o3tl/CppunitTest_o3tl_tests.mk +++ b/o3tl/CppunitTest_o3tl_tests.mk @@ -19,8 +19,6 @@ $(eval $(call gb_CppunitTest_CppunitTest,o3tl_tests)) -$(eval $(call gb_CppunitTest_use_external,o3tl_tests,boost_headers)) - $(eval $(call gb_CppunitTest_use_libraries,o3tl_tests,\ sal \ )) diff --git a/opencl/Library_opencl.mk b/opencl/Library_opencl.mk index 213c600637c2..204cba064ee4 100644 --- a/opencl/Library_opencl.mk +++ b/opencl/Library_opencl.mk @@ -19,7 +19,6 @@ $(eval $(call gb_Library_add_defs,opencl,\ )) $(eval $(call gb_Library_use_externals,opencl,\ - boost_headers \ clew \ icu_headers \ icui18n \ diff --git a/package/Library_package2.mk b/package/Library_package2.mk index 2ddbc31caf85..16ef09af5f6d 100644 --- a/package/Library_package2.mk +++ b/package/Library_package2.mk @@ -41,7 +41,6 @@ $(eval $(call gb_Library_use_libraries,package2,\ )) $(eval $(call gb_Library_use_externals,package2,\ - boost_headers \ argon2 \ zlib \ )) diff --git a/pyuno/Library_pythonloader.mk b/pyuno/Library_pythonloader.mk index 2f1e69cfaef8..bbfe5469da62 100644 --- a/pyuno/Library_pythonloader.mk +++ b/pyuno/Library_pythonloader.mk @@ -34,7 +34,6 @@ $(eval $(call gb_Library_use_libraries,pythonloader,\ )) $(eval $(call gb_Library_use_externals,pythonloader,\ - boost_headers \ python \ )) diff --git a/pyuno/Library_pyuno.mk b/pyuno/Library_pyuno.mk index 49c5b9104e16..65b3855e49b7 100644 --- a/pyuno/Library_pyuno.mk +++ b/pyuno/Library_pyuno.mk @@ -31,7 +31,6 @@ $(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 d17b1196990a..8b36aec893ca 100644 --- a/registry/Library_reg.mk +++ b/registry/Library_reg.mk @@ -18,8 +18,6 @@ $(eval $(call gb_Library_set_include,reg, \ -I$(SRCDIR)/registry/inc \ )) -$(eval $(call gb_Library_use_external,reg,boost_headers)) - $(eval $(call gb_Library_use_libraries,reg,\ sal \ store \ diff --git a/salhelper/CppunitTest_salhelper_testapi.mk b/salhelper/CppunitTest_salhelper_testapi.mk index abcb5bc02616..862507beaade 100644 --- a/salhelper/CppunitTest_salhelper_testapi.mk +++ b/salhelper/CppunitTest_salhelper_testapi.mk @@ -20,8 +20,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,salhelper_testapi,\ salhelper/qa/timer \ )) -$(eval $(call gb_CppunitTest_use_external,salhelper_testapi,boost_headers)) - $(eval $(call gb_CppunitTest_use_libraries,salhelper_testapi,\ salhelper \ sal \ diff --git a/sax/CppunitTest_sax.mk b/sax/CppunitTest_sax.mk index 282ba2414e41..6b38222d36cd 100644 --- a/sax/CppunitTest_sax.mk +++ b/sax/CppunitTest_sax.mk @@ -11,8 +11,6 @@ $(eval $(call gb_CppunitTest_CppunitTest,sax)) $(eval $(call gb_CppunitTest_use_sdk_api,sax)) -$(eval $(call gb_CppunitTest_use_external,sax,boost_headers)) - $(eval $(call gb_CppunitTest_use_common_precompiled_header,sax)) $(eval $(call gb_CppunitTest_use_libraries,sax, \ diff --git a/sax/CppunitTest_sax_parser.mk b/sax/CppunitTest_sax_parser.mk index 27dfc15fed39..9238f97e3197 100644 --- a/sax/CppunitTest_sax_parser.mk +++ b/sax/CppunitTest_sax_parser.mk @@ -25,10 +25,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sax_parser, \ test \ )) -$(eval $(call gb_CppunitTest_use_externals,sax_parser, \ - boost_headers \ -)) - $(eval $(call gb_CppunitTest_use_sdk_api,sax_parser)) $(eval $(call gb_CppunitTest_use_ure,sax_parser)) diff --git a/sax/CppunitTest_sax_xmlimport.mk b/sax/CppunitTest_sax_xmlimport.mk index 2e107363294b..959d392fb4c1 100644 --- a/sax/CppunitTest_sax_xmlimport.mk +++ b/sax/CppunitTest_sax_xmlimport.mk @@ -32,10 +32,6 @@ $(eval $(call gb_CppunitTest_use_api,sax_xmlimport,\ udkapi \ )) -$(eval $(call gb_CppunitTest_use_externals,sax_xmlimport, \ - boost_headers \ -)) - $(eval $(call gb_CppunitTest_use_ure,sax_xmlimport)) $(eval $(call gb_CppunitTest_use_vcl,sax_xmlimport)) diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk index 97389a2bb06d..f65fcf05b669 100644 --- a/sax/Library_sax.mk +++ b/sax/Library_sax.mk @@ -16,14 +16,11 @@ $(eval $(call gb_Library_set_include,sax,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_external,sax,boost_headers)) - $(eval $(call gb_Library_use_common_precompiled_header,sax)) $(eval $(call gb_Library_use_sdk_api,sax)) $(eval $(call gb_Library_use_externals,sax,\ - boost_headers \ libxml2 \ expat \ )) diff --git a/scaddins/Library_analysis.mk b/scaddins/Library_analysis.mk index b1a97049098b..146b98350fa5 100644 --- a/scaddins/Library_analysis.mk +++ b/scaddins/Library_analysis.mk @@ -26,8 +26,6 @@ $(eval $(call gb_Library_set_include,analysis,\ -I$(SRCDIR)/scaddins/inc \ )) -$(eval $(call gb_Library_use_external,analysis,boost_headers)) - $(eval $(call gb_Library_use_common_precompiled_header,analysis)) $(eval $(call gb_Library_use_internal_comprehensive_api,analysis,\ diff --git a/scaddins/Library_date.mk b/scaddins/Library_date.mk index b39cfeeb8287..75259e95ecef 100644 --- a/scaddins/Library_date.mk +++ b/scaddins/Library_date.mk @@ -26,8 +26,6 @@ $(eval $(call gb_Library_set_include,date,\ -I$(SRCDIR)/scaddins/inc \ )) -$(eval $(call gb_Library_use_external,date,boost_headers)) - $(eval $(call gb_Library_use_common_precompiled_header,date)) $(eval $(call gb_Library_use_internal_comprehensive_api,date,\ diff --git a/scaddins/Library_pricing.mk b/scaddins/Library_pricing.mk index 1d1626ba5ede..8c517d53ad5b 100644 --- a/scaddins/Library_pricing.mk +++ b/scaddins/Library_pricing.mk @@ -26,8 +26,6 @@ $(eval $(call gb_Library_set_include,pricing,\ -I$(SRCDIR)/scaddins/inc \ )) -$(eval $(call gb_Library_use_external,pricing,boost_headers)) - $(eval $(call gb_Library_use_common_precompiled_header,pricing)) $(eval $(call gb_Library_use_internal_comprehensive_api,pricing,\ diff --git a/sccomp/CppunitTest_sccomp_solver.mk b/sccomp/CppunitTest_sccomp_solver.mk index d634fb7d93fc..818b27e5a0a6 100644 --- a/sccomp/CppunitTest_sccomp_solver.mk +++ b/sccomp/CppunitTest_sccomp_solver.mk @@ -13,10 +13,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sccomp_solver,\ sccomp/qa/unit/solver \ )) -$(eval $(call gb_CppunitTest_use_externals,sccomp_solver,\ - boost_headers \ -)) - $(eval $(call gb_CppunitTest_add_defs,sccomp_solver,\ $(if $(ENABLE_COINMP), -DENABLE_COINMP) \ $(if $(ENABLE_LPSOLVE), -DENABLE_LPSOLVE) \ diff --git a/sccomp/CppunitTest_sccomp_swarmsolvertest.mk b/sccomp/CppunitTest_sccomp_swarmsolvertest.mk index 38cc3fa39521..c86c0f6fc7d8 100644 --- a/sccomp/CppunitTest_sccomp_swarmsolvertest.mk +++ b/sccomp/CppunitTest_sccomp_swarmsolvertest.mk @@ -13,10 +13,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sccomp_swarmsolvertest,\ sccomp/qa/unit/SwarmSolverTest \ )) -$(eval $(call gb_CppunitTest_use_externals,sccomp_swarmsolvertest,\ - boost_headers \ -)) - $(eval $(call gb_CppunitTest_use_libraries,sccomp_swarmsolvertest,\ basegfx \ comphelper \ diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk index 933c0f7b6e38..1eeac011f2da 100644 --- a/sccomp/Library_solver.mk +++ b/sccomp/Library_solver.mk @@ -43,7 +43,6 @@ $(eval $(call gb_Library_use_libraries,solver,\ )) $(eval $(call gb_Library_use_externals,solver,\ - boost_headers \ coinmp \ lpsolve \ )) diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk index 61caabac5a04..2d80c9429337 100644 --- a/sot/Library_sot.mk +++ b/sot/Library_sot.mk @@ -21,8 +21,6 @@ $(eval $(call gb_Library_Library,sot)) $(eval $(call gb_Library_set_componentfile,sot,sot/util/sot,services)) -$(eval $(call gb_Library_use_external,sot,boost_headers)) - $(eval $(call gb_Library_use_sdk_api,sot)) $(eval $(call gb_Library_add_defs,sot,\ diff --git a/store/Library_store.mk b/store/Library_store.mk index fe90755e6ba3..b419f6fec809 100644 --- a/store/Library_store.mk +++ b/store/Library_store.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Library_Library,store)) -$(eval $(call gb_Library_use_external,store,boost_headers)) - $(eval $(call gb_Library_add_defs,store,\ -DSTORE_DLLIMPLEMENTATION \ )) diff --git a/unotools/CppunitTest_unotools_fontcvt.mk b/unotools/CppunitTest_unotools_fontcvt.mk index 16236c16c5d1..f51fb6cc7ed2 100644 --- a/unotools/CppunitTest_unotools_fontcvt.mk +++ b/unotools/CppunitTest_unotools_fontcvt.mk @@ -9,8 +9,6 @@ $(eval $(call gb_CppunitTest_CppunitTest,unotools_fontcvt)) -$(eval $(call gb_CppunitTest_use_external,unotools_fontcvt,boost_headers)) - $(eval $(call gb_CppunitTest_use_sdk_api,unotools_fontcvt)) $(eval $(call gb_CppunitTest_add_exception_objects,unotools_fontcvt, \ diff --git a/unotools/CppunitTest_unotools_fontdefs.mk b/unotools/CppunitTest_unotools_fontdefs.mk index 5eada2084a65..85c48c2abb8d 100644 --- a/unotools/CppunitTest_unotools_fontdefs.mk +++ b/unotools/CppunitTest_unotools_fontdefs.mk @@ -9,8 +9,6 @@ $(eval $(call gb_CppunitTest_CppunitTest,unotools_fontdefs)) -$(eval $(call gb_CppunitTest_use_external,unotools_fontdefs,boost_headers)) - $(eval $(call gb_CppunitTest_use_sdk_api,unotools_fontdefs)) $(eval $(call gb_CppunitTest_add_exception_objects,unotools_fontdefs, \ diff --git a/xmlhelp/Library_ucpchelp1.mk b/xmlhelp/Library_ucpchelp1.mk index 087a1da2deb6..16b730e72c85 100644 --- a/xmlhelp/Library_ucpchelp1.mk +++ b/xmlhelp/Library_ucpchelp1.mk @@ -23,7 +23,6 @@ $(eval $(call gb_Library_use_custom_headers,ucpchelp1, \ $(eval $(call gb_Library_use_sdk_api,ucpchelp1)) $(eval $(call gb_Library_use_externals,ucpchelp1,\ - boost_headers \ clucene \ expat \ libxml2 \ diff --git a/xmlreader/Library_xmlreader.mk b/xmlreader/Library_xmlreader.mk index f99d584749f6..c999379fe873 100644 --- a/xmlreader/Library_xmlreader.mk +++ b/xmlreader/Library_xmlreader.mk @@ -25,8 +25,6 @@ $(eval $(call gb_Library_add_defs,xmlreader,\ $(eval $(call gb_Library_set_is_ure_library_or_dependency,xmlreader)) -$(eval $(call gb_Library_use_external,xmlreader,boost_headers)) - $(eval $(call gb_Library_use_libraries,xmlreader,\ cppu \ sal \ -- cgit v1.2.3