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>

12 files changed, 12 insertions, 48 deletions

diff --git a/vcl/CppunitTest_vcl_bitmap_test.mk b/vcl/CppunitTest_vcl_bitmap_test.mk
index 110418126298..514a8463c1ea 100644
--- a/vcl/CppunitTest_vcl_bitmap_test.mk
+++ b/vcl/CppunitTest_vcl_bitmap_test.mk
@@ -42,10 +42,7 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_bitmap_test, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,vcl_bitmap_test,\
-    udkapi \
-    offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,vcl_bitmap_test))
 
 $(eval $(call gb_CppunitTest_use_ure,vcl_bitmap_test))
 $(eval $(call gb_CppunitTest_use_vcl,vcl_bitmap_test))
diff --git a/vcl/CppunitTest_vcl_blocklistparser_test.mk b/vcl/CppunitTest_vcl_blocklistparser_test.mk
index 95b75076b32b..8cc3adde8c9d 100644
--- a/vcl/CppunitTest_vcl_blocklistparser_test.mk
+++ b/vcl/CppunitTest_vcl_blocklistparser_test.mk
@@ -30,10 +30,7 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_blocklistparser_test, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,vcl_blocklistparser_test,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,vcl_blocklistparser_test))
 
 $(eval $(call gb_CppunitTest_use_ure,vcl_blocklistparser_test))
 $(eval $(call gb_CppunitTest_use_vcl,vcl_blocklistparser_test))
diff --git a/vcl/CppunitTest_vcl_complextext.mk b/vcl/CppunitTest_vcl_complextext.mk
index 60011a541a9e..0e5b5093a899 100644
--- a/vcl/CppunitTest_vcl_complextext.mk
+++ b/vcl/CppunitTest_vcl_complextext.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_complextext, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,vcl_complextext,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,vcl_complextext))
 
 $(eval $(call gb_CppunitTest_use_ure,vcl_complextext))
 $(eval $(call gb_CppunitTest_use_vcl,vcl_complextext))
diff --git a/vcl/CppunitTest_vcl_filters_test.mk b/vcl/CppunitTest_vcl_filters_test.mk
index 1f498ebe13b5..e1c30dfd5542 100644
--- a/vcl/CppunitTest_vcl_filters_test.mk
+++ b/vcl/CppunitTest_vcl_filters_test.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_filters_test, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,vcl_filters_test,\
-    udkapi \
-    offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,vcl_filters_test))
 
 $(eval $(call gb_CppunitTest_use_ure,vcl_filters_test))
 $(eval $(call gb_CppunitTest_use_vcl,vcl_filters_test))
diff --git a/vcl/CppunitTest_vcl_font.mk b/vcl/CppunitTest_vcl_font.mk
index 910f540cbd7e..55560bd7c85d 100644
--- a/vcl/CppunitTest_vcl_font.mk
+++ b/vcl/CppunitTest_vcl_font.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_font, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,vcl_font,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,vcl_font))
 
 $(eval $(call gb_CppunitTest_use_ure,vcl_font))
 $(eval $(call gb_CppunitTest_use_vcl,vcl_font))
diff --git a/vcl/CppunitTest_vcl_fontcharmap.mk b/vcl/CppunitTest_vcl_fontcharmap.mk
index 0a89f411a2e0..46cb1175bbfe 100644
--- a/vcl/CppunitTest_vcl_fontcharmap.mk
+++ b/vcl/CppunitTest_vcl_fontcharmap.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_fontcharmap, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,vcl_fontcharmap,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,vcl_fontcharmap))
 
 $(eval $(call gb_CppunitTest_use_ure,vcl_fontcharmap))
 $(eval $(call gb_CppunitTest_use_vcl,vcl_fontcharmap))
diff --git a/vcl/CppunitTest_vcl_fontmetric.mk b/vcl/CppunitTest_vcl_fontmetric.mk
index 5206db23d20b..138c9df10289 100644
--- a/vcl/CppunitTest_vcl_fontmetric.mk
+++ b/vcl/CppunitTest_vcl_fontmetric.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_fontmetric, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,vcl_fontmetric,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,vcl_fontmetric))
 
 $(eval $(call gb_CppunitTest_use_ure,vcl_fontmetric))
 $(eval $(call gb_CppunitTest_use_vcl,vcl_fontmetric))
diff --git a/vcl/CppunitTest_vcl_lifecycle.mk b/vcl/CppunitTest_vcl_lifecycle.mk
index 75b133eae394..cf874faea160 100644
--- a/vcl/CppunitTest_vcl_lifecycle.mk
+++ b/vcl/CppunitTest_vcl_lifecycle.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_lifecycle, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,vcl_lifecycle,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,vcl_lifecycle))
 
 $(eval $(call gb_CppunitTest_use_ure,vcl_lifecycle))
 $(eval $(call gb_CppunitTest_use_vcl,vcl_lifecycle))
diff --git a/vcl/CppunitTest_vcl_mapmode.mk b/vcl/CppunitTest_vcl_mapmode.mk
index daee48078e31..a11e0153a2a1 100644
--- a/vcl/CppunitTest_vcl_mapmode.mk
+++ b/vcl/CppunitTest_vcl_mapmode.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_mapmode, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,vcl_mapmode,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,vcl_mapmode))
 
 $(eval $(call gb_CppunitTest_use_ure,vcl_mapmode))
 $(eval $(call gb_CppunitTest_use_vcl,vcl_mapmode))
diff --git a/vcl/CppunitTest_vcl_outdev.mk b/vcl/CppunitTest_vcl_outdev.mk
index a5adcee81e26..b77c4dcbe671 100644
--- a/vcl/CppunitTest_vcl_outdev.mk
+++ b/vcl/CppunitTest_vcl_outdev.mk
@@ -33,10 +33,7 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_outdev, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,vcl_outdev,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,vcl_outdev))
 
 $(eval $(call gb_CppunitTest_use_ure,vcl_outdev))
 $(eval $(call gb_CppunitTest_use_vcl,vcl_outdev))
diff --git a/vcl/CppunitTest_vcl_timer.mk b/vcl/CppunitTest_vcl_timer.mk
index c1abf2f109e5..eef6eb90b17b 100644
--- a/vcl/CppunitTest_vcl_timer.mk
+++ b/vcl/CppunitTest_vcl_timer.mk
@@ -32,10 +32,7 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_timer, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,vcl_timer,\
-	udkapi \
-	offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,vcl_timer))
 
 $(eval $(call gb_CppunitTest_use_ure,vcl_timer))
 $(eval $(call gb_CppunitTest_use_vcl,vcl_timer))
diff --git a/vcl/CppunitTest_vcl_wmf_test.mk b/vcl/CppunitTest_vcl_wmf_test.mk
index 5fb4e72acea6..56136c83f3ec 100644
--- a/vcl/CppunitTest_vcl_wmf_test.mk
+++ b/vcl/CppunitTest_vcl_wmf_test.mk
@@ -38,10 +38,7 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_wmf_test, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,vcl_wmf_test,\
-    udkapi \
-    offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,vcl_wmf_test))
 
 $(eval $(call gb_CppunitTest_use_ure,vcl_wmf_test))
 $(eval $(call gb_CppunitTest_use_vcl,vcl_wmf_test))