summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2020-05-26 10:53:45 +0200
committerStefan Schmidt <s.schmidt@samsung.com>2020-05-27 11:06:51 +0200
commitf5d3a2bf282b8c871b69a03f5b7f754a936e9c07 (patch)
tree5c60975446611a6d348aeeea847327d5ce207773
parent92b049b4d7e70666b790ba78480da8f19c795b1c (diff)
build: stop buildsystem from beeing a public dependency
this is wrong, each library should declare it on its own Reviewed-by: Stefan Schmidt <stefan@datenfreihafen.org> Differential Revision: https://phab.enlightenment.org/D11883
-rw-r--r--src/lib/elementary/meson.build4
-rw-r--r--src/lib/emotion/meson.build4
-rw-r--r--src/lib/ethumb/meson.build4
-rw-r--r--src/lib/evas/meson.build2
4 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index f6674fbdc3..06e07e3a71 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -949,10 +949,10 @@ elementary_src = files([
949 'efl_ui_spotlight_animation_manager.c', 949 'efl_ui_spotlight_animation_manager.c',
950]) 950])
951 951
952elementary_deps = [emile, eo, efl, edje, ethumb, ethumb_client, emotion, ecore_imf, ecore_con, eldbus, efreet, eio] 952elementary_deps = [emile, eo, efl, edje, ethumb, ethumb_client, emotion, ecore_imf, ecore_con, eldbus, efreet, eio, buildsystem]
953elementary_pub_deps = [eina, eet, evas, ecore, ecore_evas, ecore_file, ecore_input, ecore_imf, ecore_con, 953elementary_pub_deps = [eina, eet, evas, ecore, ecore_evas, ecore_file, ecore_input, ecore_imf, ecore_con,
954 edje, eldbus, efreet, ethumb_client, efl] 954 edje, eldbus, efreet, ethumb_client, efl]
955elementary_ext_deps = [atspi, dl, intl] 955elementary_ext_deps = [atspi, dl, intl, buildsystem_simple]
956elm_options = configuration_data() 956elm_options = configuration_data()
957 957
958config_h.set_quoted('ELM_TOP_BUILD_DIR', meson.build_root()) 958config_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 b289fb221a..8404fab3fd 100644
--- a/src/lib/emotion/meson.build
+++ b/src/lib/emotion/meson.build
@@ -37,9 +37,9 @@ emotion_src = files([
37 'emotion_main.c' 37 'emotion_main.c'
38]) 38])
39 39
40emotion_deps = [ecore, eet, evas, eio, emile] 40emotion_deps = [ecore, eet, evas, eio, emile, buildsystem]
41emotion_pub_deps = [eina, eo, efl] 41emotion_pub_deps = [eina, eo, efl]
42emotion_ext_deps = [] 42emotion_ext_deps = [buildsystem_simple]
43 43
44if get_option('eeze') == true 44if get_option('eeze') == true
45 emotion_deps += [eeze] 45 emotion_deps += [eeze]
diff --git a/src/lib/ethumb/meson.build b/src/lib/ethumb/meson.build
index fbe1436e4b..9e39a7ab77 100644
--- a/src/lib/ethumb/meson.build
+++ b/src/lib/ethumb/meson.build
@@ -9,9 +9,9 @@ ethumb_src = files([
9 'md5.c', 9 'md5.c',
10]) 10])
11 11
12ethumb_deps = [eet, evas, ecore, ecore_evas, ecore_file, ecore_imf, edje, emile] 12ethumb_deps = [eet, evas, ecore, ecore_evas, ecore_file, ecore_imf, edje, emile, buildsystem]
13ethumb_pub_deps = [eina, eo, efl] 13ethumb_pub_deps = [eina, eo, efl]
14ethumb_ext_deps = [m] 14ethumb_ext_deps = [m, buildsystem_simple]
15 15
16ethumb_lib = library('ethumb', 16ethumb_lib = library('ethumb',
17 ethumb_src, 17 ethumb_src,
diff --git a/src/lib/evas/meson.build b/src/lib/evas/meson.build
index 0ff0535e4f..d923cee0df 100644
--- a/src/lib/evas/meson.build
+++ b/src/lib/evas/meson.build
@@ -200,7 +200,7 @@ if get_option('opengl') != 'none'
200endif 200endif
201 201
202evas_link = [ ] 202evas_link = [ ]
203evas_pub_deps = [eina, ecore, ector, emile, buildsystem] #FIXME buildsystem here is wrong, but needed in this commit 203evas_pub_deps = [eina, ecore, ector, emile]
204 204
205if cpu_sse3 == true or cpu_neon == true and cpu_neon_intrinsics == false 205if cpu_sse3 == true or cpu_neon == true and cpu_neon_intrinsics == false
206 evas_opt = static_library('evas_opt', 206 evas_opt = static_library('evas_opt',