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 --- comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk | 5 +---- comphelper/CppunitTest_comphelper_test.mk | 5 +---- comphelper/CppunitTest_comphelper_variadictemplates_test.mk | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) (limited to 'comphelper') diff --git a/comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk b/comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk index 73ab199e625e..9dade8b53877 100644 --- a/comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk +++ b/comphelper/CppunitTest_comphelper_syntaxhighlight_test.mk @@ -17,10 +17,7 @@ $(eval $(call gb_CppunitTest_use_externals,comphelper_syntaxhighlight_test,\ boost_headers \ )) -$(eval $(call gb_CppunitTest_use_api,comphelper_syntaxhighlight_test, \ - udkapi \ - offapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,comphelper_syntaxhighlight_test)) $(eval $(call gb_CppunitTest_use_libraries,comphelper_syntaxhighlight_test, \ comphelper \ diff --git a/comphelper/CppunitTest_comphelper_test.mk b/comphelper/CppunitTest_comphelper_test.mk index 47843c6ba8ad..f67601e6a6de 100644 --- a/comphelper/CppunitTest_comphelper_test.mk +++ b/comphelper/CppunitTest_comphelper_test.mk @@ -14,10 +14,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,comphelper_test, \ comphelper/qa/container/testifcontainer \ )) -$(eval $(call gb_CppunitTest_use_api,comphelper_test, \ - udkapi \ - offapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,comphelper_test)) $(eval $(call gb_CppunitTest_use_libraries,comphelper_test, \ comphelper \ diff --git a/comphelper/CppunitTest_comphelper_variadictemplates_test.mk b/comphelper/CppunitTest_comphelper_variadictemplates_test.mk index 21e8753f6605..58d490a5d64a 100644 --- a/comphelper/CppunitTest_comphelper_variadictemplates_test.mk +++ b/comphelper/CppunitTest_comphelper_variadictemplates_test.mk @@ -13,10 +13,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,comphelper_variadictemplates_ comphelper/qa/unit/variadictemplates \ )) -$(eval $(call gb_CppunitTest_use_api,comphelper_variadictemplates_test, \ - udkapi \ - offapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,comphelper_variadictemplates_test)) $(eval $(call gb_CppunitTest_use_externals,comphelper_variadictemplates_test, \ boost_headers \ -- cgit v1.2.3