tdf#94698 cleanup Makefiles. Get rid of udkapi and offapi

This patch changes occurences in makefiles
from
$(eval $(call gb_CppunitTest_use_api,comphelper_test_config, \
	udkapi \
	offapi \
))

to
$(eval $(call gb_CppunitTest_use_sdk_api,comphelper_test_config))

(corrected instead of abandon, jani)

Change-Id: Ic96ec65d82d7452e288f05a8b6d576ef543b068e
Reviewed-on: https://gerrit.libreoffice.org/23426
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: jan iversen <jani@documentfoundation.org>
Tested-by: jan iversen <jani@documentfoundation.org>

8 files changed, 8 insertions, 32 deletions

diff --git a/sd/CppunitTest_sd_export_tests.mk b/sd/CppunitTest_sd_export_tests.mk
index 5e5bafd99055..dc0573eb07d0 100644
--- a/sd/CppunitTest_sd_export_tests.mk
+++ b/sd/CppunitTest_sd_export_tests.mk
@@ -60,10 +60,7 @@ $(eval $(call gb_CppunitTest_set_include,sd_export_tests,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sd_export_tests,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sd_export_tests))
 
 $(eval $(call gb_CppunitTest_use_ure,sd_export_tests))
 $(eval $(call gb_CppunitTest_use_vcl,sd_export_tests))
diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk
index 083108032cbb..0387424e8a58 100644
--- a/sd/CppunitTest_sd_filters_test.mk
+++ b/sd/CppunitTest_sd_filters_test.mk
@@ -61,10 +61,7 @@ $(eval $(call gb_CppunitTest_set_include,sd_filters_test,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sd_filters_test,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sd_filters_test))
 
 $(eval $(call gb_CppunitTest_use_ure,sd_filters_test))
 $(eval $(call gb_CppunitTest_use_vcl,sd_filters_test))
diff --git a/sd/CppunitTest_sd_html_export_tests.mk b/sd/CppunitTest_sd_html_export_tests.mk
index 02908d8c7ac7..c527a6cabd90 100644
--- a/sd/CppunitTest_sd_html_export_tests.mk
+++ b/sd/CppunitTest_sd_html_export_tests.mk
@@ -59,10 +59,7 @@ $(eval $(call gb_CppunitTest_set_include,sd_html_export_tests,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sd_html_export_tests,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sd_html_export_tests))
 
 $(eval $(call gb_CppunitTest_use_ure,sd_html_export_tests))
 $(eval $(call gb_CppunitTest_use_vcl,sd_html_export_tests))
diff --git a/sd/CppunitTest_sd_import_tests.mk b/sd/CppunitTest_sd_import_tests.mk
index 33a7ad28d463..a2a295651132 100644
--- a/sd/CppunitTest_sd_import_tests.mk
+++ b/sd/CppunitTest_sd_import_tests.mk
@@ -57,10 +57,7 @@ $(eval $(call gb_CppunitTest_set_include,sd_import_tests,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sd_import_tests,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sd_import_tests))
 
 $(eval $(call gb_CppunitTest_use_ure,sd_import_tests))
 $(eval $(call gb_CppunitTest_use_vcl,sd_import_tests))
diff --git a/sd/CppunitTest_sd_misc_tests.mk b/sd/CppunitTest_sd_misc_tests.mk
index f95801ca7550..8c9cfa631c3c 100644
--- a/sd/CppunitTest_sd_misc_tests.mk
+++ b/sd/CppunitTest_sd_misc_tests.mk
@@ -62,10 +62,7 @@ $(eval $(call gb_CppunitTest_set_include,sd_misc_tests,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sd_misc_tests,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sd_misc_tests))
 
 $(eval $(call gb_CppunitTest_use_externals,sd_misc_tests,\
     boost_headers \
diff --git a/sd/CppunitTest_sd_svg_export_tests.mk b/sd/CppunitTest_sd_svg_export_tests.mk
index 36f64ea6f8a1..0221ab0e07b6 100644
--- a/sd/CppunitTest_sd_svg_export_tests.mk
+++ b/sd/CppunitTest_sd_svg_export_tests.mk
@@ -59,10 +59,7 @@ $(eval $(call gb_CppunitTest_set_include,sd_svg_export_tests,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sd_svg_export_tests,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sd_svg_export_tests))
 
 $(eval $(call gb_CppunitTest_use_ure,sd_svg_export_tests))
 $(eval $(call gb_CppunitTest_use_vcl,sd_svg_export_tests))
diff --git a/sd/CppunitTest_sd_tiledrendering.mk b/sd/CppunitTest_sd_tiledrendering.mk
index 2a3f29ce5957..60790c4fa19a 100644
--- a/sd/CppunitTest_sd_tiledrendering.mk
+++ b/sd/CppunitTest_sd_tiledrendering.mk
@@ -46,10 +46,7 @@ $(eval $(call gb_CppunitTest_set_include,sd_tiledrendering,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sd_tiledrendering,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sd_tiledrendering))
 
 $(eval $(call gb_CppunitTest_use_ure,sd_tiledrendering))
 $(eval $(call gb_CppunitTest_use_vcl,sd_tiledrendering))
diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk
index 78e9f908a7cf..b17e71c81e43 100644
--- a/sd/CppunitTest_sd_uimpress.mk
+++ b/sd/CppunitTest_sd_uimpress.mk
@@ -14,10 +14,7 @@ $(eval $(call gb_CppunitTest_set_include,sd_uimpress,\
     -I$(SRCDIR)/sd/inc \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sd_uimpress,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sd_uimpress))
 
 $(eval $(call gb_CppunitTest_use_library_objects,sd_uimpress,sd))