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
This commit is contained in:
parent
5fa5ff9522
commit
4edf8036e0
|
@ -5,7 +5,7 @@ custom_target('edje_cc_edje_externals',
|
||||||
'-id', join_paths(meson.current_source_dir()),
|
'-id', join_paths(meson.current_source_dir()),
|
||||||
'-id', elm_themes_image_include,
|
'-id', elm_themes_image_include,
|
||||||
'@INPUT@', '@OUTPUT@'],
|
'@INPUT@', '@OUTPUT@'],
|
||||||
depends : edje_cc,
|
depends : edje_depends,
|
||||||
install : true,
|
install : true,
|
||||||
install_dir : join_paths(dir_data, 'elementary', 'edje_externals'),
|
install_dir : join_paths(dir_data, 'elementary', 'edje_externals'),
|
||||||
)
|
)
|
||||||
|
|
|
@ -26,7 +26,7 @@ foreach edc_file : edc_files
|
||||||
'-id', join_paths(meson.current_source_dir()),
|
'-id', join_paths(meson.current_source_dir()),
|
||||||
'-fd', join_paths(meson.current_source_dir()),
|
'-fd', join_paths(meson.current_source_dir()),
|
||||||
'@INPUT@', '@OUTPUT@'],
|
'@INPUT@', '@OUTPUT@'],
|
||||||
depends : edje_cc,
|
depends : edje_depends,
|
||||||
install : true,
|
install : true,
|
||||||
install_dir : join_paths(dir_data, 'elementary', 'objects'),
|
install_dir : join_paths(dir_data, 'elementary', 'objects'),
|
||||||
)
|
)
|
||||||
|
|
|
@ -18,7 +18,7 @@ foreach edc_file : edc_files
|
||||||
'-id', join_paths(meson.current_source_dir(), 'fdo'),
|
'-id', join_paths(meson.current_source_dir(), 'fdo'),
|
||||||
'-fd', join_paths(meson.current_source_dir(), 'fnt'),
|
'-fd', join_paths(meson.current_source_dir(), 'fnt'),
|
||||||
'@INPUT@', '@OUTPUT@'],
|
'@INPUT@', '@OUTPUT@'],
|
||||||
depends : edje_cc,
|
depends : edje_depends,
|
||||||
install : true,
|
install : true,
|
||||||
install_dir : join_paths(dir_data, 'elementary', 'themes'),
|
install_dir : join_paths(dir_data, 'elementary', 'themes'),
|
||||||
)
|
)
|
||||||
|
|
|
@ -8,7 +8,7 @@ custom_target('edje_cc_ethumb_frame',
|
||||||
'-id', join_paths(meson.current_source_dir()),
|
'-id', join_paths(meson.current_source_dir()),
|
||||||
'-fd', join_paths(meson.current_source_dir()),
|
'-fd', join_paths(meson.current_source_dir()),
|
||||||
'@INPUT@', '@OUTPUT@'],
|
'@INPUT@', '@OUTPUT@'],
|
||||||
depends : edje_cc,
|
depends : edje_depends,
|
||||||
install : true,
|
install : true,
|
||||||
install_dir : join_paths(dir_data, 'ethumb', 'frames'),
|
install_dir : join_paths(dir_data, 'ethumb', 'frames'),
|
||||||
)
|
)
|
||||||
|
|
|
@ -34,9 +34,11 @@ if meson.is_cross_build()
|
||||||
_edje_cc = find_program('edje_cc', native: true)
|
_edje_cc = find_program('edje_cc', native: true)
|
||||||
edje_cc_path = _edje_cc.path()
|
edje_cc_path = _edje_cc.path()
|
||||||
edje_cc_exe = [_edje_cc]
|
edje_cc_exe = [_edje_cc]
|
||||||
|
edje_depends = []
|
||||||
else
|
else
|
||||||
env = find_program('env', native: true)
|
env = find_program('env', native: true)
|
||||||
edje_cc_exe = [env, 'EFL_RUN_IN_TREE=1', edje_cc.full_path()]
|
edje_cc_exe = [env, 'EFL_RUN_IN_TREE=1', edje_cc.full_path()]
|
||||||
|
edje_depends = [edje_cc, epp]
|
||||||
endif
|
endif
|
||||||
|
|
||||||
edje_decc_src = [
|
edje_decc_src = [
|
||||||
|
|
|
@ -72,7 +72,7 @@ foreach edc_file : edc_files
|
||||||
'-md', meson.current_source_dir(),
|
'-md', meson.current_source_dir(),
|
||||||
'-td', meson.current_source_dir(),
|
'-td', meson.current_source_dir(),
|
||||||
'@INPUT@', '@OUTPUT@'],
|
'@INPUT@', '@OUTPUT@'],
|
||||||
depends : edje_cc, )
|
depends : edje_depends, )
|
||||||
endforeach
|
endforeach
|
||||||
|
|
||||||
codegen = custom_target('edje_cc_codegen_edc',
|
codegen = custom_target('edje_cc_codegen_edc',
|
||||||
|
@ -87,7 +87,7 @@ codegen = custom_target('edje_cc_codegen_edc',
|
||||||
'-md', meson.current_source_dir(),
|
'-md', meson.current_source_dir(),
|
||||||
'-td', meson.current_source_dir(),
|
'-td', meson.current_source_dir(),
|
||||||
'@INPUT@', '@OUTPUT@'],
|
'@INPUT@', '@OUTPUT@'],
|
||||||
depends : edje_cc, )
|
depends : edje_depends, )
|
||||||
|
|
||||||
themes += custom_target('edje_codegen_codegen.edj',
|
themes += custom_target('edje_codegen_codegen.edj',
|
||||||
input : codegen,
|
input : codegen,
|
||||||
|
|
|
@ -131,7 +131,7 @@ themes = []
|
||||||
|
|
||||||
foreach edc_file : edc_files
|
foreach edc_file : edc_files
|
||||||
themes += custom_target('edje_cc_' + edc_file,
|
themes += custom_target('edje_cc_' + edc_file,
|
||||||
depends : edje_cc,
|
depends : edje_depends,
|
||||||
input : edc_file,
|
input : edc_file,
|
||||||
output : '@BASENAME@.edj',
|
output : '@BASENAME@.edj',
|
||||||
command : edje_cc_exe + ['-beta',
|
command : edje_cc_exe + ['-beta',
|
||||||
|
|
|
@ -12,7 +12,7 @@ themes = []
|
||||||
|
|
||||||
foreach edc_file : edc_files
|
foreach edc_file : edc_files
|
||||||
themes += custom_target('edje_cc_' + edc_file,
|
themes += custom_target('edje_cc_' + edc_file,
|
||||||
depends : edje_cc,
|
depends : edje_depends,
|
||||||
input : edc_file,
|
input : edc_file,
|
||||||
output : '@BASENAME@.edj',
|
output : '@BASENAME@.edj',
|
||||||
command : edje_cc_exe + ['-beta',
|
command : edje_cc_exe + ['-beta',
|
||||||
|
|
|
@ -10,7 +10,7 @@ themes = []
|
||||||
|
|
||||||
foreach edc_file : edc_files
|
foreach edc_file : edc_files
|
||||||
themes += custom_target('edje_cc_' + edc_file,
|
themes += custom_target('edje_cc_' + edc_file,
|
||||||
depends : edje_cc,
|
depends : edje_depends,
|
||||||
input : edc_file,
|
input : edc_file,
|
||||||
output : '@BASENAME@.edj',
|
output : '@BASENAME@.edj',
|
||||||
command : edje_cc_exe + ['-beta',
|
command : edje_cc_exe + ['-beta',
|
||||||
|
|
|
@ -17,7 +17,7 @@ foreach edc_file : edc_files
|
||||||
'-md', meson.current_source_dir(),
|
'-md', meson.current_source_dir(),
|
||||||
'-td', meson.current_source_dir(),
|
'-td', meson.current_source_dir(),
|
||||||
'@INPUT@', '@OUTPUT@'],
|
'@INPUT@', '@OUTPUT@'],
|
||||||
depends : edje_cc)
|
depends : edje_depends)
|
||||||
endforeach
|
endforeach
|
||||||
|
|
||||||
generic_src = [files(['emotion.c']) + themes]
|
generic_src = [files(['emotion.c']) + themes]
|
||||||
|
|
|
@ -34,5 +34,5 @@ foreach edc_file : edc_files
|
||||||
'-md', meson.current_source_dir(),
|
'-md', meson.current_source_dir(),
|
||||||
'-td', meson.current_source_dir(),
|
'-td', meson.current_source_dir(),
|
||||||
'@INPUT@', '@OUTPUT@'],
|
'@INPUT@', '@OUTPUT@'],
|
||||||
depends : edje_cc)
|
depends : edje_depends)
|
||||||
endforeach
|
endforeach
|
||||||
|
|
|
@ -15,5 +15,5 @@ foreach edc_file : edc_files
|
||||||
'-md', meson.current_source_dir(),
|
'-md', meson.current_source_dir(),
|
||||||
'-td', meson.current_source_dir(),
|
'-td', meson.current_source_dir(),
|
||||||
'@INPUT@', '@OUTPUT@'],
|
'@INPUT@', '@OUTPUT@'],
|
||||||
depends : edje_cc)
|
depends : edje_depends)
|
||||||
endforeach
|
endforeach
|
||||||
|
|
|
@ -17,7 +17,7 @@ foreach edc_file : edc_files
|
||||||
'-md', meson.current_source_dir(),
|
'-md', meson.current_source_dir(),
|
||||||
'-td', meson.current_source_dir(),
|
'-td', meson.current_source_dir(),
|
||||||
'@INPUT@', '@OUTPUT@'],
|
'@INPUT@', '@OUTPUT@'],
|
||||||
depends : edje_cc,
|
depends : edje_depends,
|
||||||
install : true,
|
install : true,
|
||||||
install_dir : join_paths(dir_data, 'emotion', 'data')
|
install_dir : join_paths(dir_data, 'emotion', 'data')
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue