postprocess/Rdb_services.mk | 2 +-
sc/CppunitTest_sc_bugfix_test.mk | 6 ------
sc/CppunitTest_sc_chart2dataprovider.mk | 6 ------
sc/CppunitTest_sc_copypaste.mk | 6 ------
sc/CppunitTest_sc_pivottable_filters_test.mk | 6 ------
sc/CppunitTest_sc_subsequent_export_test.mk | 6 ------
sc/CppunitTest_sc_subsequent_filters_test.mk | 6 ------
sw/CppunitTest_sw_macros_test.mk | 2 +-
8 files changed, 2 insertions(+), 38 deletions(-)
New commits:
commit c5bc0e202a03b573b9be94b65209cd9927d48fcc
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Fri Apr 27 12:31:53 2018 +0200
Remove remaining references to xsec_xmlsec.windows
Change-Id: I08f1d0c105f4cb17dcf0c5949326e35f9fa7622c
Reviewed-on: https://gerrit.libreoffice.org/53560
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 5fcd89c7d1c4..ff52ae00cdf5 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -112,7 +112,7 @@ $(eval $(call gb_Rdb_add_components,services,\
xmlscript/util/xmlscript \
$(if $(ENABLE_NSS), \
xmlsecurity/util/xmlsecurity \
- xmlsecurity/util/xsec_xmlsec$(if $(filter WNT,$(OS)),.windows))
\
+ xmlsecurity/util/xsec_xmlsec) \
$(if $(ENABLE_COINMP), \
sccomp/source/solver/coinmpsolver \
) \
diff --git a/sc/CppunitTest_sc_bugfix_test.mk b/sc/CppunitTest_sc_bugfix_test.mk
index aeac28ee5bff..69c4278994c4 100644
--- a/sc/CppunitTest_sc_bugfix_test.mk
+++ b/sc/CppunitTest_sc_bugfix_test.mk
@@ -108,15 +108,9 @@ $(eval $(call
gb_CppunitTest_use_components,sc_bugfix_test,\
xmlsecurity/util/xmlsecurity \
))
-ifeq ($(OS),WNT)
-$(eval $(call gb_CppunitTest_use_components,sc_bugfix_test,\
- xmlsecurity/util/xsec_xmlsec.windows \
-))
-else
$(eval $(call gb_CppunitTest_use_components,sc_bugfix_test,\
xmlsecurity/util/xsec_xmlsec \
))
-endif
$(eval $(call gb_CppunitTest_use_configuration,sc_bugfix_test))
diff --git a/sc/CppunitTest_sc_chart2dataprovider.mk
b/sc/CppunitTest_sc_chart2dataprovider.mk
index d802a17c2024..3747da585444 100644
--- a/sc/CppunitTest_sc_chart2dataprovider.mk
+++ b/sc/CppunitTest_sc_chart2dataprovider.mk
@@ -108,15 +108,9 @@ $(eval $(call
gb_CppunitTest_use_components,sc_chart2dataprovider,\
xmlsecurity/util/xmlsecurity \
))
-ifeq ($(OS),WNT)
-$(eval $(call gb_CppunitTest_use_components,sc_chart2dataprovider,\
- xmlsecurity/util/xsec_xmlsec.windows \
-))
-else
$(eval $(call gb_CppunitTest_use_components,sc_chart2dataprovider,\
xmlsecurity/util/xsec_xmlsec \
))
-endif
$(eval $(call gb_CppunitTest_use_configuration,sc_chart2dataprovider))
diff --git a/sc/CppunitTest_sc_copypaste.mk b/sc/CppunitTest_sc_copypaste.mk
index b9a5eb66e027..18728202e69b 100644
--- a/sc/CppunitTest_sc_copypaste.mk
+++ b/sc/CppunitTest_sc_copypaste.mk
@@ -107,15 +107,9 @@ $(eval $(call gb_CppunitTest_use_components,sc_copypaste,\
xmlsecurity/util/xmlsecurity \
))
-ifeq ($(OS),WNT)
-$(eval $(call gb_CppunitTest_use_components,sc_copypaste,\
- xmlsecurity/util/xsec_xmlsec.windows \
-))
-else
$(eval $(call gb_CppunitTest_use_components,sc_copypaste,\
xmlsecurity/util/xsec_xmlsec \
))
-endif
$(eval $(call gb_CppunitTest_use_configuration,sc_copypaste))
diff --git a/sc/CppunitTest_sc_pivottable_filters_test.mk
b/sc/CppunitTest_sc_pivottable_filters_test.mk
index 02c00e9beda7..8cfc91cd88b4 100644
--- a/sc/CppunitTest_sc_pivottable_filters_test.mk
+++ b/sc/CppunitTest_sc_pivottable_filters_test.mk
@@ -102,15 +102,9 @@ $(eval $(call
gb_CppunitTest_use_components,sc_pivottable_filters_test,\
xmlsecurity/util/xmlsecurity \
))
-ifeq ($(OS),WNT)
-$(eval $(call gb_CppunitTest_use_components,sc_pivottable_filters_test,\
- xmlsecurity/util/xsec_xmlsec.windows \
-))
-else
$(eval $(call gb_CppunitTest_use_components,sc_pivottable_filters_test,\
xmlsecurity/util/xsec_xmlsec \
))
-endif
$(eval $(call gb_CppunitTest_use_custom_headers,sc_pivottable_filters_test,\
officecfg/registry \
diff --git a/sc/CppunitTest_sc_subsequent_export_test.mk
b/sc/CppunitTest_sc_subsequent_export_test.mk
index 24d74d210fbb..f5e21badf586 100644
--- a/sc/CppunitTest_sc_subsequent_export_test.mk
+++ b/sc/CppunitTest_sc_subsequent_export_test.mk
@@ -104,15 +104,9 @@ $(eval $(call
gb_CppunitTest_use_components,sc_subsequent_export_test,\
xmlsecurity/util/xmlsecurity \
))
-ifeq ($(OS),WNT)
-$(eval $(call gb_CppunitTest_use_components,sc_subsequent_export_test,\
- xmlsecurity/util/xsec_xmlsec.windows \
-))
-else
$(eval $(call gb_CppunitTest_use_components,sc_subsequent_export_test,\
xmlsecurity/util/xsec_xmlsec \
))
-endif
$(eval $(call gb_CppunitTest_use_custom_headers,sc_subsequent_export_test,\
officecfg/registry \
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk
b/sc/CppunitTest_sc_subsequent_filters_test.mk
index b2454400a594..d8d0600e11c8 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -109,15 +109,9 @@ $(eval $(call
gb_CppunitTest_use_components,sc_subsequent_filters_test,\
xmlsecurity/util/xmlsecurity \
))
-ifeq ($(OS),WNT)
-$(eval $(call gb_CppunitTest_use_components,sc_subsequent_filters_test,\
- xmlsecurity/util/xsec_xmlsec.windows \
-))
-else
$(eval $(call gb_CppunitTest_use_components,sc_subsequent_filters_test,\
xmlsecurity/util/xsec_xmlsec \
))
-endif
$(eval $(call gb_CppunitTest_use_externals,sc_subsequent_filters_test,\
orcus \
diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk
index 49718251c6b5..ee45b6a14139 100644
--- a/sw/CppunitTest_sw_macros_test.mk
+++ b/sw/CppunitTest_sw_macros_test.mk
@@ -103,7 +103,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_macros_test,\
uui/util/uui \
vcl/vcl.common \
xmloff/util/xo \
- xmlsecurity/util/$(if $(filter
WNT,$(OS)),xsec_xmlsec.windows,xsec_xmlsec) \
+ xmlsecurity/util/xsec_xmlsec \
))
$(eval $(call gb_CppunitTest_use_configuration,sw_macros_test))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
