From a97b392879c96145701b2454b26dc0c4f6aa4bb2 Mon Sep 17 00:00:00 2001 From: Gleb Mishchenko Date: Tue, 22 Mar 2016 10:43:56 +0300 Subject: 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 Reviewed-by: jan iversen Tested-by: jan iversen --- i18npool/CppunitTest_i18npool_test_breakiterator.mk | 5 +---- i18npool/CppunitTest_i18npool_test_characterclassification.mk | 5 +---- i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk | 5 +---- i18npool/CppunitTest_i18npool_test_textsearch.mk | 5 +---- 4 files changed, 4 insertions(+), 16 deletions(-) (limited to 'i18npool') diff --git a/i18npool/CppunitTest_i18npool_test_breakiterator.mk b/i18npool/CppunitTest_i18npool_test_breakiterator.mk index f264bc3e1744..3c91d25e6dab 100644 --- a/i18npool/CppunitTest_i18npool_test_breakiterator.mk +++ b/i18npool/CppunitTest_i18npool_test_breakiterator.mk @@ -11,10 +11,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,i18npool_test_breakiterator)) $(eval $(call gb_CppunitTest_use_external,i18npool_test_breakiterator,icu_headers)) -$(eval $(call gb_CppunitTest_use_api,i18npool_test_breakiterator,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,i18npool_test_breakiterator)) $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_breakiterator,\ cppu \ diff --git a/i18npool/CppunitTest_i18npool_test_characterclassification.mk b/i18npool/CppunitTest_i18npool_test_characterclassification.mk index 997ed6710b14..be3b1eea60cb 100644 --- a/i18npool/CppunitTest_i18npool_test_characterclassification.mk +++ b/i18npool/CppunitTest_i18npool_test_characterclassification.mk @@ -9,10 +9,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,i18npool_test_characterclassification)) -$(eval $(call gb_CppunitTest_use_api,i18npool_test_characterclassification,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,i18npool_test_characterclassification)) $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_characterclassification,\ cppu \ diff --git a/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk b/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk index c9236da6a47c..74d3462174db 100644 --- a/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk +++ b/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk @@ -9,10 +9,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,i18npool_test_ordinalsuffix)) -$(eval $(call gb_CppunitTest_use_api,i18npool_test_ordinalsuffix,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,i18npool_test_ordinalsuffix)) $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_ordinalsuffix,\ cppu \ diff --git a/i18npool/CppunitTest_i18npool_test_textsearch.mk b/i18npool/CppunitTest_i18npool_test_textsearch.mk index d6ef88e5c75b..2bca0171bb70 100644 --- a/i18npool/CppunitTest_i18npool_test_textsearch.mk +++ b/i18npool/CppunitTest_i18npool_test_textsearch.mk @@ -9,10 +9,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,i18npool_test_textsearch)) -$(eval $(call gb_CppunitTest_use_api,i18npool_test_textsearch,\ - udkapi \ - offapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,i18npool_test_textsearch)) $(eval $(call gb_CppunitTest_use_ure,i18npool_test_textsearch)) -- cgit