meson: use eolian_gen with -S

this ensures that eolian does not parse installed .eo files

Differential Revision: https://phab.enlightenment.org/D7405
This commit is contained in:
Marcel Hollerbach 2018-12-03 18:49:47 +01:00
parent 9e677ae017
commit c1dd57d210
27 changed files with 61 additions and 56 deletions

View File

@ -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']

View File

@ -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'),

View File

@ -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'),

View File

@ -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@'])

View File

@ -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'),

View File

@ -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'),

View File

@ -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@'])

View File

@ -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'),

View File

@ -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@'])

View File

@ -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@'])

View File

@ -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'),

View File

@ -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@'])

View File

@ -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'),

View File

@ -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@'])

View File

@ -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'),

View File

@ -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@'])

View File

@ -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@'])

View File

@ -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'),

View File

@ -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@'])

View File

@ -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'),

View File

@ -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'),

View File

@ -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'),

View File

@ -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@'])

View File

@ -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@'])

View File

@ -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'),

View File

@ -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()+'"']

View File

@ -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@'])