[Libreoffice-commits] core.git: basctl/AllLangResTarget_basctl.mk dbaccess/AllLangResTarget_dbu.mk reportdesign/AllLangResTarget_rpt.mk reportdesign/AllLangResTarget_rptui.mk sc/AllLangResTarget_sc.mk sd/AllLangResTarget_sd.mk solenv/gbuild starmath/AllLangResTarget_sm.mk sw/AllLangResTarget_sw.mk

[David Tardon]

 basctl/AllLangResTarget_basctl.mk      |    4 ++++
 dbaccess/AllLangResTarget_dbu.mk       |    4 ++++
 reportdesign/AllLangResTarget_rpt.mk   |    4 ++++
 reportdesign/AllLangResTarget_rptui.mk |    4 ++++
 sc/AllLangResTarget_sc.mk              |    4 ++++
 sd/AllLangResTarget_sd.mk              |    4 ++++
 solenv/gbuild/AllLangResTarget.mk      |   16 ++++++++++++++++
 starmath/AllLangResTarget_sm.mk        |    4 ++++
 sw/AllLangResTarget_sw.mk              |    4 ++++
 9 files changed, 48 insertions(+)

New commits:
commit de7df0eb6708683e8927e6e627b68cf0d2028886
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 30 21:08:04 2013 +0200

    gbuild: fix deps on svx/globlmn.hrc
    
    Change-Id: I5373c0a59fdbbe0230b74df967fdaf887b91f4e4

diff --git a/basctl/AllLangResTarget_basctl.mk b/basctl/AllLangResTarget_basctl.mk
index 34c8dc7..7e31c94 100644
--- a/basctl/AllLangResTarget_basctl.mk
+++ b/basctl/AllLangResTarget_basctl.mk
@@ -34,6 +34,10 @@ $(eval $(call gb_AllLangResTarget_add_srs,basctl,\
 
 $(eval $(call gb_SrsTarget_SrsTarget,basctl/res))
 
+$(eval $(call gb_SrsTarget_use_srstargets,basctl/res,\
+	svx/res \
+))
+
 $(eval $(call gb_SrsTarget_set_include,basctl/res,\
     -I$(call gb_SrsTemplateTarget_get_include_dir,) \
 	-I$(SRCDIR)/basctl/inc \
diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk
index 084d536..3b75501 100644
--- a/dbaccess/AllLangResTarget_dbu.mk
+++ b/dbaccess/AllLangResTarget_dbu.mk
@@ -17,6 +17,10 @@ $(eval $(call gb_AllLangResTarget_add_srs,dbu,\
 
 $(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dbu))
 
+$(eval $(call gb_SrsTarget_use_srstargets,dbaccess/dbu,\
+	svx/res \
+))
+
 $(eval $(call gb_SrsTarget_set_include,dbaccess/dbu,\
     $$(INCLUDE) \
 	-I$(call gb_SrsTemplateTarget_get_include_dir,dbaccess) \
diff --git a/reportdesign/AllLangResTarget_rpt.mk b/reportdesign/AllLangResTarget_rpt.mk
index c330adf..2d2a5a1 100644
--- a/reportdesign/AllLangResTarget_rpt.mk
+++ b/reportdesign/AllLangResTarget_rpt.mk
@@ -17,6 +17,10 @@ $(eval $(call gb_AllLangResTarget_add_srs,rpt,\
 
 $(eval $(call gb_SrsTarget_SrsTarget,reportdesign/res))
 
+$(eval $(call gb_SrsTarget_use_srstargets,reportdesign/res,\
+	svx/res \
+))
+
 $(eval $(call gb_SrsTarget_set_include,reportdesign/res,\
     $$(INCLUDE) \
     -I$(SRCDIR)/reportdesign/source/core/inc \
diff --git a/reportdesign/AllLangResTarget_rptui.mk b/reportdesign/AllLangResTarget_rptui.mk
index ce526ed..bae25ac 100644
--- a/reportdesign/AllLangResTarget_rptui.mk
+++ b/reportdesign/AllLangResTarget_rptui.mk
@@ -34,6 +34,10 @@ $(eval $(call gb_AllLangResTarget_add_srs,rptui,reportdesign/rptui))
 
 $(eval $(call gb_SrsTarget_SrsTarget,reportdesign/rptui))
 
+$(eval $(call gb_SrsTarget_use_srstargets,reportdesign/rptui,\
+	svx/res \
+))
+
 $(eval $(call gb_SrsTarget_set_include,reportdesign/rptui,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/reportdesign/source/ui/inc \
diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index 9b0541a..b83e0f9 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -16,6 +16,10 @@ $(eval $(call gb_AllLangResTarget_add_srs,sc,\
 
 $(eval $(call gb_SrsTarget_SrsTarget,sc/res))
 
+$(eval $(call gb_SrsTarget_use_srstargets,sc/res,\
+	svx/res \
+))
+
 $(eval $(call gb_SrsTarget_set_include,sc/res,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/sc/inc \
diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index 28e3b94..dca617e 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -17,6 +17,10 @@ $(eval $(call gb_AllLangResTarget_add_srs,sd,\
 
 $(eval $(call gb_SrsTarget_SrsTarget,sd/res))
 
+$(eval $(call gb_SrsTarget_use_srstargets,sd/res,\
+	svx/res \
+))
+
 $(eval $(call gb_SrsTarget_set_include,sd/res,\
     $$(INCLUDE) \
     -I$(SRCDIR)/sd/inc \
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 37262d2..8cab38f 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -352,6 +352,22 @@ $(foreach package,$(2),$(call gb_SrsTarget_use_package,$(1),$(package)))
 
 endef
 
+# Use templates built by another SrsTarget.
+#
+# gb_SrsTarget_use_srstarget srs other-srs
+define gb_SrsTarget_use_srstarget
+$(call gb_SrsTarget_get_external_headers_target,$(1)) : $(call gb_SrsTemplateTarget_get_target,$(2))
+
+endef
+
+# Use templates built by other SrsTargets.
+#
+# gb_SrsTarget_use_srstargets srs other-srs(s)
+define gb_SrsTarget_use_srstargets
+$(foreach srstarget,$(2),$(call gb_SrsTarget_use_srstarget,$(1),$(srstarget)))
+
+endef
+
 
 # ResTarget
 
diff --git a/starmath/AllLangResTarget_sm.mk b/starmath/AllLangResTarget_sm.mk
index 40025ab..a63fbd4 100644
--- a/starmath/AllLangResTarget_sm.mk
+++ b/starmath/AllLangResTarget_sm.mk
@@ -18,6 +18,10 @@ $(eval $(call gb_AllLangResTarget_add_srs,sm,\
 
 $(eval $(call gb_SrsTarget_SrsTarget,sm/res))
 
+$(eval $(call gb_SrsTarget_use_srstargets,sm/res,\
+	svx/res \
+))
+
 $(eval $(call gb_SrsTarget_set_include,sm/res,\
 	-I$(SRCDIR)/starmath/inc \
     -I$(call gb_SrsTemplateTarget_get_include_dir,) \
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 3b60502..1b16550 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -25,6 +25,10 @@ $(eval $(call gb_AllLangResTarget_add_srs,sw,\
 
 $(eval $(call gb_SrsTarget_SrsTarget,sw/res))
 
+$(eval $(call gb_SrsTarget_use_srstargets,sw/res,\
+	svx/res \
+))
+
 $(eval $(call gb_SrsTarget_set_include,sw/res,\
     $$(INCLUDE) \
     -I$(SRCDIR)/sw/inc \