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>

18 files changed, 18 insertions, 72 deletions

diff --git a/sw/CppunitTest_sw_docbookexport.mk b/sw/CppunitTest_sw_docbookexport.mk
index 9bed3e131169..f8e080a1de74 100644
--- a/sw/CppunitTest_sw_docbookexport.mk
+++ b/sw/CppunitTest_sw_docbookexport.mk
@@ -43,10 +43,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_docbookexport,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sw_docbookexport,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_docbookexport))
 
 $(eval $(call gb_CppunitTest_use_ure,sw_docbookexport))
 $(eval $(call gb_CppunitTest_use_vcl,sw_docbookexport))
diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk
index 80d9fce30b02..d3cf68be3ec1 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -45,10 +45,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_filters_test,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sw_filters_test,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_filters_test))
 
 $(eval $(call gb_CppunitTest_use_ure,sw_filters_test))
 $(eval $(call gb_CppunitTest_use_vcl,sw_filters_test))
diff --git a/sw/CppunitTest_sw_globalfilter.mk b/sw/CppunitTest_sw_globalfilter.mk
index 8c48b4961c25..cb12badd22e4 100644
--- a/sw/CppunitTest_sw_globalfilter.mk
+++ b/sw/CppunitTest_sw_globalfilter.mk
@@ -42,10 +42,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_globalfilter,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sw_globalfilter,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_globalfilter))
 
 $(eval $(call gb_CppunitTest_use_ure,sw_globalfilter))
 $(eval $(call gb_CppunitTest_use_vcl,sw_globalfilter))
diff --git a/sw/CppunitTest_sw_htmlexport.mk b/sw/CppunitTest_sw_htmlexport.mk
index 6d8b9fd01e0d..a0dc5c118f43 100644
--- a/sw/CppunitTest_sw_htmlexport.mk
+++ b/sw/CppunitTest_sw_htmlexport.mk
@@ -43,10 +43,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_htmlexport,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sw_htmlexport,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_htmlexport))
 
 $(eval $(call gb_CppunitTest_use_ure,sw_htmlexport))
 $(eval $(call gb_CppunitTest_use_vcl,sw_htmlexport))
diff --git a/sw/CppunitTest_sw_mailmerge.mk b/sw/CppunitTest_sw_mailmerge.mk
index d948b892c761..131fc81094a9 100644
--- a/sw/CppunitTest_sw_mailmerge.mk
+++ b/sw/CppunitTest_sw_mailmerge.mk
@@ -30,10 +30,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_mailmerge, \
     libxml2 \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sw_mailmerge,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_mailmerge))
 
 $(eval $(call gb_CppunitTest_use_components,sw_mailmerge, \
     basic/util/sb \
diff --git a/sw/CppunitTest_sw_odfexport.mk b/sw/CppunitTest_sw_odfexport.mk
index 3757e015ec19..3dae6ac59fa8 100644
--- a/sw/CppunitTest_sw_odfexport.mk
+++ b/sw/CppunitTest_sw_odfexport.mk
@@ -41,10 +41,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_odfexport,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sw_odfexport,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_odfexport))
 
 $(eval $(call gb_CppunitTest_use_ure,sw_odfexport))
 $(eval $(call gb_CppunitTest_use_vcl,sw_odfexport))
diff --git a/sw/CppunitTest_sw_odfimport.mk b/sw/CppunitTest_sw_odfimport.mk
index eaa3542993d4..4c249d5d6168 100644
--- a/sw/CppunitTest_sw_odfimport.mk
+++ b/sw/CppunitTest_sw_odfimport.mk
@@ -43,10 +43,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_odfimport,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sw_odfimport,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_odfimport))
 
 $(eval $(call gb_CppunitTest_use_ure,sw_odfimport))
 $(eval $(call gb_CppunitTest_use_vcl,sw_odfimport))
diff --git a/sw/CppunitTest_sw_ooxmlfieldexport.mk b/sw/CppunitTest_sw_ooxmlfieldexport.mk
index ae67c2087438..abd0653f6449 100644
--- a/sw/CppunitTest_sw_ooxmlfieldexport.mk
+++ b/sw/CppunitTest_sw_ooxmlfieldexport.mk
@@ -33,10 +33,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_ooxmlfieldexport,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sw_ooxmlfieldexport,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_ooxmlfieldexport))
 
 $(eval $(call gb_CppunitTest_use_ure,sw_ooxmlfieldexport))
 $(eval $(call gb_CppunitTest_use_vcl,sw_ooxmlfieldexport))
diff --git a/sw/CppunitTest_sw_ooxmlimport.mk b/sw/CppunitTest_sw_ooxmlimport.mk
index dbcead9598c3..05da70bfacff 100644
--- a/sw/CppunitTest_sw_ooxmlimport.mk
+++ b/sw/CppunitTest_sw_ooxmlimport.mk
@@ -55,10 +55,7 @@ $(eval $(call gb_CppunitTest_use_system_darwin_frameworks,sw_ooxmlimport,\
 
 endif
 
-$(eval $(call gb_CppunitTest_use_api,sw_ooxmlimport,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_ooxmlimport))
 
 $(eval $(call gb_CppunitTest_use_ure,sw_ooxmlimport))
 $(eval $(call gb_CppunitTest_use_vcl,sw_ooxmlimport))
diff --git a/sw/CppunitTest_sw_ooxmlw14export.mk b/sw/CppunitTest_sw_ooxmlw14export.mk
index 5958019b8820..d54d3c12ca17 100644
--- a/sw/CppunitTest_sw_ooxmlw14export.mk
+++ b/sw/CppunitTest_sw_ooxmlw14export.mk
@@ -33,10 +33,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_ooxmlw14export,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sw_ooxmlw14export,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_ooxmlw14export))
 
 $(eval $(call gb_CppunitTest_use_ure,sw_ooxmlw14export))
 $(eval $(call gb_CppunitTest_use_vcl,sw_ooxmlw14export))
diff --git a/sw/CppunitTest_sw_rtfexport.mk b/sw/CppunitTest_sw_rtfexport.mk
index b47c9068a705..9e05e6fa3bfa 100644
--- a/sw/CppunitTest_sw_rtfexport.mk
+++ b/sw/CppunitTest_sw_rtfexport.mk
@@ -40,10 +40,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_rtfexport,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sw_rtfexport,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_rtfexport))
 
 $(eval $(call gb_CppunitTest_use_ure,sw_rtfexport))
 $(eval $(call gb_CppunitTest_use_vcl,sw_rtfexport))
diff --git a/sw/CppunitTest_sw_rtfimport.mk b/sw/CppunitTest_sw_rtfimport.mk
index 3eafcea38e58..537a211d93ad 100644
--- a/sw/CppunitTest_sw_rtfimport.mk
+++ b/sw/CppunitTest_sw_rtfimport.mk
@@ -42,10 +42,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_rtfimport,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sw_rtfimport,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_rtfimport))
 
 $(eval $(call gb_CppunitTest_use_ure,sw_rtfimport))
 $(eval $(call gb_CppunitTest_use_vcl,sw_rtfimport))
diff --git a/sw/CppunitTest_sw_tiledrendering.mk b/sw/CppunitTest_sw_tiledrendering.mk
index be7986b6e509..250609721e5c 100644
--- a/sw/CppunitTest_sw_tiledrendering.mk
+++ b/sw/CppunitTest_sw_tiledrendering.mk
@@ -47,10 +47,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_tiledrendering,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sw_tiledrendering,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_tiledrendering))
 
 $(eval $(call gb_CppunitTest_use_ure,sw_tiledrendering))
 $(eval $(call gb_CppunitTest_use_vcl,sw_tiledrendering))
diff --git a/sw/CppunitTest_sw_uiwriter.mk b/sw/CppunitTest_sw_uiwriter.mk
index a0b7a5844d3b..e048fae7e2c9 100644
--- a/sw/CppunitTest_sw_uiwriter.mk
+++ b/sw/CppunitTest_sw_uiwriter.mk
@@ -50,10 +50,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_uiwriter,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sw_uiwriter,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_uiwriter))
 
 $(eval $(call gb_CppunitTest_use_ure,sw_uiwriter))
 $(eval $(call gb_CppunitTest_use_vcl,sw_uiwriter))
diff --git a/sw/CppunitTest_sw_uwriter.mk b/sw/CppunitTest_sw_uwriter.mk
index f690515bef08..465aac53c3d4 100644
--- a/sw/CppunitTest_sw_uwriter.mk
+++ b/sw/CppunitTest_sw_uwriter.mk
@@ -70,10 +70,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_uwriter,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sw_uwriter,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_uwriter))
 
 $(eval $(call gb_CppunitTest_use_ure,sw_uwriter))
 $(eval $(call gb_CppunitTest_use_vcl,sw_uwriter))
diff --git a/sw/CppunitTest_sw_ww8export.mk b/sw/CppunitTest_sw_ww8export.mk
index fc1ef6b7ee7e..fa0f33e9b2a7 100644
--- a/sw/CppunitTest_sw_ww8export.mk
+++ b/sw/CppunitTest_sw_ww8export.mk
@@ -44,10 +44,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_ww8export,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sw_ww8export,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_ww8export))
 
 $(eval $(call gb_CppunitTest_use_ure,sw_ww8export))
 $(eval $(call gb_CppunitTest_use_vcl,sw_ww8export))
diff --git a/sw/CppunitTest_sw_ww8import.mk b/sw/CppunitTest_sw_ww8import.mk
index ed28ae9d641c..21d9a74aa930 100644
--- a/sw/CppunitTest_sw_ww8import.mk
+++ b/sw/CppunitTest_sw_ww8import.mk
@@ -39,10 +39,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_ww8import,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sw_ww8import,\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_ww8import))
 
 $(eval $(call gb_CppunitTest_use_ure,sw_ww8import))
 $(eval $(call gb_CppunitTest_use_vcl,sw_ww8import))
diff --git a/sw/ooxmlexport_setup.mk b/sw/ooxmlexport_setup.mk
index 84a9d0dc3588..da06f1a37bf0 100644
--- a/sw/ooxmlexport_setup.mk
+++ b/sw/ooxmlexport_setup.mk
@@ -101,10 +101,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_ooxmlexport$(1),\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sw_ooxmlexport$(1),\
-    offapi \
-    udkapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_ooxmlexport$(1),))
 
 $(eval $(call gb_CppunitTest_use_ure,sw_ooxmlexport$(1)))
 $(eval $(call gb_CppunitTest_use_vcl,sw_ooxmlexport$(1)))