Use less libxml2 external headers dependency
Change-Id: I1749628e0104dff856161bc0bdfd343ef0db208e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156784 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
This commit is contained in:
parent
7cf5faec6f
commit
d5afeecbff
@ -20,10 +20,6 @@ $(eval $(call gb_Executable_use_libraries,uno,\
|
|||||||
salhelper \
|
salhelper \
|
||||||
))
|
))
|
||||||
|
|
||||||
$(eval $(call gb_Executable_use_externals,uno,\
|
|
||||||
libxml2 \
|
|
||||||
))
|
|
||||||
|
|
||||||
$(eval $(call gb_Executable_add_exception_objects,uno,\
|
$(eval $(call gb_Executable_add_exception_objects,uno,\
|
||||||
cpputools/source/unoexe/unoexe \
|
cpputools/source/unoexe/unoexe \
|
||||||
))
|
))
|
||||||
|
@ -31,7 +31,6 @@ $(eval $(call gb_CppunitTest_use_libraries,drawinglayer_border, \
|
|||||||
|
|
||||||
$(eval $(call gb_CppunitTest_use_externals,drawinglayer_border,\
|
$(eval $(call gb_CppunitTest_use_externals,drawinglayer_border,\
|
||||||
boost_headers \
|
boost_headers \
|
||||||
libxml2 \
|
|
||||||
))
|
))
|
||||||
|
|
||||||
$(eval $(call gb_CppunitTest_add_exception_objects,drawinglayer_border, \
|
$(eval $(call gb_CppunitTest_add_exception_objects,drawinglayer_border, \
|
||||||
|
@ -32,7 +32,6 @@ $(eval $(call gb_CppunitTest_use_libraries,drawinglayer_processors, \
|
|||||||
|
|
||||||
$(eval $(call gb_CppunitTest_use_externals,drawinglayer_processors,\
|
$(eval $(call gb_CppunitTest_use_externals,drawinglayer_processors,\
|
||||||
boost_headers \
|
boost_headers \
|
||||||
libxml2 \
|
|
||||||
))
|
))
|
||||||
|
|
||||||
$(eval $(call gb_CppunitTest_add_exception_objects,drawinglayer_processors, \
|
$(eval $(call gb_CppunitTest_add_exception_objects,drawinglayer_processors, \
|
||||||
|
@ -24,7 +24,6 @@ $(eval $(call gb_Library_use_sdk_api,drawinglayercore))
|
|||||||
|
|
||||||
$(eval $(call gb_Library_use_externals,drawinglayercore,\
|
$(eval $(call gb_Library_use_externals,drawinglayercore,\
|
||||||
boost_headers \
|
boost_headers \
|
||||||
libxml2 \
|
|
||||||
))
|
))
|
||||||
|
|
||||||
$(eval $(call gb_Library_use_libraries,drawinglayercore,\
|
$(eval $(call gb_Library_use_libraries,drawinglayercore,\
|
||||||
|
@ -17,7 +17,6 @@ $(eval $(call gb_Executable_use_libraries,HelpIndexer,\
|
|||||||
$(eval $(call gb_Executable_use_externals,HelpIndexer,\
|
$(eval $(call gb_Executable_use_externals,HelpIndexer,\
|
||||||
expat \
|
expat \
|
||||||
libxslt \
|
libxslt \
|
||||||
libxml2 \
|
|
||||||
clucene \
|
clucene \
|
||||||
))
|
))
|
||||||
|
|
||||||
|
@ -24,7 +24,6 @@ $(eval $(call gb_CppunitTest_use_externals,i18nlangtag_test_languagetag,\
|
|||||||
icu_headers \
|
icu_headers \
|
||||||
icuuc \
|
icuuc \
|
||||||
liblangtag \
|
liblangtag \
|
||||||
libxml2 \
|
|
||||||
))
|
))
|
||||||
|
|
||||||
ifneq ($(SYSTEM_LIBLANGTAG),)
|
ifneq ($(SYSTEM_LIBLANGTAG),)
|
||||||
|
@ -24,7 +24,6 @@ $(eval $(call gb_Library_use_externals,opencl,\
|
|||||||
icu_headers \
|
icu_headers \
|
||||||
icui18n \
|
icui18n \
|
||||||
icuuc \
|
icuuc \
|
||||||
libxml2 \
|
|
||||||
))
|
))
|
||||||
|
|
||||||
$(eval $(call gb_Library_use_custom_headers,opencl,\
|
$(eval $(call gb_Library_use_custom_headers,opencl,\
|
||||||
|
@ -24,7 +24,6 @@ endif
|
|||||||
$(eval $(call gb_CppunitTest_use_externals,sc_filters_test, \
|
$(eval $(call gb_CppunitTest_use_externals,sc_filters_test, \
|
||||||
boost_headers \
|
boost_headers \
|
||||||
mdds_headers \
|
mdds_headers \
|
||||||
libxml2 \
|
|
||||||
))
|
))
|
||||||
|
|
||||||
$(eval $(call gb_CppunitTest_use_libraries,sc_filters_test, \
|
$(eval $(call gb_CppunitTest_use_libraries,sc_filters_test, \
|
||||||
|
@ -39,7 +39,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_screenshots, \
|
|||||||
|
|
||||||
$(eval $(call gb_CppunitTest_use_externals,sc_screenshots,\
|
$(eval $(call gb_CppunitTest_use_externals,sc_screenshots,\
|
||||||
boost_headers \
|
boost_headers \
|
||||||
libxml2 \
|
|
||||||
))
|
))
|
||||||
|
|
||||||
$(eval $(call gb_CppunitTest_set_include,sc_screenshots,\
|
$(eval $(call gb_CppunitTest_set_include,sc_screenshots,\
|
||||||
|
@ -12,7 +12,6 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_vba_macro_test))
|
|||||||
$(eval $(call gb_CppunitTest_use_externals,sc_vba_macro_test, \
|
$(eval $(call gb_CppunitTest_use_externals,sc_vba_macro_test, \
|
||||||
boost_headers \
|
boost_headers \
|
||||||
mdds_headers \
|
mdds_headers \
|
||||||
libxml2 \
|
|
||||||
))
|
))
|
||||||
|
|
||||||
$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_vba_macro_test))
|
$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_vba_macro_test))
|
||||||
|
@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_$(1)_functions_test, \
|
|||||||
$(eval $(call gb_CppunitTest_use_externals,sc_$(1)_functions_test, \
|
$(eval $(call gb_CppunitTest_use_externals,sc_$(1)_functions_test, \
|
||||||
boost_headers \
|
boost_headers \
|
||||||
mdds_headers \
|
mdds_headers \
|
||||||
libxml2 \
|
|
||||||
))
|
))
|
||||||
|
|
||||||
$(eval $(call gb_CppunitTest_use_libraries,sc_$(1)_functions_test, \
|
$(eval $(call gb_CppunitTest_use_libraries,sc_$(1)_functions_test, \
|
||||||
|
@ -11,7 +11,6 @@ $(eval $(call gb_CppunitTest_CppunitTest,svtools_graphic))
|
|||||||
|
|
||||||
$(eval $(call gb_CppunitTest_use_externals,svtools_graphic,\
|
$(eval $(call gb_CppunitTest_use_externals,svtools_graphic,\
|
||||||
boost_headers \
|
boost_headers \
|
||||||
libxml2 \
|
|
||||||
))
|
))
|
||||||
|
|
||||||
$(eval $(call gb_CppunitTest_use_api,svtools_graphic,\
|
$(eval $(call gb_CppunitTest_use_api,svtools_graphic,\
|
||||||
|
@ -35,7 +35,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_accessible_relation_set, \
|
|||||||
|
|
||||||
$(eval $(call gb_CppunitTest_use_externals,sw_accessible_relation_set,\
|
$(eval $(call gb_CppunitTest_use_externals,sw_accessible_relation_set,\
|
||||||
boost_headers \
|
boost_headers \
|
||||||
libxml2 \
|
|
||||||
))
|
))
|
||||||
|
|
||||||
$(eval $(call gb_CppunitTest_set_include,sw_htmlexport,\
|
$(eval $(call gb_CppunitTest_set_include,sw_htmlexport,\
|
||||||
|
@ -13,7 +13,6 @@ $(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 \
|
boost_headers \
|
||||||
libxml2 \
|
|
||||||
))
|
))
|
||||||
|
|
||||||
$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_filters_test))
|
$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_filters_test))
|
||||||
|
@ -32,7 +32,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_odffeatures, \
|
|||||||
|
|
||||||
$(eval $(call gb_CppunitTest_use_externals,sw_odffeatures,\
|
$(eval $(call gb_CppunitTest_use_externals,sw_odffeatures,\
|
||||||
boost_headers \
|
boost_headers \
|
||||||
libxml2 \
|
|
||||||
))
|
))
|
||||||
|
|
||||||
$(eval $(call gb_CppunitTest_set_include,sw_odffeatures,\
|
$(eval $(call gb_CppunitTest_set_include,sw_odffeatures,\
|
||||||
|
@ -31,7 +31,6 @@ $(eval $(call gb_CppunitTest_use_library_objects,ucb_webdav_core, \
|
|||||||
|
|
||||||
$(eval $(call gb_CppunitTest_use_externals,ucb_webdav_core,\
|
$(eval $(call gb_CppunitTest_use_externals,ucb_webdav_core,\
|
||||||
boost_headers \
|
boost_headers \
|
||||||
libxml2 \
|
|
||||||
curl \
|
curl \
|
||||||
))
|
))
|
||||||
|
|
||||||
|
@ -31,10 +31,6 @@ $(eval $(call gb_CppunitTest_use_libraries,writerfilter_misc, \
|
|||||||
salhelper \
|
salhelper \
|
||||||
))
|
))
|
||||||
|
|
||||||
$(eval $(call gb_CppunitTest_use_externals,writerfilter_misc,\
|
|
||||||
libxml2 \
|
|
||||||
))
|
|
||||||
|
|
||||||
$(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_misc, \
|
$(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_misc, \
|
||||||
writerfilter/qa/cppunittests/misc/misc \
|
writerfilter/qa/cppunittests/misc/misc \
|
||||||
))
|
))
|
||||||
|
@ -57,7 +57,6 @@ $(eval $(call gb_Library_use_externals,wpftcalc,\
|
|||||||
staroffice \
|
staroffice \
|
||||||
wps \
|
wps \
|
||||||
lcms2 \
|
lcms2 \
|
||||||
libxml2 \
|
|
||||||
icu_headers \
|
icu_headers \
|
||||||
icui18n \
|
icui18n \
|
||||||
icuuc \
|
icuuc \
|
||||||
|
@ -50,7 +50,6 @@ $(eval $(call gb_Library_use_externals,wpftimpress,\
|
|||||||
odfgen \
|
odfgen \
|
||||||
staroffice \
|
staroffice \
|
||||||
revenge \
|
revenge \
|
||||||
libxml2 \
|
|
||||||
))
|
))
|
||||||
|
|
||||||
$(eval $(call gb_Library_add_exception_objects,wpftimpress,\
|
$(eval $(call gb_Library_add_exception_objects,wpftimpress,\
|
||||||
|
Loading…
x
Reference in New Issue
Block a user