summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--basic/Library_sb.mk4
-rw-r--r--chart2/Library_chartcontroller.mk4
-rw-r--r--dbaccess/CppunitTest_dbaccess_macros_test.mk5
-rw-r--r--editeng/Library_editeng.mk4
-rw-r--r--formula/Library_for.mk4
-rw-r--r--framework/Library_fwe.mk4
-rw-r--r--sc/CppunitTest_sc_annotationshapeobj.mk5
-rw-r--r--sc/CppunitTest_sc_cellrangeobj.mk5
-rw-r--r--sc/CppunitTest_sc_chart_regression_test.mk5
-rw-r--r--sc/CppunitTest_sc_databaserangeobj.mk5
-rw-r--r--sc/CppunitTest_sc_datapilotfieldobj.mk5
-rw-r--r--sc/CppunitTest_sc_datapilottableobj.mk5
-rw-r--r--sc/CppunitTest_sc_editfieldobj_cell.mk5
-rw-r--r--sc/CppunitTest_sc_editfieldobj_header.mk5
-rw-r--r--sc/CppunitTest_sc_filters_test.mk5
-rw-r--r--sc/CppunitTest_sc_macros_test.mk5
-rw-r--r--sc/CppunitTest_sc_namedrangeobj.mk5
-rw-r--r--sc/CppunitTest_sc_namedrangesobj.mk5
-rw-r--r--sc/CppunitTest_sc_subsequent_filters_test.mk5
-rw-r--r--sc/CppunitTest_sc_tableautoformatfield.mk5
-rw-r--r--sc/CppunitTest_sc_tablesheetobj.mk3
-rw-r--r--sc/CppunitTest_sc_tablesheetsobj.mk3
-rw-r--r--sc/CppunitTest_sc_ucalc.mk6
-rw-r--r--sc/Library_sc.mk4
-rw-r--r--scaddins/Library_analysis.mk4
-rw-r--r--scaddins/Library_date.mk4
-rw-r--r--sfx2/Library_sfx.mk4
-rw-r--r--starmath/CppunitTest_starmath_qa_cppunit.mk2
-rw-r--r--starmath/Library_sm.mk4
-rw-r--r--svtools/Library_svt.mk5
-rw-r--r--svx/Library_svxcore.mk4
-rw-r--r--sw/CppunitTest_sw_filters_test.mk2
-rw-r--r--sw/CppunitTest_sw_swdoc_test.mk6
-rw-r--r--sw/Library_sw.mk4
-rw-r--r--vcl/Library_vcl.mk4
35 files changed, 57 insertions, 97 deletions
diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index 90cbe715dcdd..fa0e8201e941 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -170,4 +170,8 @@ $(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)
+
# vim: set noet sw=4 ts=4:
diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk
index bd1837956130..19220da8b5f9 100644
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@@ -213,4 +213,8 @@ $(eval $(call gb_Library_add_exception_objects,chartcontroller,\
chart2/source/controller/main/UndoGuard \
))
+# Runtime dependency for unit-tests
+$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,chartcontroller)) :| \
+ $(call gb_AllLangResTarget_get_target,chartcontroller)
+
# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk
index 1b7c4b405ebd..c35ebd5a5d14 100644
--- a/dbaccess/CppunitTest_dbaccess_macros_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk
@@ -124,9 +124,4 @@ $(eval $(call gb_CppunitTest_use_filter_configuration,dbaccess_macros_test))
$(eval $(call gb_CppunitTest_use_unittest_configuration,dbaccess_macros_test))
-# we need to
-# - explicitly depend on the dbaccess resource files needed at unit-test runtime
-$(call gb_CppunitTest_get_target,dbaccess_macros_test) : \
- $(WORKDIR)/AllLangRes/dbaccess \
-
# vim: set noet sw=4 ts=4:
diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk
index 81164b94c11c..91f7e4a53cfc 100644
--- a/editeng/Library_editeng.mk
+++ b/editeng/Library_editeng.mk
@@ -156,4 +156,8 @@ $(eval $(call gb_Library_use_libraries,editeng,\
$(eval $(call gb_Library_use_external,editeng,icuuc))
+# Runtime dependency for unit-tests
+$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,editeng)) :| \
+ $(call gb_AllLangResTarget_get_target,editeng)
+
# vim: set noet sw=4 ts=4:
diff --git a/formula/Library_for.mk b/formula/Library_for.mk
index 90820c331122..ce93f1695e7a 100644
--- a/formula/Library_for.mk
+++ b/formula/Library_for.mk
@@ -65,4 +65,8 @@ $(eval $(call gb_Library_add_exception_objects,for,\
formula/source/core/resource/core_resource \
))
+# Runtime dependency for unit-tests
+$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,for)) :| \
+ $(call gb_AllLangResTarget_get_target,for)
+
# vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
index b517187eb621..5c87ddb46812 100644
--- a/framework/Library_fwe.mk
+++ b/framework/Library_fwe.mk
@@ -86,4 +86,8 @@ $(eval $(call gb_Library_add_exception_objects,fwe,\
framework/source/fwe/xml/xmlnamespaces \
))
+# Runtime dependency for unit-tests
+$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,fwe)) :| \
+ $(call gb_AllLangResTarget_get_target,fwe)
+
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk b/sc/CppunitTest_sc_annotationshapeobj.mk
index cbffc92939e7..d707bc8f33c9 100644
--- a/sc/CppunitTest_sc_annotationshapeobj.mk
+++ b/sc/CppunitTest_sc_annotationshapeobj.mk
@@ -124,9 +124,4 @@ $(eval $(call gb_CppunitTest_use_filter_configuration,sc_annonationshapeobj))
$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_annonationshapeobj))
-# we need to
-# - explicitly depend on the sc resource files needed at unit-test runtime
-$(call gb_CppunitTest_get_target,sc_annonationshapeobj) : \
- $(WORKDIR)/AllLangRes/sc \
-
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk
index 17e5f2766dfd..b6b71a0b4514 100644
--- a/sc/CppunitTest_sc_cellrangeobj.mk
+++ b/sc/CppunitTest_sc_cellrangeobj.mk
@@ -125,9 +125,4 @@ $(eval $(call gb_CppunitTest_use_filter_configuration,sc_cellrangesbase))
$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_cellrangesbase))
-# we need to
-# - explicitly depend on the sc resource files needed at unit-test runtime
-$(call gb_CppunitTest_get_target,sc_cellrangesbase) : \
- $(WORKDIR)/AllLangRes/sc \
-
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk
index f27fb2fc6cbd..7d67779ee0b4 100644
--- a/sc/CppunitTest_sc_chart_regression_test.mk
+++ b/sc/CppunitTest_sc_chart_regression_test.mk
@@ -132,9 +132,4 @@ $(eval $(call gb_CppunitTest_use_unittest_configuration,sc_chart_regression_test
$(eval $(call gb_CppunitTest_use_external,sc_chart_regression_test,libxml2))
-# we need to
-# - explicitly depend on the sc resource files needed at unit-test runtime
-$(call gb_CppunitTest_get_target,sc_chart_regression_test) : \
- $(WORKDIR)/AllLangRes/sc \
-
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk
index 606c205d1da7..6c3f4a0c013c 100644
--- a/sc/CppunitTest_sc_databaserangeobj.mk
+++ b/sc/CppunitTest_sc_databaserangeobj.mk
@@ -124,9 +124,4 @@ $(eval $(call gb_CppunitTest_use_filter_configuration,sc_databaserangeobj))
$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_databaserangeobj))
-# we need to
-# - explicitly depend on the sc resource files needed at unit-test runtime
-$(call gb_CppunitTest_get_target,sc_databaserangeobj) : \
- $(WORKDIR)/AllLangRes/sc \
-
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk
index 5031a8bd8e08..6a4b89ba6897 100644
--- a/sc/CppunitTest_sc_datapilotfieldobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldobj.mk
@@ -124,9 +124,4 @@ $(eval $(call gb_CppunitTest_use_filter_configuration,sc_datapilotfieldobj))
$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_datapilotfieldobj))
-# we need to
-# - explicitly depend on the sc resource files needed at unit-test runtime
-$(call gb_CppunitTest_get_target,sc_datapilotfieldobj) : \
- $(WORKDIR)/AllLangRes/sc \
-
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk
index 2f5b11ddd1e6..40e3f83df1eb 100644
--- a/sc/CppunitTest_sc_datapilottableobj.mk
+++ b/sc/CppunitTest_sc_datapilottableobj.mk
@@ -124,9 +124,4 @@ $(eval $(call gb_CppunitTest_use_filter_configuration,sc_datapilottableobj))
$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_datapilottableobj))
-# we need to
-# - explicitly depend on the sc resource files needed at unit-test runtime
-$(call gb_CppunitTest_get_target,sc_datapilottableobj) : \
- $(WORKDIR)/AllLangRes/sc \
-
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_editfieldobj_cell.mk b/sc/CppunitTest_sc_editfieldobj_cell.mk
index a3604a4e0fba..7b3e45b2696b 100644
--- a/sc/CppunitTest_sc_editfieldobj_cell.mk
+++ b/sc/CppunitTest_sc_editfieldobj_cell.mk
@@ -124,9 +124,4 @@ $(eval $(call gb_CppunitTest_use_filter_configuration,sc_editfieldobj_cell))
$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_editfieldobj_cell))
-# we need to
-# - explicitly depend on the sc resource files needed at unit-test runtime
-$(call gb_CppunitTest_get_target,sc_editfieldobj_cell) : \
- $(WORKDIR)/AllLangRes/sc \
-
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_editfieldobj_header.mk b/sc/CppunitTest_sc_editfieldobj_header.mk
index 85235b7b2d7d..56378223778c 100644
--- a/sc/CppunitTest_sc_editfieldobj_header.mk
+++ b/sc/CppunitTest_sc_editfieldobj_header.mk
@@ -124,9 +124,4 @@ $(eval $(call gb_CppunitTest_use_filter_configuration,sc_editfieldobj_header))
$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_editfieldobj_header))
-# we need to
-# - explicitly depend on the sc resource files needed at unit-test runtime
-$(call gb_CppunitTest_get_target,sc_editfieldobj_header) : \
- $(WORKDIR)/AllLangRes/sc \
-
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index 15469c1a816e..7883ef7daa68 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -122,9 +122,4 @@ $(eval $(call gb_CppunitTest_use_configuration,sc_filters_test))
$(eval $(call gb_CppunitTest_use_filter_configuration,sc_filters_test))
-# we need to
-# - explicitly depend on the sc resource files needed at unit-test runtime
-$(call gb_CppunitTest_get_target,sc_filters_test) : \
- $(WORKDIR)/AllLangRes/sc \
-
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index a19403f4bd92..839c9e39c38b 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -122,9 +122,4 @@ $(eval $(call gb_CppunitTest_use_filter_configuration,sc_macros_test))
$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_macros_test))
-# we need to
-# - explicitly depend on the sc resource files needed at unit-test runtime
-$(call gb_CppunitTest_get_target,sc_macros_test) : \
- $(WORKDIR)/AllLangRes/sc \
-
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk
index bb1f6914210c..666181118538 100644
--- a/sc/CppunitTest_sc_namedrangeobj.mk
+++ b/sc/CppunitTest_sc_namedrangeobj.mk
@@ -124,9 +124,4 @@ $(eval $(call gb_CppunitTest_use_filter_configuration,sc_namedrangeobj))
$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_namedrangeobj))
-# we need to
-# - explicitly depend on the sc resource files needed at unit-test runtime
-$(call gb_CppunitTest_get_target,sc_namedrangeobj) : \
- $(WORKDIR)/AllLangRes/sc \
-
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk
index 4cd080fb4488..99a215dbebff 100644
--- a/sc/CppunitTest_sc_namedrangesobj.mk
+++ b/sc/CppunitTest_sc_namedrangesobj.mk
@@ -124,9 +124,4 @@ $(eval $(call gb_CppunitTest_use_filter_configuration,sc_namedrangesobj))
$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_namedrangesobj))
-# we need to
-# - explicitly depend on the sc resource files needed at unit-test runtime
-$(call gb_CppunitTest_get_target,sc_namedrangesobj) : \
- $(WORKDIR)/AllLangRes/sc \
-
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk
index eb53f5c86079..c716924725c7 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -135,9 +135,4 @@ $(eval $(call gb_CppunitTest_use_configuration,sc_subsequent_filters_test))
$(eval $(call gb_CppunitTest_use_filter_configuration,sc_subsequent_filters_test))
-# we need to
-# - explicitly depend on the sc resource files needed at unit-test runtime
-$(call gb_CppunitTest_get_target,sc_subsequent_filters_test) : \
- $(WORKDIR)/AllLangRes/sc \
-
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk
index 8be35a47f1cf..ece36aae60c3 100644
--- a/sc/CppunitTest_sc_tableautoformatfield.mk
+++ b/sc/CppunitTest_sc_tableautoformatfield.mk
@@ -124,9 +124,4 @@ $(eval $(call gb_CppunitTest_use_filter_configuration,sc_tableautoformatfield))
$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_tableautoformatfield))
-# we need to
-# - explicitly depend on the sc resource files needed at unit-test runtime
-$(call gb_CppunitTest_get_target,sc_tableautoformatfield) : \
- $(WORKDIR)/AllLangRes/sc \
-
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk
index f2e7c52e66be..d904e745a830 100644
--- a/sc/CppunitTest_sc_tablesheetobj.mk
+++ b/sc/CppunitTest_sc_tablesheetobj.mk
@@ -125,7 +125,4 @@ $(eval $(call gb_CppunitTest_use_filter_configuration,sc_spreadsheetobj))
$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_spreadsheetobj))
-# we need to explicitly depend on the sc resource files needed at unit-test runtime
-$(call gb_CppunitTest_get_target,sc_spreadsheetobj) : $(WORKDIR)/AllLangRes/sc
-
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk
index 5ef9a01d6df2..1e097a02434f 100644
--- a/sc/CppunitTest_sc_tablesheetsobj.mk
+++ b/sc/CppunitTest_sc_tablesheetsobj.mk
@@ -124,7 +124,4 @@ $(eval $(call gb_CppunitTest_use_filter_configuration,sc_spreadsheetsobj))
$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_spreadsheetsobj))
-# we need to explicitly depend on the sc resource files needed at unit-test runtime
-$(call gb_CppunitTest_get_target,sc_spreadsheetsobj) : $(WORKDIR)/AllLangRes/sc
-
# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index 27962423cba8..64a0d55dd295 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -37,12 +37,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_ucalc, \
$(eval $(call gb_CppunitTest_use_library_objects,sc_ucalc,sc))
-$(call gb_CxxObject_get_target,sc/qa/unit/ucalc): \
- $(WORKDIR)/AllLangRes/for \
- $(WORKDIR)/AllLangRes/forui \
- $(WORKDIR)/AllLangRes/frm \
- $(WORKDIR)/AllLangRes/sc \
-
ifeq ($(ENABLE_TELEPATHY),TRUE)
$(eval $(call gb_CppunitTest_use_libraries,sc_ucalc,tubes))
endif
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 1a68be6800f7..77a9e42c4442 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -577,4 +577,8 @@ $(eval $(call gb_SdiTarget_set_include,sc/sdi/scslots,\
$$(INCLUDE) \
))
+# Runtime dependency for unit-tests
+$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,sc)) :| \
+ $(call gb_AllLangResTarget_get_target,sc)
+
# vim: set noet sw=4 ts=4:
diff --git a/scaddins/Library_analysis.mk b/scaddins/Library_analysis.mk
index fa5175d99ce7..7a4c361f3a20 100644
--- a/scaddins/Library_analysis.mk
+++ b/scaddins/Library_analysis.mk
@@ -51,4 +51,8 @@ $(eval $(call gb_Library_add_exception_objects,analysis,\
scaddins/source/analysis/financial \
))
+# Runtime dependency for unit-tests
+$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,analysis)) :| \
+ $(call gb_AllLangResTarget_get_target,analysis)
+
# vim: set noet sw=4 ts=4:
diff --git a/scaddins/Library_date.mk b/scaddins/Library_date.mk
index 77d5eb6ef31c..57820806fc97 100644
--- a/scaddins/Library_date.mk
+++ b/scaddins/Library_date.mk
@@ -48,4 +48,8 @@ $(eval $(call gb_Library_add_exception_objects,date,\
scaddins/source/datefunc/datefunc \
))
+# Runtime dependency for unit-tests
+$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,date)) :| \
+ $(call gb_AllLangResTarget_get_target,date)
+
# vim: set noet sw=4 ts=4:
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 50e55219790d..5bc8903b2196 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -301,4 +301,8 @@ $(eval $(call gb_Library_use_libraries,sfx,\
endif
+# Runtime dependency for unit-tests
+$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,sfx)) :| \
+ $(call gb_AllLangResTarget_get_target,sfx)
+
# vim: set noet sw=4 ts=4:
diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk
index b065032cf96c..959d3d66f297 100644
--- a/starmath/CppunitTest_starmath_qa_cppunit.mk
+++ b/starmath/CppunitTest_starmath_qa_cppunit.mk
@@ -41,8 +41,6 @@ $(eval $(call gb_CppunitTest_use_library_objects,starmath_qa_cppunit,\
sm \
))
-$(call gb_CxxObject_get_target,starmath/qa/cppunit/test_starmath): $(WORKDIR)/AllLangRes/sm
-
$(eval $(call gb_CppunitTest_use_libraries,starmath_qa_cppunit,\
comphelper \
cppu \
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index e3727c8afdc3..17c6c7a6dd9a 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -102,4 +102,8 @@ $(eval $(call gb_SdiTarget_set_include,starmath/sdi/smslots,\
$$(INCLUDE) \
))
+# Runtime dependency for unit-tests
+$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,sm)) :| \
+ $(call gb_AllLangResTarget_get_target,sm)
+
# vim: set noet sw=4 ts=4:
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index c265afb8eab0..080704c80bdc 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -275,4 +275,9 @@ $(eval $(call gb_Library_use_libraries,svt,\
uuid \
))
endif
+
+# Runtime dependency for unit-tests
+$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,svt)) :| \
+ $(call gb_AllLangResTarget_get_target,svt)
+
# vim: set noet sw=4 ts=4:
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 5ee330927854..89983fdd7966 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -463,4 +463,8 @@ $(eval $(call gb_SdiTarget_set_include,svx/sdi/svxslots,\
-I$(SRCDIR)/svx/sdi \
))
+# Runtime dependency for unit-tests
+$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,svxcore)) :| \
+ $(call gb_AllLangResTarget_get_target,svx)
+
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk
index 1b573abe3056..5a02e31872f9 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -39,8 +39,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_filters_test, \
sw/qa/core/filters-test \
))
-$(call gb_CxxObject_get_target,sw/qa/core/filters-test): $(WORKDIR)/AllLangRes/sw
-
$(eval $(call gb_CppunitTest_use_libraries,sw_filters_test, \
sw \
sfx \
diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk
index b3ab7d72f3f0..74bb52a7f834 100644
--- a/sw/CppunitTest_sw_swdoc_test.mk
+++ b/sw/CppunitTest_sw_swdoc_test.mk
@@ -103,10 +103,4 @@ $(eval $(call gb_CppunitTest_use_components,sw_swdoc_test,\
$(eval $(call gb_CppunitTest_use_configuration,sw_swdoc_test))
-# we need to explicitly depend on the sw resource files needed at unit-test
-# runtime
-$(call gb_CppunitTest_get_target,sw_swdoc_test) : \
- $(WORKDIR)/AllLangRes/sw \
- $(call gb_AllLangResTarget_get_target,sw) \
-
# vim: set noet sw=4 ts=4:
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 0e85e0e61b03..1d1801345a5e 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -747,4 +747,8 @@ $(eval $(call gb_SdiTarget_set_include,sw/sdi/swslots,\
$$(INCLUDE) \
))
+# Runtime dependency for unit-tests
+$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,sw)) :| \
+ $(call gb_AllLangResTarget_get_target,sw)
+
# vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 4ba8a00849a1..f8e7fa80e5e8 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -690,4 +690,8 @@ $(eval $(call gb_Library_use_static_libraries,vcl,\
))
endif
+# Runtime dependency for unit-tests
+$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,vcl)) :| \
+ $(call gb_AllLangResTarget_get_target,vcl)
+
# vim: set noet sw=4 ts=4: