summaryrefslogtreecommitdiff
path: root/src/lib/evas
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2018-12-03 18:49:47 +0100
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2018-12-03 19:00:26 +0100
commitc1dd57d210c7c0b099b00984855600092b9fe660 (patch)
tree8f07341ac54541275ee8ed79e735f00d6d7a0638 /src/lib/evas
parent9e677ae0175bc1e46f2e5aaedeaae83dd2a65fcd (diff)
meson: use eolian_gen with -S
this ensures that eolian does not parse installed .eo files Differential Revision: https://phab.enlightenment.org/D7405
Diffstat (limited to 'src/lib/evas')
-rw-r--r--src/lib/evas/canvas/meson.build8
-rw-r--r--src/lib/evas/gesture/meson.build10
-rw-r--r--src/lib/evas/include/meson.build2
-rw-r--r--src/lib/evas/meson.build8
4 files changed, 14 insertions, 14 deletions
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@'])