[Libreoffice-commits] .: basic/Library_sb.mk chart2/Library_chartcontroller.mk dbaccess/CppunitTest_dbaccess_macros_test.mk editeng/Library_editeng.mk formula/Library_for.mk framework/Library_fwe.mk scaddins/Library_analysis.mk scaddins/Library_date.mk sc/CppunitTest_sc_annotationshapeobj.mk sc/CppunitTest_sc_cellrangeobj.mk sc/CppunitTest_sc_chart_regression_test.mk sc/CppunitTest_sc_databaserangeobj.mk sc/CppunitTest_sc_datapilotfieldobj.mk sc/CppunitTest_sc_datapilottableobj.mk sc/CppunitTest_sc_editfieldobj_cell.mk sc/CppunitTest_sc_editfieldobj_header.mk sc/CppunitTest_sc_filters_test.mk sc/CppunitTest_sc_macros_test.mk sc/CppunitTest_sc_namedrangeobj.mk sc/CppunitTest_sc_namedrangesobj.mk sc/CppunitTest_sc_subsequent_filters_test.mk sc/CppunitTest_sc_tableautoformatfield.mk sc/CppunitTest_sc_tablesheetobj.mk sc/CppunitTest_sc_tablesheetsobj.mk sc/CppunitTest_sc_ucalc.mk sc/Library_sc.mk sfx2/Library_sfx.mk starmath/CppunitTest_starmath_qa_cppunit.mk starmath/Library_sm.mk svtools/Li brary_svt.mk svx/Library_svxcore.mk sw/CppunitTest_sw_filters_test.mk sw/CppunitTest_sw_swdoc_test.mk sw/Library_sw.mk vcl/Library_vcl.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Aug 20 17:08:05 PDT 2012
basic/Library_sb.mk | 4 ++++
chart2/Library_chartcontroller.mk | 4 ++++
dbaccess/CppunitTest_dbaccess_macros_test.mk | 5 -----
editeng/Library_editeng.mk | 4 ++++
formula/Library_for.mk | 4 ++++
framework/Library_fwe.mk | 4 ++++
sc/CppunitTest_sc_annotationshapeobj.mk | 5 -----
sc/CppunitTest_sc_cellrangeobj.mk | 5 -----
sc/CppunitTest_sc_chart_regression_test.mk | 5 -----
sc/CppunitTest_sc_databaserangeobj.mk | 5 -----
sc/CppunitTest_sc_datapilotfieldobj.mk | 5 -----
sc/CppunitTest_sc_datapilottableobj.mk | 5 -----
sc/CppunitTest_sc_editfieldobj_cell.mk | 5 -----
sc/CppunitTest_sc_editfieldobj_header.mk | 5 -----
sc/CppunitTest_sc_filters_test.mk | 5 -----
sc/CppunitTest_sc_macros_test.mk | 5 -----
sc/CppunitTest_sc_namedrangeobj.mk | 5 -----
sc/CppunitTest_sc_namedrangesobj.mk | 5 -----
sc/CppunitTest_sc_subsequent_filters_test.mk | 5 -----
sc/CppunitTest_sc_tableautoformatfield.mk | 5 -----
sc/CppunitTest_sc_tablesheetobj.mk | 3 ---
sc/CppunitTest_sc_tablesheetsobj.mk | 3 ---
sc/CppunitTest_sc_ucalc.mk | 6 ------
sc/Library_sc.mk | 4 ++++
scaddins/Library_analysis.mk | 4 ++++
scaddins/Library_date.mk | 4 ++++
sfx2/Library_sfx.mk | 4 ++++
starmath/CppunitTest_starmath_qa_cppunit.mk | 2 --
starmath/Library_sm.mk | 4 ++++
svtools/Library_svt.mk | 5 +++++
svx/Library_svxcore.mk | 4 ++++
sw/CppunitTest_sw_filters_test.mk | 2 --
sw/CppunitTest_sw_swdoc_test.mk | 6 ------
sw/Library_sw.mk | 4 ++++
vcl/Library_vcl.mk | 4 ++++
35 files changed, 57 insertions(+), 97 deletions(-)
New commits:
commit 9e04ae0b7d86895420634e442a09feb366340393
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Mon Aug 20 22:59:40 2012 +0200
add more runtime deps on resource files for unit-tests
Change-Id: Id9bbb2bbcafe335eada3f36ae103a9074a56848f
diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index 90cbe71..fa0e820 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 bd18379..19220da 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 1b7c4b4..c35ebd5 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 81164b9..91f7e4a 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 90820c3..ce93f16 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 b517187..5c87ddb 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 cbffc92..d707bc8 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 17e5f27..b6b71a0 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 f27fb2f..7d67779 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 606c205..6c3f4a0 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 5031a8b..6a4b89b 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 2f5b11d..40e3f83 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 a3604a4..7b3e45b 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 85235b7..5637822 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 15469c1..7883ef7 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 a19403f..839c9e3 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 bb1f691..6661811 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 4cd080f..99a215d 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 eb53f5c..c716924 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 8be35a4..ece36aa 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 f2e7c52..d904e74 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 5ef9a01..1e097a0 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 2796242..64a0d55 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 1a68be6..77a9e42 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 fa5175d..7a4c361 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 77d5eb6..5782080 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 50e5521..5bc8903 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 b065032..959d3d6 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 e3727c8..17c6c7a 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 c265afb..080704c 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 5ee3309..89983fd 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 1b573ab..5a02e31 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 b3ab7d7..74bb52a 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 0e85e0e..1d18013 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 4ba8a00..f8e7fa8 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:
More information about the Libreoffice-commits
mailing list