aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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',
'-id', join_paths(meson.current_source_dir()),
'-id', elm_themes_image_include,
'@INPUT@', '@OUTPUT@'],
- depends : edje_cc,
+ depends : edje_depends,
install : true,
install_dir : join_paths(dir_data, 'elementary', 'edje_externals'),
)
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
'-id', join_paths(meson.current_source_dir()),
'-fd', join_paths(meson.current_source_dir()),
'@INPUT@', '@OUTPUT@'],
- depends : edje_cc,
+ depends : edje_depends,
install : true,
install_dir : join_paths(dir_data, 'elementary', 'objects'),
)
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
'-id', join_paths(meson.current_source_dir(), 'fdo'),
'-fd', join_paths(meson.current_source_dir(), 'fnt'),
'@INPUT@', '@OUTPUT@'],
- depends : edje_cc,
+ depends : edje_depends,
install : true,
install_dir : join_paths(dir_data, 'elementary', 'themes'),
)
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',
'-id', join_paths(meson.current_source_dir()),
'-fd', join_paths(meson.current_source_dir()),
'@INPUT@', '@OUTPUT@'],
- depends : edje_cc,
+ depends : edje_depends,
install : true,
install_dir : join_paths(dir_data, 'ethumb', 'frames'),
)
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()
_edje_cc = find_program('edje_cc', native: true)
edje_cc_path = _edje_cc.path()
edje_cc_exe = [_edje_cc]
+ edje_depends = []
else
env = find_program('env', native: true)
edje_cc_exe = [env, 'EFL_RUN_IN_TREE=1', edje_cc.full_path()]
+ edje_depends = [edje_cc, epp]
endif
edje_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
'-md', meson.current_source_dir(),
'-td', meson.current_source_dir(),
'@INPUT@', '@OUTPUT@'],
- depends : edje_cc, )
+ depends : edje_depends, )
endforeach
codegen = custom_target('edje_cc_codegen_edc',
@@ -87,7 +87,7 @@ codegen = custom_target('edje_cc_codegen_edc',
'-md', meson.current_source_dir(),
'-td', meson.current_source_dir(),
'@INPUT@', '@OUTPUT@'],
- depends : edje_cc, )
+ depends : edje_depends, )
themes += custom_target('edje_codegen_codegen.edj',
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 = []
foreach edc_file : edc_files
themes += custom_target('edje_cc_' + edc_file,
- depends : edje_cc,
+ depends : edje_depends,
input : edc_file,
output : '@BASENAME@.edj',
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 = []
foreach edc_file : edc_files
themes += custom_target('edje_cc_' + edc_file,
- depends : edje_cc,
+ depends : edje_depends,
input : edc_file,
output : '@BASENAME@.edj',
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 = []
foreach edc_file : edc_files
themes += custom_target('edje_cc_' + edc_file,
- depends : edje_cc,
+ depends : edje_depends,
input : edc_file,
output : '@BASENAME@.edj',
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
'-md', meson.current_source_dir(),
'-td', meson.current_source_dir(),
'@INPUT@', '@OUTPUT@'],
- depends : edje_cc)
+ depends : edje_depends)
endforeach
generic_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
'-md', meson.current_source_dir(),
'-td', meson.current_source_dir(),
'@INPUT@', '@OUTPUT@'],
- depends : edje_cc)
+ depends : edje_depends)
endforeach
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
'-md', meson.current_source_dir(),
'-td', meson.current_source_dir(),
'@INPUT@', '@OUTPUT@'],
- depends : edje_cc)
+ depends : edje_depends)
endforeach
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
'-md', meson.current_source_dir(),
'-td', meson.current_source_dir(),
'@INPUT@', '@OUTPUT@'],
- depends : edje_cc,
+ depends : edje_depends,
install : true,
install_dir : join_paths(dir_data, 'emotion', 'data')
)