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>

11 files changed, 11 insertions, 44 deletions

diff --git a/filter/CppunitTest_filter_dxf_test.mk b/filter/CppunitTest_filter_dxf_test.mk
index e8afc39bf266..362c89b6af75 100644
--- a/filter/CppunitTest_filter_dxf_test.mk
+++ b/filter/CppunitTest_filter_dxf_test.mk
@@ -25,10 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_dxf_test, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,filter_dxf_test,\
-    udkapi \
-    offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_dxf_test))
 
 $(eval $(call gb_CppunitTest_use_ure,filter_dxf_test))
 $(eval $(call gb_CppunitTest_use_vcl,filter_dxf_test))
diff --git a/filter/CppunitTest_filter_eps_test.mk b/filter/CppunitTest_filter_eps_test.mk
index 300f9a707838..d49f10e05aeb 100644
--- a/filter/CppunitTest_filter_eps_test.mk
+++ b/filter/CppunitTest_filter_eps_test.mk
@@ -25,10 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_eps_test, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,filter_eps_test,\
-    udkapi \
-    offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_eps_test))
 
 $(eval $(call gb_CppunitTest_use_ure,filter_eps_test))
 $(eval $(call gb_CppunitTest_use_vcl,filter_eps_test))
diff --git a/filter/CppunitTest_filter_met_test.mk b/filter/CppunitTest_filter_met_test.mk
index 64bbeb63782e..4a0027fdde36 100644
--- a/filter/CppunitTest_filter_met_test.mk
+++ b/filter/CppunitTest_filter_met_test.mk
@@ -25,10 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_met_test, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,filter_met_test,\
-    udkapi \
-    offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_met_test))
 
 $(eval $(call gb_CppunitTest_use_ure,filter_met_test))
 $(eval $(call gb_CppunitTest_use_vcl,filter_met_test))
diff --git a/filter/CppunitTest_filter_pcd_test.mk b/filter/CppunitTest_filter_pcd_test.mk
index 2603d4800bbd..4d6406956aba 100644
--- a/filter/CppunitTest_filter_pcd_test.mk
+++ b/filter/CppunitTest_filter_pcd_test.mk
@@ -25,10 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_pcd_test, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,filter_pcd_test,\
-    udkapi \
-    offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_pcd_test))
 
 $(eval $(call gb_CppunitTest_use_ure,filter_pcd_test))
 $(eval $(call gb_CppunitTest_use_vcl,filter_pcd_test))
diff --git a/filter/CppunitTest_filter_pcx_test.mk b/filter/CppunitTest_filter_pcx_test.mk
index b44062aa0785..4a31c51f2d8c 100644
--- a/filter/CppunitTest_filter_pcx_test.mk
+++ b/filter/CppunitTest_filter_pcx_test.mk
@@ -25,10 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_pcx_test, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,filter_pcx_test,\
-    udkapi \
-    offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_pcx_test))
 
 $(eval $(call gb_CppunitTest_use_ure,filter_pcx_test))
 $(eval $(call gb_CppunitTest_use_vcl,filter_pcx_test))
diff --git a/filter/CppunitTest_filter_pict_test.mk b/filter/CppunitTest_filter_pict_test.mk
index fde0f54d8e82..7da6023b3850 100644
--- a/filter/CppunitTest_filter_pict_test.mk
+++ b/filter/CppunitTest_filter_pict_test.mk
@@ -35,10 +35,7 @@ $(eval $(call gb_CppunitTest_use_library_objects,filter_pict_test, \
     gie \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,filter_pict_test,\
-    udkapi \
-    offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_pict_test))
 
 $(eval $(call gb_CppunitTest_use_ure,filter_pict_test))
 $(eval $(call gb_CppunitTest_use_vcl,filter_pict_test))
diff --git a/filter/CppunitTest_filter_ppm_test.mk b/filter/CppunitTest_filter_ppm_test.mk
index e7879cad1cc9..5ccbde7df3de 100644
--- a/filter/CppunitTest_filter_ppm_test.mk
+++ b/filter/CppunitTest_filter_ppm_test.mk
@@ -25,10 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_ppm_test, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,filter_ppm_test,\
-    udkapi \
-    offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_ppm_test))
 
 $(eval $(call gb_CppunitTest_use_ure,filter_ppm_test))
 $(eval $(call gb_CppunitTest_use_vcl,filter_ppm_test))
diff --git a/filter/CppunitTest_filter_psd_test.mk b/filter/CppunitTest_filter_psd_test.mk
index 2e4b03897f8f..503d1006e4e7 100644
--- a/filter/CppunitTest_filter_psd_test.mk
+++ b/filter/CppunitTest_filter_psd_test.mk
@@ -25,10 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_psd_test, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,filter_psd_test,\
-    udkapi \
-    offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_psd_test))
 
 $(eval $(call gb_CppunitTest_use_ure,filter_psd_test))
 $(eval $(call gb_CppunitTest_use_vcl,filter_psd_test))
diff --git a/filter/CppunitTest_filter_ras_test.mk b/filter/CppunitTest_filter_ras_test.mk
index f6e5810b7f39..9265db9857ec 100644
--- a/filter/CppunitTest_filter_ras_test.mk
+++ b/filter/CppunitTest_filter_ras_test.mk
@@ -25,10 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_ras_test, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,filter_ras_test,\
-    udkapi \
-    offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_ras_test))
 
 $(eval $(call gb_CppunitTest_use_ure,filter_ras_test))
 $(eval $(call gb_CppunitTest_use_vcl,filter_ras_test))
diff --git a/filter/CppunitTest_filter_tga_test.mk b/filter/CppunitTest_filter_tga_test.mk
index 51f17d3a6124..d62addca5bdd 100644
--- a/filter/CppunitTest_filter_tga_test.mk
+++ b/filter/CppunitTest_filter_tga_test.mk
@@ -25,10 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_tga_test, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,filter_tga_test,\
-    udkapi \
-    offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_tga_test))
 
 $(eval $(call gb_CppunitTest_use_ure,filter_tga_test))
 $(eval $(call gb_CppunitTest_use_vcl,filter_tga_test))
diff --git a/filter/CppunitTest_filter_tiff_test.mk b/filter/CppunitTest_filter_tiff_test.mk
index 2aa9b806d499..d3dfdae4a7a5 100644
--- a/filter/CppunitTest_filter_tiff_test.mk
+++ b/filter/CppunitTest_filter_tiff_test.mk
@@ -25,10 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_tiff_test, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,filter_tiff_test,\
-    udkapi \
-    offapi \
-))
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_tiff_test))
 
 $(eval $(call gb_CppunitTest_use_ure,filter_tiff_test))
 $(eval $(call gb_CppunitTest_use_vcl,filter_tiff_test))