From 41d4defdc76cfaf8c433b7066d6cd1bccc4aeb24 Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Tue, 26 May 2020 10:53:45 +0200 Subject: [PATCH] build: stop buildsystem from beeing a public dependency this is wrong, each library should declare it on its own Reviewed-by: Stefan Schmidt Differential Revision: https://phab.enlightenment.org/D11883 Change-Id: Idb9f561caa2707536e42faacc651005ed4587a22 --- src/lib/elementary/meson.build | 5 ++--- src/lib/emotion/meson.build | 4 ++-- src/lib/ethumb/meson.build | 4 ++-- src/lib/evas/meson.build | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build index 5bf0a46..f585519 100644 --- a/src/lib/elementary/meson.build +++ b/src/lib/elementary/meson.build @@ -1053,11 +1053,10 @@ endforeach elementary_src_tizen = elementary_src_tizen_tmp #TIZEN_ONLY--> -elementary_deps = [emile, eo, efl, edje, ethumb, ethumb_client, emotion, ecore_imf, ecore_con, eldbus, efreet, eio] +elementary_deps = [emile, eo, efl, edje, ethumb, ethumb_client, emotion, ecore_imf, ecore_con, eldbus, efreet, eio, buildsystem] elementary_pub_deps = [eina, eet, evas, ecore, ecore_evas, ecore_file, ecore_input, ecore_imf, ecore_con, edje, eldbus, efreet, ethumb_client, efl] -elementary_ext_deps = [atspi, dl, intl] - +elementary_ext_deps = [atspi, dl, intl, buildsystem_simple] elm_options = configuration_data() config_h.set_quoted('ELM_TOP_BUILD_DIR', meson.build_root()) diff --git a/src/lib/emotion/meson.build b/src/lib/emotion/meson.build index b289fb2..8404fab 100644 --- a/src/lib/emotion/meson.build +++ b/src/lib/emotion/meson.build @@ -37,9 +37,9 @@ emotion_src = files([ 'emotion_main.c' ]) -emotion_deps = [ecore, eet, evas, eio, emile] +emotion_deps = [ecore, eet, evas, eio, emile, buildsystem] emotion_pub_deps = [eina, eo, efl] -emotion_ext_deps = [] +emotion_ext_deps = [buildsystem_simple] if get_option('eeze') == true emotion_deps += [eeze] diff --git a/src/lib/ethumb/meson.build b/src/lib/ethumb/meson.build index fbe1436..9e39a7a 100644 --- a/src/lib/ethumb/meson.build +++ b/src/lib/ethumb/meson.build @@ -9,9 +9,9 @@ ethumb_src = files([ 'md5.c', ]) -ethumb_deps = [eet, evas, ecore, ecore_evas, ecore_file, ecore_imf, edje, emile] +ethumb_deps = [eet, evas, ecore, ecore_evas, ecore_file, ecore_imf, edje, emile, buildsystem] ethumb_pub_deps = [eina, eo, efl] -ethumb_ext_deps = [m] +ethumb_ext_deps = [m, buildsystem_simple] ethumb_lib = library('ethumb', ethumb_src, diff --git a/src/lib/evas/meson.build b/src/lib/evas/meson.build index 0e59ed5..0272661 100644 --- a/src/lib/evas/meson.build +++ b/src/lib/evas/meson.build @@ -208,7 +208,7 @@ if get_option('opengl') != 'none' endif evas_link = [ ] -evas_pub_deps = [eina, ecore, ector, emile, buildsystem] #FIXME buildsystem here is wrong, but needed in this commit +evas_pub_deps = [eina, ecore, ector, emile] if cpu_sse3 == true or cpu_neon == true and cpu_neon_intrinsics == false evas_opt = static_library('evas_opt', -- 2.7.4