summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-04-05 08:15:39 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-04-05 08:15:39 -0400
commit4edf8036e05c8e70f54abf6513e0df165a725a18 (patch)
treead90f47641c4a6d8ab8f42e656ab895888bb75e1
parent5fa5ff9522daac162c7fba4b4f199fa1d5f28d37 (diff)
meson: correctly use the correct dependency
Summary: edje_cc calls epp, so we should not only add edje_cc to the depends on target, but rather also ensure that epp is availble. Additionally, this removes unneccessary depends on declarations when we do cross compile. Depends on D8561 Reviewers: zmike, segfaultxavi, cedric Reviewed By: zmike Subscribers: #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8562
-rw-r--r--data/elementary/edje_externals/meson.build2
-rw-r--r--data/elementary/objects/meson.build2
-rw-r--r--data/elementary/themes/meson.build2
-rw-r--r--data/ethumb/frames/meson.build2
-rw-r--r--src/bin/edje/meson.build2
-rw-r--r--src/examples/edje/meson.build4
-rw-r--r--src/examples/elementary/meson.build2
-rw-r--r--src/examples/elementary/performance/meson.build2
-rw-r--r--src/examples/elementary/sphere_hunter/meson.build2
-rw-r--r--src/modules/ethumb/emotion/meson.build2
-rw-r--r--src/tests/edje/data/meson.build2
-rw-r--r--src/tests/edje/tests/meson.build2
-rw-r--r--src/tests/emotion/data/meson.build2
13 files changed, 15 insertions, 13 deletions
diff --git a/data/elementary/edje_externals/meson.build b/data/elementary/edje_externals/meson.build
index b805b4c042..64fa05cdca 100644
--- a/data/elementary/edje_externals/meson.build
+++ b/data/elementary/edje_externals/meson.build
@@ -5,7 +5,7 @@ custom_target('edje_cc_edje_externals',
5 '-id', join_paths(meson.current_source_dir()), 5 '-id', join_paths(meson.current_source_dir()),
6 '-id', elm_themes_image_include, 6 '-id', elm_themes_image_include,
7 '@INPUT@', '@OUTPUT@'], 7 '@INPUT@', '@OUTPUT@'],
8 depends : edje_cc, 8 depends : edje_depends,
9 install : true, 9 install : true,
10 install_dir : join_paths(dir_data, 'elementary', 'edje_externals'), 10 install_dir : join_paths(dir_data, 'elementary', 'edje_externals'),
11) 11)
diff --git a/data/elementary/objects/meson.build b/data/elementary/objects/meson.build
index 6d9ead2463..92020a7795 100644
--- a/data/elementary/objects/meson.build
+++ b/data/elementary/objects/meson.build
@@ -26,7 +26,7 @@ foreach edc_file : edc_files
26 '-id', join_paths(meson.current_source_dir()), 26 '-id', join_paths(meson.current_source_dir()),
27 '-fd', join_paths(meson.current_source_dir()), 27 '-fd', join_paths(meson.current_source_dir()),
28 '@INPUT@', '@OUTPUT@'], 28 '@INPUT@', '@OUTPUT@'],
29 depends : edje_cc, 29 depends : edje_depends,
30 install : true, 30 install : true,
31 install_dir : join_paths(dir_data, 'elementary', 'objects'), 31 install_dir : join_paths(dir_data, 'elementary', 'objects'),
32 ) 32 )
diff --git a/data/elementary/themes/meson.build b/data/elementary/themes/meson.build
index 0096aa2630..8a30c71cb9 100644
--- a/data/elementary/themes/meson.build
+++ b/data/elementary/themes/meson.build
@@ -18,7 +18,7 @@ foreach edc_file : edc_files
18 '-id', join_paths(meson.current_source_dir(), 'fdo'), 18 '-id', join_paths(meson.current_source_dir(), 'fdo'),
19 '-fd', join_paths(meson.current_source_dir(), 'fnt'), 19 '-fd', join_paths(meson.current_source_dir(), 'fnt'),
20 '@INPUT@', '@OUTPUT@'], 20 '@INPUT@', '@OUTPUT@'],
21 depends : edje_cc, 21 depends : edje_depends,
22 install : true, 22 install : true,
23 install_dir : join_paths(dir_data, 'elementary', 'themes'), 23 install_dir : join_paths(dir_data, 'elementary', 'themes'),
24 ) 24 )
diff --git a/data/ethumb/frames/meson.build b/data/ethumb/frames/meson.build
index 31f3333944..f10f982eee 100644
--- a/data/ethumb/frames/meson.build
+++ b/data/ethumb/frames/meson.build
@@ -8,7 +8,7 @@ custom_target('edje_cc_ethumb_frame',
8 '-id', join_paths(meson.current_source_dir()), 8 '-id', join_paths(meson.current_source_dir()),
9 '-fd', join_paths(meson.current_source_dir()), 9 '-fd', join_paths(meson.current_source_dir()),
10 '@INPUT@', '@OUTPUT@'], 10 '@INPUT@', '@OUTPUT@'],
11 depends : edje_cc, 11 depends : edje_depends,
12 install : true, 12 install : true,
13 install_dir : join_paths(dir_data, 'ethumb', 'frames'), 13 install_dir : join_paths(dir_data, 'ethumb', 'frames'),
14) 14)
diff --git a/src/bin/edje/meson.build b/src/bin/edje/meson.build
index 2fedb2cf4a..b2f2e738b1 100644
--- a/src/bin/edje/meson.build
+++ b/src/bin/edje/meson.build
@@ -34,9 +34,11 @@ if meson.is_cross_build()
34 _edje_cc = find_program('edje_cc', native: true) 34 _edje_cc = find_program('edje_cc', native: true)
35 edje_cc_path = _edje_cc.path() 35 edje_cc_path = _edje_cc.path()
36 edje_cc_exe = [_edje_cc] 36 edje_cc_exe = [_edje_cc]
37 edje_depends = []
37else 38else
38 env = find_program('env', native: true) 39 env = find_program('env', native: true)
39 edje_cc_exe = [env, 'EFL_RUN_IN_TREE=1', edje_cc.full_path()] 40 edje_cc_exe = [env, 'EFL_RUN_IN_TREE=1', edje_cc.full_path()]
41 edje_depends = [edje_cc, epp]
40endif 42endif
41 43
42edje_decc_src = [ 44edje_decc_src = [
diff --git a/src/examples/edje/meson.build b/src/examples/edje/meson.build
index bad8f7c085..21910ad389 100644
--- a/src/examples/edje/meson.build
+++ b/src/examples/edje/meson.build
@@ -72,7 +72,7 @@ foreach edc_file : edc_files
72 '-md', meson.current_source_dir(), 72 '-md', meson.current_source_dir(),
73 '-td', meson.current_source_dir(), 73 '-td', meson.current_source_dir(),
74 '@INPUT@', '@OUTPUT@'], 74 '@INPUT@', '@OUTPUT@'],
75 depends : edje_cc, ) 75 depends : edje_depends, )
76endforeach 76endforeach
77 77
78codegen = custom_target('edje_cc_codegen_edc', 78codegen = custom_target('edje_cc_codegen_edc',
@@ -87,7 +87,7 @@ codegen = custom_target('edje_cc_codegen_edc',
87 '-md', meson.current_source_dir(), 87 '-md', meson.current_source_dir(),
88 '-td', meson.current_source_dir(), 88 '-td', meson.current_source_dir(),
89 '@INPUT@', '@OUTPUT@'], 89 '@INPUT@', '@OUTPUT@'],
90 depends : edje_cc, ) 90 depends : edje_depends, )
91 91
92themes += custom_target('edje_codegen_codegen.edj', 92themes += custom_target('edje_codegen_codegen.edj',
93 input : codegen, 93 input : codegen,
diff --git a/src/examples/elementary/meson.build b/src/examples/elementary/meson.build
index a0309838b0..67286d95f8 100644
--- a/src/examples/elementary/meson.build
+++ b/src/examples/elementary/meson.build
@@ -131,7 +131,7 @@ themes = []
131 131
132foreach edc_file : edc_files 132foreach edc_file : edc_files
133 themes += custom_target('edje_cc_' + edc_file, 133 themes += custom_target('edje_cc_' + edc_file,
134 depends : edje_cc, 134 depends : edje_depends,
135 input : edc_file, 135 input : edc_file,
136 output : '@BASENAME@.edj', 136 output : '@BASENAME@.edj',
137 command : edje_cc_exe + ['-beta', 137 command : edje_cc_exe + ['-beta',
diff --git a/src/examples/elementary/performance/meson.build b/src/examples/elementary/performance/meson.build
index 35fb38c9eb..cd209955a8 100644
--- a/src/examples/elementary/performance/meson.build
+++ b/src/examples/elementary/performance/meson.build
@@ -12,7 +12,7 @@ themes = []
12 12
13foreach edc_file : edc_files 13foreach edc_file : edc_files
14 themes += custom_target('edje_cc_' + edc_file, 14 themes += custom_target('edje_cc_' + edc_file,
15 depends : edje_cc, 15 depends : edje_depends,
16 input : edc_file, 16 input : edc_file,
17 output : '@BASENAME@.edj', 17 output : '@BASENAME@.edj',
18 command : edje_cc_exe + ['-beta', 18 command : edje_cc_exe + ['-beta',
diff --git a/src/examples/elementary/sphere_hunter/meson.build b/src/examples/elementary/sphere_hunter/meson.build
index 31b0cbb9a7..4ef08822ea 100644
--- a/src/examples/elementary/sphere_hunter/meson.build
+++ b/src/examples/elementary/sphere_hunter/meson.build
@@ -10,7 +10,7 @@ themes = []
10 10
11foreach edc_file : edc_files 11foreach edc_file : edc_files
12 themes += custom_target('edje_cc_' + edc_file, 12 themes += custom_target('edje_cc_' + edc_file,
13 depends : edje_cc, 13 depends : edje_depends,
14 input : edc_file, 14 input : edc_file,
15 output : '@BASENAME@.edj', 15 output : '@BASENAME@.edj',
16 command : edje_cc_exe + ['-beta', 16 command : edje_cc_exe + ['-beta',
diff --git a/src/modules/ethumb/emotion/meson.build b/src/modules/ethumb/emotion/meson.build
index 12c508a781..3ef9d4b12d 100644
--- a/src/modules/ethumb/emotion/meson.build
+++ b/src/modules/ethumb/emotion/meson.build
@@ -17,7 +17,7 @@ foreach edc_file : edc_files
17 '-md', meson.current_source_dir(), 17 '-md', meson.current_source_dir(),
18 '-td', meson.current_source_dir(), 18 '-td', meson.current_source_dir(),
19 '@INPUT@', '@OUTPUT@'], 19 '@INPUT@', '@OUTPUT@'],
20 depends : edje_cc) 20 depends : edje_depends)
21endforeach 21endforeach
22 22
23generic_src = [files(['emotion.c']) + themes] 23generic_src = [files(['emotion.c']) + themes]
diff --git a/src/tests/edje/data/meson.build b/src/tests/edje/data/meson.build
index 18ebbf62f7..2148b861dc 100644
--- a/src/tests/edje/data/meson.build
+++ b/src/tests/edje/data/meson.build
@@ -34,5 +34,5 @@ foreach edc_file : edc_files
34 '-md', meson.current_source_dir(), 34 '-md', meson.current_source_dir(),
35 '-td', meson.current_source_dir(), 35 '-td', meson.current_source_dir(),
36 '@INPUT@', '@OUTPUT@'], 36 '@INPUT@', '@OUTPUT@'],
37 depends : edje_cc) 37 depends : edje_depends)
38endforeach 38endforeach
diff --git a/src/tests/edje/tests/meson.build b/src/tests/edje/tests/meson.build
index d88ddaf5ef..3d3f4313ad 100644
--- a/src/tests/edje/tests/meson.build
+++ b/src/tests/edje/tests/meson.build
@@ -15,5 +15,5 @@ foreach edc_file : edc_files
15 '-md', meson.current_source_dir(), 15 '-md', meson.current_source_dir(),
16 '-td', meson.current_source_dir(), 16 '-td', meson.current_source_dir(),
17 '@INPUT@', '@OUTPUT@'], 17 '@INPUT@', '@OUTPUT@'],
18 depends : edje_cc) 18 depends : edje_depends)
19endforeach 19endforeach
diff --git a/src/tests/emotion/data/meson.build b/src/tests/emotion/data/meson.build
index 0e50cb3e2f..9f6229ad81 100644
--- a/src/tests/emotion/data/meson.build
+++ b/src/tests/emotion/data/meson.build
@@ -17,7 +17,7 @@ foreach edc_file : edc_files
17 '-md', meson.current_source_dir(), 17 '-md', meson.current_source_dir(),
18 '-td', meson.current_source_dir(), 18 '-td', meson.current_source_dir(),
19 '@INPUT@', '@OUTPUT@'], 19 '@INPUT@', '@OUTPUT@'],
20 depends : edje_cc, 20 depends : edje_depends,
21 install : true, 21 install : true,
22 install_dir : join_paths(dir_data, 'emotion', 'data') 22 install_dir : join_paths(dir_data, 'emotion', 'data')
23 ) 23 )