add package deps for resources

5 files changed, 26 insertions, 8 deletions

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