summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2016-03-08 15:01:59 +0100
committerMichael Stahl <mstahl@redhat.com>2016-03-08 15:05:31 +0100
commit07d4c443e21cd22545d4516515c50b1c8dd39a9b (patch)
tree6d0665c1d296ae56e0f370621c9554e456bde8ef /sc
parent29cb1f192312d395067b5024e40aea3388f7674d (diff)
sc: remove unnecessary orcus external usage from makefiles
This caused incremental builds to fail after today's orcus upgrade. The cxx files of these tests don't actually include orcus headers, so the libraries were not re-linked in incremental builds. Change-Id: Ibfcf216a7848f3c0adfae4ef59c4b756c290d6b2
Diffstat (limited to 'sc')
-rw-r--r--sc/CppunitTest_sc_bugfix_test.mk2
-rw-r--r--sc/CppunitTest_sc_copypaste.mk2
-rw-r--r--sc/CppunitTest_sc_filters_test.mk2
-rw-r--r--sc/CppunitTest_sc_opencl_test.mk2
-rw-r--r--sc/CppunitTest_sc_rangelst_test.mk7
-rw-r--r--sc/CppunitTest_sc_subsequent_export_test.mk2
-rw-r--r--sc/CppunitTest_sc_subsequent_filters_test.mk2
7 files changed, 1 insertions, 18 deletions
diff --git a/sc/CppunitTest_sc_bugfix_test.mk b/sc/CppunitTest_sc_bugfix_test.mk
index 55311cde3643..712f44489c1e 100644
--- a/sc/CppunitTest_sc_bugfix_test.mk
+++ b/sc/CppunitTest_sc_bugfix_test.mk
@@ -16,8 +16,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_bugfix_test, \
$(eval $(call gb_CppunitTest_use_externals,sc_bugfix_test, \
boost_headers \
mdds_headers \
- orcus \
- orcus-parser \
libxml2 \
))
diff --git a/sc/CppunitTest_sc_copypaste.mk b/sc/CppunitTest_sc_copypaste.mk
index 7df4f51a9da9..641709c6cd69 100644
--- a/sc/CppunitTest_sc_copypaste.mk
+++ b/sc/CppunitTest_sc_copypaste.mk
@@ -16,8 +16,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_copypaste, \
$(eval $(call gb_CppunitTest_use_externals,sc_copypaste, \
boost_headers \
mdds_headers \
- orcus \
- orcus-parser \
libxml2 \
))
diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index 4fbf4892b075..db445f53cb05 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -22,8 +22,6 @@ endif
$(eval $(call gb_CppunitTest_use_externals,sc_filters_test, \
boost_headers \
mdds_headers \
- orcus \
- orcus-parser \
))
$(eval $(call gb_CppunitTest_use_libraries,sc_filters_test, \
diff --git a/sc/CppunitTest_sc_opencl_test.mk b/sc/CppunitTest_sc_opencl_test.mk
index 86605a21eb6c..ea93111e2e4e 100644
--- a/sc/CppunitTest_sc_opencl_test.mk
+++ b/sc/CppunitTest_sc_opencl_test.mk
@@ -16,8 +16,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_opencl_test, \
$(eval $(call gb_CppunitTest_use_externals,sc_opencl_test, \
boost_headers \
mdds_headers \
- orcus \
- orcus-parser \
))
$(eval $(call gb_CppunitTest_use_libraries,sc_opencl_test, \
diff --git a/sc/CppunitTest_sc_rangelst_test.mk b/sc/CppunitTest_sc_rangelst_test.mk
index 2bf6f0fd82eb..fa6f690e425c 100644
--- a/sc/CppunitTest_sc_rangelst_test.mk
+++ b/sc/CppunitTest_sc_rangelst_test.mk
@@ -16,18 +16,12 @@ $(eval $(call gb_CppunitTest_use_externals,sc_rangelst_test, \
icuuc \
libxml2 \
mdds_headers \
- orcus \
- orcus-parser \
))
$(eval $(call gb_CppunitTest_add_exception_objects,sc_rangelst_test, \
sc/qa/unit/rangelst_test \
))
-$(eval $(call gb_CppunitTest_use_library_objects,sc_rangelst_test, \
- scqahelper \
-))
-
$(eval $(call gb_CppunitTest_use_libraries,sc_rangelst_test, \
basegfx \
comphelper \
@@ -45,6 +39,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_rangelst_test, \
sax \
sb \
sc \
+ scqahelper \
sfx \
sot \
svl \
diff --git a/sc/CppunitTest_sc_subsequent_export_test.mk b/sc/CppunitTest_sc_subsequent_export_test.mk
index 1cfaf6914850..6c2c9e573388 100644
--- a/sc/CppunitTest_sc_subsequent_export_test.mk
+++ b/sc/CppunitTest_sc_subsequent_export_test.mk
@@ -16,8 +16,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_subsequent_export_test, \
$(eval $(call gb_CppunitTest_use_externals,sc_subsequent_export_test, \
boost_headers \
mdds_headers \
- orcus \
- orcus-parser \
libxml2 \
))
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk
index 08dedbb705ce..845206b38423 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -16,8 +16,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_subsequent_filters_test, \
$(eval $(call gb_CppunitTest_use_externals,sc_subsequent_filters_test, \
boost_headers \
mdds_headers \
- orcus \
- orcus-parser \
libxml2 \
))