diff --git a/src/bin/eolian/meson.build b/src/bin/eolian/meson.build index 2104676f3e..0714fbea85 100644 --- a/src/bin/eolian/meson.build +++ b/src/bin/eolian/meson.build @@ -11,9 +11,14 @@ eolian_gen_src = [ 'docs.h' ] -eolian_gen = executable('eolian_gen', +eolian_gen_bin = executable('eolian_gen', eolian_gen_src, dependencies: eolian, install: true, c_args : package_c_args, ) + +eolian_gen_path = eolian_gen_bin.full_path() + + +eolian_gen = [eolian_gen_bin, '-S'] diff --git a/src/lib/ecore/meson.build b/src/lib/ecore/meson.build index cfa6609666..3757bad5f3 100644 --- a/src/lib/ecore/meson.build +++ b/src/lib/ecore/meson.build @@ -16,7 +16,7 @@ foreach eo_file : pub_legacy_eo_files depfile : eo_file + '.d', install : true, install_dir : dir_package_include, - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), @@ -27,7 +27,7 @@ foreach eo_file : pub_legacy_eo_files depfile : eo_file + '.legacy.d', install : true, install_dir : dir_package_include, - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'), '-gld', '@INPUT@']) @@ -85,7 +85,7 @@ foreach eo_file : pub_eo_files depfile : eo_file + '.d', install : true, install_dir : dir_package_include, - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), diff --git a/src/lib/ecore_audio/meson.build b/src/lib/ecore_audio/meson.build index 6fdd5a30b4..b73d53d81b 100644 --- a/src/lib/ecore_audio/meson.build +++ b/src/lib/ecore_audio/meson.build @@ -19,7 +19,7 @@ foreach eo_file : pub_eo_files depfile : eo_file + '.d', install : true, install_dir : dir_package_include, - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), diff --git a/src/lib/ecore_con/meson.build b/src/lib/ecore_con/meson.build index f945ccd0d4..d1375e246e 100644 --- a/src/lib/ecore_con/meson.build +++ b/src/lib/ecore_con/meson.build @@ -31,7 +31,7 @@ foreach eo_file : pub_legacy_eo_files depfile : eo_file + '.d', install : true, install_dir : dir_package_include, - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), @@ -42,7 +42,7 @@ foreach eo_file : pub_legacy_eo_files depfile : eo_file + '.legacy.d', install : true, install_dir : dir_package_include, - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'), '-gld', '@INPUT@']) @@ -99,7 +99,7 @@ foreach eo_file : pub_eo_files depfile : eo_file + '.d', install : true, install_dir : dir_package_include, - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), @@ -120,7 +120,7 @@ foreach eo_file : pub_eo_types_files depfile : eo_file + '.d', install : true, install_dir : dir_package_include, - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), '-ghd', '@INPUT@']) diff --git a/src/lib/ector/cairo/meson.build b/src/lib/ector/cairo/meson.build index e9ebc60708..123ea90d1f 100644 --- a/src/lib/ector/cairo/meson.build +++ b/src/lib/ector/cairo/meson.build @@ -24,7 +24,7 @@ foreach eo_file : pub_eo_files depfile : eo_file + '.d', install : false, install_dir : dir_package_include, - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), diff --git a/src/lib/ector/gl/meson.build b/src/lib/ector/gl/meson.build index 11bb8cfc6a..071e98eaee 100644 --- a/src/lib/ector/gl/meson.build +++ b/src/lib/ector/gl/meson.build @@ -27,7 +27,7 @@ foreach eo_file : pub_eo_files depfile : eo_file + '.d', install : false, install_dir : dir_package_include, - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), diff --git a/src/lib/ector/meson.build b/src/lib/ector/meson.build index 874d16a21c..5b86466873 100644 --- a/src/lib/ector/meson.build +++ b/src/lib/ector/meson.build @@ -39,7 +39,7 @@ foreach eo_file : pub_eo_files depfile : eo_file + '.d', install : false, install_dir : dir_package_include, - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), @@ -66,7 +66,7 @@ foreach eo_file : pub_eo_types_files depfile : eo_file + '.d', install : false, install_dir : dir_package_include, - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), '-ghd', '@INPUT@']) diff --git a/src/lib/ector/software/meson.build b/src/lib/ector/software/meson.build index cef9c957c8..1484553374 100644 --- a/src/lib/ector/software/meson.build +++ b/src/lib/ector/software/meson.build @@ -27,7 +27,7 @@ foreach eo_file : pub_eo_files depfile : eo_file + '.d', install : false, install_dir : dir_package_include, - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), diff --git a/src/lib/edje/meson.build b/src/lib/edje/meson.build index bd2374637b..393383fbde 100644 --- a/src/lib/edje/meson.build +++ b/src/lib/edje/meson.build @@ -46,7 +46,7 @@ foreach eo_file : pub_legacy_eo_files depfile : eo_file + '.d', install : true, install_dir : dir_package_include, - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), @@ -57,7 +57,7 @@ foreach eo_file : pub_legacy_eo_files depfile : eo_file + '.legacy.d', install : true, install_dir : dir_package_include, - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'), '-gld', '@INPUT@']) @@ -74,7 +74,7 @@ foreach eo_file : pub_eo_types_files depfile : eo_file + '.d', install : true, install_dir : dir_package_include, - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), '-ghd', '@INPUT@']) @@ -90,7 +90,7 @@ foreach eo_file : priv_eo_files input : eo_file, output : [eo_file + '.h'], depfile : eo_file + '.d', - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), '-gchd', '@INPUT@']) diff --git a/src/lib/efl/interfaces/meson.build b/src/lib/efl/interfaces/meson.build index fbcc31bcb1..bcd9b22bba 100644 --- a/src/lib/efl/interfaces/meson.build +++ b/src/lib/efl/interfaces/meson.build @@ -24,7 +24,7 @@ foreach eo_file : pub_legacy_eo_files depfile : eo_file + '.d', install : true, install_dir : join_paths(dir_package_include, 'interfaces'), - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), @@ -35,7 +35,7 @@ foreach eo_file : pub_legacy_eo_files depfile : eo_file + '.legacy.d', install : true, install_dir : join_paths(dir_package_include, 'interfaces'), - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'), '-gld', '@INPUT@']) @@ -113,7 +113,7 @@ foreach eo_file : pub_eo_files depfile : eo_file + '.d', install : true, install_dir : join_paths(dir_package_include, 'interfaces'), - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), @@ -137,7 +137,7 @@ foreach eo_file : pub_eo_types_files depfile : eo_file + '.d', install : true, install_dir : join_paths(dir_package_include, 'interfaces'), - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), '-ghd', '@INPUT@']) diff --git a/src/lib/eio/meson.build b/src/lib/eio/meson.build index c3410d752e..40f0def8f3 100644 --- a/src/lib/eio/meson.build +++ b/src/lib/eio/meson.build @@ -13,7 +13,7 @@ foreach eo_file : pub_eo_files depfile : eo_file + '.d', install : true, install_dir : dir_package_include, - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths( meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), diff --git a/src/lib/eldbus/meson.build b/src/lib/eldbus/meson.build index fcb452c8a3..1fd852fcb3 100644 --- a/src/lib/eldbus/meson.build +++ b/src/lib/eldbus/meson.build @@ -18,7 +18,7 @@ foreach eo_file : pub_eo_files depfile : eo_file + '.d', install : true, install_dir : dir_package_include, - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), @@ -37,7 +37,7 @@ foreach eo_file : pub_eo_types_files depfile : eo_file + '.d', install : true, install_dir : dir_package_include, - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), '-ghd', '@INPUT@']) diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build index e2bed0773c..ac69f99905 100644 --- a/src/lib/elementary/meson.build +++ b/src/lib/elementary/meson.build @@ -120,7 +120,7 @@ foreach eo_file : pub_legacy_eo_files depfile : eo_file + '.d', install : true, install_dir : dir_package_include, - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), @@ -289,7 +289,7 @@ foreach eo_file : pub_eo_files depfile : eo_file + '.d', install : true, install_dir : dir_package_include, - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), @@ -300,7 +300,7 @@ foreach eo_file : pub_eo_files depfile : eo_file + '.legacy.d', install : true, install_dir : dir_package_include, - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'), '-gld', '@INPUT@']) @@ -322,7 +322,7 @@ foreach eo_file : pub_eo_types_files depfile : eo_file + '.d', install : true, install_dir : dir_package_include, - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), '-ghd', '@INPUT@']) @@ -346,7 +346,7 @@ foreach eo_file : priv_eo_files input : eo_file, output : [eo_file + '.h'], depfile : eo_file + '.d', - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), diff --git a/src/lib/emotion/meson.build b/src/lib/emotion/meson.build index 1caea9dcee..ad25dc65a6 100644 --- a/src/lib/emotion/meson.build +++ b/src/lib/emotion/meson.build @@ -12,7 +12,7 @@ foreach eo_file : pub_legacy_eo_files depfile : eo_file + '.d', install : true, install_dir : dir_package_include, - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), @@ -23,7 +23,7 @@ foreach eo_file : pub_legacy_eo_files depfile : eo_file + '.legacy.d', install : true, install_dir : dir_package_include, - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'), '-gld', '@INPUT@']) diff --git a/src/lib/eo/meson.build b/src/lib/eo/meson.build index 34f60aac76..6647096d6c 100644 --- a/src/lib/eo/meson.build +++ b/src/lib/eo/meson.build @@ -35,7 +35,7 @@ foreach eo_file : pub_eo_files depfile : eo_file + '.d', install : true, install_dir : dir_package_include, - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), diff --git a/src/lib/evas/canvas/meson.build b/src/lib/evas/canvas/meson.build index 034483bcb6..c7e8810f63 100644 --- a/src/lib/evas/canvas/meson.build +++ b/src/lib/evas/canvas/meson.build @@ -17,7 +17,7 @@ foreach eo_file : pub_legacy_eo_files depfile : eo_file + '.d', install : true, install_dir : join_paths(dir_package_include, 'canvas'), - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), @@ -90,7 +90,7 @@ foreach eo_file : pub_eo_files depfile : eo_file + '.d', install : true, install_dir : join_paths(dir_package_include, 'canvas'), - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), @@ -101,7 +101,7 @@ foreach eo_file : pub_eo_files depfile : eo_file + '.legacy.d', install : true, install_dir : join_paths(dir_package_include, 'canvas'), - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'), '-gld', '@INPUT@']) @@ -122,7 +122,7 @@ foreach eo_file : pub_eo_types_files depfile : eo_file + '.d', install : true, install_dir : join_paths(dir_package_include, 'canvas'), - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), '-ghd', '@INPUT@']) diff --git a/src/lib/evas/gesture/meson.build b/src/lib/evas/gesture/meson.build index 5a341f5bff..86927504ac 100644 --- a/src/lib/evas/gesture/meson.build +++ b/src/lib/evas/gesture/meson.build @@ -16,7 +16,7 @@ foreach eo_file : pub_eo_files depfile : eo_file + '.d', install : true, install_dir : join_paths(dir_package_include, 'gesture'), - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), @@ -27,7 +27,7 @@ foreach eo_file : pub_eo_files depfile : eo_file + '.legacy.d', install : true, install_dir : join_paths(dir_package_include, 'gesture'), - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'), '-gld', '@INPUT@']) @@ -47,7 +47,7 @@ foreach eo_file : pub_eo_files depfile : eo_file + '.d', install : false, install_dir : join_paths(dir_package_include, 'gesture'), - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), @@ -58,7 +58,7 @@ foreach eo_file : pub_eo_files depfile : eo_file + '.legacy.d', install : false, install_dir : join_paths(dir_package_include, 'gesture'), - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'), '-gld', '@INPUT@']) @@ -79,7 +79,7 @@ foreach eo_file : pub_eo_types_files depfile : eo_file + '.d', install : true, install_dir : join_paths(dir_package_include, 'gesture'), - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), '-ghd', '@INPUT@']) diff --git a/src/lib/evas/include/meson.build b/src/lib/evas/include/meson.build index a833f67b40..b9f90fce0f 100644 --- a/src/lib/evas/include/meson.build +++ b/src/lib/evas/include/meson.build @@ -10,7 +10,7 @@ foreach eo_file : pub_eo_files input : eo_file, output : [eo_file + '.h'], depfile : eo_file + '.d', - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), diff --git a/src/lib/evas/meson.build b/src/lib/evas/meson.build index f9f038dc93..10347d3e5a 100644 --- a/src/lib/evas/meson.build +++ b/src/lib/evas/meson.build @@ -30,7 +30,7 @@ foreach eo_file : pub_legacy_eo_files depfile : eo_file + '.d', install : true, install_dir : dir_package_include, - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), @@ -41,7 +41,7 @@ foreach eo_file : pub_legacy_eo_files depfile : eo_file + '.legacy.d', install : true, install_dir : dir_package_include, - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'), '-gld', '@INPUT@']) @@ -58,7 +58,7 @@ foreach eo_file : pub_eo_files depfile : eo_file + '.d', install : true, install_dir : dir_package_include, - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), @@ -77,7 +77,7 @@ foreach eo_file : pub_eo_types_files depfile : eo_file + '.d', install : true, install_dir : dir_package_include, - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), '-ghd', '@INPUT@']) diff --git a/src/modules/elementary/web/none/meson.build b/src/modules/elementary/web/none/meson.build index 18a5aa4187..e71a16837d 100644 --- a/src/modules/elementary/web/none/meson.build +++ b/src/modules/elementary/web/none/meson.build @@ -10,7 +10,7 @@ foreach eo_file : pub_eo_files depfile : eo_file + '.d', install : true, install_dir : dir_package_include, - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), diff --git a/src/modules/evas/engines/gl_generic/meson.build b/src/modules/evas/engines/gl_generic/meson.build index 5d29b4e020..cbc467b7ab 100644 --- a/src/modules/evas/engines/gl_generic/meson.build +++ b/src/modules/evas/engines/gl_generic/meson.build @@ -25,7 +25,7 @@ foreach eo_file : pub_eo_files input : eo_file, output : [eo_file + '.h'], depfile : eo_file + '.d', - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), diff --git a/src/modules/evas/engines/software_generic/meson.build b/src/modules/evas/engines/software_generic/meson.build index fe3ef78ee8..ef499821e8 100644 --- a/src/modules/evas/engines/software_generic/meson.build +++ b/src/modules/evas/engines/software_generic/meson.build @@ -21,7 +21,7 @@ foreach eo_file : pub_eo_files input : eo_file, output : [eo_file + '.h'], depfile : eo_file + '.d', - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), diff --git a/src/tests/efl_mono/meson.build b/src/tests/efl_mono/meson.build index 975bb868e4..f901152b54 100644 --- a/src/tests/efl_mono/meson.build +++ b/src/tests/efl_mono/meson.build @@ -6,7 +6,7 @@ foreach eo_file : eo_files eo_file_targets += custom_target('eolian_gen_' + eo_file, input : eo_file, output : [eo_file + '.h'], - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-gch', '@INPUT@']) diff --git a/src/tests/eina_cxx/meson.build b/src/tests/eina_cxx/meson.build index 07470a2e0d..6caee80f30 100644 --- a/src/tests/eina_cxx/meson.build +++ b/src/tests/eina_cxx/meson.build @@ -27,7 +27,7 @@ foreach eo_file : pub_eo_files priv_eo_file_target += custom_target('eolian_gen_eina_cxx_' + eo_file, input : eo_file, output : [eo_file + '.h'], - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-gch', '@INPUT@']) diff --git a/src/tests/elementary/meson.build b/src/tests/elementary/meson.build index 405278d169..823e93e1cf 100644 --- a/src/tests/elementary/meson.build +++ b/src/tests/elementary/meson.build @@ -9,7 +9,7 @@ foreach eo_file : priv_eo_files input : eo_file, output : [eo_file + '.h'], depfile : eo_file + '.d', - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), diff --git a/src/tests/eolian/meson.build b/src/tests/eolian/meson.build index a453974cc0..a9f569dfd1 100644 --- a/src/tests/eolian/meson.build +++ b/src/tests/eolian/meson.build @@ -18,7 +18,7 @@ foreach eo_file : priv_eo_files input : eo_file, output : [eo_file + '.h'], depfile : eo_file + '.d', - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), @@ -29,7 +29,7 @@ eolian_suite = executable('eolian_suite', eolian_test_src, priv_eo_file_target, dependencies: [eolian, check, eo], c_args : [ - '-DEOLIAN_GEN="'+eolian_gen.full_path()+'"', + '-DEOLIAN_GEN="'+eolian_gen_path+'"', '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"', '-DEO_SRC_DIR="'+join_paths(meson.source_root(), 'src', 'lib')+'"', '-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"'] diff --git a/src/tests/eolian_cxx/meson.build b/src/tests/eolian_cxx/meson.build index be2f5c37c8..d93fe60c88 100644 --- a/src/tests/eolian_cxx/meson.build +++ b/src/tests/eolian_cxx/meson.build @@ -53,7 +53,7 @@ foreach eo_file : pub_eo_files pub_eo_file_target += custom_target('eolian_gen_' + eo_file, input : eo_file, output : [eo_file + '.h'], - command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, + command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-gch', '@INPUT@'])