diff options
Diffstat (limited to 'sc')
-rw-r--r-- | sc/CppunitTest_sc_annotationshapeobj.mk | 5 | ||||
-rw-r--r-- | sc/CppunitTest_sc_cellrangeobj.mk | 5 | ||||
-rw-r--r-- | sc/CppunitTest_sc_chart_regression_test.mk | 5 | ||||
-rw-r--r-- | sc/CppunitTest_sc_databaserangeobj.mk | 5 | ||||
-rw-r--r-- | sc/CppunitTest_sc_datapilotfieldobj.mk | 5 | ||||
-rw-r--r-- | sc/CppunitTest_sc_datapilottableobj.mk | 5 | ||||
-rw-r--r-- | sc/CppunitTest_sc_editfieldobj_cell.mk | 5 | ||||
-rw-r--r-- | sc/CppunitTest_sc_editfieldobj_header.mk | 5 | ||||
-rw-r--r-- | sc/CppunitTest_sc_filters_test.mk | 5 | ||||
-rw-r--r-- | sc/CppunitTest_sc_macros_test.mk | 5 | ||||
-rw-r--r-- | sc/CppunitTest_sc_namedrangeobj.mk | 5 | ||||
-rw-r--r-- | sc/CppunitTest_sc_namedrangesobj.mk | 5 | ||||
-rw-r--r-- | sc/CppunitTest_sc_subsequent_filters_test.mk | 5 | ||||
-rw-r--r-- | sc/CppunitTest_sc_tableautoformatfield.mk | 5 | ||||
-rw-r--r-- | sc/CppunitTest_sc_tablesheetobj.mk | 3 | ||||
-rw-r--r-- | sc/CppunitTest_sc_tablesheetsobj.mk | 3 | ||||
-rw-r--r-- | sc/CppunitTest_sc_ucalc.mk | 6 | ||||
-rw-r--r-- | sc/Library_sc.mk | 4 |
18 files changed, 4 insertions, 82 deletions
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: |