add package deps for resources

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:

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 \

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 \

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 \

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 \

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,\

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:

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:

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 \
 ))
 

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,\

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \
 ))
 

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 \

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,\

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 \

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 \

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:

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:

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:

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:

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,\

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:

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,\

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 \

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 \

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,\

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 \

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,\

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:

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) \

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 \

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 \
 ))

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 \
 ))

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 \
 ))

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 \
 ))

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 \
 ))

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 \
 ))

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 \
 ))

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 \