diff options
45 files changed, 214 insertions, 71 deletions
diff --git a/basctl/AllLangResTarget_basctl.mk b/basctl/AllLangResTarget_basctl.mk index d2383503f2df..54ba3c3395d2 100644 --- a/basctl/AllLangResTarget_basctl.mk +++ b/basctl/AllLangResTarget_basctl.mk @@ -34,6 +34,15 @@ $(eval $(call gb_AllLangResTarget_add_srs,basctl,\ $(eval $(call gb_SrsTarget_SrsTarget,basctl/res)) +$(eval $(call gb_SrsTarget_use_packages,basctl/res,\ + editeng_inc \ + sfx2_inc \ + svl_inc \ + svtools_inc \ + svx_globlmn_hrc \ + svx_inc \ +)) + $(eval $(call gb_SrsTarget_set_include,basctl/res,\ -I$(SRCDIR)/basctl/inc \ -I$(SRCDIR)/basctl/source/inc \ @@ -54,8 +63,4 @@ $(eval $(call gb_SrsTarget_add_files,basctl/res,\ basctl/source/dlged/managelang.src \ )) -$(call gb_SrsTemplateTarget_get_target,basctl/res) : \ - $(call gb_Package_get_target,svx_globlmn_hrc) \ - $(call gb_Package_get_target,svx_inc) - # vim: set noet sw=4 ts=4: diff --git a/basic/AllLangResTarget_sb.mk b/basic/AllLangResTarget_sb.mk index 8677373a4426..b3cb941b190f 100644 --- a/basic/AllLangResTarget_sb.mk +++ b/basic/AllLangResTarget_sb.mk @@ -35,6 +35,13 @@ $(eval $(call gb_AllLangResTarget_add_srs,sb,\ $(eval $(call gb_SrsTarget_SrsTarget,sb/res)) +$(eval $(call gb_SrsTarget_use_packages,sb/res,\ + basic_inc \ + svl_inc \ + svtools_inc \ + tools_inc \ +)) + $(eval $(call gb_SrsTarget_set_include,sb/res,\ $$(INCLUDE) \ -I$(SRCDIR)/basic/inc \ diff --git a/chart2/AllLangResTarget_chartcontroller.mk b/chart2/AllLangResTarget_chartcontroller.mk index db22e6ca1f33..b72a07a8c1c5 100644 --- a/chart2/AllLangResTarget_chartcontroller.mk +++ b/chart2/AllLangResTarget_chartcontroller.mk @@ -35,6 +35,14 @@ $(eval $(call gb_AllLangResTarget_add_srs,chartcontroller,\ $(eval $(call gb_SrsTarget_SrsTarget,chart2/res)) +$(eval $(call gb_SrsTarget_use_packages,chart2/res,\ + editeng_inc \ + sfx2_inc \ + svl_inc \ + svtools_inc \ + svx_inc \ +)) + $(eval $(call gb_SrsTarget_set_include,chart2/res,\ $$(INCLUDE) \ -I$(SRCDIR)/chart2/source/controller/dialogs \ diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk index 39aaa841a524..c4ef420d76b5 100644 --- a/cui/AllLangResTarget_cui.mk +++ b/cui/AllLangResTarget_cui.mk @@ -35,6 +35,14 @@ $(eval $(call gb_AllLangResTarget_add_srs,cui,\ $(eval $(call gb_SrsTarget_SrsTarget,cui/res)) +$(eval $(call gb_SrsTarget_use_packages,cui/res,\ + editeng_inc \ + sfx2_inc \ + svl_inc \ + svtools_inc \ + svx_inc \ +)) + $(eval $(call gb_SrsTarget_set_include,cui/res,\ $$(INCLUDE) \ -I$(SRCDIR)/cui/source/inc \ diff --git a/dbaccess/AllLangResTarget_dba.mk b/dbaccess/AllLangResTarget_dba.mk index 7c58a5b97041..8e61901b805b 100644 --- a/dbaccess/AllLangResTarget_dba.mk +++ b/dbaccess/AllLangResTarget_dba.mk @@ -35,6 +35,10 @@ $(eval $(call gb_AllLangResTarget_add_srs,dba,\ $(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dba)) +$(eval $(call gb_SrsTarget_use_packages,dbaccess/dba,\ + svl_inc \ +)) + $(eval $(call gb_SrsTarget_set_include,dbaccess/dba,\ $$(INCLUDE) \ -I$(SRCDIR)/dbaccess/source/core/inc \ diff --git a/dbaccess/AllLangResTarget_dbmm.mk b/dbaccess/AllLangResTarget_dbmm.mk index 94f1811be8bb..e9619d888377 100644 --- a/dbaccess/AllLangResTarget_dbmm.mk +++ b/dbaccess/AllLangResTarget_dbmm.mk @@ -35,8 +35,8 @@ $(eval $(call gb_AllLangResTarget_add_srs,dbmm,\ $(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dbmm)) -$(eval $(call gb_SrsTarget_set_include,dbaccess/dbmm,\ - $$(INCLUDE) \ +$(eval $(call gb_SrsTarget_use_packages,dbaccess/dbmm,\ + svl_inc \ )) $(eval $(call gb_SrsTarget_add_files,dbaccess/dbmm,\ diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk index 1d09ad33a2d9..a8e17f88bbad 100644 --- a/dbaccess/AllLangResTarget_dbu.mk +++ b/dbaccess/AllLangResTarget_dbu.mk @@ -35,6 +35,14 @@ $(eval $(call gb_AllLangResTarget_add_srs,dbu,\ $(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dbu)) +$(eval $(call gb_SrsTarget_use_packages,dbaccess/dbu,\ + editeng_inc \ + sfx2_inc \ + svl_inc \ + svx_globlmn_hrc \ + svx_inc \ +)) + $(eval $(call gb_SrsTarget_set_include,dbaccess/dbu,\ $$(INCLUDE) \ -I$(WORKDIR)/inc/dbaccess \ @@ -89,6 +97,4 @@ $(eval $(call gb_SrsTarget_add_templates,dbaccess/dbu,\ dbaccess/source/ui/inc/toolbox_tmpl.hrc \ )) -$(call gb_SrsTemplateTarget_get_target,dbaccess/dbu) : $(call gb_Package_get_target,svx_globlmn_hrc) - # vim: set noet sw=4 ts=4: diff --git a/dbaccess/AllLangResTarget_dbui.mk b/dbaccess/AllLangResTarget_dbui.mk index d46190243722..c22b4d1e3652 100644 --- a/dbaccess/AllLangResTarget_dbui.mk +++ b/dbaccess/AllLangResTarget_dbui.mk @@ -34,6 +34,14 @@ $(eval $(call gb_AllLangResTarget_add_srs,dbui,dbaccess/dbui)) $(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dbui)) +$(eval $(call gb_SrsTarget_use_package,dbaccess/dbui,\ + editeng_inc \ + sfx2_inc \ + svl_inc \ + svx_globlmn_hrc \ + svx_inc \ +)) + $(eval $(call gb_SrsTarget_set_include,dbaccess/dbui,\ $$(INCLUDE) \ -I$(WORKDIR)/inc/dbaccess \ @@ -90,6 +98,4 @@ $(eval $(call gb_SrsTarget_add_templates,dbaccess/dbui,\ dbaccess/source/ui/inc/toolbox_tmpl.hrc \ )) -$(call gb_SrsTemplateTarget_get_target,dbaccess/dbui) : $(call gb_Package_get_target,svx_globlmn_hrc) - # vim: set noet sw=4 ts=4: diff --git a/dbaccess/AllLangResTarget_sdbt.mk b/dbaccess/AllLangResTarget_sdbt.mk index fb31dd5b1488..778dd894f087 100644 --- a/dbaccess/AllLangResTarget_sdbt.mk +++ b/dbaccess/AllLangResTarget_sdbt.mk @@ -35,10 +35,12 @@ $(eval $(call gb_AllLangResTarget_add_srs,sdbt,\ $(eval $(call gb_SrsTarget_SrsTarget,dbaccess/sdbt)) +$(eval $(call gb_SrsTarget_use_packages,dbaccess/sdbt,\ + svl_inc \ +)) + $(eval $(call gb_SrsTarget_set_include,dbaccess/sdbt,\ $$(INCLUDE) \ - -I$(WORKDIR)/inc/dbaccess \ - -I$(SRCDIR)/dbaccess/inc \ -I$(SRCDIR)/dbaccess/source/sdbtools/inc \ )) diff --git a/desktop/AllLangResTarget_dkt.mk b/desktop/AllLangResTarget_dkt.mk index 5dd7f044f5c4..0a2bfc78fa1e 100644 --- a/desktop/AllLangResTarget_dkt.mk +++ b/desktop/AllLangResTarget_dkt.mk @@ -35,8 +35,8 @@ $(eval $(call gb_AllLangResTarget_add_srs,dkt,\ $(eval $(call gb_SrsTarget_SrsTarget,dkt/res)) -$(eval $(call gb_SrsTarget_set_include,dkt/res,\ - $$(INCLUDE) \ +$(eval $(call gb_SrsTarget_use_packages,dkt/res,\ + svl_inc \ )) $(eval $(call gb_SrsTarget_add_files,dkt/res,\ diff --git a/editeng/AllLangResTarget_editeng.mk b/editeng/AllLangResTarget_editeng.mk index 924e098128d3..512de2d2a03f 100644 --- a/editeng/AllLangResTarget_editeng.mk +++ b/editeng/AllLangResTarget_editeng.mk @@ -33,6 +33,10 @@ $(eval $(call gb_AllLangResTarget_set_reslocation,editeng,svx)) $(eval $(call gb_AllLangResTarget_add_srs,editeng, editeng/res)) $(eval $(call gb_SrsTarget_SrsTarget,editeng/res)) +$(eval $(call gb_SrsTarget_use_packages,editeng/srs,\ + svl_inc \ +)) + $(eval $(call gb_SrsTarget_set_include,editeng/res,\ $$(INCLUDE) \ -I$(SRCDIR)/editeng/inc \ diff --git a/extensions/AllLangResTarget_abp.mk b/extensions/AllLangResTarget_abp.mk index 7da6d415e6e3..6ea4ea3b97b6 100644 --- a/extensions/AllLangResTarget_abp.mk +++ b/extensions/AllLangResTarget_abp.mk @@ -36,6 +36,10 @@ $(eval $(call gb_AllLangResTarget_add_srs,abp,abp/res)) $(eval $(call gb_SrsTarget_SrsTarget,abp/res)) +$(eval $(call gb_SrsTarget_use_packages,abp/res,\ + svl_inc \ +)) + $(eval $(call gb_SrsTarget_set_include,abp/res,\ $$(INCLUDE) \ -I$(SRCDIR)/extensions/inc \ diff --git a/extensions/AllLangResTarget_bib.mk b/extensions/AllLangResTarget_bib.mk index 78b06773f8dc..4d5f8fae06de 100644 --- a/extensions/AllLangResTarget_bib.mk +++ b/extensions/AllLangResTarget_bib.mk @@ -34,6 +34,13 @@ $(eval $(call gb_AllLangResTarget_add_srs,bib,bib/res)) $(eval $(call gb_SrsTarget_SrsTarget,bib/res)) +$(eval $(call gb_SrsTarget_use_packages,bib/res,\ + editeng_inc \ + sfx2_inc \ + svl_inc \ + svx_inc \ +)) + $(eval $(call gb_SrsTarget_set_include,bib/res,\ $$(INCLUDE) \ -I$(SRCDIR)/extensions/inc \ diff --git a/extensions/AllLangResTarget_dbp.mk b/extensions/AllLangResTarget_dbp.mk index d4d4e3053736..1645177ca9d2 100644 --- a/extensions/AllLangResTarget_dbp.mk +++ b/extensions/AllLangResTarget_dbp.mk @@ -34,6 +34,10 @@ $(eval $(call gb_AllLangResTarget_add_srs,dbp,dbp/res)) $(eval $(call gb_SrsTarget_SrsTarget,dbp/res)) +$(eval $(call gb_SrsTarget_use_packages,dbp/res,\ + svl_inc \ +)) + $(eval $(call gb_SrsTarget_set_include,dbp/res,\ $$(INCLUDE) \ -I$(SRCDIR)/extensions/inc \ diff --git a/filter/AllLangResTarget_pdffilter.mk b/filter/AllLangResTarget_pdffilter.mk index ce3ef8528a86..c4025ffcbb40 100644 --- a/filter/AllLangResTarget_pdffilter.mk +++ b/filter/AllLangResTarget_pdffilter.mk @@ -28,6 +28,10 @@ $(eval $(call gb_AllLangResTarget_add_srs,pdffilter,\ $(eval $(call gb_SrsTarget_SrsTarget,filter/pdffilter)) +$(eval $(call gb_SrsTarget_use_packages,filter/pdffilter,\ + svl_inc \ +)) + $(eval $(call gb_SrsTarget_set_include,filter/pdffilter,\ $$(INCLUDE) \ -I$(SRCDIR)/filter/inc \ diff --git a/filter/AllLangResTarget_xsltdlg.mk b/filter/AllLangResTarget_xsltdlg.mk index 6ed201d11961..d4a38f1be353 100644 --- a/filter/AllLangResTarget_xsltdlg.mk +++ b/filter/AllLangResTarget_xsltdlg.mk @@ -25,6 +25,10 @@ $(eval $(call gb_AllLangResTarget_add_srs,xsltdlg,\ $(eval $(call gb_SrsTarget_SrsTarget,filter/xsltdlg)) +$(eval $(call gb_SrsTarget_use_packages,filter/xsltdlg,\ + svl_inc \ +)) + $(eval $(call gb_SrsTarget_set_include,filter/xsltdlg,\ $$(INCLUDE) \ -I$(SRCDIR)/filter/inc \ diff --git a/forms/AllLangResTarget_frm.mk b/forms/AllLangResTarget_frm.mk index 29c12780f81d..9ad13854ee83 100644 --- a/forms/AllLangResTarget_frm.mk +++ b/forms/AllLangResTarget_frm.mk @@ -35,6 +35,10 @@ $(eval $(call gb_AllLangResTarget_add_srs,frm,\ $(eval $(call gb_SrsTarget_SrsTarget,frm/res)) +$(eval $(call gb_SrsTarget_use_packages,frm/res,\ + svl_inc \ +)) + $(eval $(call gb_SrsTarget_set_include,frm/res,\ $$(INCLUDE) \ -I$(SRCDIR)/forms/source/inc \ diff --git a/formula/AllLangResTarget_for.mk b/formula/AllLangResTarget_for.mk index 0cc451e283a8..0ff2d28ae529 100644 --- a/formula/AllLangResTarget_for.mk +++ b/formula/AllLangResTarget_for.mk @@ -35,9 +35,13 @@ $(eval $(call gb_AllLangResTarget_add_srs,for,\ $(eval $(call gb_SrsTarget_SrsTarget,formula/res)) +$(eval $(call gb_SrsTarget_use_packages,formula/res,\ + formula_inc \ + svl_inc \ +)) + $(eval $(call gb_SrsTarget_set_include,formula/res,\ $$(INCLUDE) \ - -I$(SRCDIR)/formula/inc \ -I$(SRCDIR)/formula/source/core/inc \ )) diff --git a/formula/AllLangResTarget_forui.mk b/formula/AllLangResTarget_forui.mk index d6e95d214d44..3b1e96272186 100644 --- a/formula/AllLangResTarget_forui.mk +++ b/formula/AllLangResTarget_forui.mk @@ -35,6 +35,10 @@ $(eval $(call gb_AllLangResTarget_add_srs,forui,\ $(eval $(call gb_SrsTarget_SrsTarget,formula/ui)) +$(eval $(call gb_SrsTarget_use_packages,formula/ui,\ + svl_inc \ +)) + $(eval $(call gb_SrsTarget_set_include,formula/ui,\ $$(INCLUDE) \ -I$(SRCDIR)/formula/inc \ diff --git a/fpicker/AllLangResTarget_fps_office.mk b/fpicker/AllLangResTarget_fps_office.mk index 27e0f85b20a3..5d666bb474d7 100644 --- a/fpicker/AllLangResTarget_fps_office.mk +++ b/fpicker/AllLangResTarget_fps_office.mk @@ -35,8 +35,9 @@ $(eval $(call gb_AllLangResTarget_add_srs,fps_office,\ $(eval $(call gb_SrsTarget_SrsTarget,fps_office/res)) -$(eval $(call gb_SrsTarget_set_include,fps_office/res,\ - $$(INCLUDE) \ +$(eval $(call gb_SrsTarget_use_packages,fps_office/res,\ + svl_inc \ + svtools_inc \ )) $(eval $(call gb_SrsTarget_add_files,fps_office/res,\ diff --git a/framework/AllLangResTarget_fwe.mk b/framework/AllLangResTarget_fwe.mk index ef8ec879e2b7..a6dff4c4a297 100644 --- a/framework/AllLangResTarget_fwe.mk +++ b/framework/AllLangResTarget_fwe.mk @@ -50,6 +50,10 @@ $(eval $(call gb_SrsTarget_add_files,fwe/fwk_classes,\ $(eval $(call gb_SrsTarget_SrsTarget,fwe/fwk_services)) +$(eval $(call gb_SrsTarget_use_packages,fwe/fwk_services,\ + svl_inc \ +)) + $(eval $(call gb_SrsTarget_set_include,fwe/fwk_services,\ $$(INCLUDE) \ -I$(SRCDIR)/framework/inc \ diff --git a/padmin/AllLangResTarget_spa.mk b/padmin/AllLangResTarget_spa.mk index bd76b9251859..f70e50713d2d 100644 --- a/padmin/AllLangResTarget_spa.mk +++ b/padmin/AllLangResTarget_spa.mk @@ -36,10 +36,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,spa,\ $(eval $(call gb_SrsTarget_SrsTarget,padmin/source)) -$(eval $(call gb_SrsTarget_set_include,padmin/source,\ - $$(INCLUDE) \ -)) - $(eval $(call gb_SrsTarget_add_files,padmin/source,\ padmin/source/padialog.src \ padmin/source/rtsetup.src \ diff --git a/reportdesign/AllLangResTarget_rpt.mk b/reportdesign/AllLangResTarget_rpt.mk index bb35615d9f9c..ef5c450c6896 100644 --- a/reportdesign/AllLangResTarget_rpt.mk +++ b/reportdesign/AllLangResTarget_rpt.mk @@ -35,6 +35,11 @@ $(eval $(call gb_AllLangResTarget_add_srs,rpt,\ $(eval $(call gb_SrsTarget_SrsTarget,reportdesign/res)) +$(eval $(call gb_SrsTarget_use_packages,reportdesign/res,\ + svl_inc \ + svx_globlmn_hrc \ +)) + $(eval $(call gb_SrsTarget_set_include,reportdesign/res,\ $$(INCLUDE) \ -I$(SRCDIR)/reportdesign/source/core/inc \ @@ -44,6 +49,4 @@ $(eval $(call gb_SrsTarget_add_files,reportdesign/res,\ reportdesign/source/core/resource/strings.src \ )) -$(call gb_SrsTemplateTarget_get_target,reportdesign/res) : $(call gb_Package_get_target,svx_globlmn_hrc) - # vim: set noet sw=4 ts=4: diff --git a/reportdesign/AllLangResTarget_rptui.mk b/reportdesign/AllLangResTarget_rptui.mk index f767460a93f1..0235e7f31811 100644 --- a/reportdesign/AllLangResTarget_rptui.mk +++ b/reportdesign/AllLangResTarget_rptui.mk @@ -34,6 +34,14 @@ $(eval $(call gb_AllLangResTarget_add_srs,rptui,reportdesign/rptui)) $(eval $(call gb_SrsTarget_SrsTarget,reportdesign/rptui)) +$(eval $(call gb_SrsTarget_use_packages,reportdesign/rptui,\ + editeng_inc \ + sfx2_inc \ + svl_inc \ + svx_globlmn_hrc \ + svx_inc \ +)) + $(eval $(call gb_SrsTarget_set_include,reportdesign/rptui,\ $$(INCLUDE) \ -I$(SRCDIR)/reportdesign/source/ui/inc \ @@ -52,6 +60,4 @@ $(eval $(call gb_SrsTarget_add_files,reportdesign/rptui,\ reportdesign/source/ui/report/report.src \ )) -$(call gb_SrsTemplateTarget_get_target,reportdesign/rptui) : $(call gb_Package_get_target,svx_globlmn_hrc) - # vim: set noet sw=4 ts=4: diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk index ab87f3df3973..09526bd78025 100644 --- a/sc/AllLangResTarget_sc.mk +++ b/sc/AllLangResTarget_sc.mk @@ -29,6 +29,16 @@ $(eval $(call gb_AllLangResTarget_add_srs,sc,\ $(eval $(call gb_SrsTarget_SrsTarget,sc/res)) +$(eval $(call gb_SrsTarget_use_packages,sc/res,\ + editeng_inc \ + formula_inc \ + sfx2_inc \ + svl_inc \ + svx_globlmn_hrc \ + svx_inc \ + tools_inc \ +)) + $(eval $(call gb_SrsTarget_set_include,sc/res,\ $$(INCLUDE) \ -I$(SRCDIR)/sc/inc \ @@ -104,6 +114,4 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\ sc/source/core/src/compiler.src \ )) -$(call gb_SrsTemplateTarget_get_target,sc/res) : $(call gb_Package_get_target,svx_globlmn_hrc) - # vim: set noet sw=4 ts=4: diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk index 8b8634f9ae12..62a205f3ac63 100644 --- a/sd/AllLangResTarget_sd.mk +++ b/sd/AllLangResTarget_sd.mk @@ -35,6 +35,16 @@ $(eval $(call gb_AllLangResTarget_add_srs,sd,\ $(eval $(call gb_SrsTarget_SrsTarget,sd/res)) +$(eval $(call gb_SrsTarget_use_packages,sd/res,\ + editeng_inc \ + sfx2_inc \ + svl_inc \ + svtools_inc \ + svx_globlmn_hrc \ + svx_inc \ + tools_inc \ +)) + $(eval $(call gb_SrsTarget_set_include,sd/res,\ $$(INCLUDE) \ -I$(SRCDIR)/sd/inc \ @@ -102,6 +112,4 @@ $(eval $(call gb_SrsTarget_add_templates,sd/res,\ sd/source/ui/app/toolbox2_tmpl.src \ )) -$(call gb_SrsTemplateTarget_get_target,sd/res) : $(call gb_Package_get_target,svx_globlmn_hrc) - # vim: set noet sw=4 ts=4: diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk index d73d9bfbb9c4..bce308530352 100644 --- a/sfx2/AllLangResTarget_sfx2.mk +++ b/sfx2/AllLangResTarget_sfx2.mk @@ -36,12 +36,18 @@ $(eval $(call gb_AllLangResTarget_add_srs,sfx,\ $(eval $(call gb_SrsTarget_SrsTarget,sfx/res)) +$(eval $(call gb_SrsTarget_use_packages,sfx/res,\ + sfx2_inc \ + svl_inc \ + svtools_inc \ + tools_inc \ +)) + $(eval $(call gb_SrsTarget_set_include,sfx/res,\ $$(INCLUDE) \ -I$(SRCDIR)/sfx2/source/dialog \ -I$(SRCDIR)/sfx2/source/inc \ -I$(SRCDIR)/sfx2/inc/ \ - -I$(SRCDIR)/sfx2/inc/sfx \ )) $(eval $(call gb_SrsTarget_add_files,sfx/res,\ diff --git a/starmath/AllLangResTarget_sm.mk b/starmath/AllLangResTarget_sm.mk index 3cfda797c2ce..a89c924840d4 100644 --- a/starmath/AllLangResTarget_sm.mk +++ b/starmath/AllLangResTarget_sm.mk @@ -36,6 +36,13 @@ $(eval $(call gb_AllLangResTarget_set_reslocation,sm,starmath)) $(eval $(call gb_SrsTarget_SrsTarget,sm/res)) +$(eval $(call gb_SrsTarget_use_packages,sm/res,\ + editeng_inc \ + sfx2_inc \ + svl_inc \ + svx_globlmn_hrc \ +)) + $(eval $(call gb_SrsTarget_set_include,sm/res,\ $$(INCLUDE) \ -I$(SRCDIR)/starmath/inc \ @@ -48,6 +55,4 @@ $(eval $(call gb_SrsTarget_add_files,sm/res,\ starmath/source/toolbox.src \ )) -$(call gb_SrsTemplateTarget_get_target,sm/res) : $(call gb_Package_get_target,svx_globlmn_hrc) - # vim: set noet sw=4 ts=4: diff --git a/svl/AllLangResTarget_svl.mk b/svl/AllLangResTarget_svl.mk index 40bb46f9a471..4deeed78d9a6 100644 --- a/svl/AllLangResTarget_svl.mk +++ b/svl/AllLangResTarget_svl.mk @@ -34,9 +34,8 @@ $(eval $(call gb_AllLangResTarget_add_srs,svl,\ $(eval $(call gb_SrsTarget_SrsTarget,svl/res)) -$(eval $(call gb_SrsTarget_set_include,svl/res,\ - $$(INCLUDE) \ - -I$(SRCDIR)/svl/inc \ +$(eval $(call gb_SrsTarget_use_packages,svl/res,\ + svl_inc \ )) $(eval $(call gb_SrsTarget_add_files,svl/res,\ diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk index a495a70ea2d4..430eb23d55ad 100644 --- a/svtools/AllLangResTarget_svt.mk +++ b/svtools/AllLangResTarget_svt.mk @@ -36,6 +36,13 @@ $(eval $(call gb_AllLangResTarget_add_srs,svt,\ $(eval $(call gb_SrsTarget_SrsTarget,svt/res)) +$(eval $(call gb_SrsTarget_use_packages,svt/res,\ + i18npool_inc \ + svl_inc \ + svtools_inc \ + tools_inc \ +)) + $(eval $(call gb_SrsTarget_set_include,svt/res,\ $$(INCLUDE) \ -I$(SRCDIR)/svtools/source/inc \ diff --git a/svx/AllLangResTarget_gal.mk b/svx/AllLangResTarget_gal.mk index 7694c6578319..b959f4527ddc 100644 --- a/svx/AllLangResTarget_gal.mk +++ b/svx/AllLangResTarget_gal.mk @@ -34,6 +34,13 @@ $(eval $(call gb_AllLangResTarget_add_srs,gal,svx/gal)) $(eval $(call gb_SrsTarget_SrsTarget,svx/gal)) +$(eval $(call gb_SrsTarget_use_packages,svx/gal,\ + editeng_inc \ + sfx2_inc \ + svl_inc \ + svx_inc \ +)) + $(eval $(call gb_SrsTarget_set_include,svx/gal,\ $$(INCLUDE) \ -I$(SRCDIR)/svx/source/gallery2 \ diff --git a/svx/AllLangResTarget_ofa.mk b/svx/AllLangResTarget_ofa.mk index c8f0e1056fca..5b47aab99d99 100644 --- a/svx/AllLangResTarget_ofa.mk +++ b/svx/AllLangResTarget_ofa.mk @@ -34,9 +34,13 @@ $(eval $(call gb_AllLangResTarget_add_srs,ofa,svx/ofa)) $(eval $(call gb_SrsTarget_SrsTarget,svx/ofa)) -$(eval $(call gb_SrsTarget_set_include,svx/ofa,\ - $$(INCLUDE) \ - -I$(SRCDIR)/svx/inc/ \ +$(eval $(call gb_SrsTarget_use_packages,svx/ofa,\ + editeng_inc \ + sfx2_inc \ + svl_inc \ + svtools_inc \ + svx_inc \ + tools_inc \ )) $(eval $(call gb_SrsTarget_add_files,svx/ofa,\ diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk index 38b68b3e7c34..520db94f6d85 100644 --- a/svx/AllLangResTarget_svx.mk +++ b/svx/AllLangResTarget_svx.mk @@ -36,6 +36,16 @@ $(eval $(call gb_AllLangResTarget_add_srs,svx,\ $(eval $(call gb_SrsTarget_SrsTarget,svx/res)) +$(eval $(call gb_SrsTarget_use_packages,svx/res,\ + editeng_inc \ + sal_inc \ + sfx2_inc \ + svl_inc \ + svtools_inc \ + svx_inc \ + tools_inc \ +)) + $(eval $(call gb_SrsTarget_set_include,svx/res,\ $$(INCLUDE) \ -I$(WORKDIR)/inc/svx \ diff --git a/svx/AllLangResTarget_textconversiondlgs.mk b/svx/AllLangResTarget_textconversiondlgs.mk index 65cf7ad1cc36..981f34ade777 100644 --- a/svx/AllLangResTarget_textconversiondlgs.mk +++ b/svx/AllLangResTarget_textconversiondlgs.mk @@ -36,9 +36,8 @@ $(eval $(call gb_AllLangResTarget_add_srs,textconversiondlgs,\ $(eval $(call gb_SrsTarget_SrsTarget,svx/textconversiondlgs)) -$(eval $(call gb_SrsTarget_set_include,svx/textconversiondlgs,\ - $$(INCLUDE) \ - -I$(SRCDIR)/svx/inc/ \ +$(eval $(call gb_SrsTarget_use_packages,svx/textconversiondlgs,\ + svtools_inc \ )) $(eval $(call gb_SrsTarget_add_files,svx/textconversiondlgs,\ diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk index 8294e4f45339..26ae74751566 100644 --- a/sw/AllLangResTarget_sw.mk +++ b/sw/AllLangResTarget_sw.mk @@ -34,6 +34,16 @@ $(eval $(call gb_AllLangResTarget_add_srs,sw,\ $(eval $(call gb_SrsTarget_SrsTarget,sw/res)) +$(eval $(call gb_SrsTarget_use_packages,sw/res,\ + editeng_inc \ + sfx2_inc \ + svl_inc \ + svtools_inc \ + svx_globlmn_hrc \ + svx_inc \ + tools_inc \ +)) + $(eval $(call gb_SrsTarget_set_include,sw/res,\ $$(INCLUDE) \ -I$(SRCDIR)/sw/inc \ @@ -186,6 +196,4 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\ sw/source/ui/wrtsh/wrtsh.src \ )) -$(call gb_SrsTemplateTarget_get_target,sw/res) :| $(call gb_Package_get_target,svx_globlmn_hrc) - # vim: set noet sw=4 ts=4: diff --git a/uui/AllLangResTarget_uui.mk b/uui/AllLangResTarget_uui.mk index 29cf4c5e7bdb..b3fae69e959f 100644 --- a/uui/AllLangResTarget_uui.mk +++ b/uui/AllLangResTarget_uui.mk @@ -34,6 +34,12 @@ $(eval $(call gb_AllLangResTarget_add_srs,uui,\ $(eval $(call gb_SrsTarget_SrsTarget,uui/res)) +$(eval $(call gb_SrsTarget_use_packages,uui/res,\ + svl_inc \ + svtools_inc \ + tools_inc \ +)) + $(eval $(call gb_SrsTarget_set_include,uui/res,\ -I$(SRCDIR)/uui/source \ $$(INCLUDE) \ diff --git a/vcl/AllLangResTarget_vcl.mk b/vcl/AllLangResTarget_vcl.mk index cf4b549eac04..6fd8c1ac3dec 100644 --- a/vcl/AllLangResTarget_vcl.mk +++ b/vcl/AllLangResTarget_vcl.mk @@ -36,6 +36,10 @@ $(eval $(call gb_AllLangResTarget_add_srs,vcl,\ $(eval $(call gb_SrsTarget_SrsTarget,vcl/source/src)) +$(eval $(call gb_SrsTarget_use_packages,vcl/source/src,\ + svl_inc \ +)) + $(eval $(call gb_SrsTarget_set_include,vcl/source/src,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ diff --git a/wizards/AllLangResTarget_cal.mk b/wizards/AllLangResTarget_cal.mk index 2a312f064963..c5215f510809 100644 --- a/wizards/AllLangResTarget_cal.mk +++ b/wizards/AllLangResTarget_cal.mk @@ -34,10 +34,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,cal,\ $(eval $(call gb_SrsTarget_SrsTarget,cal/res)) -$(eval $(call gb_SrsTarget_set_include,cal/res,\ - $$(INCLUDE) \ -)) - $(eval $(call gb_SrsTarget_add_files,cal/res,\ wizards/source/schedule/schedule.src \ )) diff --git a/wizards/AllLangResTarget_dbw.mk b/wizards/AllLangResTarget_dbw.mk index dc596b5e8991..b03839b5f1f1 100644 --- a/wizards/AllLangResTarget_dbw.mk +++ b/wizards/AllLangResTarget_dbw.mk @@ -34,10 +34,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,dbw,\ $(eval $(call gb_SrsTarget_SrsTarget,dbw/res)) -$(eval $(call gb_SrsTarget_set_include,dbw/res,\ - $$(INCLUDE) \ -)) - $(eval $(call gb_SrsTarget_add_files,dbw/res,\ wizards/source/formwizard/dbwizres.src \ )) diff --git a/wizards/AllLangResTarget_eur.mk b/wizards/AllLangResTarget_eur.mk index a55d679cb93b..81478d13693c 100644 --- a/wizards/AllLangResTarget_eur.mk +++ b/wizards/AllLangResTarget_eur.mk @@ -34,10 +34,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,eur,\ $(eval $(call gb_SrsTarget_SrsTarget,eur/res)) -$(eval $(call gb_SrsTarget_set_include,eur/res,\ - $$(INCLUDE) \ -)) - $(eval $(call gb_SrsTarget_add_files,eur/res,\ wizards/source/euro/euro.src \ )) diff --git a/wizards/AllLangResTarget_imp.mk b/wizards/AllLangResTarget_imp.mk index 7a25f06b3598..2cd2f8eaa6c1 100644 --- a/wizards/AllLangResTarget_imp.mk +++ b/wizards/AllLangResTarget_imp.mk @@ -34,10 +34,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,imp,\ $(eval $(call gb_SrsTarget_SrsTarget,imp/res)) -$(eval $(call gb_SrsTarget_set_include,imp/res,\ - $$(INCLUDE) \ -)) - $(eval $(call gb_SrsTarget_add_files,imp/res,\ wizards/source/importwizard/importwi.src \ )) diff --git a/wizards/AllLangResTarget_tpl.mk b/wizards/AllLangResTarget_tpl.mk index 5546ece07f2a..1043e0d260f9 100644 --- a/wizards/AllLangResTarget_tpl.mk +++ b/wizards/AllLangResTarget_tpl.mk @@ -34,10 +34,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,tpl,\ $(eval $(call gb_SrsTarget_SrsTarget,tpl/res)) -$(eval $(call gb_SrsTarget_set_include,tpl/res,\ - $$(INCLUDE) \ -)) - $(eval $(call gb_SrsTarget_add_files,tpl/res,\ wizards/source/template/template.src \ )) diff --git a/wizards/AllLangResTarget_wwz.mk b/wizards/AllLangResTarget_wwz.mk index c64f40f01b78..696d457a0bf9 100644 --- a/wizards/AllLangResTarget_wwz.mk +++ b/wizards/AllLangResTarget_wwz.mk @@ -34,10 +34,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,wwz,\ $(eval $(call gb_SrsTarget_SrsTarget,wwz/res)) -$(eval $(call gb_SrsTarget_set_include,wwz/res,\ - $$(INCLUDE) \ -)) - $(eval $(call gb_SrsTarget_add_files,wwz/res,\ wizards/source/webwizard/webwizar.src \ )) diff --git a/wizards/AllLangResTarget_wzi.mk b/wizards/AllLangResTarget_wzi.mk index e48961808cbc..e7d3c3c4456c 100644 --- a/wizards/AllLangResTarget_wzi.mk +++ b/wizards/AllLangResTarget_wzi.mk @@ -36,10 +36,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,wzi,\ $(eval $(call gb_SrsTarget_SrsTarget,wzi/res)) -$(eval $(call gb_SrsTarget_set_include,wzi/res,\ - $$(INCLUDE) \ -)) - $(eval $(call gb_SrsTarget_add_files,wzi/res,\ wizards/source/imagelists/imagelists.src \ )) diff --git a/xmlsecurity/AllLangResTarget_xsec.mk b/xmlsecurity/AllLangResTarget_xsec.mk index 7049effca3cc..0f7cb282737a 100644 --- a/xmlsecurity/AllLangResTarget_xsec.mk +++ b/xmlsecurity/AllLangResTarget_xsec.mk @@ -36,6 +36,11 @@ $(eval $(call gb_AllLangResTarget_add_srs,xmlsec,\ $(eval $(call gb_SrsTarget_SrsTarget,xmlsec/res)) +$(eval $(call gb_SrsTarget_use_packages,xmlsec/res,\ + svl_inc \ + svtools_inc \ +)) + $(eval $(call gb_SrsTarget_set_include,xmlsec/res,\ $$(INCLUDE) \ -I$(SRCDIR)/xmlsecurity/inc \ |