gbuild: add gb_Library_use_restarget

Change-Id: Ic0a2fd3c1adeb55ec27f6a2eb4709be598120fba

17 files changed, 26 insertions, 30 deletions

diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index bf529a02f1ac..7c355f7d2e2b 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -173,7 +173,6 @@ $(eval $(call gb_Library_add_asmobjects,sb,\
 endif
 
 # Runtime dependency for unit-tests
-$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,sb)) :| \
-	$(call gb_AllLangResTarget_get_target,sb)
+$(eval $(call gb_Library_use_restarget,sb,sb))
 
 # vim: set noet sw=4 ts=4:
diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk
index a3d3e22ef1ba..bd15c3f7aeed 100644
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@@ -191,7 +191,6 @@ $(eval $(call gb_Library_add_exception_objects,chartcontroller,\
 ))
 
 # Runtime dependency for unit-tests
-$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,chartcontroller)) :| \
-	$(call gb_AllLangResTarget_get_target,chartcontroller)
+$(eval $(call gb_Library_use_restarget,chartcontroller,chartcontroller))
 
 # vim: set noet sw=4 ts=4:
diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk
index 9a1ca715d1c8..21e2fd7a16a3 100644
--- a/editeng/Library_editeng.mk
+++ b/editeng/Library_editeng.mk
@@ -152,7 +152,6 @@ $(eval $(call gb_Library_use_externals,editeng,\
 ))
 
 # Runtime dependency for unit-tests
-$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,editeng)) :| \
-	$(call gb_AllLangResTarget_get_target,editeng)
+$(eval $(call gb_Library_use_restarget,editeng,editeng))
 
 # vim: set noet sw=4 ts=4:
diff --git a/formula/Library_for.mk b/formula/Library_for.mk
index 832d7cd96d5e..d2a6671d3b20 100644
--- a/formula/Library_for.mk
+++ b/formula/Library_for.mk
@@ -48,7 +48,6 @@ $(eval $(call gb_Library_add_exception_objects,for,\
 ))
 
 # Runtime dependency for unit-tests
-$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,for)) :| \
-	$(call gb_AllLangResTarget_get_target,for)
+$(eval $(call gb_Library_use_restarget,for,for))
 
 # vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
index 482dac4dfc99..408be094f2d4 100644
--- a/framework/Library_fwe.mk
+++ b/framework/Library_fwe.mk
@@ -81,7 +81,6 @@ $(eval $(call gb_Library_add_exception_objects,fwe,\
 ))
 
 # Runtime dependency for unit-tests
-$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,fwe)) :| \
-	$(call gb_AllLangResTarget_get_target,fwe)
+$(eval $(call gb_Library_use_restarget,fwe,fwe))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 47a67f0a6926..f76032ac4648 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -633,7 +633,6 @@ $(eval $(call gb_SdiTarget_set_include,sc/sdi/scslots,\
 ))
 
 # Runtime dependency for unit-tests
-$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,sc)) :| \
-	$(call gb_AllLangResTarget_get_target,sc)
+$(eval $(call gb_Library_use_restarget,sc,sc))
 
 # vim: set noet sw=4 ts=4:
diff --git a/scaddins/Library_analysis.mk b/scaddins/Library_analysis.mk
index 57cd225a2cda..cafce60604a7 100644
--- a/scaddins/Library_analysis.mk
+++ b/scaddins/Library_analysis.mk
@@ -47,7 +47,6 @@ $(eval $(call gb_Library_add_exception_objects,analysis,\
 ))
 
 # Runtime dependency for unit-tests
-$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,analysis)) :| \
-	$(call gb_AllLangResTarget_get_target,analysis)
+$(eval $(call gb_Library_use_restarget,analysis,analysis))
 
 # vim: set noet sw=4 ts=4:
diff --git a/scaddins/Library_date.mk b/scaddins/Library_date.mk
index 108f5d1afa6d..dbe1b9901219 100644
--- a/scaddins/Library_date.mk
+++ b/scaddins/Library_date.mk
@@ -43,7 +43,6 @@ $(eval $(call gb_Library_add_exception_objects,date,\
 ))
 
 # Runtime dependency for unit-tests
-$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,date)) :| \
-	$(call gb_AllLangResTarget_get_target,date)
+$(eval $(call gb_Library_use_restarget,date,date))
 
 # vim: set noet sw=4 ts=4:
diff --git a/scaddins/Library_pricing.mk b/scaddins/Library_pricing.mk
index 30053a1c9ab0..f2fbeca7f169 100644
--- a/scaddins/Library_pricing.mk
+++ b/scaddins/Library_pricing.mk
@@ -44,7 +44,6 @@ $(eval $(call gb_Library_add_exception_objects,pricing,\
 ))
 
 # Runtime dependency for unit-tests
-$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,pricing)) :| \
-	$(call gb_AllLangResTarget_get_target,pricing)
+$(eval $(call gb_Library_use_restarget,pricing,pricing))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 6f145ce10c05..16fd84a5f523 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -346,7 +346,6 @@ $(eval $(call gb_Library_use_system_win32_libs,sfx,\
 endif
 
 # Runtime dependency for unit-tests
-$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,sfx)) :| \
-    $(call gb_AllLangResTarget_get_target,sfx)
+$(eval $(call gb_Library_use_restarget,sfx,sfx))
 
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 6fda71f36256..34e590065b38 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -252,6 +252,7 @@ $(eval $(foreach method,\
 	use_package \
 	use_packages \
 	use_unpacked \
+	use_restarget \
 	add_package_headers \
 	add_sdi_headers \
 	set_precompiled_header \
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index c1b40e8bcc3f..00abdc472a7d 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -1317,6 +1317,16 @@ $(call gb_LinkTarget_get_headers_target,$(1)) :| $(call gb_ExternalProject_get_t
 
 endef
 
+# Delay linking until a res target has been built. This is needed so that
+# unit tests using libraries do not fail if the res target is not yet built.
+#
+# gb_LinkTarget_use_restarget linktarget restarget(s)
+define gb_LinkTarget_use_restarget
+$(call gb_LinkTarget_get_target,$(1)) :| \
+	$(foreach res,$(2),$(call gb_AllLangResTarget_get_target,$(res)))
+
+endef
+
 # this forwards to functions that must be defined in RepositoryExternal.mk.
 # $(eval $(call gb_LinkTarget_use_external,library,external))
 define gb_LinkTarget_use_external
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index c24dd27860dc..3abafb78a61f 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -99,7 +99,6 @@ $(eval $(call gb_SdiTarget_set_include,starmath/sdi/smslots,\
 ))
 
 # Runtime dependency for unit-tests
-$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,sm)) :| \
-	$(call gb_AllLangResTarget_get_target,sm)
+$(eval $(call gb_Library_use_restarget,sm,sm))
 
 # vim: set noet sw=4 ts=4:
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 1a176519675e..b18370f2e794 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -252,7 +252,6 @@ $(eval $(call gb_Library_use_system_win32_libs,svt,\
 endif
 
 # Runtime dependency for unit-tests
-$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,svt)) :| \
-	$(call gb_AllLangResTarget_get_target,svt)
+$(eval $(call gb_Library_use_restarget,svt,svt))
 
 # vim: set noet sw=4 ts=4:
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 3bb261620ecc..4b8914e2cca1 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -449,7 +449,6 @@ $(eval $(call gb_SdiTarget_set_include,svx/sdi/svxslots,\
 ))
 
 # Runtime dependency for unit-tests
-$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,svxcore)) :| \
-	$(call gb_AllLangResTarget_get_target,svx)
+$(eval $(call gb_Library_use_restarget,svxcore,svx))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 679d60d32cbe..f1064ef75748 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -756,7 +756,6 @@ $(eval $(call gb_SdiTarget_set_include,sw/sdi/swslots,\
 ))
 
 # Runtime dependency for unit-tests
-$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,sw)) :| \
-	$(call gb_AllLangResTarget_get_target,sw)
+$(eval $(call gb_Library_use_restarget,sw,sw))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index f82fd875459a..c8008ae281e4 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -673,7 +673,6 @@ endif
 endif
 
 # Runtime dependency for unit-tests
-$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,vcl)) :| \
-	$(call gb_AllLangResTarget_get_target,vcl)
+$(eval $(call gb_Library_use_restarget,vcl,vcl))
 
 # vim: set noet sw=4 ts=4: