summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@samsung.com>2018-10-21 15:55:51 +0200
committerDaniel Kolesa <d.kolesa@samsung.com>2018-10-22 16:37:01 +0200
commit926f7c12e3f68f050cf4181ea693297e81259504 (patch)
treece4d12acf16e7eda483cac0232b6035fa534e9f6
parent5b148986e0f2a5bf4bacc0de94166eeb55180a39 (diff)
meson: add eolian custom dependencies supportdevs/q66/eolian_deps
This uses the meson/ninja depfile functionality + eolian to make sure proper dependencies between generated files and .eo files are managed, to ensure consistent re-generation of all generated files that are affected upon .eo file modification. For custom rules with multiple outputs, Ninja currently does not support depfiles. Therefore, split those into two custom rules so that the depfiles functionality can be enabled. While this is ugly and slows down the process a little by having to invoke Eolian twice instead of once, it has to be done and it's still better than what we had in Autotools anyway.
-rw-r--r--src/lib/ecore/meson.build20
-rw-r--r--src/lib/ecore_audio/meson.build4
-rw-r--r--src/lib/ecore_con/meson.build27
-rw-r--r--src/lib/ector/cairo/meson.build4
-rw-r--r--src/lib/ector/gl/meson.build4
-rw-r--r--src/lib/ector/meson.build8
-rw-r--r--src/lib/ector/software/meson.build4
-rw-r--r--src/lib/edje/meson.build24
-rw-r--r--src/lib/efl/interfaces/meson.build24
-rw-r--r--src/lib/eio/meson.build4
-rw-r--r--src/lib/eldbus/meson.build8
-rw-r--r--src/lib/elementary/meson.build19
-rw-r--r--src/lib/emotion/meson.build16
-rw-r--r--src/lib/eo/meson.build4
-rw-r--r--src/lib/evas/canvas/meson.build23
-rw-r--r--src/lib/evas/gesture/meson.build34
-rw-r--r--src/lib/evas/include/meson.build4
-rw-r--r--src/lib/evas/meson.build24
-rw-r--r--src/modules/elementary/web/none/meson.build4
-rw-r--r--src/modules/evas/engines/gl_generic/meson.build4
-rw-r--r--src/modules/evas/engines/software_generic/meson.build4
-rw-r--r--src/tests/elementary/meson.build4
-rw-r--r--src/tests/eolian/meson.build4
23 files changed, 215 insertions, 60 deletions
diff --git a/src/lib/ecore/meson.build b/src/lib/ecore/meson.build
index 732856dd23..dbb511e2bf 100644
--- a/src/lib/ecore/meson.build
+++ b/src/lib/ecore/meson.build
@@ -12,15 +12,25 @@ pub_eo_file_target = []
12foreach eo_file : pub_legacy_eo_files 12foreach eo_file : pub_legacy_eo_files
13 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 13 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
14 input : eo_file, 14 input : eo_file,
15 output : [eo_file + '.h', eo_file + '.legacy.h',], 15 output : [eo_file + '.h'],
16 depfile : eo_file + '.d',
16 install : true, 17 install : true,
17 install_dir : dir_package_include, 18 install_dir : dir_package_include,
18 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 19 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
19 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 20 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
20 '-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'),
23 '-gchd', '@INPUT@'])
24 pub_eo_file_target += custom_target('eolian_gen_legacy_' + eo_file,
25 input : eo_file,
26 output : [eo_file + '.legacy.h'],
27 depfile : eo_file + '.legacy.d',
28 install : true,
29 install_dir : dir_package_include,
30 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
21 '-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'),
22 '-gchl', '@INPUT@']) 32 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'),
23 33 '-gld', '@INPUT@'])
24endforeach 34endforeach
25 35
26pub_eo_files = [ 36pub_eo_files = [
@@ -72,12 +82,14 @@ foreach eo_file : pub_eo_files
72 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 82 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
73 input : eo_file, 83 input : eo_file,
74 output : [eo_file + '.h'], 84 output : [eo_file + '.h'],
85 depfile : eo_file + '.d',
75 install : true, 86 install : true,
76 install_dir : dir_package_include, 87 install_dir : dir_package_include,
77 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 88 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
78 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 89 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
79 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), 90 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
80 '-gch', '@INPUT@']) 91 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
92 '-gchd', '@INPUT@'])
81endforeach 93endforeach
82 94
83# special handling, because this is already eo API and legacy API 95# special handling, because this is already eo API and legacy API
diff --git a/src/lib/ecore_audio/meson.build b/src/lib/ecore_audio/meson.build
index 099f8454db..6fdd5a30b4 100644
--- a/src/lib/ecore_audio/meson.build
+++ b/src/lib/ecore_audio/meson.build
@@ -16,12 +16,14 @@ foreach eo_file : pub_eo_files
16 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 16 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
17 input : eo_file, 17 input : eo_file,
18 output : [eo_file + '.h'], 18 output : [eo_file + '.h'],
19 depfile : eo_file + '.d',
19 install : true, 20 install : true,
20 install_dir : dir_package_include, 21 install_dir : dir_package_include,
21 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 22 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
22 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 23 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
23 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), 24 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
24 '-gch', '@INPUT@']) 25 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
26 '-gchd', '@INPUT@'])
25endforeach 27endforeach
26 28
27pub_eo_types_files = [] 29pub_eo_types_files = []
diff --git a/src/lib/ecore_con/meson.build b/src/lib/ecore_con/meson.build
index b8b5a36b2a..f945ccd0d4 100644
--- a/src/lib/ecore_con/meson.build
+++ b/src/lib/ecore_con/meson.build
@@ -27,15 +27,25 @@ pub_eo_file_target = []
27foreach eo_file : pub_legacy_eo_files 27foreach eo_file : pub_legacy_eo_files
28 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 28 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
29 input : eo_file, 29 input : eo_file,
30 output : [eo_file + '.h', eo_file + '.legacy.h',], 30 output : [eo_file + '.h'],
31 depfile : eo_file + '.d',
31 install : true, 32 install : true,
32 install_dir : dir_package_include, 33 install_dir : dir_package_include,
33 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 34 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
34 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 35 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
35 '-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'),
38 '-gchd', '@INPUT@'])
39 pub_eo_file_target += custom_target('eolian_gen_legacy_' + eo_file,
40 input : eo_file,
41 output : [eo_file + '.legacy.h'],
42 depfile : eo_file + '.legacy.d',
43 install : true,
44 install_dir : dir_package_include,
45 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
36 '-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'),
37 '-gchl', '@INPUT@']) 47 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'),
38 48 '-gld', '@INPUT@'])
39endforeach 49endforeach
40 50
41pub_eo_files = [ 51pub_eo_files = [
@@ -85,14 +95,15 @@ endif
85foreach eo_file : pub_eo_files 95foreach eo_file : pub_eo_files
86 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 96 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
87 input : eo_file, 97 input : eo_file,
88 output : [eo_file + '.h', eo_file + '.legacy.h',], 98 output : [eo_file + '.h'],
99 depfile : eo_file + '.d',
89 install : true, 100 install : true,
90 install_dir : dir_package_include, 101 install_dir : dir_package_include,
91 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 102 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
92 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 103 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
93 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), 104 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
94 '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), 105 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
95 '-gch', '@INPUT@']) 106 '-gchd', '@INPUT@'])
96endforeach 107endforeach
97 108
98 109
@@ -106,11 +117,13 @@ foreach eo_file : pub_eo_types_files
106 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 117 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
107 input : eo_file, 118 input : eo_file,
108 output : [eo_file + '.h'], 119 output : [eo_file + '.h'],
120 depfile : eo_file + '.d',
109 install : true, 121 install : true,
110 install_dir : dir_package_include, 122 install_dir : dir_package_include,
111 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 123 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
112 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 124 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
113 '-gh', '@INPUT@']) 125 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
126 '-ghd', '@INPUT@'])
114endforeach 127endforeach
115 128
116eolian_include_directories += ['-I', meson.current_source_dir()] 129eolian_include_directories += ['-I', meson.current_source_dir()]
diff --git a/src/lib/ector/cairo/meson.build b/src/lib/ector/cairo/meson.build
index 2b45ce2b87..e9ebc60708 100644
--- a/src/lib/ector/cairo/meson.build
+++ b/src/lib/ector/cairo/meson.build
@@ -21,12 +21,14 @@ foreach eo_file : pub_eo_files
21 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 21 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
22 input : eo_file, 22 input : eo_file,
23 output : [eo_file + '.h'], 23 output : [eo_file + '.h'],
24 depfile : eo_file + '.d',
24 install : false, 25 install : false,
25 install_dir : dir_package_include, 26 install_dir : dir_package_include,
26 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 27 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
27 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 28 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
28 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), 29 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
29 '-gch', '@INPUT@']) 30 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
31 '-gchd', '@INPUT@'])
30endforeach 32endforeach
31 33
32install_data(pub_eo_files, 34install_data(pub_eo_files,
diff --git a/src/lib/ector/gl/meson.build b/src/lib/ector/gl/meson.build
index dad958c0fc..11bb8cfc6a 100644
--- a/src/lib/ector/gl/meson.build
+++ b/src/lib/ector/gl/meson.build
@@ -24,12 +24,14 @@ foreach eo_file : pub_eo_files
24 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 24 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
25 input : eo_file, 25 input : eo_file,
26 output : [eo_file + '.h'], 26 output : [eo_file + '.h'],
27 depfile : eo_file + '.d',
27 install : false, 28 install : false,
28 install_dir : dir_package_include, 29 install_dir : dir_package_include,
29 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 30 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
30 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 31 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
31 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), 32 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
32 '-gch', '@INPUT@']) 33 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
34 '-gchd', '@INPUT@'])
33endforeach 35endforeach
34 36
35install_data(pub_eo_files, 37install_data(pub_eo_files,
diff --git a/src/lib/ector/meson.build b/src/lib/ector/meson.build
index be3c6a5f62..58e4f96d53 100644
--- a/src/lib/ector/meson.build
+++ b/src/lib/ector/meson.build
@@ -34,12 +34,14 @@ foreach eo_file : pub_eo_files
34 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 34 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
35 input : eo_file, 35 input : eo_file,
36 output : [eo_file + '.h'], 36 output : [eo_file + '.h'],
37 depfile : eo_file + '.d',
37 install : false, 38 install : false,
38 install_dir : dir_package_include, 39 install_dir : dir_package_include,
39 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 40 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
40 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 41 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
41 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), 42 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
42 '-gch', '@INPUT@']) 43 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
44 '-gchd', '@INPUT@'])
43endforeach 45endforeach
44 46
45eolian_include_directories += ['-I', meson.current_source_dir()] 47eolian_include_directories += ['-I', meson.current_source_dir()]
@@ -60,11 +62,13 @@ foreach eo_file : pub_eo_types_files
60 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 62 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
61 input : eo_file, 63 input : eo_file,
62 output : [eo_file + '.h'], 64 output : [eo_file + '.h'],
65 depfile : eo_file + '.d',
63 install : false, 66 install : false,
64 install_dir : dir_package_include, 67 install_dir : dir_package_include,
65 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 68 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
66 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 69 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
67 '-gh', '@INPUT@']) 70 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
71 '-ghd', '@INPUT@'])
68endforeach 72endforeach
69 73
70ector_lib = library('ector', 74ector_lib = library('ector',
diff --git a/src/lib/ector/software/meson.build b/src/lib/ector/software/meson.build
index ceb08ef3f2..5e5dc599d7 100644
--- a/src/lib/ector/software/meson.build
+++ b/src/lib/ector/software/meson.build
@@ -23,12 +23,14 @@ foreach eo_file : pub_eo_files
23 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 23 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
24 input : eo_file, 24 input : eo_file,
25 output : [eo_file + '.h'], 25 output : [eo_file + '.h'],
26 depfile : eo_file + '.d',
26 install : false, 27 install : false,
27 install_dir : dir_package_include, 28 install_dir : dir_package_include,
28 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 29 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
29 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 30 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
30 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), 31 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
31 '-gch', '@INPUT@']) 32 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
33 '-gchd', '@INPUT@'])
32endforeach 34endforeach
33 35
34install_data(pub_eo_files, 36install_data(pub_eo_files,
diff --git a/src/lib/edje/meson.build b/src/lib/edje/meson.build
index bcfcd9b569..bd2374637b 100644
--- a/src/lib/edje/meson.build
+++ b/src/lib/edje/meson.build
@@ -42,15 +42,25 @@ pub_eo_file_target = []
42foreach eo_file : pub_legacy_eo_files 42foreach eo_file : pub_legacy_eo_files
43 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 43 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
44 input : eo_file, 44 input : eo_file,
45 output : [eo_file + '.h', eo_file + '.legacy.h',], 45 output : [eo_file + '.h'],
46 depfile : eo_file + '.d',
46 install : true, 47 install : true,
47 install_dir : dir_package_include, 48 install_dir : dir_package_include,
48 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 49 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
49 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 50 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
50 '-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'),
53 '-gchd', '@INPUT@'])
54 pub_eo_file_target += custom_target('eolian_gen_legacy_' + eo_file,
55 input : eo_file,
56 output : [eo_file + '.legacy.h'],
57 depfile : eo_file + '.legacy.d',
58 install : true,
59 install_dir : dir_package_include,
60 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
51 '-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'),
52 '-gchl', '@INPUT@']) 62 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'),
53 63 '-gld', '@INPUT@'])
54endforeach 64endforeach
55 65
56pub_eo_types_files = [ 66pub_eo_types_files = [
@@ -61,11 +71,13 @@ foreach eo_file : pub_eo_types_files
61 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 71 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
62 input : eo_file, 72 input : eo_file,
63 output : [eo_file + '.h'], 73 output : [eo_file + '.h'],
74 depfile : eo_file + '.d',
64 install : true, 75 install : true,
65 install_dir : dir_package_include, 76 install_dir : dir_package_include,
66 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 77 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
67 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 78 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
68 '-gh', '@INPUT@']) 79 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
80 '-ghd', '@INPUT@'])
69endforeach 81endforeach
70 82
71priv_eo_files = [ 83priv_eo_files = [
@@ -77,9 +89,11 @@ foreach eo_file : priv_eo_files
77 priv_eo_file_target += custom_target('eolian_gen_' + eo_file, 89 priv_eo_file_target += custom_target('eolian_gen_' + eo_file,
78 input : eo_file, 90 input : eo_file,
79 output : [eo_file + '.h'], 91 output : [eo_file + '.h'],
92 depfile : eo_file + '.d',
80 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 93 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
81 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 94 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
82 '-gch', '@INPUT@']) 95 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
96 '-gchd', '@INPUT@'])
83endforeach 97endforeach
84 98
85 99
diff --git a/src/lib/efl/interfaces/meson.build b/src/lib/efl/interfaces/meson.build
index 8d29c404a8..cb39cff2e5 100644
--- a/src/lib/efl/interfaces/meson.build
+++ b/src/lib/efl/interfaces/meson.build
@@ -18,15 +18,25 @@ pub_eo_file_target = []
18foreach eo_file : pub_legacy_eo_files 18foreach eo_file : pub_legacy_eo_files
19 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 19 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
20 input : eo_file, 20 input : eo_file,
21 output : [eo_file + '.h', eo_file + '.legacy.h',], 21 output : [eo_file + '.h'],
22 depfile : eo_file + '.d',
22 install : true, 23 install : true,
23 install_dir : join_paths(dir_package_include, 'interfaces'), 24 install_dir : join_paths(dir_package_include, 'interfaces'),
24 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 25 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
25 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 26 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
26 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), 27 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
28 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
29 '-gchd', '@INPUT@'])
30 pub_eo_file_target += custom_target('eolian_gen_legacy_' + eo_file,
31 input : eo_file,
32 output : [eo_file + '.legacy.h'],
33 depfile : eo_file + '.legacy.d',
34 install : true,
35 install_dir : join_paths(dir_package_include, 'interfaces'),
36 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
27 '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), 37 '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'),
28 '-gchl', '@INPUT@']) 38 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'),
29 39 '-gld', '@INPUT@'])
30endforeach 40endforeach
31 41
32pub_eo_files = [ 42pub_eo_files = [
@@ -99,12 +109,14 @@ foreach eo_file : pub_eo_files
99 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 109 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
100 input : eo_file, 110 input : eo_file,
101 output : [eo_file + '.h'], 111 output : [eo_file + '.h'],
112 depfile : eo_file + '.d',
102 install : true, 113 install : true,
103 install_dir : join_paths(dir_package_include, 'interfaces'), 114 install_dir : join_paths(dir_package_include, 'interfaces'),
104 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 115 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
105 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 116 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
106 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), 117 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
107 '-gch', '@INPUT@']) 118 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
119 '-gchd', '@INPUT@'])
108endforeach 120endforeach
109 121
110pub_eo_types_files = [ 122pub_eo_types_files = [
@@ -119,11 +131,13 @@ foreach eo_file : pub_eo_types_files
119 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 131 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
120 input : eo_file, 132 input : eo_file,
121 output : [eo_file + '.h'], 133 output : [eo_file + '.h'],
134 depfile : eo_file + '.d',
122 install : true, 135 install : true,
123 install_dir : join_paths(dir_package_include, 'interfaces'), 136 install_dir : join_paths(dir_package_include, 'interfaces'),
124 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 137 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
125 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 138 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
126 '-gh', '@INPUT@']) 139 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
140 '-ghd', '@INPUT@'])
127endforeach 141endforeach
128 142
129pub_eo_files = files(pub_eo_files + pub_legacy_eo_files + pub_eo_types_files) 143pub_eo_files = files(pub_eo_files + pub_legacy_eo_files + pub_eo_types_files)
diff --git a/src/lib/eio/meson.build b/src/lib/eio/meson.build
index fd6902f38b..c3410d752e 100644
--- a/src/lib/eio/meson.build
+++ b/src/lib/eio/meson.build
@@ -10,13 +10,15 @@ foreach eo_file : pub_eo_files
10 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 10 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
11 input : eo_file, 11 input : eo_file,
12 output : [eo_file + '.h'], 12 output : [eo_file + '.h'],
13 depfile : eo_file + '.d',
13 install : true, 14 install : true,
14 install_dir : dir_package_include, 15 install_dir : dir_package_include,
15 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 16 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
16 '-o', 'h:' + join_paths( 17 '-o', 'h:' + join_paths(
17 meson.current_build_dir(), eo_file + '.h'), 18 meson.current_build_dir(), eo_file + '.h'),
18 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), 19 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
19 '-gch', '@INPUT@']) 20 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
21 '-gchd', '@INPUT@'])
20endforeach 22endforeach
21 23
22pub_eo_types_files = [] 24pub_eo_types_files = []
diff --git a/src/lib/eldbus/meson.build b/src/lib/eldbus/meson.build
index 57f2981c4a..fcb452c8a3 100644
--- a/src/lib/eldbus/meson.build
+++ b/src/lib/eldbus/meson.build
@@ -15,12 +15,14 @@ foreach eo_file : pub_eo_files
15 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 15 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
16 input : eo_file, 16 input : eo_file,
17 output : [eo_file + '.h'], 17 output : [eo_file + '.h'],
18 depfile : eo_file + '.d',
18 install : true, 19 install : true,
19 install_dir : dir_package_include, 20 install_dir : dir_package_include,
20 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 21 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
21 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 22 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
22 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), 23 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
23 '-gch', '@INPUT@']) 24 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
25 '-gchd', '@INPUT@'])
24endforeach 26endforeach
25 27
26 28
@@ -32,11 +34,13 @@ foreach eo_file : pub_eo_types_files
32 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 34 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
33 input : eo_file, 35 input : eo_file,
34 output : [eo_file + '.h'], 36 output : [eo_file + '.h'],
37 depfile : eo_file + '.d',
35 install : true, 38 install : true,
36 install_dir : dir_package_include, 39 install_dir : dir_package_include,
37 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 40 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
38 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 41 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
39 '-gh', '@INPUT@']) 42 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
43 '-ghd', '@INPUT@'])
40endforeach 44endforeach
41 45
42eolian_include_directories += ['-I', meson.current_source_dir()] 46eolian_include_directories += ['-I', meson.current_source_dir()]
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index 16ea518792..31bc4fede2 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -117,13 +117,15 @@ foreach eo_file : pub_legacy_eo_files
117 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 117 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
118 input : eo_file, 118 input : eo_file,
119 output : [eo_file + '.legacy.h',], 119 output : [eo_file + '.legacy.h',],
120 depfile : eo_file + '.d',
120 install : true, 121 install : true,
121 install_dir : dir_package_include, 122 install_dir : dir_package_include,
122 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 123 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
123 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 124 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
124 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), 125 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
125 '-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'),
126 '-gchl', '@INPUT@']) 127 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
128 '-gchld', '@INPUT@'])
127 129
128endforeach 130endforeach
129 131
@@ -277,14 +279,15 @@ pub_eo_files = [
277foreach eo_file : pub_eo_files 279foreach eo_file : pub_eo_files
278 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 280 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
279 input : eo_file, 281 input : eo_file,
280 output : [eo_file + '.h', eo_file + '.legacy.h'], 282 output : [eo_file + '.h'],
283 depfile : eo_file + '.d',
281 install : true, 284 install : true,
282 install_dir : dir_package_include, 285 install_dir : dir_package_include,
283 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 286 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
284 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 287 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
285 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), 288 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
286 '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), 289 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
287 '-gch', '@INPUT@']) 290 '-gchd', '@INPUT@'])
288endforeach 291endforeach
289 292
290 293
@@ -300,11 +303,13 @@ foreach eo_file : pub_eo_types_files
300 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 303 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
301 input : eo_file, 304 input : eo_file,
302 output : [eo_file + '.h'], 305 output : [eo_file + '.h'],
306 depfile : eo_file + '.d',
303 install : true, 307 install : true,
304 install_dir : dir_package_include, 308 install_dir : dir_package_include,
305 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 309 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
306 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 310 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
307 '-gh', '@INPUT@']) 311 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
312 '-ghd', '@INPUT@'])
308endforeach 313endforeach
309 314
310priv_eo_files = [ 315priv_eo_files = [
@@ -323,10 +328,12 @@ foreach eo_file : priv_eo_files
323 priv_eo_file_target += custom_target('eolian_gen_' + eo_file, 328 priv_eo_file_target += custom_target('eolian_gen_' + eo_file,
324 input : eo_file, 329 input : eo_file,
325 output : [eo_file + '.h'], 330 output : [eo_file + '.h'],
331 depfile : eo_file + '.d',
326 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 332 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
327 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 333 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
328 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), 334 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
329 '-gch', '@INPUT@']) 335 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
336 '-gchd', '@INPUT@'])
330endforeach 337endforeach
331 338
332eolian_include_directories += ['-I', meson.current_source_dir()] 339eolian_include_directories += ['-I', meson.current_source_dir()]
diff --git a/src/lib/emotion/meson.build b/src/lib/emotion/meson.build
index 56fda43cb9..1caea9dcee 100644
--- a/src/lib/emotion/meson.build
+++ b/src/lib/emotion/meson.build
@@ -8,15 +8,25 @@ priv_eo_file_target = []
8foreach eo_file : pub_legacy_eo_files 8foreach eo_file : pub_legacy_eo_files
9 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 9 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
10 input : eo_file, 10 input : eo_file,
11 output : [eo_file + '.h', eo_file + '.legacy.h',], 11 output : [eo_file + '.h'],
12 depfile : eo_file + '.d',
12 install : true, 13 install : true,
13 install_dir : dir_package_include, 14 install_dir : dir_package_include,
14 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 15 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
15 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 16 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
16 '-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'),
19 '-gchd', '@INPUT@'])
20 pub_eo_file_target += custom_target('eolian_gen_legacy_' + eo_file,
21 input : eo_file,
22 output : [eo_file + '.legacy.h'],
23 depfile : eo_file + '.legacy.d',
24 install : true,
25 install_dir : dir_package_include,
26 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
17 '-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'),
18 '-gchl', '@INPUT@']) 28 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'),
19 29 '-gld', '@INPUT@'])
20endforeach 30endforeach
21 31
22eolian_include_directories += ['-I', meson.current_source_dir()] 32eolian_include_directories += ['-I', meson.current_source_dir()]
diff --git a/src/lib/eo/meson.build b/src/lib/eo/meson.build
index 5789c95f4c..34f60aac76 100644
--- a/src/lib/eo/meson.build
+++ b/src/lib/eo/meson.build
@@ -32,12 +32,14 @@ foreach eo_file : pub_eo_files
32 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 32 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
33 input : eo_file, 33 input : eo_file,
34 output : [eo_file + '.h'], 34 output : [eo_file + '.h'],
35 depfile : eo_file + '.d',
35 install : true, 36 install : true,
36 install_dir : dir_package_include, 37 install_dir : dir_package_include,
37 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 38 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
38 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 39 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
39 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), 40 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
40 '-gch', '@INPUT@']) 41 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
42 '-gchd', '@INPUT@'])
41endforeach 43endforeach
42 44
43eolian_include_directories += ['-I', meson.current_source_dir()] 45eolian_include_directories += ['-I', meson.current_source_dir()]
diff --git a/src/lib/evas/canvas/meson.build b/src/lib/evas/canvas/meson.build
index 47db33de4b..982d8f3af1 100644
--- a/src/lib/evas/canvas/meson.build
+++ b/src/lib/evas/canvas/meson.build
@@ -14,13 +14,15 @@ foreach eo_file : pub_legacy_eo_files
14 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 14 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
15 input : eo_file, 15 input : eo_file,
16 output : [eo_file + '.legacy.h',], 16 output : [eo_file + '.legacy.h',],
17 depfile : eo_file + '.d',
17 install : true, 18 install : true,
18 install_dir : join_paths(dir_package_include, 'canvas'), 19 install_dir : join_paths(dir_package_include, 'canvas'),
19 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 20 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
20 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 21 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
21 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), 22 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
22 '-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'),
23 '-gchl', '@INPUT@']) 24 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
25 '-gchld', '@INPUT@'])
24 26
25endforeach 27endforeach
26 28
@@ -82,14 +84,25 @@ pub_evas_eo_files += files(pub_eo_files)
82foreach eo_file : pub_eo_files 84foreach eo_file : pub_eo_files
83 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 85 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
84 input : eo_file, 86 input : eo_file,
85 output : [eo_file + '.h', eo_file + '.legacy.h',], 87 output : [eo_file + '.h'],
88 depfile : eo_file + '.d',
86 install : true, 89 install : true,
87 install_dir : join_paths(dir_package_include, 'canvas'), 90 install_dir : join_paths(dir_package_include, 'canvas'),
88 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 91 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
89 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 92 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
90 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), 93 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
94 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
95 '-gchd', '@INPUT@'])
96 pub_eo_file_target += custom_target('eolian_gen_legacy_' + eo_file,
97 input : eo_file,
98 output : [eo_file + '.legacy.h'],
99 depfile : eo_file + '.legacy.d',
100 install : true,
101 install_dir : join_paths(dir_package_include, 'canvas'),
102 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
91 '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), 103 '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'),
92 '-gchl', '@INPUT@']) 104 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'),
105 '-gld', '@INPUT@'])
93endforeach 106endforeach
94 107
95 108
@@ -102,11 +115,13 @@ foreach eo_file : pub_eo_types_files
102 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 115 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
103 input : eo_file, 116 input : eo_file,
104 output : [eo_file + '.h'], 117 output : [eo_file + '.h'],
118 depfile : eo_file + '.d',
105 install : true, 119 install : true,
106 install_dir : join_paths(dir_package_include, 'canvas'), 120 install_dir : join_paths(dir_package_include, 'canvas'),
107 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 121 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
108 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 122 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
109 '-gh', '@INPUT@']) 123 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
124 '-ghd', '@INPUT@'])
110endforeach 125endforeach
111 126
112pub_evas_eot_files += files(pub_eo_types_files) 127pub_evas_eot_files += files(pub_eo_types_files)
diff --git a/src/lib/evas/gesture/meson.build b/src/lib/evas/gesture/meson.build
index 62d9b27599..a6289264eb 100644
--- a/src/lib/evas/gesture/meson.build
+++ b/src/lib/evas/gesture/meson.build
@@ -10,14 +10,25 @@ pub_eo_files = [
10foreach eo_file : pub_eo_files 10foreach eo_file : pub_eo_files
11 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 11 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
12 input : eo_file, 12 input : eo_file,
13 output : [eo_file + '.h', eo_file + '.legacy.h',], 13 output : [eo_file + '.h'],
14 depfile : eo_file + '.d',
14 install : true, 15 install : true,
15 install_dir : join_paths(dir_package_include, 'gesture'), 16 install_dir : join_paths(dir_package_include, 'gesture'),
16 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 17 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
17 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 18 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
18 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), 19 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
20 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
21 '-gchd', '@INPUT@'])
22 pub_eo_file_target += custom_target('eolian_gen_legacy_' + eo_file,
23 input : eo_file,
24 output : [eo_file + '.legacy.h'],
25 depfile : eo_file + '.legacy.d',
26 install : true,
27 install_dir : join_paths(dir_package_include, 'gesture'),
28 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
19 '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), 29 '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'),
20 '-gchl', '@INPUT@']) 30 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'),
31 '-gld', '@INPUT@'])
21endforeach 32endforeach
22 33
23pub_evas_eo_files += files(pub_eo_files) 34pub_evas_eo_files += files(pub_eo_files)
@@ -30,14 +41,25 @@ pub_eo_files = [
30foreach eo_file : pub_eo_files 41foreach eo_file : pub_eo_files
31 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 42 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
32 input : eo_file, 43 input : eo_file,
33 output : [eo_file + '.h', eo_file + '.legacy.h',], 44 output : [eo_file + '.h'],
45 depfile : eo_file + '.d',
34 install : false, 46 install : false,
35 install_dir : join_paths(dir_package_include, 'gesture'), 47 install_dir : join_paths(dir_package_include, 'gesture'),
36 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 48 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
37 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 49 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
38 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), 50 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
51 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
52 '-gchd', '@INPUT@'])
53 pub_eo_file_target += custom_target('eolian_gen_legacy_' + eo_file,
54 input : eo_file,
55 output : [eo_file + '.legacy.h'],
56 depfile : eo_file + '.legacy.d',
57 install : false,
58 install_dir : join_paths(dir_package_include, 'gesture'),
59 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
39 '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), 60 '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'),
40 '-gchl', '@INPUT@']) 61 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'),
62 '-gld', '@INPUT@'])
41endforeach 63endforeach
42 64
43pub_eo_types_files = [ 65pub_eo_types_files = [
@@ -50,11 +72,13 @@ foreach eo_file : pub_eo_types_files
50 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 72 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
51 input : eo_file, 73 input : eo_file,
52 output : [eo_file + '.h'], 74 output : [eo_file + '.h'],
75 depfile : eo_file + '.d',
53 install : true, 76 install : true,
54 install_dir : join_paths(dir_package_include, 'gesture'), 77 install_dir : join_paths(dir_package_include, 'gesture'),
55 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 78 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
56 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 79 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
57 '-gh', '@INPUT@']) 80 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
81 '-ghd', '@INPUT@'])
58endforeach 82endforeach
59 83
60evas_src += files([ 84evas_src += files([
diff --git a/src/lib/evas/include/meson.build b/src/lib/evas/include/meson.build
index aaeeb9ba66..a833f67b40 100644
--- a/src/lib/evas/include/meson.build
+++ b/src/lib/evas/include/meson.build
@@ -9,10 +9,12 @@ foreach eo_file : pub_eo_files
9 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 9 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
10 input : eo_file, 10 input : eo_file,
11 output : [eo_file + '.h'], 11 output : [eo_file + '.h'],
12 depfile : eo_file + '.d',
12 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 13 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
13 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 14 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
14 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), 15 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
15 '-gch', '@INPUT@']) 16 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
17 '-gchd', '@INPUT@'])
16endforeach 18endforeach
17 19
18eolian_include_directories += ['-I', meson.current_source_dir()] 20eolian_include_directories += ['-I', meson.current_source_dir()]
diff --git a/src/lib/evas/meson.build b/src/lib/evas/meson.build
index 8498016763..9c118030fe 100644
--- a/src/lib/evas/meson.build
+++ b/src/lib/evas/meson.build
@@ -26,15 +26,25 @@ pub_legacy_eo_files = [
26foreach eo_file : pub_legacy_eo_files 26foreach eo_file : pub_legacy_eo_files
27 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 27 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
28 input : eo_file, 28 input : eo_file,
29 output : [eo_file + '.h', eo_file + '.legacy.h',], 29 output : [eo_file + '.h'],
30 depfile : eo_file + '.d',
30 install : true, 31 install : true,
31 install_dir : dir_package_include, 32 install_dir : dir_package_include,
32 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 33 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
33 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 34 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
34 '-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'),
37 '-gchd', '@INPUT@'])
38 pub_eo_file_target += custom_target('eolian_gen_legacy_' + eo_file,
39 input : eo_file,
40 output : [eo_file + '.legacy.h'],
41 depfile : eo_file + '.legacy.d',
42 install : true,
43 install_dir : dir_package_include,
44 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
35 '-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'),
36 '-gchl', '@INPUT@']) 46 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'),
37 47 '-gld', '@INPUT@'])
38endforeach 48endforeach
39 49
40pub_eo_files = [ 50pub_eo_files = [
@@ -45,12 +55,14 @@ foreach eo_file : pub_eo_files
45 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 55 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
46 input : eo_file, 56 input : eo_file,
47 output : [eo_file + '.h'], 57 output : [eo_file + '.h'],
58 depfile : eo_file + '.d',
48 install : true, 59 install : true,
49 install_dir : dir_package_include, 60 install_dir : dir_package_include,
50 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 61 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
51 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 62 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
52 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), 63 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
53 '-gch', '@INPUT@']) 64 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
65 '-gchd', '@INPUT@'])
54endforeach 66endforeach
55 67
56 68
@@ -62,11 +74,13 @@ foreach eo_file : pub_eo_types_files
62 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 74 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
63 input : eo_file, 75 input : eo_file,
64 output : [eo_file + '.h'], 76 output : [eo_file + '.h'],
77 depfile : eo_file + '.d',
65 install : true, 78 install : true,
66 install_dir : dir_package_include, 79 install_dir : dir_package_include,
67 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 80 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
68 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 81 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
69 '-gh', '@INPUT@']) 82 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
83 '-ghd', '@INPUT@'])
70endforeach 84endforeach
71 85
72eolian_include_directories += ['-I', meson.current_source_dir()] 86eolian_include_directories += ['-I', meson.current_source_dir()]
diff --git a/src/modules/elementary/web/none/meson.build b/src/modules/elementary/web/none/meson.build
index ddbd9c2f2e..18a5aa4187 100644
--- a/src/modules/elementary/web/none/meson.build
+++ b/src/modules/elementary/web/none/meson.build
@@ -7,12 +7,14 @@ foreach eo_file : pub_eo_files
7 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 7 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
8 input : eo_file, 8 input : eo_file,
9 output : [eo_file + '.h'], 9 output : [eo_file + '.h'],
10 depfile : eo_file + '.d',
10 install : true, 11 install : true,
11 install_dir : dir_package_include, 12 install_dir : dir_package_include,
12 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 13 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
13 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 14 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
14 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), 15 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
15 '-gch', '@INPUT@']) 16 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
17 '-gchd', '@INPUT@'])
16endforeach 18endforeach
17 19
18 20
diff --git a/src/modules/evas/engines/gl_generic/meson.build b/src/modules/evas/engines/gl_generic/meson.build
index bfa7e82a6d..5d29b4e020 100644
--- a/src/modules/evas/engines/gl_generic/meson.build
+++ b/src/modules/evas/engines/gl_generic/meson.build
@@ -24,10 +24,12 @@ foreach eo_file : pub_eo_files
24 engine_src += custom_target('eolian_gen_' + eo_file, 24 engine_src += custom_target('eolian_gen_' + eo_file,
25 input : eo_file, 25 input : eo_file,
26 output : [eo_file + '.h'], 26 output : [eo_file + '.h'],
27 depfile : eo_file + '.d',
27 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 28 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
28 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 29 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
29 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), 30 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
30 '-gch', '@INPUT@']) 31 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
32 '-gchd', '@INPUT@'])
31endforeach 33endforeach
32 34
33engine_deps = [gl_common] 35engine_deps = [gl_common]
diff --git a/src/modules/evas/engines/software_generic/meson.build b/src/modules/evas/engines/software_generic/meson.build
index 7571ca3bc1..fe3ef78ee8 100644
--- a/src/modules/evas/engines/software_generic/meson.build
+++ b/src/modules/evas/engines/software_generic/meson.build
@@ -20,10 +20,12 @@ foreach eo_file : pub_eo_files
20 engine_src += custom_target('eolian_gen_' + eo_file, 20 engine_src += custom_target('eolian_gen_' + eo_file,
21 input : eo_file, 21 input : eo_file,
22 output : [eo_file + '.h'], 22 output : [eo_file + '.h'],
23 depfile : eo_file + '.d',
23 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 24 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
24 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 25 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
25 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), 26 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
26 '-gch', '@INPUT@']) 27 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
28 '-gchd', '@INPUT@'])
27endforeach 29endforeach
28 30
29engine_deps = [draw, dl] 31engine_deps = [draw, dl]
diff --git a/src/tests/elementary/meson.build b/src/tests/elementary/meson.build
index 0f083672cd..b6073af73d 100644
--- a/src/tests/elementary/meson.build
+++ b/src/tests/elementary/meson.build
@@ -8,10 +8,12 @@ foreach eo_file : priv_eo_files
8 priv_eo_file_target += custom_target('eolian_gen_' + eo_file, 8 priv_eo_file_target += custom_target('eolian_gen_' + eo_file,
9 input : eo_file, 9 input : eo_file,
10 output : [eo_file + '.h'], 10 output : [eo_file + '.h'],
11 depfile : eo_file + '.d',
11 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 12 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
12 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 13 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
13 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), 14 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
14 '-gch', '@INPUT@']) 15 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
16 '-gchd', '@INPUT@'])
15endforeach 17endforeach
16 18
17 19
diff --git a/src/tests/eolian/meson.build b/src/tests/eolian/meson.build
index 01fd6d3c10..4c6102a78d 100644
--- a/src/tests/eolian/meson.build
+++ b/src/tests/eolian/meson.build
@@ -16,10 +16,12 @@ foreach eo_file : priv_eo_files
16 priv_eo_file_target += custom_target('eolian_gen_' + eo_file, 16 priv_eo_file_target += custom_target('eolian_gen_' + eo_file,
17 input : eo_file, 17 input : eo_file,
18 output : [eo_file + '.h'], 18 output : [eo_file + '.h'],
19 depfile : eo_file + '.d',
19 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories, 20 command : [eolian_gen, '-I', meson.current_source_dir(), eolian_include_directories,
20 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 21 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
21 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), 22 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
22 '-gch', '@INPUT@']) 23 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
24 '-gchd', '@INPUT@'])
23endforeach 25endforeach
24 26
25eolian_suite = executable('eolian_suite', 27eolian_suite = executable('eolian_suite',