diff options
author | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2018-12-03 18:49:47 +0100 |
---|---|---|
committer | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2018-12-03 19:00:26 +0100 |
commit | c1dd57d210c7c0b099b00984855600092b9fe660 (patch) | |
tree | 8f07341ac54541275ee8ed79e735f00d6d7a0638 | |
parent | 9e677ae0175bc1e46f2e5aaedeaae83dd2a65fcd (diff) |
meson: use eolian_gen with -S
this ensures that eolian does not parse installed .eo files
Differential Revision: https://phab.enlightenment.org/D7405
27 files changed, 61 insertions, 56 deletions
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 = [ | |||
11 | 'docs.h' | 11 | 'docs.h' |
12 | ] | 12 | ] |
13 | 13 | ||
14 | eolian_gen = executable('eolian_gen', | 14 | eolian_gen_bin = executable('eolian_gen', |
15 | eolian_gen_src, | 15 | eolian_gen_src, |
16 | dependencies: eolian, | 16 | dependencies: eolian, |
17 | install: true, | 17 | install: true, |
18 | c_args : package_c_args, | 18 | c_args : package_c_args, |
19 | ) | 19 | ) |
20 | |||
21 | eolian_gen_path = eolian_gen_bin.full_path() | ||
22 | |||
23 | |||
24 | 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 | |||
16 | depfile : eo_file + '.d', | 16 | depfile : eo_file + '.d', |
17 | install : true, | 17 | install : true, |
18 | install_dir : dir_package_include, | 18 | install_dir : dir_package_include, |
19 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 19 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
20 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 20 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
21 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), | 21 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), |
22 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 22 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), |
@@ -27,7 +27,7 @@ foreach eo_file : pub_legacy_eo_files | |||
27 | depfile : eo_file + '.legacy.d', | 27 | depfile : eo_file + '.legacy.d', |
28 | install : true, | 28 | install : true, |
29 | install_dir : dir_package_include, | 29 | install_dir : dir_package_include, |
30 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 30 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
31 | '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), | 31 | '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), |
32 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'), | 32 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'), |
33 | '-gld', '@INPUT@']) | 33 | '-gld', '@INPUT@']) |
@@ -85,7 +85,7 @@ foreach eo_file : pub_eo_files | |||
85 | depfile : eo_file + '.d', | 85 | depfile : eo_file + '.d', |
86 | install : true, | 86 | install : true, |
87 | install_dir : dir_package_include, | 87 | install_dir : dir_package_include, |
88 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 88 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
89 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 89 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
90 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), | 90 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), |
91 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 91 | '-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 | |||
19 | depfile : eo_file + '.d', | 19 | depfile : eo_file + '.d', |
20 | install : true, | 20 | install : true, |
21 | install_dir : dir_package_include, | 21 | install_dir : dir_package_include, |
22 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 22 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
23 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 23 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
24 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), | 24 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), |
25 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 25 | '-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 | |||
31 | depfile : eo_file + '.d', | 31 | depfile : eo_file + '.d', |
32 | install : true, | 32 | install : true, |
33 | install_dir : dir_package_include, | 33 | install_dir : dir_package_include, |
34 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 34 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
35 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 35 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
36 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), | 36 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), |
37 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 37 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), |
@@ -42,7 +42,7 @@ foreach eo_file : pub_legacy_eo_files | |||
42 | depfile : eo_file + '.legacy.d', | 42 | depfile : eo_file + '.legacy.d', |
43 | install : true, | 43 | install : true, |
44 | install_dir : dir_package_include, | 44 | install_dir : dir_package_include, |
45 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 45 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
46 | '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), | 46 | '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), |
47 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'), | 47 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'), |
48 | '-gld', '@INPUT@']) | 48 | '-gld', '@INPUT@']) |
@@ -99,7 +99,7 @@ foreach eo_file : pub_eo_files | |||
99 | depfile : eo_file + '.d', | 99 | depfile : eo_file + '.d', |
100 | install : true, | 100 | install : true, |
101 | install_dir : dir_package_include, | 101 | install_dir : dir_package_include, |
102 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 102 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
103 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 103 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
104 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), | 104 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), |
105 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 105 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), |
@@ -120,7 +120,7 @@ foreach eo_file : pub_eo_types_files | |||
120 | depfile : eo_file + '.d', | 120 | depfile : eo_file + '.d', |
121 | install : true, | 121 | install : true, |
122 | install_dir : dir_package_include, | 122 | install_dir : dir_package_include, |
123 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 123 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
124 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 124 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
125 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 125 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), |
126 | '-ghd', '@INPUT@']) | 126 | '-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 | |||
24 | depfile : eo_file + '.d', | 24 | depfile : eo_file + '.d', |
25 | install : false, | 25 | install : false, |
26 | install_dir : dir_package_include, | 26 | install_dir : dir_package_include, |
27 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 27 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
28 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 28 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
29 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), | 29 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), |
30 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 30 | '-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 | |||
27 | depfile : eo_file + '.d', | 27 | depfile : eo_file + '.d', |
28 | install : false, | 28 | install : false, |
29 | install_dir : dir_package_include, | 29 | install_dir : dir_package_include, |
30 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 30 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
31 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 31 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
32 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), | 32 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), |
33 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 33 | '-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 | |||
39 | depfile : eo_file + '.d', | 39 | depfile : eo_file + '.d', |
40 | install : false, | 40 | install : false, |
41 | install_dir : dir_package_include, | 41 | install_dir : dir_package_include, |
42 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 42 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
43 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 43 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
44 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), | 44 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), |
45 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 45 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), |
@@ -66,7 +66,7 @@ foreach eo_file : pub_eo_types_files | |||
66 | depfile : eo_file + '.d', | 66 | depfile : eo_file + '.d', |
67 | install : false, | 67 | install : false, |
68 | install_dir : dir_package_include, | 68 | install_dir : dir_package_include, |
69 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 69 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
70 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 70 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
71 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 71 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), |
72 | '-ghd', '@INPUT@']) | 72 | '-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 | |||
27 | depfile : eo_file + '.d', | 27 | depfile : eo_file + '.d', |
28 | install : false, | 28 | install : false, |
29 | install_dir : dir_package_include, | 29 | install_dir : dir_package_include, |
30 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 30 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
31 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 31 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
32 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), | 32 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), |
33 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 33 | '-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 | |||
46 | depfile : eo_file + '.d', | 46 | depfile : eo_file + '.d', |
47 | install : true, | 47 | install : true, |
48 | install_dir : dir_package_include, | 48 | install_dir : dir_package_include, |
49 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 49 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
50 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 50 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
51 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), | 51 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), |
52 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 52 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), |
@@ -57,7 +57,7 @@ foreach eo_file : pub_legacy_eo_files | |||
57 | depfile : eo_file + '.legacy.d', | 57 | depfile : eo_file + '.legacy.d', |
58 | install : true, | 58 | install : true, |
59 | install_dir : dir_package_include, | 59 | install_dir : dir_package_include, |
60 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 60 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
61 | '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), | 61 | '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), |
62 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'), | 62 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'), |
63 | '-gld', '@INPUT@']) | 63 | '-gld', '@INPUT@']) |
@@ -74,7 +74,7 @@ foreach eo_file : pub_eo_types_files | |||
74 | depfile : eo_file + '.d', | 74 | depfile : eo_file + '.d', |
75 | install : true, | 75 | install : true, |
76 | install_dir : dir_package_include, | 76 | install_dir : dir_package_include, |
77 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 77 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
78 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 78 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
79 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 79 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), |
80 | '-ghd', '@INPUT@']) | 80 | '-ghd', '@INPUT@']) |
@@ -90,7 +90,7 @@ foreach eo_file : priv_eo_files | |||
90 | input : eo_file, | 90 | input : eo_file, |
91 | output : [eo_file + '.h'], | 91 | output : [eo_file + '.h'], |
92 | depfile : eo_file + '.d', | 92 | depfile : eo_file + '.d', |
93 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 93 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
94 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 94 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
95 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 95 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), |
96 | '-gchd', '@INPUT@']) | 96 | '-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 | |||
24 | depfile : eo_file + '.d', | 24 | depfile : eo_file + '.d', |
25 | install : true, | 25 | install : true, |
26 | install_dir : join_paths(dir_package_include, 'interfaces'), | 26 | install_dir : join_paths(dir_package_include, 'interfaces'), |
27 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 27 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
28 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 28 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
29 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), | 29 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), |
30 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 30 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), |
@@ -35,7 +35,7 @@ foreach eo_file : pub_legacy_eo_files | |||
35 | depfile : eo_file + '.legacy.d', | 35 | depfile : eo_file + '.legacy.d', |
36 | install : true, | 36 | install : true, |
37 | install_dir : join_paths(dir_package_include, 'interfaces'), | 37 | install_dir : join_paths(dir_package_include, 'interfaces'), |
38 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 38 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
39 | '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), | 39 | '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), |
40 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'), | 40 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'), |
41 | '-gld', '@INPUT@']) | 41 | '-gld', '@INPUT@']) |
@@ -113,7 +113,7 @@ foreach eo_file : pub_eo_files | |||
113 | depfile : eo_file + '.d', | 113 | depfile : eo_file + '.d', |
114 | install : true, | 114 | install : true, |
115 | install_dir : join_paths(dir_package_include, 'interfaces'), | 115 | install_dir : join_paths(dir_package_include, 'interfaces'), |
116 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 116 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
117 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 117 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
118 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), | 118 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), |
119 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 119 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), |
@@ -137,7 +137,7 @@ foreach eo_file : pub_eo_types_files | |||
137 | depfile : eo_file + '.d', | 137 | depfile : eo_file + '.d', |
138 | install : true, | 138 | install : true, |
139 | install_dir : join_paths(dir_package_include, 'interfaces'), | 139 | install_dir : join_paths(dir_package_include, 'interfaces'), |
140 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 140 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
141 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 141 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
142 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 142 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), |
143 | '-ghd', '@INPUT@']) | 143 | '-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 | |||
13 | depfile : eo_file + '.d', | 13 | depfile : eo_file + '.d', |
14 | install : true, | 14 | install : true, |
15 | install_dir : dir_package_include, | 15 | install_dir : dir_package_include, |
16 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 16 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
17 | '-o', 'h:' + join_paths( | 17 | '-o', 'h:' + join_paths( |
18 | meson.current_build_dir(), eo_file + '.h'), | 18 | meson.current_build_dir(), eo_file + '.h'), |
19 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), | 19 | '-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 | |||
18 | depfile : eo_file + '.d', | 18 | depfile : eo_file + '.d', |
19 | install : true, | 19 | install : true, |
20 | install_dir : dir_package_include, | 20 | install_dir : dir_package_include, |
21 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 21 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
22 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 22 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
23 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), | 23 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), |
24 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 24 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), |
@@ -37,7 +37,7 @@ foreach eo_file : pub_eo_types_files | |||
37 | depfile : eo_file + '.d', | 37 | depfile : eo_file + '.d', |
38 | install : true, | 38 | install : true, |
39 | install_dir : dir_package_include, | 39 | install_dir : dir_package_include, |
40 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 40 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
41 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 41 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
42 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 42 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), |
43 | '-ghd', '@INPUT@']) | 43 | '-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 | |||
120 | depfile : eo_file + '.d', | 120 | depfile : eo_file + '.d', |
121 | install : true, | 121 | install : true, |
122 | install_dir : dir_package_include, | 122 | install_dir : dir_package_include, |
123 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 123 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
124 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 124 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
125 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), | 125 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), |
126 | '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), | 126 | '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), |
@@ -289,7 +289,7 @@ foreach eo_file : pub_eo_files | |||
289 | depfile : eo_file + '.d', | 289 | depfile : eo_file + '.d', |
290 | install : true, | 290 | install : true, |
291 | install_dir : dir_package_include, | 291 | install_dir : dir_package_include, |
292 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 292 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
293 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 293 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
294 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), | 294 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), |
295 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 295 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), |
@@ -300,7 +300,7 @@ foreach eo_file : pub_eo_files | |||
300 | depfile : eo_file + '.legacy.d', | 300 | depfile : eo_file + '.legacy.d', |
301 | install : true, | 301 | install : true, |
302 | install_dir : dir_package_include, | 302 | install_dir : dir_package_include, |
303 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 303 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
304 | '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), | 304 | '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), |
305 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'), | 305 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'), |
306 | '-gld', '@INPUT@']) | 306 | '-gld', '@INPUT@']) |
@@ -322,7 +322,7 @@ foreach eo_file : pub_eo_types_files | |||
322 | depfile : eo_file + '.d', | 322 | depfile : eo_file + '.d', |
323 | install : true, | 323 | install : true, |
324 | install_dir : dir_package_include, | 324 | install_dir : dir_package_include, |
325 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 325 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
326 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 326 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
327 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 327 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), |
328 | '-ghd', '@INPUT@']) | 328 | '-ghd', '@INPUT@']) |
@@ -346,7 +346,7 @@ foreach eo_file : priv_eo_files | |||
346 | input : eo_file, | 346 | input : eo_file, |
347 | output : [eo_file + '.h'], | 347 | output : [eo_file + '.h'], |
348 | depfile : eo_file + '.d', | 348 | depfile : eo_file + '.d', |
349 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 349 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
350 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 350 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
351 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), | 351 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), |
352 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 352 | '-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 | |||
12 | depfile : eo_file + '.d', | 12 | depfile : eo_file + '.d', |
13 | install : true, | 13 | install : true, |
14 | install_dir : dir_package_include, | 14 | install_dir : dir_package_include, |
15 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 15 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
16 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 16 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
17 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), | 17 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), |
18 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 18 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), |
@@ -23,7 +23,7 @@ foreach eo_file : pub_legacy_eo_files | |||
23 | depfile : eo_file + '.legacy.d', | 23 | depfile : eo_file + '.legacy.d', |
24 | install : true, | 24 | install : true, |
25 | install_dir : dir_package_include, | 25 | install_dir : dir_package_include, |
26 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 26 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
27 | '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), | 27 | '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), |
28 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'), | 28 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'), |
29 | '-gld', '@INPUT@']) | 29 | '-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 | |||
35 | depfile : eo_file + '.d', | 35 | depfile : eo_file + '.d', |
36 | install : true, | 36 | install : true, |
37 | install_dir : dir_package_include, | 37 | install_dir : dir_package_include, |
38 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 38 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
39 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 39 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
40 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), | 40 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), |
41 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 41 | '-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 | |||
17 | depfile : eo_file + '.d', | 17 | depfile : eo_file + '.d', |
18 | install : true, | 18 | install : true, |
19 | install_dir : join_paths(dir_package_include, 'canvas'), | 19 | install_dir : join_paths(dir_package_include, 'canvas'), |
20 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 20 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
21 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 21 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
22 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), | 22 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), |
23 | '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), | 23 | '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), |
@@ -90,7 +90,7 @@ foreach eo_file : pub_eo_files | |||
90 | depfile : eo_file + '.d', | 90 | depfile : eo_file + '.d', |
91 | install : true, | 91 | install : true, |
92 | install_dir : join_paths(dir_package_include, 'canvas'), | 92 | install_dir : join_paths(dir_package_include, 'canvas'), |
93 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 93 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
94 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 94 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
95 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), | 95 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), |
96 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 96 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), |
@@ -101,7 +101,7 @@ foreach eo_file : pub_eo_files | |||
101 | depfile : eo_file + '.legacy.d', | 101 | depfile : eo_file + '.legacy.d', |
102 | install : true, | 102 | install : true, |
103 | install_dir : join_paths(dir_package_include, 'canvas'), | 103 | install_dir : join_paths(dir_package_include, 'canvas'), |
104 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 104 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
105 | '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), | 105 | '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), |
106 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'), | 106 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'), |
107 | '-gld', '@INPUT@']) | 107 | '-gld', '@INPUT@']) |
@@ -122,7 +122,7 @@ foreach eo_file : pub_eo_types_files | |||
122 | depfile : eo_file + '.d', | 122 | depfile : eo_file + '.d', |
123 | install : true, | 123 | install : true, |
124 | install_dir : join_paths(dir_package_include, 'canvas'), | 124 | install_dir : join_paths(dir_package_include, 'canvas'), |
125 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 125 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
126 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 126 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
127 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 127 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), |
128 | '-ghd', '@INPUT@']) | 128 | '-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 | |||
16 | depfile : eo_file + '.d', | 16 | depfile : eo_file + '.d', |
17 | install : true, | 17 | install : true, |
18 | install_dir : join_paths(dir_package_include, 'gesture'), | 18 | install_dir : join_paths(dir_package_include, 'gesture'), |
19 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 19 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
20 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 20 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
21 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), | 21 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), |
22 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 22 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), |
@@ -27,7 +27,7 @@ foreach eo_file : pub_eo_files | |||
27 | depfile : eo_file + '.legacy.d', | 27 | depfile : eo_file + '.legacy.d', |
28 | install : true, | 28 | install : true, |
29 | install_dir : join_paths(dir_package_include, 'gesture'), | 29 | install_dir : join_paths(dir_package_include, 'gesture'), |
30 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 30 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
31 | '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), | 31 | '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), |
32 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'), | 32 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'), |
33 | '-gld', '@INPUT@']) | 33 | '-gld', '@INPUT@']) |
@@ -47,7 +47,7 @@ foreach eo_file : pub_eo_files | |||
47 | depfile : eo_file + '.d', | 47 | depfile : eo_file + '.d', |
48 | install : false, | 48 | install : false, |
49 | install_dir : join_paths(dir_package_include, 'gesture'), | 49 | install_dir : join_paths(dir_package_include, 'gesture'), |
50 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 50 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
51 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 51 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
52 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), | 52 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), |
53 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 53 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), |
@@ -58,7 +58,7 @@ foreach eo_file : pub_eo_files | |||
58 | depfile : eo_file + '.legacy.d', | 58 | depfile : eo_file + '.legacy.d', |
59 | install : false, | 59 | install : false, |
60 | install_dir : join_paths(dir_package_include, 'gesture'), | 60 | install_dir : join_paths(dir_package_include, 'gesture'), |
61 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 61 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
62 | '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), | 62 | '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), |
63 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'), | 63 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'), |
64 | '-gld', '@INPUT@']) | 64 | '-gld', '@INPUT@']) |
@@ -79,7 +79,7 @@ foreach eo_file : pub_eo_types_files | |||
79 | depfile : eo_file + '.d', | 79 | depfile : eo_file + '.d', |
80 | install : true, | 80 | install : true, |
81 | install_dir : join_paths(dir_package_include, 'gesture'), | 81 | install_dir : join_paths(dir_package_include, 'gesture'), |
82 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 82 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
83 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 83 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
84 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 84 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), |
85 | '-ghd', '@INPUT@']) | 85 | '-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 | |||
10 | input : eo_file, | 10 | input : eo_file, |
11 | output : [eo_file + '.h'], | 11 | output : [eo_file + '.h'], |
12 | depfile : eo_file + '.d', | 12 | depfile : eo_file + '.d', |
13 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 13 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
14 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 14 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
15 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), | 15 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), |
16 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 16 | '-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 | |||
30 | depfile : eo_file + '.d', | 30 | depfile : eo_file + '.d', |
31 | install : true, | 31 | install : true, |
32 | install_dir : dir_package_include, | 32 | install_dir : dir_package_include, |
33 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 33 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
34 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 34 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
35 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), | 35 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), |
36 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 36 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), |
@@ -41,7 +41,7 @@ foreach eo_file : pub_legacy_eo_files | |||
41 | depfile : eo_file + '.legacy.d', | 41 | depfile : eo_file + '.legacy.d', |
42 | install : true, | 42 | install : true, |
43 | install_dir : dir_package_include, | 43 | install_dir : dir_package_include, |
44 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 44 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
45 | '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), | 45 | '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), |
46 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'), | 46 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'), |
47 | '-gld', '@INPUT@']) | 47 | '-gld', '@INPUT@']) |
@@ -58,7 +58,7 @@ foreach eo_file : pub_eo_files | |||
58 | depfile : eo_file + '.d', | 58 | depfile : eo_file + '.d', |
59 | install : true, | 59 | install : true, |
60 | install_dir : dir_package_include, | 60 | install_dir : dir_package_include, |
61 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 61 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
62 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 62 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
63 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), | 63 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), |
64 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 64 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), |
@@ -77,7 +77,7 @@ foreach eo_file : pub_eo_types_files | |||
77 | depfile : eo_file + '.d', | 77 | depfile : eo_file + '.d', |
78 | install : true, | 78 | install : true, |
79 | install_dir : dir_package_include, | 79 | install_dir : dir_package_include, |
80 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 80 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
81 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 81 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
82 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 82 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), |
83 | '-ghd', '@INPUT@']) | 83 | '-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 | |||
10 | depfile : eo_file + '.d', | 10 | depfile : eo_file + '.d', |
11 | install : true, | 11 | install : true, |
12 | install_dir : dir_package_include, | 12 | install_dir : dir_package_include, |
13 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 13 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
14 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 14 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
15 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), | 15 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), |
16 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 16 | '-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 | |||
25 | input : eo_file, | 25 | input : eo_file, |
26 | output : [eo_file + '.h'], | 26 | output : [eo_file + '.h'], |
27 | depfile : eo_file + '.d', | 27 | depfile : eo_file + '.d', |
28 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 28 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
29 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 29 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
30 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), | 30 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), |
31 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 31 | '-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 | |||
21 | input : eo_file, | 21 | input : eo_file, |
22 | output : [eo_file + '.h'], | 22 | output : [eo_file + '.h'], |
23 | depfile : eo_file + '.d', | 23 | depfile : eo_file + '.d', |
24 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 24 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
25 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 25 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
26 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), | 26 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), |
27 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 27 | '-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 | |||
6 | eo_file_targets += custom_target('eolian_gen_' + eo_file, | 6 | eo_file_targets += custom_target('eolian_gen_' + eo_file, |
7 | input : eo_file, | 7 | input : eo_file, |
8 | output : [eo_file + '.h'], | 8 | output : [eo_file + '.h'], |
9 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 9 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
10 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 10 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
11 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), | 11 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), |
12 | '-gch', '@INPUT@']) | 12 | '-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 | |||
27 | priv_eo_file_target += custom_target('eolian_gen_eina_cxx_' + eo_file, | 27 | priv_eo_file_target += custom_target('eolian_gen_eina_cxx_' + eo_file, |
28 | input : eo_file, | 28 | input : eo_file, |
29 | output : [eo_file + '.h'], | 29 | output : [eo_file + '.h'], |
30 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 30 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
31 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 31 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
32 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), | 32 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), |
33 | '-gch', '@INPUT@']) | 33 | '-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 | |||
9 | input : eo_file, | 9 | input : eo_file, |
10 | output : [eo_file + '.h'], | 10 | output : [eo_file + '.h'], |
11 | depfile : eo_file + '.d', | 11 | depfile : eo_file + '.d', |
12 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 12 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
13 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 13 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
14 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), | 14 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), |
15 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 15 | '-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 | |||
18 | input : eo_file, | 18 | input : eo_file, |
19 | output : [eo_file + '.h'], | 19 | output : [eo_file + '.h'], |
20 | depfile : eo_file + '.d', | 20 | depfile : eo_file + '.d', |
21 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 21 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
22 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 22 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
23 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), | 23 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), |
24 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), | 24 | '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), |
@@ -29,7 +29,7 @@ eolian_suite = executable('eolian_suite', | |||
29 | eolian_test_src, priv_eo_file_target, | 29 | eolian_test_src, priv_eo_file_target, |
30 | dependencies: [eolian, check, eo], | 30 | dependencies: [eolian, check, eo], |
31 | c_args : [ | 31 | c_args : [ |
32 | '-DEOLIAN_GEN="'+eolian_gen.full_path()+'"', | 32 | '-DEOLIAN_GEN="'+eolian_gen_path+'"', |
33 | '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"', | 33 | '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"', |
34 | '-DEO_SRC_DIR="'+join_paths(meson.source_root(), 'src', 'lib')+'"', | 34 | '-DEO_SRC_DIR="'+join_paths(meson.source_root(), 'src', 'lib')+'"', |
35 | '-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"'] | 35 | '-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 | |||
53 | pub_eo_file_target += custom_target('eolian_gen_' + eo_file, | 53 | pub_eo_file_target += custom_target('eolian_gen_' + eo_file, |
54 | input : eo_file, | 54 | input : eo_file, |
55 | output : [eo_file + '.h'], | 55 | output : [eo_file + '.h'], |
56 | command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, | 56 | command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, |
57 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), | 57 | '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), |
58 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), | 58 | '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), |
59 | '-gch', '@INPUT@']) | 59 | '-gch', '@INPUT@']) |