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

diff --git a/data/elementary/edje_externals/meson.build b/data/elementary/edje_externals/meson.build
index b805b4c..64fa05c 100644 (file)
--- 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 6d9ead2..92020a7 100644 (file)
--- 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 0096aa2..8a30c71 100644 (file)
--- 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 31f3333..f10f982 100644 (file)
--- 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 2fedb2c..b2f2e73 100644 (file)
--- 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 bad8f7c..21910ad 100644 (file)
--- 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 a030983..67286d9 100644 (file)
--- 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 35fb38c..cd20995 100644 (file)
--- 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 31b0cbb..4ef0882 100644 (file)
--- 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 f460ada..f85b573 100644 (file)
--- 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,
     install: true,
     install_dir : mod_install_dir)
 endforeach

diff --git a/src/tests/edje/data/meson.build b/src/tests/edje/data/meson.build
index 18ebbf6..2148b86 100644 (file)
--- 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 d88ddaf..3d3f431 100644 (file)
--- 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 0e50cb3..9f6229a 100644 (file)
--- 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')
   )