From bbb9264610a179720877b884060aeaed2008967b Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 19 Nov 2016 21:53:20 +0100 Subject: add missing deps on ui files Change-Id: I28bb2a33c02d8eadced584d3d3f2b62b2e847324 --- basctl/CppunitTest_basctl_dialogs_test.mk | 4 ++++ chart2/CppunitTest_chart2_dialogs_test.mk | 5 +++++ cui/CppunitTest_cui_dialogs_test.mk | 4 ++++ dbaccess/CppunitTest_dbaccess_dialogs_test.mk | 4 ++++ desktop/CppunitTest_desktop_dialogs_test.mk | 4 ++++ filter/CppunitTest_filter_dialogs_test.mk | 4 ++++ formula/CppunitTest_formula_dialogs_test.mk | 4 ++++ fpicker/CppunitTest_fpicker_dialogs_test.mk | 4 ++++ reportdesign/CppunitTest_reportdesign_dialogs_test.mk | 4 ++++ sc/CppunitTest_sc_screenshots.mk | 5 +++++ sd/CppunitTest_sd_dialogs_test.mk | 5 +++++ sfx2/CppunitTest_sfx2_classification.mk | 4 ++++ sfx2/CppunitTest_sfx2_dialogs_test.mk | 4 ++++ solenv/gbuild/CppunitTest.mk | 10 ++++++++++ starmath/CppunitTest_starmath_dialogs_test.mk | 4 ++++ svtools/CppunitTest_svtools_dialogs_test.mk | 4 ++++ svx/CppunitTest_svx_dialogs_test.mk | 4 ++++ sw/CppunitTest_sw_dialogs_test.mk | 4 ++++ sw/CppunitTest_sw_mailmerge.mk | 4 ++++ uui/CppunitTest_uui_dialogs_test.mk | 4 ++++ vcl/CppunitTest_vcl_dialogs_test.mk | 4 ++++ xmlsecurity/CppunitTest_xmlsecurity_dialogs_test.mk | 4 ++++ 22 files changed, 97 insertions(+) diff --git a/basctl/CppunitTest_basctl_dialogs_test.mk b/basctl/CppunitTest_basctl_dialogs_test.mk index a3583721444f..5a290bfee725 100644 --- a/basctl/CppunitTest_basctl_dialogs_test.mk +++ b/basctl/CppunitTest_basctl_dialogs_test.mk @@ -64,4 +64,8 @@ $(eval $(call gb_CppunitTest_use_rdb,basctl_dialogs_test,services)) # $(eval $(call gb_CppunitTest_use_configuration,basctl_dialogs_test)) $(eval $(call gb_CppunitTest_use_instdir_configuration,basctl_dialogs_test)) +$(eval $(call gb_CppunitTest_use_uiconfigs,basctl_dialogs_test,\ + modules/BasicIDE \ +)) + # vim: set noet sw=4 ts=4: diff --git a/chart2/CppunitTest_chart2_dialogs_test.mk b/chart2/CppunitTest_chart2_dialogs_test.mk index b7dd86728c64..142813e8dab9 100644 --- a/chart2/CppunitTest_chart2_dialogs_test.mk +++ b/chart2/CppunitTest_chart2_dialogs_test.mk @@ -66,4 +66,9 @@ $(eval $(call gb_CppunitTest_use_rdb,chart2_dialogs_test,services)) # $(eval $(call gb_CppunitTest_use_configuration,chart2_dialogs_test)) $(eval $(call gb_CppunitTest_use_instdir_configuration,chart2_dialogs_test)) +$(eval $(call gb_CppunitTest_use_uiconfigs,chart2_dialogs_test,\ + modules/schart \ + svx \ +)) + # vim: set noet sw=4 ts=4: diff --git a/cui/CppunitTest_cui_dialogs_test.mk b/cui/CppunitTest_cui_dialogs_test.mk index 223404a56707..e1c07faeb8e2 100644 --- a/cui/CppunitTest_cui_dialogs_test.mk +++ b/cui/CppunitTest_cui_dialogs_test.mk @@ -65,4 +65,8 @@ $(eval $(call gb_CppunitTest_use_rdb,cui_dialogs_test,services)) # $(eval $(call gb_CppunitTest_use_configuration,cui_dialogs_test)) $(eval $(call gb_CppunitTest_use_instdir_configuration,cui_dialogs_test)) +$(eval $(call gb_CppunitTest_use_uiconfigs,cui_dialogs_test,\ + cui \ +)) + # vim: set noet sw=4 ts=4: diff --git a/dbaccess/CppunitTest_dbaccess_dialogs_test.mk b/dbaccess/CppunitTest_dbaccess_dialogs_test.mk index fbc4ebe0cc5c..704764bac605 100644 --- a/dbaccess/CppunitTest_dbaccess_dialogs_test.mk +++ b/dbaccess/CppunitTest_dbaccess_dialogs_test.mk @@ -64,4 +64,8 @@ $(eval $(call gb_CppunitTest_use_rdb,dbaccess_dialogs_test,services)) # $(eval $(call gb_CppunitTest_use_configuration,dbaccess_dialogs_test)) $(eval $(call gb_CppunitTest_use_instdir_configuration,dbaccess_dialogs_test)) +$(eval $(call gb_CppunitTest_use_uiconfigs,dbaccess_dialogs_test,\ + dbaccess \ +)) + # vim: set noet sw=4 ts=4: diff --git a/desktop/CppunitTest_desktop_dialogs_test.mk b/desktop/CppunitTest_desktop_dialogs_test.mk index a00620cc1f7c..d8117a4689d6 100644 --- a/desktop/CppunitTest_desktop_dialogs_test.mk +++ b/desktop/CppunitTest_desktop_dialogs_test.mk @@ -64,4 +64,8 @@ $(eval $(call gb_CppunitTest_use_rdb,desktop_dialogs_test,services)) # $(eval $(call gb_CppunitTest_use_configuration,desktop_dialogs_test)) $(eval $(call gb_CppunitTest_use_instdir_configuration,desktop_dialogs_test)) +$(eval $(call gb_CppunitTest_use_uiconfigs,desktop_dialogs_test,\ + desktop \ +)) + # vim: set noet sw=4 ts=4: diff --git a/filter/CppunitTest_filter_dialogs_test.mk b/filter/CppunitTest_filter_dialogs_test.mk index b901076191c9..5f98799d4e92 100644 --- a/filter/CppunitTest_filter_dialogs_test.mk +++ b/filter/CppunitTest_filter_dialogs_test.mk @@ -63,4 +63,8 @@ $(eval $(call gb_CppunitTest_use_rdb,filter_dialogs_test,services)) # $(eval $(call gb_CppunitTest_use_configuration,filter_dialogs_test)) $(eval $(call gb_CppunitTest_use_instdir_configuration,filter_dialogs_test)) +$(eval $(call gb_CppunitTest_use_uiconfigs,filter_dialogs_test,\ + filter \ +)) + # vim: set noet sw=4 ts=4: diff --git a/formula/CppunitTest_formula_dialogs_test.mk b/formula/CppunitTest_formula_dialogs_test.mk index d12f2d9e9b58..7cc881cab747 100644 --- a/formula/CppunitTest_formula_dialogs_test.mk +++ b/formula/CppunitTest_formula_dialogs_test.mk @@ -58,4 +58,8 @@ $(eval $(call gb_CppunitTest_use_rdb,formula_dialogs_test,services)) # $(eval $(call gb_CppunitTest_use_configuration,formula_dialogs_test)) $(eval $(call gb_CppunitTest_use_instdir_configuration,formula_dialogs_test)) +$(eval $(call gb_CppunitTest_use_uiconfigs,formula_dialogs_test,\ + formula \ +)) + # vim: set noet sw=4 ts=4: diff --git a/fpicker/CppunitTest_fpicker_dialogs_test.mk b/fpicker/CppunitTest_fpicker_dialogs_test.mk index 079f759a0d02..1bf3ae17a9c3 100644 --- a/fpicker/CppunitTest_fpicker_dialogs_test.mk +++ b/fpicker/CppunitTest_fpicker_dialogs_test.mk @@ -58,4 +58,8 @@ $(eval $(call gb_CppunitTest_use_rdb,fpicker_dialogs_test,services)) # $(eval $(call gb_CppunitTest_use_configuration,fpicker_dialogs_test)) $(eval $(call gb_CppunitTest_use_instdir_configuration,fpicker_dialogs_test)) +$(eval $(call gb_CppunitTest_use_uiconfigs,fpicker_dialogs_test,\ + fps \ +)) + # vim: set noet sw=4 ts=4: diff --git a/reportdesign/CppunitTest_reportdesign_dialogs_test.mk b/reportdesign/CppunitTest_reportdesign_dialogs_test.mk index 932ff6e57287..7ec61e8038ec 100644 --- a/reportdesign/CppunitTest_reportdesign_dialogs_test.mk +++ b/reportdesign/CppunitTest_reportdesign_dialogs_test.mk @@ -64,4 +64,8 @@ $(eval $(call gb_CppunitTest_use_rdb,reportdesign_dialogs_test,services)) # $(eval $(call gb_CppunitTest_use_configuration,reportdesign_dialogs_test)) $(eval $(call gb_CppunitTest_use_instdir_configuration,reportdesign_dialogs_test)) +$(eval $(call gb_CppunitTest_use_uiconfigs,reportdesign_dialogs_test,\ + modules/dbreport \ +)) + # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_screenshots.mk b/sc/CppunitTest_sc_screenshots.mk index ac1aa41d3709..ea42cb8b8c5d 100644 --- a/sc/CppunitTest_sc_screenshots.mk +++ b/sc/CppunitTest_sc_screenshots.mk @@ -58,6 +58,11 @@ $(eval $(call gb_CppunitTest_use_rdb,sc_screenshots,services)) $(eval $(call gb_CppunitTest_use_instdir_configuration,sc_screenshots)) +$(eval $(call gb_CppunitTest_use_uiconfigs,sc_screenshots,\ + cui \ + modules/scalc \ +)) + $(call gb_CppunitTest_get_target,sc_screenshots) : $(call gb_AllLangResTarget_get_target,sc) # vim: set noet sw=4 ts=4: diff --git a/sd/CppunitTest_sd_dialogs_test.mk b/sd/CppunitTest_sd_dialogs_test.mk index 6bbce335341a..f82eca48bc95 100644 --- a/sd/CppunitTest_sd_dialogs_test.mk +++ b/sd/CppunitTest_sd_dialogs_test.mk @@ -68,4 +68,9 @@ $(eval $(call gb_CppunitTest_use_rdb,sd_dialogs_test,services)) # $(eval $(call gb_CppunitTest_use_configuration,sd_dialogs_test)) $(eval $(call gb_CppunitTest_use_instdir_configuration,sd_dialogs_test)) +$(eval $(call gb_CppunitTest_use_uiconfigs,sd_dialogs_test,\ + modules/sdraw \ + modules/simpress \ +)) + # vim: set noet sw=4 ts=4: diff --git a/sfx2/CppunitTest_sfx2_classification.mk b/sfx2/CppunitTest_sfx2_classification.mk index d2f797cc88dc..f7b5f7e9f8af 100644 --- a/sfx2/CppunitTest_sfx2_classification.mk +++ b/sfx2/CppunitTest_sfx2_classification.mk @@ -38,4 +38,8 @@ $(eval $(call gb_CppunitTest_use_rdb,sfx2_classification,services)) $(eval $(call gb_CppunitTest_use_configuration,sfx2_classification)) +$(eval $(call gb_CppunitTest_use_uiconfigs,sfx2_classification,\ + svx \ +)) + # vim: set noet sw=4 ts=4: diff --git a/sfx2/CppunitTest_sfx2_dialogs_test.mk b/sfx2/CppunitTest_sfx2_dialogs_test.mk index 1ea68c0a1b10..55129c0b1846 100644 --- a/sfx2/CppunitTest_sfx2_dialogs_test.mk +++ b/sfx2/CppunitTest_sfx2_dialogs_test.mk @@ -64,4 +64,8 @@ $(eval $(call gb_CppunitTest_use_rdb,sfx2_dialogs_test,services)) # $(eval $(call gb_CppunitTest_use_configuration,sfx2_dialogs_test)) $(eval $(call gb_CppunitTest_use_instdir_configuration,sfx2_dialogs_test)) +$(eval $(call gb_CppunitTest_use_uiconfigs,sfx2_dialogs_test,\ + sfx \ +)) + # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 4a9c050bbc96..63317d8e5e18 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -380,6 +380,16 @@ $(call gb_CppunitTest_get_target,$(1)) :\ endef +define gb_CppunitTest_use_uiconfig +$(call gb_CppunitTest_get_target,$(1)) : $(call gb_UIConfig_get_target,$(2)) + +endef + +define gb_CppunitTest_use_uiconfigs +$(foreach uiconfig,$(2),$(call gb_CppunitTest_use_uiconfig,$(1),$(uiconfig))) + +endef + define gb_CppunitTest__forward_to_Linktarget gb_CppunitTest_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_CppunitTest_get_linktarget,$$(1)),$$(2),$$(3),CppunitTest_$$(1)) diff --git a/starmath/CppunitTest_starmath_dialogs_test.mk b/starmath/CppunitTest_starmath_dialogs_test.mk index d5e6866eee07..a1147f3efeb8 100644 --- a/starmath/CppunitTest_starmath_dialogs_test.mk +++ b/starmath/CppunitTest_starmath_dialogs_test.mk @@ -63,4 +63,8 @@ $(eval $(call gb_CppunitTest_use_rdb,starmath_dialogs_test,services)) # $(eval $(call gb_CppunitTest_use_configuration,starmath_dialogs_test)) $(eval $(call gb_CppunitTest_use_instdir_configuration,starmath_dialogs_test)) +$(eval $(call gb_CppunitTest_use_uiconfigs,starmath_dialogs_test,\ + modules/smath \ +)) + # vim: set noet sw=4 ts=4: diff --git a/svtools/CppunitTest_svtools_dialogs_test.mk b/svtools/CppunitTest_svtools_dialogs_test.mk index 38b50cb37f5b..7706985974a9 100644 --- a/svtools/CppunitTest_svtools_dialogs_test.mk +++ b/svtools/CppunitTest_svtools_dialogs_test.mk @@ -64,4 +64,8 @@ $(eval $(call gb_CppunitTest_use_rdb,svtools_dialogs_test,services)) # $(eval $(call gb_CppunitTest_use_configuration,svtools_dialogs_test)) $(eval $(call gb_CppunitTest_use_instdir_configuration,svtools_dialogs_test)) +$(eval $(call gb_CppunitTest_use_uiconfigs,svtools_dialogs_test,\ + svt \ +)) + # vim: set noet sw=4 ts=4: diff --git a/svx/CppunitTest_svx_dialogs_test.mk b/svx/CppunitTest_svx_dialogs_test.mk index cf841941cdc9..ff251ea31655 100644 --- a/svx/CppunitTest_svx_dialogs_test.mk +++ b/svx/CppunitTest_svx_dialogs_test.mk @@ -66,4 +66,8 @@ $(eval $(call gb_CppunitTest_use_rdb,svx_dialogs_test,services)) # $(eval $(call gb_CppunitTest_use_configuration,svx_dialogs_test)) $(eval $(call gb_CppunitTest_use_instdir_configuration,svx_dialogs_test)) +$(eval $(call gb_CppunitTest_use_uiconfigs,svx_dialogs_test,\ + svx \ +)) + # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_dialogs_test.mk b/sw/CppunitTest_sw_dialogs_test.mk index 42ae22bc7794..af26da32e394 100644 --- a/sw/CppunitTest_sw_dialogs_test.mk +++ b/sw/CppunitTest_sw_dialogs_test.mk @@ -69,4 +69,8 @@ $(eval $(call gb_CppunitTest_use_rdb,sw_dialogs_test,services)) # $(eval $(call gb_CppunitTest_use_configuration,sw_dialogs_test)) $(eval $(call gb_CppunitTest_use_instdir_configuration,sw_dialogs_test)) +$(eval $(call gb_CppunitTest_use_uiconfigs,sw_dialogs_test,\ + modules/swriter \ +)) + # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_mailmerge.mk b/sw/CppunitTest_sw_mailmerge.mk index aa037fc4b805..693a5e2aa7df 100644 --- a/sw/CppunitTest_sw_mailmerge.mk +++ b/sw/CppunitTest_sw_mailmerge.mk @@ -90,4 +90,8 @@ $(eval $(call gb_CppunitTest_set_include,sw_mailmerge,\ $$(INCLUDE) \ )) +$(eval $(call gb_CppunitTest_use_uiconfigs,sw_mailmerge,\ + modules/swriter \ +)) + # vim: set noet sw=4 ts=4: diff --git a/uui/CppunitTest_uui_dialogs_test.mk b/uui/CppunitTest_uui_dialogs_test.mk index 9c7ed39dea8a..385c467712a8 100644 --- a/uui/CppunitTest_uui_dialogs_test.mk +++ b/uui/CppunitTest_uui_dialogs_test.mk @@ -63,4 +63,8 @@ $(eval $(call gb_CppunitTest_use_rdb,uui_dialogs_test,services)) # $(eval $(call gb_CppunitTest_use_configuration,uui_dialogs_test)) $(eval $(call gb_CppunitTest_use_instdir_configuration,uui_dialogs_test)) +$(eval $(call gb_CppunitTest_use_uiconfigs,uui_dialogs_test,\ + uui \ +)) + # vim: set noet sw=4 ts=4: diff --git a/vcl/CppunitTest_vcl_dialogs_test.mk b/vcl/CppunitTest_vcl_dialogs_test.mk index 2bebfe41d852..d2ae83cb4c52 100644 --- a/vcl/CppunitTest_vcl_dialogs_test.mk +++ b/vcl/CppunitTest_vcl_dialogs_test.mk @@ -63,4 +63,8 @@ $(eval $(call gb_CppunitTest_use_rdb,vcl_dialogs_test,services)) # $(eval $(call gb_CppunitTest_use_configuration,vcl_dialogs_test)) $(eval $(call gb_CppunitTest_use_instdir_configuration,vcl_dialogs_test)) +$(eval $(call gb_CppunitTest_use_uiconfigs,vcl_dialogs_test,\ + vcl \ +)) + # vim: set noet sw=4 ts=4: diff --git a/xmlsecurity/CppunitTest_xmlsecurity_dialogs_test.mk b/xmlsecurity/CppunitTest_xmlsecurity_dialogs_test.mk index f30b5c238ac8..a5f609361480 100644 --- a/xmlsecurity/CppunitTest_xmlsecurity_dialogs_test.mk +++ b/xmlsecurity/CppunitTest_xmlsecurity_dialogs_test.mk @@ -63,4 +63,8 @@ $(eval $(call gb_CppunitTest_use_rdb,xmlsecurity_dialogs_test,services)) # $(eval $(call gb_CppunitTest_use_configuration,xmlsecurity_dialogs_test)) $(eval $(call gb_CppunitTest_use_instdir_configuration,xmlsecurity_dialogs_test)) +$(eval $(call gb_CppunitTest_use_uiconfigs,xmlsecurity_dialogs_test,\ + xmlsec \ +)) + # vim: set noet sw=4 ts=4: -- cgit