summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/bin/ecore_buffer/meson.build2
-rw-r--r--src/bin/edje/meson.build3
-rw-r--r--src/bin/elementary/meson.build16
-rw-r--r--src/bin/exactness/meson.build4
-rw-r--r--src/examples/elementary/meson.build2
-rw-r--r--src/lib/ecore/meson.build17
-rw-r--r--src/lib/ecore_audio/meson.build23
-rw-r--r--src/lib/ecore_buffer/meson.build9
-rw-r--r--src/lib/ecore_cocoa/meson.build14
-rw-r--r--src/lib/ecore_con/meson.build28
-rw-r--r--src/lib/ecore_drm2/meson.build9
-rw-r--r--src/lib/ecore_evas/meson.build15
-rw-r--r--src/lib/ecore_fb/meson.build9
-rw-r--r--src/lib/ecore_file/meson.build13
-rw-r--r--src/lib/ecore_imf/meson.build9
-rw-r--r--src/lib/ecore_imf_evas/meson.build7
-rw-r--r--src/lib/ecore_input/meson.build8
-rw-r--r--src/lib/ecore_input_evas/meson.build7
-rw-r--r--src/lib/ecore_ipc/meson.build8
-rw-r--r--src/lib/ecore_sdl/meson.build9
-rw-r--r--src/lib/ecore_win32/meson.build16
-rw-r--r--src/lib/ecore_wl2/meson.build18
-rw-r--r--src/lib/ecore_x/meson.build19
-rw-r--r--src/lib/ector/meson.build16
-rw-r--r--src/lib/edje/meson.build13
-rw-r--r--src/lib/eet/meson.build9
-rw-r--r--src/lib/eeze/meson.build21
-rw-r--r--src/lib/efl/meson.build5
-rw-r--r--src/lib/efl_canvas_wl/meson.build2
-rw-r--r--src/lib/efreet/meson.build13
-rw-r--r--src/lib/eina/meson.build19
-rw-r--r--src/lib/eio/meson.build15
-rw-r--r--src/lib/eldbus/meson.build9
-rw-r--r--src/lib/elementary/meson.build17
-rw-r--r--src/lib/elput/meson.build13
-rw-r--r--src/lib/embryo/meson.build12
-rw-r--r--src/lib/emile/meson.build13
-rw-r--r--src/lib/emotion/meson.build7
-rw-r--r--src/lib/eo/meson.build9
-rw-r--r--src/lib/ephysics/meson.build10
-rw-r--r--src/lib/ethumb/meson.build7
-rw-r--r--src/lib/ethumb_client/meson.build7
-rw-r--r--src/lib/evas/meson.build43
-rw-r--r--src/lib/evas/software_generic/meson.build2
-rw-r--r--src/lib/evil/meson.build11
-rw-r--r--src/modules/ecore_evas/engines/wayland/meson.build2
-rw-r--r--src/modules/ecore_imf/meson.build1
-rw-r--r--src/modules/evas/engines/buffer/meson.build6
-rw-r--r--src/modules/evas/engines/drm/meson.build4
-rw-r--r--src/modules/evas/engines/fb/meson.build4
-rw-r--r--src/modules/evas/engines/gl_cocoa/meson.build4
-rw-r--r--src/modules/evas/engines/gl_drm/meson.build4
-rw-r--r--src/modules/evas/engines/gl_generic/meson.build4
-rw-r--r--src/modules/evas/engines/gl_x11/meson.build4
-rw-r--r--src/modules/evas/engines/meson.build2
-rw-r--r--src/modules/evas/engines/software_ddraw/meson.build4
-rw-r--r--src/modules/evas/engines/software_gdi/meson.build4
-rw-r--r--src/modules/evas/engines/software_x11/meson.build4
-rw-r--r--src/modules/evas/engines/wayland_egl/meson.build4
-rw-r--r--src/modules/evas/engines/wayland_shm/meson.build4
-rw-r--r--src/modules/evas/image_loaders/meson.build2
-rw-r--r--src/modules/evas/image_savers/meson.build2
-rw-r--r--src/static_libs/buildsystem/meson.build4
-rw-r--r--src/static_libs/draw/meson.build11
-rw-r--r--src/static_libs/rg_etc/meson.build4
-rw-r--r--src/tests/elementary/meson.build4
-rw-r--r--src/tests/evas/meson.build2
-rw-r--r--src/wayland_protocol/meson.build5
68 files changed, 360 insertions, 267 deletions
diff --git a/src/bin/ecore_buffer/meson.build b/src/bin/ecore_buffer/meson.build
index 5e1a9d9381..b2df51b4f7 100644
--- a/src/bin/ecore_buffer/meson.build
+++ b/src/bin/ecore_buffer/meson.build
@@ -1,6 +1,6 @@
1executable('bqmgr', 1executable('bqmgr',
2 ['bq_mgr_protocol.c', 'bq_mgr.c'], 2 ['bq_mgr_protocol.c', 'bq_mgr.c'],
3 dependencies: [ecore, ecore_buffer, ecore_buffer_deps], 3 dependencies: [ecore, ecore_buffer, ecore_buffer_deps, ecore_buffer_ext_deps],
4 install: true, 4 install: true,
5 install_dir: join_paths(dir_lib, 'ecore_buffer', 'bin') 5 install_dir: join_paths(dir_lib, 'ecore_buffer', 'bin')
6) 6)
diff --git a/src/bin/edje/meson.build b/src/bin/edje/meson.build
index fa059ca4b7..82d51c7a77 100644
--- a/src/bin/edje/meson.build
+++ b/src/bin/edje/meson.build
@@ -6,7 +6,8 @@ edje_bin_deps = [
6 ecore_file, ecore_input, 6 ecore_file, ecore_input,
7 ecore_imf, ecore_imf_evas, 7 ecore_imf, ecore_imf_evas,
8 embryo, efreet, eio, 8 embryo, efreet, eio,
9 edje, ecore_evas 9 edje, ecore_evas,
10 intl,
10] 11]
11 12
12edje_cc_src = [ 13edje_cc_src = [
diff --git a/src/bin/elementary/meson.build b/src/bin/elementary/meson.build
index ef5d3ded60..de731e55cf 100644
--- a/src/bin/elementary/meson.build
+++ b/src/bin/elementary/meson.build
@@ -177,7 +177,7 @@ else
177endif 177endif
178elementary_test = executable('elementary_test', 178elementary_test = executable('elementary_test',
179 elementary_test_src, 179 elementary_test_src,
180 dependencies: [elementary] + elementary_deps + elementary_pub_deps, 180 dependencies: [elementary, intl] + elementary_deps + elementary_pub_deps,
181 install: true, 181 install: true,
182 c_args : package_c_args + [ 182 c_args : package_c_args + [
183 '-Delementary_test_BIN_DIR="'+dir_bin+'"', 183 '-Delementary_test_BIN_DIR="'+dir_bin+'"',
@@ -189,7 +189,7 @@ elementary_test = executable('elementary_test',
189 189
190library('elementary_test', 190library('elementary_test',
191 elementary_test_src, 191 elementary_test_src,
192 dependencies: [elementary] + elementary_deps + elementary_pub_deps, 192 dependencies: [elementary, intl] + elementary_deps + elementary_pub_deps,
193 install: false, 193 install: false,
194 c_args : package_c_args + [ 194 c_args : package_c_args + [
195 '-Delementary_test_BIN_DIR="'+dir_bin+'"', 195 '-Delementary_test_BIN_DIR="'+dir_bin+'"',
@@ -205,7 +205,7 @@ elementary_config_src = [
205 205
206elementary_config = executable('elementary_config', 206elementary_config = executable('elementary_config',
207 elementary_config_src, 207 elementary_config_src,
208 dependencies: [elementary] + elementary_deps + elementary_pub_deps, 208 dependencies: [elementary, intl] + elementary_deps + elementary_pub_deps,
209 install: true, 209 install: true,
210 c_args : package_c_args, 210 c_args : package_c_args,
211 link_args: link_args 211 link_args: link_args
@@ -218,7 +218,7 @@ if sys_windows == false
218 218
219 elementary_quicklaunch = executable('elementary_quicklaunch', 219 elementary_quicklaunch = executable('elementary_quicklaunch',
220 elementary_quicklaunch_src, 220 elementary_quicklaunch_src,
221 dependencies: [elementary] + elementary_deps + elementary_pub_deps, 221 dependencies: [elementary, intl] + elementary_deps + elementary_pub_deps,
222 install: true, 222 install: true,
223 c_args : package_c_args, 223 c_args : package_c_args,
224 link_args: link_args 224 link_args: link_args
@@ -231,7 +231,7 @@ elementary_codegen_src = [
231 231
232elementary_codegen = executable('elementary_codegen', 232elementary_codegen = executable('elementary_codegen',
233 elementary_codegen_src, 233 elementary_codegen_src,
234 dependencies: [elementary] + elementary_deps + elementary_pub_deps, 234 dependencies: [elementary, intl] + elementary_deps + elementary_pub_deps,
235 install: true, 235 install: true,
236 c_args : package_c_args, 236 c_args : package_c_args,
237 link_args: link_args 237 link_args: link_args
@@ -260,7 +260,7 @@ elm_prefs_cc_src = [
260 260
261elm_prefs_cc = executable('elm_prefs_cc', 261elm_prefs_cc = executable('elm_prefs_cc',
262 elm_prefs_cc_src, 262 elm_prefs_cc_src,
263 dependencies: [elementary] + elementary_deps + elementary_pub_deps, 263 dependencies: [elementary, intl] + elementary_deps + elementary_pub_deps,
264 install: true, 264 install: true,
265 c_args : package_c_args, 265 c_args : package_c_args,
266 link_args: link_args 266 link_args: link_args
@@ -282,7 +282,7 @@ if sys_windows == false
282 282
283 elementary_run = executable('elementary_run', 283 elementary_run = executable('elementary_run',
284 elementary_run_src, 284 elementary_run_src,
285 dependencies: [elementary] + elementary_deps + elementary_pub_deps, 285 dependencies: [elementary, intl] + elementary_deps + elementary_pub_deps,
286 install: true, 286 install: true,
287 c_args : package_c_args, 287 c_args : package_c_args,
288 link_args: link_args 288 link_args: link_args
@@ -302,7 +302,7 @@ elementary_perf_src = [
302 302
303elementary_perf = executable('elementary_perf', 303elementary_perf = executable('elementary_perf',
304 elementary_perf_src, 304 elementary_perf_src,
305 dependencies: [elementary] + elementary_deps + elementary_pub_deps, 305 dependencies: [elementary, intl] + elementary_deps + elementary_pub_deps,
306 install: true, 306 install: true,
307 c_args : package_c_args + [ 307 c_args : package_c_args + [
308 '-Delementary_test_BIN_DIR="'+dir_bin+'"', 308 '-Delementary_test_BIN_DIR="'+dir_bin+'"',
diff --git a/src/bin/exactness/meson.build b/src/bin/exactness/meson.build
index 2f2b2bb280..4d048f18c9 100644
--- a/src/bin/exactness/meson.build
+++ b/src/bin/exactness/meson.build
@@ -32,7 +32,7 @@ edjs = custom_target('player_entry',
32 32
33exactness_play_bin = library('exactness_play', 33exactness_play_bin = library('exactness_play',
34 [ 'player.c', 'common.c', 'common.h', edjs ], 34 [ 'player.c', 'common.c', 'common.h', edjs ],
35 dependencies: [ elementary ], 35 dependencies: [ elementary, dl],
36 c_args: '-DDATA_DIR="'+join_paths(dir_data, 'exactness')+'"', 36 c_args: '-DDATA_DIR="'+join_paths(dir_data, 'exactness')+'"',
37 install: true, 37 install: true,
38 version : meson.project_version() 38 version : meson.project_version()
@@ -40,7 +40,7 @@ exactness_play_bin = library('exactness_play',
40 40
41exactness_record_bin = library('exactness_record', 41exactness_record_bin = library('exactness_record',
42 [ 'recorder.c', 'common.c', 'common.h' ], 42 [ 'recorder.c', 'common.c', 'common.h' ],
43 dependencies: [ elementary ], 43 dependencies: [ elementary, dl],
44 c_args: '-DDATA_DIR="'+join_paths(dir_data, 'exactness')+'"', 44 c_args: '-DDATA_DIR="'+join_paths(dir_data, 'exactness')+'"',
45 install: true, 45 install: true,
46 version : meson.project_version() 46 version : meson.project_version()
diff --git a/src/examples/elementary/meson.build b/src/examples/elementary/meson.build
index 14a743c9c5..7876285349 100644
--- a/src/examples/elementary/meson.build
+++ b/src/examples/elementary/meson.build
@@ -122,7 +122,7 @@ examples = [
122] 122]
123 123
124foreach example : examples 124foreach example : examples
125 executable(example, example + '.c', dependencies: [elementary, ecore, eio]) 125 executable(example, example + '.c', dependencies: [elementary, ecore, eio, m])
126endforeach 126endforeach
127if get_option('bindings').contains('cxx') 127if get_option('bindings').contains('cxx')
128 cxx_examples = [ 128 cxx_examples = [
diff --git a/src/lib/ecore/meson.build b/src/lib/ecore/meson.build
index 637761dcc4..0f72f4ba28 100644
--- a/src/lib/ecore/meson.build
+++ b/src/lib/ecore/meson.build
@@ -1,5 +1,6 @@
1ecore_deps = [intl] 1ecore_deps = []
2ecore_pub_deps = [eina, eo, efl] 2ecore_pub_deps = [eina, eo, efl]
3ecore_ext_deps = [intl, m, buildsystem]
3 4
4pub_legacy_eo_files = [ 5pub_legacy_eo_files = [
5 'ecore_event_message.eo', 6 'ecore_event_message.eo',
@@ -98,7 +99,7 @@ ecore_header_src = [
98 'efl_loop_timer_eo.legacy.h', 99 'efl_loop_timer_eo.legacy.h',
99] 100]
100 101
101ecore_src = [ 102ecore_src = files([
102 'efl_app.c', 103 'efl_app.c',
103 'ecore.c', 104 'ecore.c',
104 'ecore_alloc.c', 105 'ecore_alloc.c',
@@ -168,18 +169,18 @@ ecore_src = [
168 'efl_core_env.c', 169 'efl_core_env.c',
169 'efl_core_proc_env.c', 170 'efl_core_proc_env.c',
170 'efl_core_command_line.c', 171 'efl_core_command_line.c',
171] 172])
172 173
173if sys_windows == true 174if sys_windows == true
174 #nothing for now ... needs testing 175 #nothing for now ... needs testing
175 ecore_src += ['ecore_exe_win32.c'] 176 ecore_src += files(['ecore_exe_win32.c'])
176else 177else
177 ecore_src += ['ecore_signal.c', 'ecore_exe_posix.c'] 178 ecore_src += files(['ecore_signal.c', 'ecore_exe_posix.c'])
178endif 179endif
179 180
180if get_option('glib') == true and sys_windows == false 181if get_option('glib') == true and sys_windows == false
181 ecore_deps += dependency('glib-2.0') 182 ecore_ext_deps += dependency('glib-2.0')
182 ecore_deps += dependency('gthread-2.0') 183 ecore_ext_deps += dependency('gthread-2.0')
183 config_h.set('GLIB_INTEGRATION_ALWAYS', '1') 184 config_h.set('GLIB_INTEGRATION_ALWAYS', '1')
184 config_h.set('HAVE_GLIB', '1') 185 config_h.set('HAVE_GLIB', '1')
185endif 186endif
@@ -194,7 +195,7 @@ endif
194 195
195ecore_lib = library('ecore', 196ecore_lib = library('ecore',
196 ecore_src, pub_eo_file_target, 197 ecore_src, pub_eo_file_target,
197 dependencies: ecore_pub_deps + [m, buildsystem, ecore_deps], 198 dependencies: ecore_pub_deps + [ecore_deps, ecore_ext_deps],
198 include_directories : config_dir + [include_directories(join_paths('..','..'))], 199 include_directories : config_dir + [include_directories(join_paths('..','..'))],
199 install: true, 200 install: true,
200 c_args : package_c_args, 201 c_args : package_c_args,
diff --git a/src/lib/ecore_audio/meson.build b/src/lib/ecore_audio/meson.build
index 68a5c606c2..0376968a4b 100644
--- a/src/lib/ecore_audio/meson.build
+++ b/src/lib/ecore_audio/meson.build
@@ -1,5 +1,6 @@
1ecore_audio_deps = [ecore] 1ecore_audio_deps = [ecore]
2ecore_audio_pub_deps = [eina, eo] 2ecore_audio_pub_deps = [eina, eo]
3ecore_audio_ext_deps = [m]
3 4
4pub_eo_files = [ 5pub_eo_files = [
5 'ecore_audio.eo', 6 'ecore_audio.eo',
@@ -41,46 +42,46 @@ ecore_audio_header_src = [
41 'ecore_audio_obj_out_wasapi.h' 42 'ecore_audio_obj_out_wasapi.h'
42] 43]
43 44
44ecore_audio_src = [ 45ecore_audio_src = files([
45 'ecore_audio.c', 46 'ecore_audio.c',
46 'ecore_audio_obj.c', 47 'ecore_audio_obj.c',
47 'ecore_audio_obj_in.c', 48 'ecore_audio_obj_in.c',
48 'ecore_audio_obj_out.c', 49 'ecore_audio_obj_out.c',
49 'ecore_audio_obj_in_tone.c', 50 'ecore_audio_obj_in_tone.c',
50 'ecore_audio_private.h' 51 'ecore_audio_private.h'
51] 52])
52 53
53ecore_audio_src += [ 54ecore_audio_src += files([
54 'ecore_audio_obj_in_sndfile.c', 55 'ecore_audio_obj_in_sndfile.c',
55 'ecore_audio_obj_out_sndfile.c', 56 'ecore_audio_obj_out_sndfile.c',
56 'ecore_audio_sndfile_vio.c' 57 'ecore_audio_sndfile_vio.c'
57] 58])
58 59
59ecore_audio_deps += dependency('sndfile') 60ecore_audio_deps += dependency('sndfile')
60config_h.set('HAVE_SNDFILE', '1') 61config_h.set('HAVE_SNDFILE', '1')
61 62
62if get_option('pulseaudio') 63if get_option('pulseaudio')
63 ecore_audio_deps += dependency('libpulse') 64 ecore_audio_ext_deps += dependency('libpulse')
64 65
65 ecore_audio_src += [ 66 ecore_audio_src += files([
66 'ecore_audio_pulse_ml.c', 67 'ecore_audio_pulse_ml.c',
67 'ecore_audio_obj_out_pulse.c' 68 'ecore_audio_obj_out_pulse.c'
68 ] 69 ])
69 70
70 config_h.set('HAVE_PULSE', '1') 71 config_h.set('HAVE_PULSE', '1')
71endif 72endif
72 73
73if sys_windows == true 74if sys_windows == true
74 ecore_audio_src += [ 75 ecore_audio_src += files([
75 'ecore_audio_obj_out_wasapi.c' 76 'ecore_audio_obj_out_wasapi.c'
76 ] 77 ])
77 ecore_audio_deps += [cc.find_library('ksuser', required: true), cc.find_library('winmm', required: true)] 78 ecore_audio_ext_deps += [cc.find_library('ksuser', required: true), cc.find_library('winmm', required: true)]
78endif 79endif
79 80
80ecore_audio_lib = library('ecore_audio', 81ecore_audio_lib = library('ecore_audio',
81 ecore_audio_src, pub_eo_file_target, 82 ecore_audio_src, pub_eo_file_target,
82 c_args : package_c_args, 83 c_args : package_c_args,
83 dependencies: ecore_audio_pub_deps + [m] + ecore_audio_deps, 84 dependencies: ecore_audio_pub_deps + ecore_audio_deps + ecore_audio_ext_deps,
84 include_directories : config_dir, 85 include_directories : config_dir,
85 install: true, 86 install: true,
86 version : meson.project_version() 87 version : meson.project_version()
diff --git a/src/lib/ecore_buffer/meson.build b/src/lib/ecore_buffer/meson.build
index c4aa63f62c..1d05cbe65b 100644
--- a/src/lib/ecore_buffer/meson.build
+++ b/src/lib/ecore_buffer/meson.build
@@ -1,12 +1,13 @@
1ecore_buffer_deps = [dependency('wayland-client'), dependency('wayland-server'), ecore] 1ecore_buffer_deps = [ecore]
2ecore_buffer_pub_deps = [eina] 2ecore_buffer_pub_deps = [eina]
3ecore_buffer_ext_deps = [dependency('wayland-client'), dependency('wayland-server')]
3 4
4ecore_buffer_header_src = [ 5ecore_buffer_header_src = [
5 'Ecore_Buffer.h', 6 'Ecore_Buffer.h',
6 'Ecore_Buffer_Queue.h' 7 'Ecore_Buffer_Queue.h'
7] 8]
8 9
9ecore_buffer_src = [ 10ecore_buffer_src = files([
10 'bq_mgr_protocol.c', 11 'bq_mgr_protocol.c',
11 'buffer_queue.c', 12 'buffer_queue.c',
12 'shared_buffer.c', 13 'shared_buffer.c',
@@ -15,12 +16,12 @@ ecore_buffer_src = [
15 'ecore_buffer_con.c', 16 'ecore_buffer_con.c',
16 'ecore_buffer_provider.c', 17 'ecore_buffer_provider.c',
17 'ecore_buffer_consumer.c' 18 'ecore_buffer_consumer.c'
18] 19])
19 20
20ecore_buffer_lib = library('ecore_buffer', 21ecore_buffer_lib = library('ecore_buffer',
21 ecore_buffer_src, pub_eo_file_target, 22 ecore_buffer_src, pub_eo_file_target,
22 c_args : package_c_args, 23 c_args : package_c_args,
23 dependencies: ecore_buffer_pub_deps + ecore_buffer_deps, 24 dependencies: ecore_buffer_pub_deps + ecore_buffer_deps + ecore_buffer_ext_deps,
24 include_directories : config_dir, 25 include_directories : config_dir,
25 install: true, 26 install: true,
26 version : meson.project_version() 27 version : meson.project_version()
diff --git a/src/lib/ecore_cocoa/meson.build b/src/lib/ecore_cocoa/meson.build
index e04ca0fd5d..a44d6a4d58 100644
--- a/src/lib/ecore_cocoa/meson.build
+++ b/src/lib/ecore_cocoa/meson.build
@@ -1,12 +1,18 @@
1cocoa_external_dep = declare_dependency(
2 link_args : ['-lobjc', '-framework', 'CoreFoundation', '-framework', 'cocoa', ],
3)
4
1ecore_cocoa_deps = [eina, ecore_input, ecore, emile, eet] 5ecore_cocoa_deps = [eina, ecore_input, ecore, emile, eet]
2ecore_cocoa_pub_deps = [eina] 6ecore_cocoa_pub_deps = [eina]
7ecore_cocoa_ext_deps = [cocoa_external_dep]
8
3pub_eo_file_target = [] 9pub_eo_file_target = []
4 10
5ecore_cocoa_header_src = [ 11ecore_cocoa_header_src = [
6 'Ecore_Cocoa.h' 12 'Ecore_Cocoa.h'
7] 13]
8 14
9ecore_cocoa_src = [ 15ecore_cocoa_src = files([
10 'ecore_cocoa.m', 16 'ecore_cocoa.m',
11 'ecore_cocoa_keys.h', 17 'ecore_cocoa_keys.h',
12 'ecore_cocoa_window.h', 18 'ecore_cocoa_window.h',
@@ -15,7 +21,7 @@ ecore_cocoa_src = [
15 'ecore_cocoa_app.m', 21 'ecore_cocoa_app.m',
16 'ecore_cocoa_app.h', 22 'ecore_cocoa_app.h',
17 'ecore_cocoa_private.h' 23 'ecore_cocoa_private.h'
18] 24])
19 25
20evas_include_directories = [ 26evas_include_directories = [
21 include_directories(join_paths('..', 'evas')), 27 include_directories(join_paths('..', 'evas')),
@@ -28,9 +34,9 @@ evas_include_directories = [
28ecore_cocoa_lib = library('ecore_cocoa', 34ecore_cocoa_lib = library('ecore_cocoa',
29 ecore_cocoa_src, pub_eo_file_target, 35 ecore_cocoa_src, pub_eo_file_target,
30 c_args : package_c_args, 36 c_args : package_c_args,
31 dependencies: ecore_cocoa_deps + ecore_cocoa_pub_deps, 37 dependencies: ecore_cocoa_deps + ecore_cocoa_pub_deps + ecore_cocoa_ext_deps,
38 link_args : '-Wl,-U,_evas_textblock_text_markup_to_utf8',
32 include_directories : config_dir + evas_include_directories, 39 include_directories : config_dir + evas_include_directories,
33 link_args : ['-lobjc', '-framework', 'CoreFoundation', '-framework', 'cocoa', '-Wl,-U,_evas_textblock_text_markup_to_utf8'],
34 install: true, 40 install: true,
35 version : meson.project_version() 41 version : meson.project_version()
36) 42)
diff --git a/src/lib/ecore_con/meson.build b/src/lib/ecore_con/meson.build
index 44faa486af..bf288053ad 100644
--- a/src/lib/ecore_con/meson.build
+++ b/src/lib/ecore_con/meson.build
@@ -1,6 +1,6 @@
1ecore_con_deps = [] 1ecore_con_deps = [buildsystem, eldbus, eet]
2ecore_con_pub_deps = [eina, eo, efl, ecore] 2ecore_con_pub_deps = [eina, eo, efl, ecore]
3 3ecore_con_ext_deps = [buildsystem_simple, dl, http_parser]
4if sys_windows == true 4if sys_windows == true
5 ipv6 = true 5 ipv6 = true
6else 6else
@@ -110,7 +110,7 @@ ecore_con_header_src = [
110 'ecore_con_eet_server_obj_eo.legacy.h' 110 'ecore_con_eet_server_obj_eo.legacy.h'
111] 111]
112 112
113ecore_con_src = [ 113ecore_con_src = files([
114 'ecore_con_alloc.c', 114 'ecore_con_alloc.c',
115 'ecore_con.c', 115 'ecore_con.c',
116 'ecore_con_proxy_helper.c', 116 'ecore_con_proxy_helper.c',
@@ -145,46 +145,46 @@ ecore_con_src = [
145 'efl_net_server_ssl.c', 145 'efl_net_server_ssl.c',
146 'ecore_con_local.c', 146 'ecore_con_local.c',
147 'efl_net_ip_address.c' 147 'efl_net_ip_address.c'
148] 148])
149 149
150if sys_windows == true 150if sys_windows == true
151 ecore_con_src += [ 151 ecore_con_src += files([
152 'efl_net_socket_windows.c', 152 'efl_net_socket_windows.c',
153 'efl_net_dialer_windows.c', 153 'efl_net_dialer_windows.c',
154 'efl_net_server_windows.c' 154 'efl_net_server_windows.c'
155 ] 155 ])
156else 156else
157 ecore_con_src += [ 157 ecore_con_src += files([
158 'efl_net_socket_unix.c', 158 'efl_net_socket_unix.c',
159 'efl_net_dialer_unix.c', 159 'efl_net_dialer_unix.c',
160 'efl_net_server_unix.c' 160 'efl_net_server_unix.c'
161 ] 161 ])
162endif 162endif
163 163
164if get_option('network-backend') == 'none' 164if get_option('network-backend') == 'none'
165 ecore_con_src += [ 165 ecore_con_src += files([
166 'efl_net_control_access_point-none.c', 166 'efl_net_control_access_point-none.c',
167 'efl_net_control_technology-none.c', 167 'efl_net_control_technology-none.c',
168 'efl_net_control-none.c', 168 'efl_net_control-none.c',
169 'efl_net_session-none.c' 169 'efl_net_session-none.c'
170 ] 170 ])
171else 171else
172 ecore_con_src += [ 172 ecore_con_src += files([
173 'efl_net-connman.h', 173 'efl_net-connman.h',
174 'efl_net-connman.c', 174 'efl_net-connman.c',
175 'efl_net_control_access_point-connman.c', 175 'efl_net_control_access_point-connman.c',
176 'efl_net_control_technology-connman.c', 176 'efl_net_control_technology-connman.c',
177 'efl_net_control-connman.c', 177 'efl_net_control-connman.c',
178 'efl_net_session-connman.c' 178 'efl_net_session-connman.c'
179 ] 179 ])
180 ecore_con_deps += eldbus 180 ecore_con_deps += eldbus
181endif 181endif
182 182
183ecore_con_deps += crypto 183ecore_con_ext_deps += crypto
184 184
185ecore_con_lib = library('ecore_con', 185ecore_con_lib = library('ecore_con',
186 ecore_con_src, pub_eo_file_target, 186 ecore_con_src, pub_eo_file_target,
187 dependencies: [ecore, ecore_con_deps, http_parser, eldbus, eet, buildsystem, dl], 187 dependencies: [ecore_con_deps, ecore_con_ext_deps, ecore_con_pub_deps],
188 include_directories : config_dir, 188 include_directories : config_dir,
189 install: true, 189 install: true,
190 c_args : package_c_args, 190 c_args : package_c_args,
diff --git a/src/lib/ecore_drm2/meson.build b/src/lib/ecore_drm2/meson.build
index 53ddc303b3..212dd366c7 100644
--- a/src/lib/ecore_drm2/meson.build
+++ b/src/lib/ecore_drm2/meson.build
@@ -1,23 +1,24 @@
1ecore_drm2_deps = [eeze, elput, dl, libdrm] 1ecore_drm2_deps = [eeze, elput]
2ecore_drm2_pub_deps = [ecore] 2ecore_drm2_pub_deps = [ecore]
3ecore_drm2_ext_deps = [dl, libdrm]
3 4
4ecore_drm2_header_src = [ 5ecore_drm2_header_src = [
5 'Ecore_Drm2.h' 6 'Ecore_Drm2.h'
6] 7]
7 8
8ecore_drm2_src = [ 9ecore_drm2_src = files([
9 'ecore_drm2_plane.c', 10 'ecore_drm2_plane.c',
10 'ecore_drm2_fb.c', 11 'ecore_drm2_fb.c',
11 'ecore_drm2_outputs.c', 12 'ecore_drm2_outputs.c',
12 'ecore_drm2_device.c', 13 'ecore_drm2_device.c',
13 'ecore_drm2.c', 14 'ecore_drm2.c',
14 'ecore_drm2_private.h' 15 'ecore_drm2_private.h'
15] 16])
16 17
17ecore_drm2_lib = library('ecore_drm2', 18ecore_drm2_lib = library('ecore_drm2',
18 ecore_drm2_src, pub_eo_file_target, 19 ecore_drm2_src, pub_eo_file_target,
19 c_args : package_c_args, 20 c_args : package_c_args,
20 dependencies: ecore_drm2_pub_deps + ecore_drm2_deps, 21 dependencies: ecore_drm2_pub_deps + ecore_drm2_deps + ecore_drm2_ext_deps,
21 include_directories : config_dir, 22 include_directories : config_dir,
22 install: true, 23 install: true,
23 version : meson.project_version() 24 version : meson.project_version()
diff --git a/src/lib/ecore_evas/meson.build b/src/lib/ecore_evas/meson.build
index c673097dbc..554c77cf44 100644
--- a/src/lib/ecore_evas/meson.build
+++ b/src/lib/ecore_evas/meson.build
@@ -1,5 +1,6 @@
1ecore_evas_deps = [eina, ecore_input_evas, ecore_input, ecore, eet, evas, efl, eo, eina, emile] 1ecore_evas_deps = [eina, ecore_input_evas, ecore_input, ecore, eet, evas, efl, eo, eina, emile, buildsystem]
2ecore_evas_pub_deps = [evas, ecore] 2ecore_evas_pub_deps = [evas, ecore]
3ecore_evas_ext_deps = [buildsystem_simple]
3pub_eo_file_target = [] 4pub_eo_file_target = []
4 5
5ecore_evas_header_src = [ 6ecore_evas_header_src = [
@@ -8,7 +9,7 @@ ecore_evas_header_src = [
8 9
9] 10]
10 11
11ecore_evas_src = [ 12ecore_evas_src = files([
12 'ecore_evas.c', 13 'ecore_evas.c',
13 'ecore_evas_buffer.c', 14 'ecore_evas_buffer.c',
14 'ecore_evas_buffer.h', 15 'ecore_evas_buffer.h',
@@ -25,20 +26,24 @@ ecore_evas_src = [
25 'ecore_evas_x11.h', 26 'ecore_evas_x11.h',
26 'ecore_evas_util.c', 27 'ecore_evas_util.c',
27 'ecore_evas_fallback_selection.c' 28 'ecore_evas_fallback_selection.c'
28] 29])
30
31ecore_evas_ext_deps += declare_dependency(
32 include_directories: include_directories(join_paths('..', '..', 'modules', 'evas', 'engines', 'buffer')),
33)
29 34
30 35
31ecore_evas_lib = library('ecore_evas', 36ecore_evas_lib = library('ecore_evas',
32 ecore_evas_src, pub_eo_file_target, 37 ecore_evas_src, pub_eo_file_target,
33 c_args : package_c_args, 38 c_args : package_c_args,
34 dependencies: [ecore_evas_deps, buildsystem], 39 dependencies: ecore_evas_deps + ecore_evas_ext_deps,
35 include_directories : config_dir, 40 include_directories : config_dir,
36 install: true, 41 install: true,
37 version : meson.project_version() 42 version : meson.project_version()
38) 43)
39 44
40ecore_evas = declare_dependency( 45ecore_evas = declare_dependency(
41 include_directories: [include_directories('.')], 46 include_directories: [include_directories('.'), include_directories(join_paths('..', '..', 'modules', 'evas', 'engines', 'buffer'))],
42 link_with: ecore_evas_lib, 47 link_with: ecore_evas_lib,
43 sources : pub_eo_file_target + priv_eo_file_target, 48 sources : pub_eo_file_target + priv_eo_file_target,
44 dependencies: [evas], 49 dependencies: [evas],
diff --git a/src/lib/ecore_fb/meson.build b/src/lib/ecore_fb/meson.build
index 28ad6bfe88..6d50e0f146 100644
--- a/src/lib/ecore_fb/meson.build
+++ b/src/lib/ecore_fb/meson.build
@@ -1,22 +1,23 @@
1ecore_fb_deps = [ecore, ecore_input] 1ecore_fb_deps = [ecore, ecore_input]
2ecore_fb_pub_deps = [eina] 2ecore_fb_pub_deps = [eina]
3ecore_fb_ext_deps = []
3 4
4if get_option('tslib') 5if get_option('tslib')
5 ecore_fb_deps += dependency('tslib') 6 ecore_fb_ext_deps += dependency('tslib')
6endif 7endif
7 8
8ecore_fb_header_src = [ 9ecore_fb_header_src = [
9 'Ecore_Fb.h' 10 'Ecore_Fb.h'
10] 11]
11 12
12ecore_fb_src = [ 13ecore_fb_src = files([
13 'ecore_fb.c', 14 'ecore_fb.c',
14 'ecore_fb_li.c', 15 'ecore_fb_li.c',
15 'ecore_fb_ts.c', 16 'ecore_fb_ts.c',
16 'ecore_fb_vt.c', 17 'ecore_fb_vt.c',
17 'ecore_fb_keytable.h', 18 'ecore_fb_keytable.h',
18 'ecore_fb_private.h' 19 'ecore_fb_private.h'
19] 20])
20 21
21ecore_fb_lib = library('ecore_fb', 22ecore_fb_lib = library('ecore_fb',
22 ecore_fb_src, pub_eo_file_target, 23 ecore_fb_src, pub_eo_file_target,
@@ -31,7 +32,7 @@ ecore_fb = declare_dependency(
31 include_directories: [include_directories('.')], 32 include_directories: [include_directories('.')],
32 link_with: ecore_fb_lib, 33 link_with: ecore_fb_lib,
33 sources : pub_eo_file_target + priv_eo_file_target, 34 sources : pub_eo_file_target + priv_eo_file_target,
34 dependencies: ecore_fb_pub_deps, 35 dependencies: ecore_fb_pub_deps + ecore_fb_ext_deps,
35) 36)
36 37
37install_headers(ecore_fb_header_src, 38install_headers(ecore_fb_header_src,
diff --git a/src/lib/ecore_file/meson.build b/src/lib/ecore_file/meson.build
index 9bbee467d6..9e0212d6c0 100644
--- a/src/lib/ecore_file/meson.build
+++ b/src/lib/ecore_file/meson.build
@@ -1,20 +1,21 @@
1ecore_file_deps = [ecore_con, ecore] 1ecore_file_deps = [ecore_con, ecore]
2ecore_file_pub_deps = [eina] 2ecore_file_pub_deps = [eina]
3ecore_file_ext_deps = []
3 4
4ecore_file_src = [ 5ecore_file_src = files([
5 'ecore_file.c', 6 'ecore_file.c',
6 'ecore_file_download.c', 7 'ecore_file_download.c',
7 'ecore_file_monitor.c', 8 'ecore_file_monitor.c',
8 'ecore_file_path.c', 9 'ecore_file_path.c',
9 'ecore_file_private.h' 10 'ecore_file_private.h'
10] 11])
11 12
12if sys_windows == true 13if sys_windows == true
13 ecore_file_src += [ 'ecore_file_monitor_win32.c'] 14 ecore_file_src += files([ 'ecore_file_monitor_win32.c'])
14elif sys_linux == true 15elif sys_linux == true
15 ecore_file_src += [ 'ecore_file_monitor_inotify.c'] 16 ecore_file_src += files([ 'ecore_file_monitor_inotify.c'])
16else 17else
17 ecore_file_src += [ 'ecore_file_monitor_poll.c'] 18 ecore_file_src += files([ 'ecore_file_monitor_poll.c'])
18endif 19endif
19 20
20ecore_file_header_src = ['Ecore_File.h'] 21ecore_file_header_src = ['Ecore_File.h']
@@ -23,7 +24,7 @@ ecore_file_header_src = ['Ecore_File.h']
23ecore_file_lib = library('ecore_file', 24ecore_file_lib = library('ecore_file',
24 ecore_file_src, 25 ecore_file_src,
25 c_args : package_c_args, 26 c_args : package_c_args,
26 dependencies: ecore_file_deps + ecore_file_pub_deps + ecore_file_deps, 27 dependencies: ecore_file_deps + ecore_file_pub_deps + ecore_file_ext_deps,
27 include_directories : config_dir + [include_directories(join_paths('..','..'))], 28 include_directories : config_dir + [include_directories(join_paths('..','..'))],
28 install: true, 29 install: true,
29 version : meson.project_version() 30 version : meson.project_version()
diff --git a/src/lib/ecore_imf/meson.build b/src/lib/ecore_imf/meson.build
index 978594d20a..7b305751dd 100644
--- a/src/lib/ecore_imf/meson.build
+++ b/src/lib/ecore_imf/meson.build
@@ -1,21 +1,22 @@
1ecore_imf_deps = [ecore] 1ecore_imf_deps = [ecore, buildsystem]
2ecore_imf_pub_deps = [eina] 2ecore_imf_pub_deps = [eina]
3ecore_imf_ext_deps = [buildsystem_simple]
3 4
4ecore_imf_header_src = [ 5ecore_imf_header_src = [
5 'Ecore_IMF.h' 6 'Ecore_IMF.h'
6] 7]
7 8
8ecore_imf_src = [ 9ecore_imf_src = files([
9 'ecore_imf.c', 10 'ecore_imf.c',
10 'ecore_imf_context.c', 11 'ecore_imf_context.c',
11 'ecore_imf_module.c', 12 'ecore_imf_module.c',
12 'ecore_imf_private.h', 13 'ecore_imf_private.h',
13] 14])
14 15
15 16
16ecore_imf_lib = library('ecore_imf', 17ecore_imf_lib = library('ecore_imf',
17 ecore_imf_src, pub_eo_file_target, 18 ecore_imf_src, pub_eo_file_target,
18 dependencies: [buildsystem, ecore_imf_deps, ecore_imf_pub_deps], 19 dependencies: [ecore_imf_deps, ecore_imf_pub_deps, ecore_imf_ext_deps],
19 include_directories : config_dir, 20 include_directories : config_dir,
20 c_args : package_c_args, 21 c_args : package_c_args,
21 install: true, 22 install: true,
diff --git a/src/lib/ecore_imf_evas/meson.build b/src/lib/ecore_imf_evas/meson.build
index 28d53ea78d..b5d2d64125 100644
--- a/src/lib/ecore_imf_evas/meson.build
+++ b/src/lib/ecore_imf_evas/meson.build
@@ -2,16 +2,17 @@ ecore_imf_evas_header_src = [
2 'Ecore_IMF_Evas.h' 2 'Ecore_IMF_Evas.h'
3] 3]
4 4
5ecore_imf_evas_src = [ 5ecore_imf_evas_src = files([
6 'ecore_imf_evas.c' 6 'ecore_imf_evas.c'
7] 7])
8 8
9ecore_imf_evas_deps = [ecore_imf, evas] 9ecore_imf_evas_deps = [ecore_imf, evas]
10ecore_imf_evas_pub_deps = [eina, eo, efl] 10ecore_imf_evas_pub_deps = [eina, eo, efl]
11ecore_imf_evas_ext_deps = [m]
11 12
12ecore_imf_evas_lib = library('ecore_imf_evas', 13ecore_imf_evas_lib = library('ecore_imf_evas',
13 ecore_imf_evas_src, 14 ecore_imf_evas_src,
14 dependencies: ecore_imf_evas_pub_deps + [m] + ecore_imf_evas_deps, 15 dependencies: ecore_imf_evas_pub_deps + ecore_imf_evas_deps + ecore_imf_evas_ext_deps,
15 include_directories : config_dir + [include_directories('.')], 16 include_directories : config_dir + [include_directories('.')],
16 install: true, 17 install: true,
17 c_args : package_c_args, 18 c_args : package_c_args,
diff --git a/src/lib/ecore_input/meson.build b/src/lib/ecore_input/meson.build
index d985eb58e8..d1250c3591 100644
--- a/src/lib/ecore_input/meson.build
+++ b/src/lib/ecore_input/meson.build
@@ -1,27 +1,27 @@
1ecore_input_deps = [ecore] 1ecore_input_deps = [ecore]
2ecore_input_pub_deps = [eina, eo] 2ecore_input_pub_deps = [eina, eo]
3ecore_input_ext_deps = []
3 4
4ecore_input_header_src = [ 5ecore_input_header_src = [
5 'Ecore_Input.h' 6 'Ecore_Input.h'
6] 7]
7 8
8ecore_input_src = [ 9ecore_input_src = files([
9 'ecore_input.c', 10 'ecore_input.c',
10 'ecore_input_compose.c', 11 'ecore_input_compose.c',
11 'ecore_input_joystick.c', 12 'ecore_input_joystick.c',
12 'ecore_input_compose.h', 13 'ecore_input_compose.h',
13 'ecore_input_private.h' 14 'ecore_input_private.h'
14] 15])
15 16
16if get_option('eeze') 17if get_option('eeze')
17 ecore_input_deps += eeze 18 ecore_input_deps += eeze
18endif 19endif
19 20
20
21ecore_input_lib = library('ecore_input', 21ecore_input_lib = library('ecore_input',
22 ecore_input_src, pub_eo_file_target, 22 ecore_input_src, pub_eo_file_target,
23 c_args : package_c_args, 23 c_args : package_c_args,
24 dependencies: ecore_input_pub_deps + ecore_input_deps, 24 dependencies: ecore_input_pub_deps + ecore_input_deps + ecore_input_ext_deps,
25 include_directories : config_dir, 25 include_directories : config_dir,
26 install: true, 26 install: true,
27 version : meson.project_version() 27 version : meson.project_version()
diff --git a/src/lib/ecore_input_evas/meson.build b/src/lib/ecore_input_evas/meson.build
index ee2516bfbf..612a931c16 100644
--- a/src/lib/ecore_input_evas/meson.build
+++ b/src/lib/ecore_input_evas/meson.build
@@ -1,21 +1,22 @@
1ecore_input_evas_deps = [ecore, ecore_input, evas] 1ecore_input_evas_deps = [ecore, ecore_input, evas]
2ecore_input_evas_pub_deps = [eina, evas] 2ecore_input_evas_pub_deps = [eina, evas]
3ecore_input_evas_ext_deps = []
3pub_eo_file_target = [] 4pub_eo_file_target = []
4 5
5ecore_input_evas_header_src = [ 6ecore_input_evas_header_src = [
6 'Ecore_Input_Evas.h' 7 'Ecore_Input_Evas.h'
7] 8]
8 9
9ecore_input_evas_src = [ 10ecore_input_evas_src = files([
10 'ecore_input_evas.c', 11 'ecore_input_evas.c',
11 'ecore_input_evas_private.h', 12 'ecore_input_evas_private.h',
12] 13])
13 14
14 15
15ecore_input_evas_lib = library('ecore_input_evas', 16ecore_input_evas_lib = library('ecore_input_evas',
16 ecore_input_evas_src, pub_eo_file_target, 17 ecore_input_evas_src, pub_eo_file_target,
17 c_args : package_c_args, 18 c_args : package_c_args,
18 dependencies: ecore_input_evas_pub_deps + ecore_input_evas_deps, 19 dependencies: [ecore_input_evas_pub_deps, ecore_input_evas_deps, ecore_input_evas_ext_deps],
19 include_directories : config_dir, 20 include_directories : config_dir,
20 install: true, 21 install: true,
21 version : meson.project_version() 22 version : meson.project_version()
diff --git a/src/lib/ecore_ipc/meson.build b/src/lib/ecore_ipc/meson.build
index e34caa3619..6439148d16 100644
--- a/src/lib/ecore_ipc/meson.build
+++ b/src/lib/ecore_ipc/meson.build
@@ -1,19 +1,19 @@
1ecore_ipc_deps = [ecore, ecore_con] 1ecore_ipc_deps = [ecore, ecore_con]
2ecore_ipc_pub_deps = [eina] 2ecore_ipc_pub_deps = [eina]
3 3ecore_ipc_ext_deps = []
4ecore_ipc_header_src = [ 4ecore_ipc_header_src = [
5 'Ecore_Ipc.h' 5 'Ecore_Ipc.h'
6] 6]
7 7
8ecore_ipc_src = [ 8ecore_ipc_src = files([
9 'ecore_ipc.c', 9 'ecore_ipc.c',
10 'ecore_ipc_private.h', 10 'ecore_ipc_private.h',
11] 11])
12 12
13ecore_ipc_lib = library('ecore_ipc', 13ecore_ipc_lib = library('ecore_ipc',
14 ecore_ipc_src, pub_eo_file_target, 14 ecore_ipc_src, pub_eo_file_target,
15 c_args : package_c_args, 15 c_args : package_c_args,
16 dependencies: ecore_ipc_deps + ecore_ipc_pub_deps, 16 dependencies: [ecore_ipc_deps, ecore_ipc_pub_deps, ecore_ipc_ext_deps],
17 include_directories : config_dir, 17 include_directories : config_dir,
18 install: true, 18 install: true,
19 version : meson.project_version() 19 version : meson.project_version()
diff --git a/src/lib/ecore_sdl/meson.build b/src/lib/ecore_sdl/meson.build
index b4685818c1..f3cd70428d 100644
--- a/src/lib/ecore_sdl/meson.build
+++ b/src/lib/ecore_sdl/meson.build
@@ -1,20 +1,21 @@
1ecore_sdl_deps = [eina, ecore, ecore_input] 1ecore_sdl_deps = [eina, ecore, ecore_input]
2ecore_sdl_pub_deps = [] 2ecore_sdl_pub_deps = []
3ecore_sdl_ext_deps = [m]
3 4
4ecore_sdl_src = [ 5ecore_sdl_src = files([
5 'ecore_sdl.c' 6 'ecore_sdl.c'
6] 7])
7 8
8ecore_sdl_header_src = [ 9ecore_sdl_header_src = [
9 'Ecore_Sdl.h', 10 'Ecore_Sdl.h',
10 'Ecore_Sdl_Keys.h' 11 'Ecore_Sdl_Keys.h'
11] 12]
12 13
13ecore_sdl_deps += dependency('sdl2') 14ecore_sdl_ext_deps += dependency('sdl2')
14 15
15ecore_sdl_lib = library('ecore_sdl', 16ecore_sdl_lib = library('ecore_sdl',
16 ecore_sdl_src, 17 ecore_sdl_src,
17 dependencies: [m] + ecore_sdl_deps + ecore_sdl_pub_deps, 18 dependencies: [ecore_sdl_deps, ecore_sdl_pub_deps, ecore_sdl_ext_deps],
18 include_directories : config_dir + [include_directories(join_paths('..','..'))], 19 include_directories : config_dir + [include_directories(join_paths('..','..'))],
19 install: true, 20 install: true,
20 c_args : package_c_args, 21 c_args : package_c_args,
diff --git a/src/lib/ecore_win32/meson.build b/src/lib/ecore_win32/meson.build
index 1bb4589f28..b105dbae91 100644
--- a/src/lib/ecore_win32/meson.build
+++ b/src/lib/ecore_win32/meson.build
@@ -1,8 +1,14 @@
1ecore_win32_deps = []
2ecore_win32_pub_deps = []
3ecore_win32_ext_deps = []
4ecore_win32_src = []
5
1if sys_windows == true 6if sys_windows == true
2 ecore_win32_deps = [evil, eina, ecore, ecore_input] 7 ecore_win32_deps += [evil, eina, ecore, ecore_input]
3 ecore_win32_pub_deps = [] 8 ecore_win32_pub_deps += []
9 ecore_win32_ext_deps += []
4 10
5 ecore_win32_src = [ 11 ecore_win32_src += files([
6 'ecore_win32.c', 12 'ecore_win32.c',
7 'ecore_win32_clipboard.c', 13 'ecore_win32_clipboard.c',
8 'ecore_win32_cursor.c', 14 'ecore_win32_cursor.c',
@@ -14,7 +20,7 @@ if sys_windows == true
14 'ecore_win32_event.c', 20 'ecore_win32_event.c',
15 'ecore_win32_monitor.c', 21 'ecore_win32_monitor.c',
16 'ecore_win32_window.c', 22 'ecore_win32_window.c',
17 ] 23 ])
18 24
19 ecore_win32_header_src = [ 25 ecore_win32_header_src = [
20 'Ecore_Win32.h' 26 'Ecore_Win32.h'
@@ -22,7 +28,7 @@ if sys_windows == true
22 28
23 ecore_win32_lib = library('ecore_win32', 29 ecore_win32_lib = library('ecore_win32',
24 ecore_win32_src, 30 ecore_win32_src,
25 dependencies: ecore_win32_deps + ecore_win32_pub_deps, 31 dependencies: [ecore_win32_deps, ecore_win32_pub_deps, ecore_win32_ext_deps],
26 include_directories : config_dir, 32 include_directories : config_dir,
27 install: true, 33 install: true,
28 c_args : package_c_args, 34 c_args : package_c_args,
diff --git a/src/lib/ecore_wl2/meson.build b/src/lib/ecore_wl2/meson.build
index 4260aa78a5..eb88e47703 100644
--- a/src/lib/ecore_wl2/meson.build
+++ b/src/lib/ecore_wl2/meson.build
@@ -1,14 +1,13 @@
1ecore_wl2_deps = [ 1ecore_wl2_deps = [ecore, ecore_input, buildsystem]
2 dependency('wayland-client'), dependency('wayland-server'), dependency('xkbcommon'),
3 wayland_protocol, dl, m, ecore, ecore_input, libdrm, buildsystem
4]
5ecore_wl2_pub_deps = [eina, ecore] 2ecore_wl2_pub_deps = [eina, ecore]
3ecore_wl2_ext_deps = [dependency('wayland-client'), dependency('wayland-server'), dependency('xkbcommon'),
4 wayland_protocol, libdrm, buildsystem_simple, dl, m]
6 5
7ecore_wl2_header_src = [ 6ecore_wl2_header_src = [
8 'Ecore_Wl2.h' 7 'Ecore_Wl2.h'
9] 8]
10 9
11ecore_wl2_src = [ 10ecore_wl2_src = files([
12 'ecore_wl2_internal.h', 11 'ecore_wl2_internal.h',
13 'ecore_wl2_subsurf.c', 12 'ecore_wl2_subsurf.c',
14 'ecore_wl2_dnd.c', 13 'ecore_wl2_dnd.c',
@@ -20,12 +19,12 @@ ecore_wl2_src = [
20 'ecore_wl2_private.h', 19 'ecore_wl2_private.h',
21 'ecore_wl2_buffer.c', 20 'ecore_wl2_buffer.c',
22 'ecore_wl2_surface.c' 21 'ecore_wl2_surface.c'
23] 22])
24 23
25ecore_wl2_lib = library('ecore_wl2', 24ecore_wl2_lib = library('ecore_wl2',
26 ecore_wl2_src, pub_eo_file_target, 25 ecore_wl2_src, pub_eo_file_target,
27 c_args : package_c_args, 26 c_args : package_c_args,
28 dependencies: ecore_wl2_deps + ecore_wl2_pub_deps, 27 dependencies: ecore_wl2_deps + ecore_wl2_pub_deps + ecore_wl2_ext_deps,
29 include_directories : config_dir, 28 include_directories : config_dir,
30 install: true, 29 install: true,
31 version : meson.project_version() 30 version : meson.project_version()
@@ -38,6 +37,11 @@ ecore_wl2 = declare_dependency(
38 dependencies: ecore_wl2_pub_deps, 37 dependencies: ecore_wl2_pub_deps,
39) 38)
40 39
40ecore_wl2_internal_headers = declare_dependency(
41 include_directories: include_directories('.'),
42 dependencies: [wayland_protocol_simple, libdrm, dependency('wayland-client'), dependency('wayland-server'), dependency('xkbcommon'),],
43)
44
41install_headers(ecore_wl2_header_src, 45install_headers(ecore_wl2_header_src,
42 install_dir : dir_package_include, 46 install_dir : dir_package_include,
43) 47)
diff --git a/src/lib/ecore_x/meson.build b/src/lib/ecore_x/meson.build
index 51bdb2a7e8..608d3cda22 100644
--- a/src/lib/ecore_x/meson.build
+++ b/src/lib/ecore_x/meson.build
@@ -1,5 +1,6 @@
1ecore_x_deps = [ecore, dl, m, ecore_input] 1ecore_x_deps = [ecore, ecore_input]
2ecore_x_pub_deps = [eina, efl] 2ecore_x_pub_deps = [eina, efl]
3ecore_x_ext_deps = [dl, m]
3 4
4ecore_x_header_src = [ 5ecore_x_header_src = [
5 'Ecore_X.h', 6 'Ecore_X.h',
@@ -7,7 +8,7 @@ ecore_x_header_src = [
7 'Ecore_X_Cursor.h' 8 'Ecore_X_Cursor.h'
8] 9]
9 10
10ecore_x_src = [ 11ecore_x_src = files([
11 'ecore_x_atoms_decl.h', 12 'ecore_x_atoms_decl.h',
12 'ecore_x.c', 13 'ecore_x.c',
13 'ecore_x_dnd.c', 14 'ecore_x_dnd.c',
@@ -43,7 +44,7 @@ ecore_x_src = [
43 'ecore_x_vsync.c', 44 'ecore_x_vsync.c',
44 'ecore_x_gesture.c', 45 'ecore_x_gesture.c',
45 'ecore_x_private.h' 46 'ecore_x_private.h'
46] 47])
47 48
48ecore_x_checks = [ 49ecore_x_checks = [
49 ['Xcomposite', 'Xcomposite.h', 'Xcomposite', 'XCompositeQueryExtension'], 50 ['Xcomposite', 'Xcomposite.h', 'Xcomposite', 'XCompositeQueryExtension'],
@@ -104,12 +105,12 @@ int main () {
104 else 105 else
105 error('extension '+ecore_x_check[0]+' not found for X11') 106 error('extension '+ecore_x_check[0]+' not found for X11')
106 endif 107 endif
107 ecore_x_deps += x_lib 108 ecore_x_ext_deps += x_lib
108endforeach 109endforeach
109 110
110ecore_x_deps += x11 111ecore_x_ext_deps += x11
111ecore_x_deps += xcb 112ecore_x_ext_deps += xcb
112ecore_x_deps += x11_xcb 113ecore_x_ext_deps += x11_xcb
113 114
114 115
115# there are a few special cases 116# there are a few special cases
@@ -125,12 +126,12 @@ cc.has_header_symbol('X11/Xcursor/Xcursor.h', 'XcursorSupportsARGB',
125 dependencies : [x11, xcb] 126 dependencies : [x11, xcb]
126 ) 127 )
127config_h.set('ECORE_XCURSOR', '1') 128config_h.set('ECORE_XCURSOR', '1')
128ecore_x_deps += lib 129ecore_x_ext_deps += lib
129 130
130ecore_x_lib = library('ecore_x', 131ecore_x_lib = library('ecore_x',
131 ecore_x_src, pub_eo_file_target, 132 ecore_x_src, pub_eo_file_target,
132 c_args : package_c_args, 133 c_args : package_c_args,
133 dependencies: ecore_x_pub_deps + ecore_x_deps, 134 dependencies: ecore_x_pub_deps + ecore_x_deps + ecore_x_ext_deps,
134 include_directories : config_dir, 135 include_directories : config_dir,
135 install: true, 136 install: true,
136 version : meson.project_version() 137 version : meson.project_version()
diff --git a/src/lib/ector/meson.build b/src/lib/ector/meson.build
index 628c83f384..0d044b5404 100644
--- a/src/lib/ector/meson.build
+++ b/src/lib/ector/meson.build
@@ -1,5 +1,6 @@
1ector_deps = [eina, emile, eet, eo, efl] 1ector_deps = [eina, emile, eet, eo, efl, draw]
2ector_pub_deps = [eina, efl] 2ector_pub_deps = [eina, efl]
3ector_ext_deps = [triangulator, freetype, draw_without_deps, m]
3 4
4pub_eo_file_target = [] 5pub_eo_file_target = []
5ector_opt_lib = [ ] 6ector_opt_lib = [ ]
@@ -9,7 +10,7 @@ ector_header_src = [
9 # nothing for now ector stays only intree 10 # nothing for now ector stays only intree
10] 11]
11 12
12ector_src = [ 13ector_src = files([
13 'ector_main.c', 14 'ector_main.c',
14 'ector_gl_internal.h', 15 'ector_gl_internal.h',
15 'ector_buffer.c', 16 'ector_buffer.c',
@@ -19,7 +20,7 @@ ector_src = [
19 'ector_renderer_gradient.c', 20 'ector_renderer_gradient.c',
20 'ector_renderer_gradient_radial.c', 21 'ector_renderer_gradient_radial.c',
21 'ector_renderer_gradient_linear.c' 22 'ector_renderer_gradient_linear.c'
22] 23])
23 24
24pub_eo_files = [ 25pub_eo_files = [
25 'ector_surface.eo', 26 'ector_surface.eo',
@@ -80,14 +81,19 @@ endforeach
80 81
81subdir('software') 82subdir('software')
82 83
84ector_opt_lib_dep = declare_dependency(
85 link_with: ector_opt_lib
86)
87
88ector_ext_deps += ector_opt_lib_dep
89
83ector_lib = library('ector', 90ector_lib = library('ector',
84 ector_src, pub_eo_file_target, 91 ector_src, pub_eo_file_target,
85 c_args : package_c_args, 92 c_args : package_c_args,
86 dependencies: ector_pub_deps + [triangulator, freetype, draw, m] + ector_deps, 93 dependencies: ector_pub_deps + ector_ext_deps + ector_deps,
87 include_directories : config_dir, 94 include_directories : config_dir,
88 install: true, 95 install: true,
89 version : meson.project_version(), 96 version : meson.project_version(),
90 link_with: ector_opt_lib
91) 97)
92 98
93ector = declare_dependency( 99ector = declare_dependency(
diff --git a/src/lib/edje/meson.build b/src/lib/edje/meson.build
index 84b8ac7318..8332f9525a 100644
--- a/src/lib/edje/meson.build
+++ b/src/lib/edje/meson.build
@@ -3,10 +3,12 @@ edje_deps = [
3 eet, evas, ecore_evas, 3 eet, evas, ecore_evas,
4 ecore_file, ecore_input, 4 ecore_file, ecore_input,
5 ecore_imf, ecore_imf_evas, 5 ecore_imf, ecore_imf_evas,
6 embryo, efreet, eio, intl 6 embryo, efreet, eio, intl,
7 buildsystem
7] 8]
8 9
9edje_pub_deps = [m, evas, eo, efl, lua] 10edje_pub_deps = [evas, eo, efl]
11edje_ext_deps = [m, lua, buildsystem_simple]
10 12
11if (get_option('physics')) 13if (get_option('physics'))
12 edje_deps += ephysics 14 edje_deps += ephysics
@@ -102,7 +104,7 @@ edje_header_src = [
102 'efl_canvas_layout_eo.legacy.h', 104 'efl_canvas_layout_eo.legacy.h',
103] 105]
104 106
105edje_src = [ 107edje_src = files([
106 'edje_private.h', 108 'edje_private.h',
107 'edje_convert.h', 109 'edje_convert.h',
108 'edje_box_layout.c', 110 'edje_box_layout.c',
@@ -141,12 +143,11 @@ edje_src = [
141 'edje_part_box.c', 143 'edje_part_box.c',
142 'edje_part_text.c', 144 'edje_part_text.c',
143 'edje_part_invalid.c' 145 'edje_part_invalid.c'
144 146])
145]
146 147
147edje_lib = library('edje', 148edje_lib = library('edje',
148 edje_src, pub_eo_file_target, priv_eo_file_target, 149 edje_src, pub_eo_file_target, priv_eo_file_target,
149 dependencies: edje_pub_deps + edje_deps, 150 dependencies: edje_pub_deps + edje_deps + edje_ext_deps,
150 include_directories : config_dir + [include_directories('.')], 151 include_directories : config_dir + [include_directories('.')],
151 install: true, 152 install: true,
152 c_args : [package_c_args], 153 c_args : [package_c_args],
diff --git a/src/lib/eet/meson.build b/src/lib/eet/meson.build
index 2dec5335c0..78b5146296 100644
--- a/src/lib/eet/meson.build
+++ b/src/lib/eet/meson.build
@@ -1,11 +1,12 @@
1eet_deps = [crypto, jpeg, rg_etc, m] 1eet_deps = [rg_etc]
2eet_pub_deps = [eina, emile, efl] 2eet_pub_deps = [eina, emile, efl]
3eet_ext_deps = [crypto, jpeg, m, rg_etc_simple]
3 4
4eet_header_src = [ 5eet_header_src = [
5 'Eet.h' 6 'Eet.h'
6] 7]
7 8
8eet_src = [ 9eet_src = files([
9 'Eet_private.h', 10 'Eet_private.h',
10 'eet_alloc.c', 11 'eet_alloc.c',
11 'eet_cipher.c', 12 'eet_cipher.c',
@@ -16,12 +17,12 @@ eet_src = [
16 'eet_lib.c', 17 'eet_lib.c',
17 'eet_node.c', 18 'eet_node.c',
18 'eet_utils.c', 19 'eet_utils.c',
19] 20])
20 21
21eet_lib = library('eet', 22eet_lib = library('eet',
22 eet_src, pub_eo_file_target, 23 eet_src, pub_eo_file_target,
23 c_args : package_c_args, 24 c_args : package_c_args,
24 dependencies: eet_deps + eet_pub_deps, 25 dependencies: eet_deps + eet_pub_deps + eet_ext_deps,
25 include_directories : config_dir, 26 include_directories : config_dir,
26 install: true, 27 install: true,
27 version : meson.project_version() 28 version : meson.project_version()
diff --git a/src/lib/eeze/meson.build b/src/lib/eeze/meson.build
index 313a73d888..1435fe7a2f 100644
--- a/src/lib/eeze/meson.build
+++ b/src/lib/eeze/meson.build
@@ -1,5 +1,6 @@
1eeze_deps = [buildsystem] 1eeze_deps = [buildsystem]
2eeze_pub_deps = [eina, efl] 2eeze_pub_deps = [eina, efl, ecore, ecore_file]
3eeze_ext_deps = []
3pub_eo_file_target = [] 4pub_eo_file_target = []
4 5
5eeze_header_src = [ 6eeze_header_src = [
@@ -10,7 +11,7 @@ eeze_header_src = [
10 join_paths('..','..','bin','eeze','eeze_scanner','eeze_scanner.h') 11 join_paths('..','..','bin','eeze','eeze_scanner','eeze_scanner.h')
11] 12]
12 13
13eeze_src = [ 14eeze_src = files([
14 'eeze_main.c', 15 'eeze_main.c',
15 'eeze_net.c', 16 'eeze_net.c',
16 'eeze_net_private.h', 17 'eeze_net_private.h',
@@ -26,7 +27,7 @@ eeze_src = [
26 'eeze_disk_udev.c', 27 'eeze_disk_udev.c',
27 'eeze_disk_mount.c', 28 'eeze_disk_mount.c',
28 'eeze_disk_private.h' 29 'eeze_disk_private.h'
29] 30])
30 31
31if get_option('v4l2') 32if get_option('v4l2')
32 config_h.set('HAVE_V4L2', '1') 33 config_h.set('HAVE_V4L2', '1')
@@ -37,17 +38,17 @@ endif
37 38
38if (get_option('libmount')) 39if (get_option('libmount'))
39 libmount = dependency('mount') 40 libmount = dependency('mount')
40 eeze_deps += [libmount] 41 eeze_ext_deps += [libmount]
41 if libmount.version() == '2.19' 42 if libmount.version() == '2.19'
42 eeze_src += 'eeze_disk_libmount.c' 43 eeze_src += files('eeze_disk_libmount.c')
43 elif libmount.version() < '2.19' 44 elif libmount.version() < '2.19'
44 eeze_src += 'eeze_disk_libmount_old.c' 45 eeze_src += files('eeze_disk_libmount_old.c')
45 elif libmount.version() > '2.19' 46 elif libmount.version() > '2.19'
46 eeze_src += 'eeze_disk_libmount_new.c' 47 eeze_src += files('eeze_disk_libmount_new.c')
47 endif 48 endif
48 config_h.set('HAVE_EEZE_MOUNT', '1') 49 config_h.set('HAVE_EEZE_MOUNT', '1')
49else 50else
50 eeze_src += 'eeze_disk_dummy.c' 51 eeze_src += files('eeze_disk_dummy.c')
51endif 52endif
52 53
53options_to_check = ['eject', 'mount', 'unmount'] 54options_to_check = ['eject', 'mount', 'unmount']
@@ -55,7 +56,7 @@ options_to_check = ['eject', 'mount', 'unmount']
55udev = dependency('libudev', 56udev = dependency('libudev',
56 version: ['>=148'] 57 version: ['>=148']
57) 58)
58eeze_deps += udev 59eeze_ext_deps += udev
59 60
60if udev.version() < '199' 61if udev.version() < '199'
61 config_h.set('OLD_LIBUDEV', '1') 62 config_h.set('OLD_LIBUDEV', '1')
@@ -87,7 +88,7 @@ config_h.set_quoted('EEZE_UNMOUNT_BIN', unmount_bin)
87 88
88eeze_lib = library('eeze', 89eeze_lib = library('eeze',
89 eeze_src, pub_eo_file_target, 90 eeze_src, pub_eo_file_target,
90 dependencies: eeze_deps + eeze_pub_deps + [ecore, ecore_file, buildsystem, eeze_deps], 91 dependencies: eeze_deps + eeze_pub_deps + eeze_deps + eeze_ext_deps,
91 include_directories : config_dir, 92 include_directories : config_dir,
92 install: true, 93 install: true,
93 c_args : package_c_args, 94 c_args : package_c_args,
diff --git a/src/lib/efl/meson.build b/src/lib/efl/meson.build
index 326e34eafd..5dbc825894 100644
--- a/src/lib/efl/meson.build
+++ b/src/lib/efl/meson.build
@@ -1,5 +1,6 @@
1efl_deps = [] 1efl_deps = [m]
2efl_pub_deps = [eo] 2efl_pub_deps = [eo]
3efl_ext_deps = []
3 4
4efl_header_src = [ 5efl_header_src = [
5 'Efl.h', 6 'Efl.h',
@@ -14,7 +15,7 @@ package_header_subdirs += 'interfaces'
14efl_lib = library('efl', 15efl_lib = library('efl',
15 efl_src, pub_eo_file_target, 16 efl_src, pub_eo_file_target,
16 c_args : package_c_args, 17 c_args : package_c_args,
17 dependencies: [eina, eo, m], 18 dependencies: [efl_deps, efl_pub_deps, efl_ext_deps],
18 install: true, 19 install: true,
19 version : meson.project_version() 20 version : meson.project_version()
20) 21)
diff --git a/src/lib/efl_canvas_wl/meson.build b/src/lib/efl_canvas_wl/meson.build
index d021975844..63527c7d5c 100644
--- a/src/lib/efl_canvas_wl/meson.build
+++ b/src/lib/efl_canvas_wl/meson.build
@@ -1,5 +1,5 @@
1efl_canvas_wl_deps = [ecore_wl2, ecore_input, ecore, ecore_evas, evas, emile, eina] 1efl_canvas_wl_deps = [ecore_wl2, ecore_input, ecore, ecore_evas, evas, emile, eina]
2efl_canvas_wl_pub_deps = [eo, efl, evas, dependency('wayland-server', version : '>= 1.11.0'), dependency('xkbcommon', version : '>= 0.6.0')] 2efl_canvas_wl_pub_deps = [eo, efl, evas, dependency('wayland-server', version : '>= 1.11.0'), dependency('xkbcommon', version : '>= 0.6.0'), wayland_protocol]
3 3
4if (get_option('x11')) 4if (get_option('x11'))
5 efl_canvas_wl_deps += [ecore_x] 5 efl_canvas_wl_deps += [ecore_x]
diff --git a/src/lib/efreet/meson.build b/src/lib/efreet/meson.build
index 271eca0b1a..41d3113566 100644
--- a/src/lib/efreet/meson.build
+++ b/src/lib/efreet/meson.build
@@ -11,7 +11,7 @@ efreet_header_src = [
11 'Efreet_Trash.h' 11 'Efreet_Trash.h'
12] 12]
13 13
14efreet_src = [ 14efreet_src = files([
15 'efreet.c', 15 'efreet.c',
16 'efreet_base.c', 16 'efreet_base.c',
17 'efreet_icon.c', 17 'efreet_icon.c',
@@ -28,17 +28,20 @@ efreet_src = [
28 'efreet_cache_private.h', 28 'efreet_cache_private.h',
29 'efreet_mime.c', 29 'efreet_mime.c',
30 'efreet_trash.c' 30 'efreet_trash.c'
31] 31])
32 32
33efreet_deps = [eet, ecore, ecore_con, ecore_file, eo, efl, eina, emile, ecore_ipc, buildsystem,intl] 33efreet_deps = [eet, ecore, ecore_con, ecore_file, eo, efl, eina, emile, ecore_ipc, buildsystem]
34efreet_pub_deps = [eina, eo, efl] 34efreet_pub_deps = [eina, eo, efl]
35efreet_ext_deps = [buildsystem_simple, intl, m]
36
37package_c_args += ['-DDATA_DIR="'+dir_data+'"']
35 38
36efreet_lib = library('efreet', 39efreet_lib = library('efreet',
37 efreet_src, 40 efreet_src,
38 dependencies: efreet_pub_deps + [m] + efreet_deps, 41 dependencies: efreet_pub_deps + efreet_ext_deps + efreet_deps,
39 include_directories : config_dir + [include_directories('.')], 42 include_directories : config_dir + [include_directories('.')],
40 install: true, 43 install: true,
41 c_args : [package_c_args, '-DDATA_DIR="'+dir_data+'"'], 44 c_args : package_c_args,
42 version : meson.project_version() 45 version : meson.project_version()
43) 46)
44 47
diff --git a/src/lib/eina/meson.build b/src/lib/eina/meson.build
index 53e1b6120b..8df3660f31 100644
--- a/src/lib/eina/meson.build
+++ b/src/lib/eina/meson.build
@@ -1,5 +1,6 @@
1eina_deps = [dl] 1eina_deps = [dl]
2eina_pub_deps = [thread_dep] 2eina_pub_deps = [thread_dep]
3eina_ext_deps = [m, rt, dl, thread_dep]
3 4
4if sys_windows == true 5if sys_windows == true
5 eina_pub_deps += [evil] 6 eina_pub_deps += [evil]
@@ -114,7 +115,7 @@ public_headers = [
114 'Eina.h' 115 'Eina.h'
115] 116]
116 117
117sources = [ 118eina_src = files([
118'eina_abi.c', 119'eina_abi.c',
119'eina_accessor.c', 120'eina_accessor.c',
120'eina_array.c', 121'eina_array.c',
@@ -191,12 +192,12 @@ sources = [
191'eina_vpath.c', 192'eina_vpath.c',
192'eina_vpath_xdg.c', 193'eina_vpath_xdg.c',
193'eina_abstract_content.c', 194'eina_abstract_content.c',
194] 195]) + eina_mp_sources
195 196
196if sys_windows == true 197if sys_windows == true
197 sources += 'eina_file_win32.c' 198 eina_src += files('eina_file_win32.c')
198else 199else
199 sources += 'eina_file.c' 200 eina_src += files('eina_file.c')
200endif 201endif
201 202
202eina_config = configuration_data() 203eina_config = configuration_data()
@@ -242,7 +243,7 @@ if use_valgrind
242 else 243 else
243 config_h.set('HAVE_VALGRIND', 1) 244 config_h.set('HAVE_VALGRIND', 1)
244 endif 245 endif
245 eina_deps += valgrind 246 eina_ext_deps += valgrind
246else 247else
247 config_h.set('NVALGRIND', 1) 248 config_h.set('NVALGRIND', 1)
248 valgrind = [] 249 valgrind = []
@@ -349,7 +350,7 @@ public_headers += eina_config_file
349unwind = dependency('libunwind-generic', required: false) 350unwind = dependency('libunwind-generic', required: false)
350if unwind.found() 351if unwind.found()
351 config_h.set('HAVE_UNWIND', 1) 352 config_h.set('HAVE_UNWIND', 1)
352 eina_deps += unwind 353 eina_ext_deps += unwind
353 config_h.set('EINA_LOG_BACKTRACE_ENABLE', 1) 354 config_h.set('EINA_LOG_BACKTRACE_ENABLE', 1)
354endif 355endif
355 356
@@ -358,13 +359,15 @@ iconv = dependency('iconv', required: false)
358if iconv.found() == false 359if iconv.found() == false
359 iconv = cc.find_library('iconv', required: false) 360 iconv = cc.find_library('iconv', required: false)
360endif 361endif
362eina_ext_deps += [iconv]
361 363
362execinfo = cc.find_library('execinfo', required: false) 364execinfo = cc.find_library('execinfo', required: false)
365eina_ext_deps += [execinfo]
363 366
364eina_lib = library('eina', sources, 367eina_lib = library('eina', eina_src,
365 c_args : package_c_args, 368 c_args : package_c_args,
366 include_directories : config_dir, 369 include_directories : config_dir,
367 dependencies: [m, rt, dl, execinfo, iconv, eina_deps, thread_dep, eina_mem_pools, evil], 370 dependencies: eina_ext_deps + [eina_deps, evil],
368 install: true, 371 install: true,
369 version : meson.project_version() 372 version : meson.project_version()
370) 373)
diff --git a/src/lib/eio/meson.build b/src/lib/eio/meson.build
index 64f33a2430..a5536cd90b 100644
--- a/src/lib/eio/meson.build
+++ b/src/lib/eio/meson.build
@@ -32,7 +32,7 @@ eio_header_src = [
32 'eio_inline_helper.x' 32 'eio_inline_helper.x'
33] 33]
34 34
35eio_src = [ 35eio_src = files([
36 'eio_dir.c', 36 'eio_dir.c',
37 'eio_eet.c', 37 'eio_eet.c',
38 'eio_file.c', 38 'eio_file.c',
@@ -48,27 +48,28 @@ eio_src = [
48 'efl_io_model_private.h', 48 'efl_io_model_private.h',
49 'eio_private.h', 49 'eio_private.h',
50 'eio_sentry_private.h' 50 'eio_sentry_private.h'
51] 51])
52 52
53linker_args = [] 53linker_args = []
54 54
55if sys_windows == true 55if sys_windows == true
56 eio_src += ['eio_monitor_win32.c'] 56 eio_src += files(['eio_monitor_win32.c'])
57elif sys_osx == true 57elif sys_osx == true
58 eio_src += ['eio_monitor_cocoa.c'] 58 eio_src += files(['eio_monitor_cocoa.c'])
59 linker_args = [['-framework', 'CoreServices']] 59 linker_args = [['-framework', 'CoreServices']]
60elif sys_linux == true 60elif sys_linux == true
61 eio_src += ['eio_monitor_inotify.c'] 61 eio_src += files(['eio_monitor_inotify.c'])
62elif sys_bsd == true 62elif sys_bsd == true
63 eio_src += ['eio_monitor_kevent.c'] 63 eio_src += files(['eio_monitor_kevent.c'])
64endif 64endif
65 65
66eio_deps = [ecore, ecore_file, eet, eo, eina, efl, emile, efreet] 66eio_deps = [ecore, ecore_file, eet, eo, eina, efl, emile, efreet]
67eio_pub_deps = [eina, eet] 67eio_pub_deps = [eina, eet]
68eio_ext_deps = [m]
68 69
69eio_lib = library('eio', 70eio_lib = library('eio',
70 eio_src, pub_eo_file_target, 71 eio_src, pub_eo_file_target,
71 dependencies: [eina, eo, efl, m, eio_deps], 72 dependencies: eio_deps + eio_pub_deps + eio_ext_deps,
72 include_directories : config_dir + [include_directories('.')], 73 include_directories : config_dir + [include_directories('.')],
73 install: true, 74 install: true,
74 c_args : package_c_args, 75 c_args : package_c_args,
diff --git a/src/lib/eldbus/meson.build b/src/lib/eldbus/meson.build
index a58be32b1b..ea3d6930c9 100644
--- a/src/lib/eldbus/meson.build
+++ b/src/lib/eldbus/meson.build
@@ -1,5 +1,6 @@
1eldbus_deps = [ecore] 1eldbus_deps = [ecore]
2eldbus_pub_deps = [eina, eo, efl] 2eldbus_pub_deps = [eina, eo, efl]
3eldbus_ext_deps = []
3 4
4pub_eo_files = [ 5pub_eo_files = [
5 'eldbus_model_connection.eo', 6 'eldbus_model_connection.eo',
@@ -61,7 +62,7 @@ eldbus_header_src = [
61 'eldbus_message_eina_value.h' 62 'eldbus_message_eina_value.h'
62] 63]
63 64
64eldbus_src = [ 65eldbus_src = files([
65 'eldbus_private.h', 66 'eldbus_private.h',
66 'eldbus_private_types.h', 67 'eldbus_private_types.h',
67 'eldbus_model_private.h', 68 'eldbus_model_private.h',
@@ -90,14 +91,14 @@ eldbus_src = [
90 'eldbus_model_arguments.c', 91 'eldbus_model_arguments.c',
91 'eldbus_model_signal.c', 92 'eldbus_model_signal.c',
92 'eldbus_introspection.c' 93 'eldbus_introspection.c'
93] 94])
94 95
95eldbus_deps += dependency('dbus-1') 96eldbus_ext_deps += dependency('dbus-1')
96 97
97eldbus_lib = library('eldbus', 98eldbus_lib = library('eldbus',
98 eldbus_src, pub_eo_file_target, 99 eldbus_src, pub_eo_file_target,
99 c_args : package_c_args, 100 c_args : package_c_args,
100 dependencies: eldbus_pub_deps + eldbus_deps, 101 dependencies: eldbus_pub_deps + eldbus_deps + eldbus_ext_deps,
101 include_directories : config_dir, 102 include_directories : config_dir,
102 install: true, 103 install: true,
103 version : meson.project_version() 104 version : meson.project_version()
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index fb4431d3f7..f6674fbdc3 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -712,7 +712,7 @@ elementary_header_src = [
712 'Elementary_Cursor.h' 712 'Elementary_Cursor.h'
713] + elementary_pub_headers + elementary_headers_unstable 713] + elementary_pub_headers + elementary_headers_unstable
714 714
715elementary_src = [ 715elementary_src = files([
716 'elm_priv.h', 716 'elm_priv.h',
717 'elementary_config.h', 717 'elementary_config.h',
718 'els_box.h', 718 'els_box.h',
@@ -947,12 +947,12 @@ elementary_src = [
947 'efl_ui_stack.c', 947 'efl_ui_stack.c',
948 'efl_ui_separator.c', 948 'efl_ui_separator.c',
949 'efl_ui_spotlight_animation_manager.c', 949 'efl_ui_spotlight_animation_manager.c',
950] 950])
951 951
952elementary_deps = [emile, eo, efl, edje, ethumb, ethumb_client, emotion, ecore_imf, ecore_con, eldbus, efreet, eio, atspi, dl, intl] 952elementary_deps = [emile, eo, efl, edje, ethumb, ethumb_client, emotion, ecore_imf, ecore_con, eldbus, efreet, eio]
953elementary_pub_deps = [eina, eet, evas, ecore, ecore_evas, ecore_file, ecore_input, ecore_imf, ecore_con, 953elementary_pub_deps = [eina, eet, evas, ecore, ecore_evas, ecore_file, ecore_input, ecore_imf, ecore_con,
954 edje, eldbus, efreet, ethumb_client, efl] 954 edje, eldbus, efreet, ethumb_client, efl]
955 955elementary_ext_deps = [atspi, dl, intl]
956elm_options = configuration_data() 956elm_options = configuration_data()
957 957
958config_h.set_quoted('ELM_TOP_BUILD_DIR', meson.build_root()) 958config_h.set_quoted('ELM_TOP_BUILD_DIR', meson.build_root())
@@ -986,6 +986,10 @@ endif
986if get_option('wl') 986if get_option('wl')
987 config_h.set('HAVE_ELEMENTARY_WL2', '1') 987 config_h.set('HAVE_ELEMENTARY_WL2', '1')
988 elementary_deps += ecore_wl2 988 elementary_deps += ecore_wl2
989 elementary_ext_deps += declare_dependency(
990 include_directories: include_directories([join_paths('..', '..', 'modules', 'ecore_evas', 'engines', 'wayland'), join_paths('..', '..', 'lib', 'ecore_wl2')]),
991 dependencies : ecore_wl2_internal_headers
992 )
989endif 993endif
990 994
991if get_option('drm') 995if get_option('drm')
@@ -1013,8 +1017,8 @@ elm_package_c_args = package_c_args
1013 1017
1014elementary_lib = library('elementary', 1018elementary_lib = library('elementary',
1015 elementary_src, pub_eo_file_target, priv_eo_file_target, c, embed_config, 1019 elementary_src, pub_eo_file_target, priv_eo_file_target, c, embed_config,
1016 dependencies: elementary_pub_deps + elementary_deps, 1020 dependencies: elementary_pub_deps + elementary_deps + elementary_ext_deps,
1017 include_directories : config_dir + [include_directories('.')] + [include_directories(join_paths('..', '..', '..'))] + [ecore_evas_wayland_engine_include_dir], 1021 include_directories : config_dir + [include_directories('.')] + [include_directories(join_paths('..', '..', '..'))],
1018 install: true, 1022 install: true,
1019 c_args : elm_package_c_args, 1023 c_args : elm_package_c_args,
1020 version : meson.project_version() 1024 version : meson.project_version()
@@ -1027,7 +1031,6 @@ elementary = declare_dependency(
1027 dependencies: elementary_pub_deps, 1031 dependencies: elementary_pub_deps,
1028) 1032)
1029 1033
1030
1031if get_option('install-eo-files') 1034if get_option('install-eo-files')
1032 install_data(pub_eo_files + pub_eo_types_files, 1035 install_data(pub_eo_files + pub_eo_types_files,
1033 install_dir: join_paths(eolian_include_dir, package_version_name) 1036 install_dir: join_paths(eolian_include_dir, package_version_name)
diff --git a/src/lib/elput/meson.build b/src/lib/elput/meson.build
index bbfe85d74f..639840e424 100644
--- a/src/lib/elput/meson.build
+++ b/src/lib/elput/meson.build
@@ -1,11 +1,12 @@
1elput_deps = [ecore, ecore_input, eeze, eo, m] 1elput_deps = [ecore, ecore_input, eeze, eo, m]
2elput_pub_deps = [eina, eldbus] 2elput_pub_deps = [eina, eldbus]
3elput_ext_deps = []
3 4
4elput_header_src = [ 5elput_header_src = [
5 'Elput.h' 6 'Elput.h'
6] 7]
7 8
8elput_src = [ 9elput_src = files([
9 'elput_touch.c', 10 'elput_touch.c',
10 'elput_evdev.c', 11 'elput_evdev.c',
11 'elput_input.c', 12 'elput_input.c',
@@ -13,16 +14,16 @@ elput_src = [
13 'elput_manager.c', 14 'elput_manager.c',
14 'elput.c', 15 'elput.c',
15 'elput_private.h' 16 'elput_private.h'
16] 17])
17 18
18elput_deps += dependency('libinput', version : ['>=1.7.0']) 19elput_ext_deps += dependency('libinput', version : ['>=1.7.0'])
19elput_deps += dependency('xkbcommon', version : ['>=0.3.0']) 20elput_ext_deps += dependency('xkbcommon', version : ['>=0.3.0'])
20elput_deps += dependency('libudev') 21elput_ext_deps += dependency('libudev')
21 22
22elput_lib = library('elput', 23elput_lib = library('elput',
23 elput_src, pub_eo_file_target, 24 elput_src, pub_eo_file_target,
24 c_args : package_c_args, 25 c_args : package_c_args,
25 dependencies: elput_pub_deps + elput_deps, 26 dependencies: elput_pub_deps + elput_deps + elput_ext_deps,
26 include_directories : config_dir, 27 include_directories : config_dir,
27 install: true, 28 install: true,
28 version : meson.project_version() 29 version : meson.project_version()
diff --git a/src/lib/embryo/meson.build b/src/lib/embryo/meson.build
index 6ab8af8fe7..e0bb2385f9 100644
--- a/src/lib/embryo/meson.build
+++ b/src/lib/embryo/meson.build
@@ -1,12 +1,12 @@
1embryo_deps = [ecore] 1embryo_deps = [eina, ecore, buildsystem]
2embryo_pub_deps = [eina, eo, efl] 2embryo_pub_deps = [eina, eo, efl]
3 3embryo_ext_deps = [buildsystem_simple, m]
4 4
5embryo_header_src = [ 5embryo_header_src = [
6 'Embryo.h' 6 'Embryo.h'
7] 7]
8 8
9embryo_src = [ 9embryo_src = files([
10 'embryo_amx.c', 10 'embryo_amx.c',
11 'embryo_args.c', 11 'embryo_args.c',
12 'embryo_float.c', 12 'embryo_float.c',
@@ -15,13 +15,11 @@ embryo_src = [
15 'embryo_str.c', 15 'embryo_str.c',
16 'embryo_time.c', 16 'embryo_time.c',
17 'embryo_private.h' 17 'embryo_private.h'
18] 18])
19
20embryo_deps = [eina, m]
21 19
22embryo_lib = library('embryo', 20embryo_lib = library('embryo',
23 embryo_src, 21 embryo_src,
24 dependencies: [m, buildsystem] + embryo_deps, 22 dependencies: [embryo_deps, embryo_pub_deps, embryo_ext_deps],
25 include_directories : config_dir + [include_directories(join_paths('..','..'))], 23 include_directories : config_dir + [include_directories(join_paths('..','..'))],
26 install: true, 24 install: true,
27 c_args : package_c_args, 25 c_args : package_c_args,
diff --git a/src/lib/emile/meson.build b/src/lib/emile/meson.build
index d8734cd1f2..fb5822836b 100644
--- a/src/lib/emile/meson.build
+++ b/src/lib/emile/meson.build
@@ -1,5 +1,6 @@
1emile_deps = [jpeg, crypto, dependency('zlib')] 1emile_deps = []
2emile_pub_deps = [eina, efl] 2emile_pub_deps = [eina, efl]
3emile_ext_deps = [jpeg, crypto, dependency('zlib'), lz4, rg_etc, m]
3 4
4emile_headers = [ 5emile_headers = [
5 'Emile.h', 6 'Emile.h',
@@ -9,25 +10,25 @@ emile_headers = [
9 'emile_base64.h' 10 'emile_base64.h'
10] 11]
11 12
12emile_src = [ 13emile_src = files([
13 'emile_private.h', 14 'emile_private.h',
14 'emile_main.c', 15 'emile_main.c',
15 'emile_compress.c', 16 'emile_compress.c',
16 'emile_image.c', 17 'emile_image.c',
17 'emile_base64.c', 18 'emile_base64.c',
18] 19])
19 20
20if (get_option('crypto') == 'gnutls') 21if (get_option('crypto') == 'gnutls')
21 emile_src += 'emile_cipher_gnutls.c' 22 emile_src += files('emile_cipher_gnutls.c')
22elif (get_option('crypto') == 'openssl') 23elif (get_option('crypto') == 'openssl')
23 emile_src += 'emile_cipher_openssl.c' 24 emile_src += files('emile_cipher_openssl.c')
24endif 25endif
25 26
26emile_lib = library('emile', 27emile_lib = library('emile',
27 emile_src, 28 emile_src,
28 c_args : package_c_args, 29 c_args : package_c_args,
29 include_directories: config_dir, 30 include_directories: config_dir,
30 dependencies: emile_pub_deps + emile_deps + [lz4, rg_etc, m], 31 dependencies: emile_pub_deps + emile_deps + emile_ext_deps,
31 install: true, 32 install: true,
32 version : meson.project_version() 33 version : meson.project_version()
33) 34)
diff --git a/src/lib/emotion/meson.build b/src/lib/emotion/meson.build
index e779a39248..b289fb221a 100644
--- a/src/lib/emotion/meson.build
+++ b/src/lib/emotion/meson.build
@@ -28,17 +28,18 @@ emotion_header_src = [
28 'efl_canvas_video_eo.legacy.h', 28 'efl_canvas_video_eo.legacy.h',
29] 29]
30 30
31emotion_src = [ 31emotion_src = files([
32 'emotion_modules.h', 32 'emotion_modules.h',
33 'emotion_private.h', 33 'emotion_private.h',
34 'emotion_smart.c', 34 'emotion_smart.c',
35 'emotion_webcam.c', 35 'emotion_webcam.c',
36 'emotion_modules.c', 36 'emotion_modules.c',
37 'emotion_main.c' 37 'emotion_main.c'
38] 38])
39 39
40emotion_deps = [ecore, eet, evas, eio, emile] 40emotion_deps = [ecore, eet, evas, eio, emile]
41emotion_pub_deps = [eina, eo, efl] 41emotion_pub_deps = [eina, eo, efl]
42emotion_ext_deps = []
42 43
43if get_option('eeze') == true 44if get_option('eeze') == true
44 emotion_deps += [eeze] 45 emotion_deps += [eeze]
@@ -49,7 +50,7 @@ emotion_package_c_args = package_c_args
49 50
50emotion_lib = library('emotion', 51emotion_lib = library('emotion',
51 emotion_src, pub_eo_file_target, priv_eo_file_target, 52 emotion_src, pub_eo_file_target, priv_eo_file_target,
52 dependencies: emotion_deps + emotion_pub_deps, 53 dependencies: emotion_deps + emotion_pub_deps + emotion_ext_deps,
53 include_directories : config_dir + [include_directories('.')], 54 include_directories : config_dir + [include_directories('.')],
54 install: true, 55 install: true,
55 c_args : emotion_package_c_args, 56 c_args : emotion_package_c_args,
diff --git a/src/lib/eo/meson.build b/src/lib/eo/meson.build
index 1360276e60..9cd33775b0 100644
--- a/src/lib/eo/meson.build
+++ b/src/lib/eo/meson.build
@@ -1,5 +1,6 @@
1eo_deps = [] 1eo_deps = []
2eo_pub_deps = [eina] 2eo_pub_deps = [eina]
3eo_ext_deps = [valgrind, dl, execinfo]
3 4
4pub_eo_files = [ 5pub_eo_files = [
5 'efl_object.eo', 6 'efl_object.eo',
@@ -7,7 +8,7 @@ pub_eo_files = [
7 'efl_object_override.eo' 8 'efl_object_override.eo'
8] 9]
9 10
10eo_src = [ 11eo_src = files([
11 'eo.c', 12 'eo.c',
12 'eo_ptr_indirection.c', 13 'eo_ptr_indirection.c',
13 'eo_ptr_indirection.h', 14 'eo_ptr_indirection.h',
@@ -17,7 +18,7 @@ eo_src = [
17 'eo_add_fallback.h', 18 'eo_add_fallback.h',
18 'eo_private.h', 19 'eo_private.h',
19 'eo_internal.h' 20 'eo_internal.h'
20] 21])
21 22
22pub_eo_types_files = [ 23pub_eo_types_files = [
23 'eina_types.eot' 24 'eina_types.eot'
@@ -61,7 +62,7 @@ eolian_include_directories += ['-I', meson.current_source_dir()]
61eo_lib = library('eo', 62eo_lib = library('eo',
62 eo_src, pub_eo_file_target, 63 eo_src, pub_eo_file_target,
63 c_args : package_c_args, 64 c_args : package_c_args,
64 dependencies: [eina, valgrind, dl, execinfo], 65 dependencies: [eo_deps, eo_pub_deps, eo_ext_deps],
65 install: true, 66 install: true,
66 version : meson.project_version() 67 version : meson.project_version()
67) 68)
@@ -69,7 +70,7 @@ eo_lib = library('eo',
69eo_lib_dbg = library('eo_dbg', 70eo_lib_dbg = library('eo_dbg',
70 eo_src, pub_eo_file_target, 71 eo_src, pub_eo_file_target,
71 c_args : package_c_args + [ '-DEO_DEBUG' ], 72 c_args : package_c_args + [ '-DEO_DEBUG' ],
72 dependencies: [eina, valgrind, dl, execinfo], 73 dependencies: [eo_deps, eo_pub_deps, eo_ext_deps],
73 install: true, 74 install: true,
74 version : meson.project_version() 75 version : meson.project_version()
75) 76)
diff --git a/src/lib/ephysics/meson.build b/src/lib/ephysics/meson.build
index ad1a168ae5..6233f58885 100644
--- a/src/lib/ephysics/meson.build
+++ b/src/lib/ephysics/meson.build
@@ -1,13 +1,13 @@
1bullet = dependency('bullet') 1bullet = dependency('bullet')
2 2
3ephysics_deps = [evas, bullet] 3ephysics_deps = [evas]
4ephysics_pub_deps = [eina, eo, efl] 4ephysics_pub_deps = [eina, eo, efl]
5 5ephysics_ext_deps = [m, bullet]
6ephysics_header_src = [ 6ephysics_header_src = [
7 'EPhysics.h' 7 'EPhysics.h'
8] 8]
9 9
10ephysics_src = [ 10ephysics_src = files([
11 'ephysics_private.h', 11 'ephysics_private.h',
12 'ephysics_trimesh.h', 12 'ephysics_trimesh.h',
13 'ephysics_body_materials.h', 13 'ephysics_body_materials.h',
@@ -18,11 +18,11 @@ ephysics_src = [
18 'ephysics_quaternion.cpp', 18 'ephysics_quaternion.cpp',
19 'ephysics_shape.cpp', 19 'ephysics_shape.cpp',
20 'ephysics_world.cpp' 20 'ephysics_world.cpp'
21] 21])
22 22
23ephysics_lib = library('ephysics', 23ephysics_lib = library('ephysics',
24 ephysics_src, 24 ephysics_src,
25 dependencies: ephysics_pub_deps + [m] + ephysics_deps, 25 dependencies: ephysics_pub_deps + ephysics_deps + ephysics_ext_deps,
26 include_directories : config_dir + [include_directories('.')], 26 include_directories : config_dir + [include_directories('.')],
27 install: true, 27 install: true,
28 c_args : package_c_args, 28 c_args : package_c_args,
diff --git a/src/lib/ethumb/meson.build b/src/lib/ethumb/meson.build
index ffc62e91e5..fbe1436e4b 100644
--- a/src/lib/ethumb/meson.build
+++ b/src/lib/ethumb/meson.build
@@ -2,19 +2,20 @@ ethumb_header_src = [
2 'Ethumb.h' 2 'Ethumb.h'
3] 3]
4 4
5ethumb_src = [ 5ethumb_src = files([
6 'ethumb.c', 6 'ethumb.c',
7 'ethumb_private.h', 7 'ethumb_private.h',
8 'md5.h', 8 'md5.h',
9 'md5.c', 9 'md5.c',
10] 10])
11 11
12ethumb_deps = [eet, evas, ecore, ecore_evas, ecore_file, ecore_imf, edje, emile] 12ethumb_deps = [eet, evas, ecore, ecore_evas, ecore_file, ecore_imf, edje, emile]
13ethumb_pub_deps = [eina, eo, efl] 13ethumb_pub_deps = [eina, eo, efl]
14ethumb_ext_deps = [m]
14 15
15ethumb_lib = library('ethumb', 16ethumb_lib = library('ethumb',
16 ethumb_src, 17 ethumb_src,
17 dependencies: ethumb_pub_deps + [m] + ethumb_deps, 18 dependencies: ethumb_pub_deps + ethumb_ext_deps + ethumb_deps,
18 include_directories : config_dir + [include_directories('.')], 19 include_directories : config_dir + [include_directories('.')],
19 install: true, 20 install: true,
20 c_args : package_c_args, 21 c_args : package_c_args,
diff --git a/src/lib/ethumb_client/meson.build b/src/lib/ethumb_client/meson.build
index bddbab1d8d..1326fee995 100644
--- a/src/lib/ethumb_client/meson.build
+++ b/src/lib/ethumb_client/meson.build
@@ -2,9 +2,9 @@ ethumb_client_header_src = [
2 'Ethumb_Client.h' 2 'Ethumb_Client.h'
3] 3]
4 4
5ethumb_client_src = [ 5ethumb_client_src = files([
6 'ethumb_client.c' 6 'ethumb_client.c'
7] 7])
8 8
9ethumb_client_deps = [ 9ethumb_client_deps = [
10 eldbus, 10 eldbus,
@@ -12,10 +12,11 @@ ethumb_client_deps = [
12] 12]
13 13
14ethumb_client_pub_deps = [eina, eo, efl, ethumb] 14ethumb_client_pub_deps = [eina, eo, efl, ethumb]
15ethumb_client_ext_deps = []
15 16
16ethumb_client_lib = library('ethumb_client', 17ethumb_client_lib = library('ethumb_client',
17 ethumb_client_src, 18 ethumb_client_src,
18 dependencies: ethumb_client_pub_deps + ethumb_client_deps, 19 dependencies: ethumb_client_pub_deps + ethumb_client_deps + ethumb_client_ext_deps,
19 include_directories : config_dir + [include_directories('.')], 20 include_directories : config_dir + [include_directories('.')],
20 install: true, 21 install: true,
21 c_args : package_c_args, 22 c_args : package_c_args,
diff --git a/src/lib/evas/meson.build b/src/lib/evas/meson.build
index 8b9c15f742..5799685e87 100644
--- a/src/lib/evas/meson.build
+++ b/src/lib/evas/meson.build
@@ -48,7 +48,9 @@ evas_vg_loaders_file = [
48evas_vg_savers_file = ['eet', 'svg'] 48evas_vg_savers_file = ['eet', 'svg']
49 49
50rel_evas_modules = join_paths('..', '..', '..', 'modules', 'evas', 'engines', 'software_generic') 50rel_evas_modules = join_paths('..', '..', '..', 'modules', 'evas', 'engines', 'software_generic')
51evas_deps = [eo, eet, eina, efl, emile, ector, ecore, buildsystem, intl] 51evas_deps = [eo, eet, eina, efl, emile, ector, ecore, draw, buildsystem]
52evas_ext_deps = [buildsystem_simple, intl, m, draw_simple, valgrind, libunibreak, lua, vg_common]
53
52pub_eo_file_target = [] 54pub_eo_file_target = []
53priv_eo_files = [] 55priv_eo_files = []
54evas_include_directories = [] 56evas_include_directories = []
@@ -128,27 +130,24 @@ evas_include_directories += [
128 include_directories('common'), 130 include_directories('common'),
129 include_directories('include'), 131 include_directories('include'),
130 include_directories('filters'), 132 include_directories('filters'),
131 vg_common_inc_dir
132] 133]
133 134
134evas_src += [ 135evas_src += files([
135 'main.c' 136 'main.c'
136] 137])
137 138
138evas_src_opt = [ ] 139evas_src_opt = [ ]
139 140
140evas_src += vg_common_src 141evas_ext_deps += dependency('freetype2')
141
142evas_deps += dependency('freetype2')
143 142
144if (get_option('fontconfig')) 143if (get_option('fontconfig'))
145 config_h.set('HAVE_FONTCONFIG', '1') 144 config_h.set('HAVE_FONTCONFIG', '1')
146 evas_deps += dependency('fontconfig') 145 evas_ext_deps += dependency('fontconfig')
147endif 146endif
148 147
149if (get_option('fribidi')) 148if (get_option('fribidi'))
150 config_h.set('HAVE_FRIBIDI', '1') 149 config_h.set('HAVE_FRIBIDI', '1')
151 evas_deps += dependency('fribidi') 150 evas_ext_deps += dependency('fribidi')
152endif 151endif
153 152
154if (get_option('pixman')) 153if (get_option('pixman'))
@@ -156,16 +155,16 @@ if (get_option('pixman'))
156 foreach support : pixman_support 155 foreach support : pixman_support
157 config_h.set(support, '1') 156 config_h.set(support, '1')
158 endforeach 157 endforeach
159 evas_deps += dependency('pixman-1') 158 evas_ext_deps += dependency('pixman-1')
160endif 159endif
161 160
162if (get_option('hyphen')) 161if (get_option('hyphen'))
163 config_h.set('HAVE_HYPHEN', '1') 162 config_h.set('HAVE_HYPHEN', '1')
164 hyphen = dependency('hyphen', required : false) 163 hyphen = dependency('hyphen', required : false)
165 if hyphen.found() == false 164 if hyphen.found() == false
166 evas_deps += cc.find_library('hyphen') 165 evas_ext_deps += cc.find_library('hyphen')
167 endif 166 endif
168 evas_deps += hyphen 167 evas_ext_deps += hyphen
169 config_h.set_quoted('EVAS_DICTS_HYPHEN_DIR', get_option('dictionaries-hyphen-dir')) 168 config_h.set_quoted('EVAS_DICTS_HYPHEN_DIR', get_option('dictionaries-hyphen-dir'))
170endif 169endif
171 170
@@ -181,12 +180,12 @@ subdir('vg')
181gl_deps = [] 180gl_deps = []
182 181
183if get_option('harfbuzz') 182if get_option('harfbuzz')
184 evas_deps += dependency('harfbuzz') 183 evas_ext_deps += dependency('harfbuzz')
185 config_h.set('HAVE_HARFBUZZ', '1') 184 config_h.set('HAVE_HARFBUZZ', '1')
186endif 185endif
187 186
188if get_option('wl') 187if get_option('wl')
189 evas_deps += wayland_protocol 188 evas_ext_deps += wayland_protocol
190endif 189endif
191 190
192 191
@@ -201,7 +200,7 @@ if get_option('opengl') != 'none'
201endif 200endif
202 201
203evas_link = [ ] 202evas_link = [ ]
204evas_pub_deps = [eina, ecore, ector, emile] 203evas_pub_deps = [eina, ecore, ector, emile, buildsystem] #FIXME buildsystem here is wrong, but needed in this commit
205 204
206if cpu_sse3 == true or cpu_neon == true and cpu_neon_intrinsics == false 205if cpu_sse3 == true or cpu_neon == true and cpu_neon_intrinsics == false
207 evas_opt = static_library('evas_opt', 206 evas_opt = static_library('evas_opt',
@@ -211,7 +210,7 @@ if cpu_sse3 == true or cpu_neon == true and cpu_neon_intrinsics == false
211 evas_include_directories + 210 evas_include_directories +
212 [vg_common_inc_dir], 211 [vg_common_inc_dir],
213 c_args: native_arch_opt_c_args, 212 c_args: native_arch_opt_c_args,
214 dependencies: [eina, eo, ector, emile, evas_deps, m], 213 dependencies: [eina, eo, ector, emile, evas_deps, evas_ext_deps],
215 ) 214 )
216 evas_link += [ evas_opt ] 215 evas_link += [ evas_opt ]
217endif 216endif
@@ -279,10 +278,16 @@ foreach loader : evas_vg_savers_file
279 endif 278 endif
280endforeach 279endforeach
281 280
281evas_ext_deps += evas_static_list
282
283evas_ext_deps += declare_dependency(
284 link_with: evas_link,
285)
286
282evas_lib = library('evas', 287evas_lib = library('evas',
283 include_directories: evas_include_directories + [vg_common_inc_dir], 288 include_directories: evas_include_directories + [vg_common_inc_dir],
284 sources : [evas_src, pub_eo_file_target, priv_eo_file_target], 289 sources : [evas_src, pub_eo_file_target, priv_eo_file_target],
285 dependencies: [evas_deps, m, draw, valgrind, libunibreak, evas_static_list], 290 dependencies: [evas_deps, evas_ext_deps],
286 link_with: evas_link, 291 link_with: evas_link,
287 install: true, 292 install: true,
288 c_args : package_c_args, 293 c_args : package_c_args,
@@ -292,13 +297,13 @@ evas_lib = library('evas',
292evas = declare_dependency( 297evas = declare_dependency(
293 link_with : [evas_lib], 298 link_with : [evas_lib],
294 sources: pub_eo_file_target, 299 sources: pub_eo_file_target,
295 dependencies : [m] + evas_pub_deps + evas_deps, 300 dependencies : evas_pub_deps,
296 include_directories: evas_include_directories + [vg_common_inc_dir] + [include_directories(join_paths('..', '..', 'modules', 'evas', 'engines', 'buffer'))], 301 include_directories: evas_include_directories + [vg_common_inc_dir] + [include_directories(join_paths('..', '..', 'modules', 'evas', 'engines', 'buffer'))],
297) 302)
298 303
299evas_bin = declare_dependency( 304evas_bin = declare_dependency(
300 link_with : [evas_lib], 305 link_with : [evas_lib],
301 dependencies : [eina, ecore, ector, emile, lua], 306 dependencies : [eina, ecore, ector, emile],
302 include_directories : evas_include_directories 307 include_directories : evas_include_directories
303) 308)
304 309
diff --git a/src/lib/evas/software_generic/meson.build b/src/lib/evas/software_generic/meson.build
index 187002a6af..8727feba32 100644
--- a/src/lib/evas/software_generic/meson.build
+++ b/src/lib/evas/software_generic/meson.build
@@ -33,4 +33,6 @@ foreach file : raw_evas_src
33 evas_src += files(join_paths(rel_evas_modules, file)) 33 evas_src += files(join_paths(rel_evas_modules, file))
34endforeach 34endforeach
35 35
36evas_include_directories += include_directories('.')
37
36subdir('filters') 38subdir('filters')
diff --git a/src/lib/evil/meson.build b/src/lib/evil/meson.build
index 823b724a91..deecb9e3cb 100644
--- a/src/lib/evil/meson.build
+++ b/src/lib/evil/meson.build
@@ -1,7 +1,10 @@
1evil_deps = [] 1evil_deps = []
2evil_pub_deps = [] 2evil_pub_deps = []
3evil_ext_deps = []
4evil_src = []
5
3if target_machine.system() == 'windows' 6if target_machine.system() == 'windows'
4 evil_src = [ 7 evil_src += files([
5 'evil_dlfcn.c', 8 'evil_dlfcn.c',
6 'evil_fcntl.c', 9 'evil_fcntl.c',
7 'evil_langinfo.c', 10 'evil_langinfo.c',
@@ -15,7 +18,7 @@ if target_machine.system() == 'windows'
15 'evil_unistd.c', 18 'evil_unistd.c',
16 'evil_util.c', 19 'evil_util.c',
17 'evil_private.h', 20 'evil_private.h',
18 ] 21 ])
19 22
20 psapi = cc.find_library('psapi') 23 psapi = cc.find_library('psapi')
21 ole32 = cc.find_library('ole32') 24 ole32 = cc.find_library('ole32')
@@ -23,9 +26,11 @@ if target_machine.system() == 'windows'
23 secur32 = cc.find_library('secur32') 26 secur32 = cc.find_library('secur32')
24 uuid = cc.find_library('uuid') 27 uuid = cc.find_library('uuid')
25 28
29 evil_ext_deps += [psapi, ole32, ws2_32, secur32, uuid, regexp]
30
26 evil_lib = library('evil', evil_src, 31 evil_lib = library('evil', evil_src,
27 c_args : package_c_args, 32 c_args : package_c_args,
28 dependencies : [psapi, ole32, ws2_32, secur32, uuid, regexp], 33 dependencies : evil_ext_deps,
29 include_directories : [config_dir], 34 include_directories : [config_dir],
30 install: true, 35 install: true,
31 version: meson.project_version(), 36 version: meson.project_version(),
diff --git a/src/modules/ecore_evas/engines/wayland/meson.build b/src/modules/ecore_evas/engines/wayland/meson.build
index fbc27a396b..259d8bcdd8 100644
--- a/src/modules/ecore_evas/engines/wayland/meson.build
+++ b/src/modules/ecore_evas/engines/wayland/meson.build
@@ -11,7 +11,7 @@ engine_src = files([
11 'ecore_evas_wayland_private.h' 11 'ecore_evas_wayland_private.h'
12 ]) 12 ])
13 13
14engine_deps = [ecore_wl2, ecore_input] 14engine_deps = [ecore_wl2, ecore_input] + ecore_wl2_ext_deps
15engine_include_dir += include_directories(join_paths('..', '..', '..', 'evas', 'engines', 'wayland_common')) 15engine_include_dir += include_directories(join_paths('..', '..', '..', 'evas', 'engines', 'wayland_common'))
16 16
17 17
diff --git a/src/modules/ecore_imf/meson.build b/src/modules/ecore_imf/meson.build
index 72154d521d..72ab44ff51 100644
--- a/src/modules/ecore_imf/meson.build
+++ b/src/modules/ecore_imf/meson.build
@@ -8,7 +8,6 @@ if get_option('wl')
8 mods += ['wayland'] 8 mods += ['wayland']
9endif 9endif
10 10
11
12loader_disabler = get_option('ecore-imf-loaders-disabler') 11loader_disabler = get_option('ecore-imf-loaders-disabler')
13 12
14foreach mod_name : mods 13foreach mod_name : mods
diff --git a/src/modules/evas/engines/buffer/meson.build b/src/modules/evas/engines/buffer/meson.build
index 23aef86b9a..4a6f31fe3a 100644
--- a/src/modules/evas/engines/buffer/meson.build
+++ b/src/modules/evas/engines/buffer/meson.build
@@ -5,18 +5,18 @@ engine_src = files([
5 'evas_outbuf.c' 5 'evas_outbuf.c'
6]) 6])
7 7
8engine_deps = []
9
10evas_include_directories += include_directories('.') 8evas_include_directories += include_directories('.')
11 9
12install_headers('Evas_Engine_Buffer.h', 10install_headers('Evas_Engine_Buffer.h',
13 install_dir : join_paths(dir_include, 'evas-'+version_major), 11 install_dir : join_paths(dir_include, 'evas-'+version_major),
14) 12)
15 13
14engine_deps += [eet]
15
16evas_engine_buffer_mod = shared_module(mod_full_name, engine_src, 16evas_engine_buffer_mod = shared_module(mod_full_name, engine_src,
17 c_args : package_c_args, 17 c_args : package_c_args,
18 include_directories : config_dir + [engine_include_dir], 18 include_directories : config_dir + [engine_include_dir],
19 dependencies : [eina, evas] + engine_deps, 19 dependencies : engine_deps,
20 install : true, 20 install : true,
21 install_dir : mod_install_dir, 21 install_dir : mod_install_dir,
22 name_suffix : sys_mod_extension 22 name_suffix : sys_mod_extension
diff --git a/src/modules/evas/engines/drm/meson.build b/src/modules/evas/engines/drm/meson.build
index fb97b631de..a75732a1b1 100644
--- a/src/modules/evas/engines/drm/meson.build
+++ b/src/modules/evas/engines/drm/meson.build
@@ -5,11 +5,11 @@ engine_src = files([
5 'evas_outbuf.c' 5 'evas_outbuf.c'
6]) 6])
7 7
8engine_deps = [ecore_drm2, libdrm] 8engine_deps += [ecore_drm2, libdrm]
9 9
10shared_module(mod_full_name, engine_src, 10shared_module(mod_full_name, engine_src,
11 include_directories : config_dir + [engine_include_dir], 11 include_directories : config_dir + [engine_include_dir],
12 dependencies : [eina, evas] + engine_deps, 12 dependencies : engine_deps,
13 install : true, 13 install : true,
14 install_dir : mod_install_dir, 14 install_dir : mod_install_dir,
15 name_suffix : sys_mod_extension 15 name_suffix : sys_mod_extension
diff --git a/src/modules/evas/engines/fb/meson.build b/src/modules/evas/engines/fb/meson.build
index 625edd5d33..29f3b76dd5 100644
--- a/src/modules/evas/engines/fb/meson.build
+++ b/src/modules/evas/engines/fb/meson.build
@@ -7,11 +7,11 @@ engine_src = files([
7 'evas_fb_main.c', 7 'evas_fb_main.c',
8]) 8])
9 9
10engine_deps = [ecore_fb] 10engine_deps += [ecore_fb]
11 11
12shared_module(mod_full_name, engine_src, 12shared_module(mod_full_name, engine_src,
13 include_directories : config_dir + [engine_include_dir], 13 include_directories : config_dir + [engine_include_dir],
14 dependencies : [eina, evas] + engine_deps, 14 dependencies : engine_deps,
15 install : true, 15 install : true,
16 install_dir : mod_install_dir, 16 install_dir : mod_install_dir,
17 name_suffix : sys_mod_extension 17 name_suffix : sys_mod_extension
diff --git a/src/modules/evas/engines/gl_cocoa/meson.build b/src/modules/evas/engines/gl_cocoa/meson.build
index a0bd765c9b..2fc5bb9b2c 100644
--- a/src/modules/evas/engines/gl_cocoa/meson.build
+++ b/src/modules/evas/engines/gl_cocoa/meson.build
@@ -5,11 +5,11 @@ engine_src = files([
5 'evas_outbuf.m', 5 'evas_outbuf.m',
6]) 6])
7 7
8engine_deps = [ecore_cocoa, gl_deps] 8engine_deps += [ecore_cocoa, gl_deps]
9 9
10shared_module(mod_full_name, engine_src, 10shared_module(mod_full_name, engine_src,
11 include_directories : config_dir + [engine_include_dir], 11 include_directories : config_dir + [engine_include_dir],
12 dependencies : [eina, evas] + engine_deps, 12 dependencies : engine_deps,
13 install : true, 13 install : true,
14 install_dir : mod_install_dir, 14 install_dir : mod_install_dir,
15 name_suffix : sys_mod_extension 15 name_suffix : sys_mod_extension
diff --git a/src/modules/evas/engines/gl_drm/meson.build b/src/modules/evas/engines/gl_drm/meson.build
index 8acf82365d..b21c00edb5 100644
--- a/src/modules/evas/engines/gl_drm/meson.build
+++ b/src/modules/evas/engines/gl_drm/meson.build
@@ -5,11 +5,11 @@ engine_src = files([
5 'evas_outbuf.c', 5 'evas_outbuf.c',
6]) 6])
7 7
8engine_deps = [ecore_drm2, libdrm, gl_deps, dependency('gbm')] 8engine_deps += [ecore_drm2, libdrm, gl_deps, dependency('gbm')]
9 9
10shared_module(mod_full_name, engine_src, 10shared_module(mod_full_name, engine_src,
11 include_directories : config_dir + [engine_include_dir], 11 include_directories : config_dir + [engine_include_dir],
12 dependencies : [eina, evas] + engine_deps, 12 dependencies : engine_deps,
13 install : true, 13 install : true,
14 install_dir : mod_install_dir, 14 install_dir : mod_install_dir,
15 name_suffix : sys_mod_extension 15 name_suffix : sys_mod_extension
diff --git a/src/modules/evas/engines/gl_generic/meson.build b/src/modules/evas/engines/gl_generic/meson.build
index 68163b5711..3a00883b8a 100644
--- a/src/modules/evas/engines/gl_generic/meson.build
+++ b/src/modules/evas/engines/gl_generic/meson.build
@@ -62,13 +62,13 @@ foreach eo_file : pub_eo_files
62 '-gchd', '@INPUT@']) 62 '-gchd', '@INPUT@'])
63endforeach 63endforeach
64 64
65engine_deps = [gl_deps] 65engine_deps += [gl_deps]
66 66
67engine_include_dir = include_directories(join_paths('..','software_generic'), join_paths('..', 'gl_common')) 67engine_include_dir = include_directories(join_paths('..','software_generic'), join_paths('..', 'gl_common'))
68 68
69shared_module(mod_full_name, engine_src, 69shared_module(mod_full_name, engine_src,
70 include_directories : config_dir + [engine_include_dir], 70 include_directories : config_dir + [engine_include_dir],
71 dependencies : [eina, evas] + engine_deps, 71 dependencies : engine_deps,
72 install : true, 72 install : true,
73 install_dir : mod_install_dir, 73 install_dir : mod_install_dir,
74 name_suffix : sys_mod_extension 74 name_suffix : sys_mod_extension
diff --git a/src/modules/evas/engines/gl_x11/meson.build b/src/modules/evas/engines/gl_x11/meson.build
index 0bac84147e..fd39ba29e8 100644
--- a/src/modules/evas/engines/gl_x11/meson.build
+++ b/src/modules/evas/engines/gl_x11/meson.build
@@ -5,11 +5,11 @@ engine_src = files([
5 'evas_x_main.c', 5 'evas_x_main.c',
6]) 6])
7 7
8engine_deps = [ecore_x_deps, gl_deps] 8engine_deps += [ecore_x_ext_deps, gl_deps]
9 9
10shared_module(mod_full_name, engine_src, 10shared_module(mod_full_name, engine_src,
11 include_directories : config_dir + [engine_include_dir], 11 include_directories : config_dir + [engine_include_dir],
12 dependencies : [eina, evas] + engine_deps, 12 dependencies : engine_deps,
13 install : true, 13 install : true,
14 install_dir : mod_install_dir, 14 install_dir : mod_install_dir,
15 name_suffix : sys_mod_extension 15 name_suffix : sys_mod_extension
diff --git a/src/modules/evas/engines/meson.build b/src/modules/evas/engines/meson.build
index 2504a761a9..1efdbbddc8 100644
--- a/src/modules/evas/engines/meson.build
+++ b/src/modules/evas/engines/meson.build
@@ -46,7 +46,7 @@ foreach engine_conf : engines
46 if build 46 if build
47 engine_include_dir = [] 47 engine_include_dir = []
48 engine_src = [] 48 engine_src = []
49 engine_deps = [] 49 engine_deps = [eina, evas, evas_ext_deps]
50 engine_dep = declare_dependency( 50 engine_dep = declare_dependency(
51 include_directories: include_directories(engine), 51 include_directories: include_directories(engine),
52 ) 52 )
diff --git a/src/modules/evas/engines/software_ddraw/meson.build b/src/modules/evas/engines/software_ddraw/meson.build
index 1b58f71a04..b15acfd3ad 100644
--- a/src/modules/evas/engines/software_ddraw/meson.build
+++ b/src/modules/evas/engines/software_ddraw/meson.build
@@ -5,13 +5,13 @@ engine_src = files([
5 'evas_ddraw_main.cpp', 5 'evas_ddraw_main.cpp',
6]) 6])
7 7
8engine_deps = [cc.find_library('ddraw')] 8engine_deps += [cc.find_library('ddraw')]
9 9
10shared_module(mod_full_name, engine_src, 10shared_module(mod_full_name, engine_src,
11 include_directories : config_dir + [engine_include_dir], 11 include_directories : config_dir + [engine_include_dir],
12 c_args : package_c_args, 12 c_args : package_c_args,
13 cpp_args: ['-fno-rtti', '-fno-exceptions'], 13 cpp_args: ['-fno-rtti', '-fno-exceptions'],
14 dependencies : [eina, evas] + engine_deps, 14 dependencies : engine_deps,
15 install : true, 15 install : true,
16 install_dir : mod_install_dir, 16 install_dir : mod_install_dir,
17 name_suffix : sys_mod_extension 17 name_suffix : sys_mod_extension
diff --git a/src/modules/evas/engines/software_gdi/meson.build b/src/modules/evas/engines/software_gdi/meson.build
index 50bbb546ed..549094913f 100644
--- a/src/modules/evas/engines/software_gdi/meson.build
+++ b/src/modules/evas/engines/software_gdi/meson.build
@@ -5,12 +5,12 @@ engine_src = files([
5 'evas_gdi_main.c', 5 'evas_gdi_main.c',
6]) 6])
7 7
8engine_deps = [cc.find_library('gdi32')] 8engine_deps += [cc.find_library('gdi32')]
9 9
10shared_module(mod_full_name, engine_src, 10shared_module(mod_full_name, engine_src,
11 c_args : package_c_args, 11 c_args : package_c_args,
12 include_directories : config_dir + [engine_include_dir], 12 include_directories : config_dir + [engine_include_dir],
13 dependencies : [eina, evas] + engine_deps, 13 dependencies : engine_deps,
14 install : true, 14 install : true,
15 install_dir : mod_install_dir, 15 install_dir : mod_install_dir,
16 name_suffix : sys_mod_extension 16 name_suffix : sys_mod_extension
diff --git a/src/modules/evas/engines/software_x11/meson.build b/src/modules/evas/engines/software_x11/meson.build
index c2f8f544e8..6ddaeee37b 100644
--- a/src/modules/evas/engines/software_x11/meson.build
+++ b/src/modules/evas/engines/software_x11/meson.build
@@ -26,11 +26,11 @@ config_h.set('BUILD_ENGINE_SOFTWARE_XLIB', '1')
26 26
27#ecore_x_deps carries all the extensions etc. so we dont have to search them twice 27#ecore_x_deps carries all the extensions etc. so we dont have to search them twice
28#it looks weird but is right, gl_deps is needed for evas_x_egl.c 28#it looks weird but is right, gl_deps is needed for evas_x_egl.c
29engine_deps = [x11, ecore_x, ecore_x_deps, gl_deps] 29engine_deps += [x11, ecore_x, ecore_x_deps, gl_deps]
30 30
31shared_module(mod_full_name, engine_src, 31shared_module(mod_full_name, engine_src,
32 include_directories : config_dir + [engine_include_dir], 32 include_directories : config_dir + [engine_include_dir],
33 dependencies : [eina, evas] + engine_deps, 33 dependencies : engine_deps,
34 install : true, 34 install : true,
35 install_dir : mod_install_dir, 35 install_dir : mod_install_dir,
36 name_suffix : sys_mod_extension 36 name_suffix : sys_mod_extension
diff --git a/src/modules/evas/engines/wayland_egl/meson.build b/src/modules/evas/engines/wayland_egl/meson.build
index af7314627b..caeab5e0e3 100644
--- a/src/modules/evas/engines/wayland_egl/meson.build
+++ b/src/modules/evas/engines/wayland_egl/meson.build
@@ -4,13 +4,13 @@ engine_src = files([
4 'evas_wl_main.c' 4 'evas_wl_main.c'
5]) 5])
6 6
7engine_deps = [ecore_wl2, dependency('wayland-egl'), gl_deps] 7engine_deps += [ecore_wl2, dependency('wayland-egl'), gl_deps]
8 8
9engine_include_dir = include_directories(join_paths('..','wayland_common')) 9engine_include_dir = include_directories(join_paths('..','wayland_common'))
10 10
11shared_module(mod_full_name, engine_src, 11shared_module(mod_full_name, engine_src,
12 include_directories : config_dir + [engine_include_dir], 12 include_directories : config_dir + [engine_include_dir],
13 dependencies : [eina, evas] + engine_deps, 13 dependencies : engine_deps,
14 install : true, 14 install : true,
15 install_dir : mod_install_dir, 15 install_dir : mod_install_dir,
16 name_suffix : sys_mod_extension 16 name_suffix : sys_mod_extension
diff --git a/src/modules/evas/engines/wayland_shm/meson.build b/src/modules/evas/engines/wayland_shm/meson.build
index 2a181cea48..c5bbd6062c 100644
--- a/src/modules/evas/engines/wayland_shm/meson.build
+++ b/src/modules/evas/engines/wayland_shm/meson.build
@@ -4,13 +4,13 @@ engine_src = files([
4 'evas_outbuf.c' 4 'evas_outbuf.c'
5]) 5])
6 6
7engine_deps = [ecore_wl2] 7engine_deps += [ecore_wl2]
8 8
9engine_include_dir = include_directories(join_paths('..','wayland_common')) 9engine_include_dir = include_directories(join_paths('..','wayland_common'))
10 10
11shared_module(mod_full_name, engine_src, 11shared_module(mod_full_name, engine_src,
12 include_directories : config_dir + [engine_include_dir], 12 include_directories : config_dir + [engine_include_dir],
13 dependencies : [eina, evas] + engine_deps, 13 dependencies : engine_deps,
14 install : true, 14 install : true,
15 install_dir : mod_install_dir, 15 install_dir : mod_install_dir,
16 name_suffix : sys_mod_extension 16 name_suffix : sys_mod_extension
diff --git a/src/modules/evas/image_loaders/meson.build b/src/modules/evas/image_loaders/meson.build
index 999cb865a4..963245ecfe 100644
--- a/src/modules/evas/image_loaders/meson.build
+++ b/src/modules/evas/image_loaders/meson.build
@@ -11,7 +11,7 @@ foreach loader_inst : evas_image_loaders_file
11 shared_module('shared_loader_'+loader, file, 11 shared_module('shared_loader_'+loader, file,
12 c_args : package_c_args, 12 c_args : package_c_args,
13 include_directories : config_dir, 13 include_directories : config_dir,
14 dependencies : [eina, evas] + loader_deps, 14 dependencies : [eina, evas, evas_ext_deps] + loader_deps,
15 install : true, 15 install : true,
16 install_dir : mod_install_dir, 16 install_dir : mod_install_dir,
17 name_suffix : sys_mod_extension 17 name_suffix : sys_mod_extension
diff --git a/src/modules/evas/image_savers/meson.build b/src/modules/evas/image_savers/meson.build
index 7ba39aa287..7a5ebcb3b3 100644
--- a/src/modules/evas/image_savers/meson.build
+++ b/src/modules/evas/image_savers/meson.build
@@ -11,7 +11,7 @@ foreach loader_inst : evas_image_savers_file
11 shared_module('shared_saver_'+loader, file, 11 shared_module('shared_saver_'+loader, file,
12 c_args : package_c_args, 12 c_args : package_c_args,
13 include_directories : config_dir, 13 include_directories : config_dir,
14 dependencies : [eina, evas] + loader_deps, 14 dependencies : [eina, evas, eet, evas_ext_deps] + loader_deps,
15 install : true, 15 install : true,
16 install_dir : mod_install_dir, 16 install_dir : mod_install_dir,
17 name_suffix : sys_mod_extension 17 name_suffix : sys_mod_extension
diff --git a/src/static_libs/buildsystem/meson.build b/src/static_libs/buildsystem/meson.build
index 61e7f1e37e..dd3b1f6dab 100644
--- a/src/static_libs/buildsystem/meson.build
+++ b/src/static_libs/buildsystem/meson.build
@@ -18,3 +18,7 @@ buildsystem = declare_dependency(
18 link_with: buildsystem_lib, 18 link_with: buildsystem_lib,
19 dependencies: [eina], 19 dependencies: [eina],
20) 20)
21
22buildsystem_simple = declare_dependency(
23 include_directories: [include_directories('.'), include_directories(join_paths('..', '..', 'lib'))],
24)
diff --git a/src/static_libs/draw/meson.build b/src/static_libs/draw/meson.build
index 0e7dce9cdd..f9fbc96a83 100644
--- a/src/static_libs/draw/meson.build
+++ b/src/static_libs/draw/meson.build
@@ -27,3 +27,14 @@ draw = declare_dependency(
27 sources : draw_src, 27 sources : draw_src,
28 link_with : draw_opt_lib 28 link_with : draw_opt_lib
29) 29)
30
31draw_without_deps = declare_dependency(
32 include_directories: [include_directories('.'), include_directories(join_paths('..', '..', 'lib'))],
33 dependencies: [rg_etc_simple],
34 sources : draw_src,
35 link_with : draw_opt_lib
36)
37
38draw_simple = declare_dependency(
39 include_directories: [include_directories('.'), include_directories(join_paths('..', '..', 'lib'))],
40)
diff --git a/src/static_libs/rg_etc/meson.build b/src/static_libs/rg_etc/meson.build
index cd093daba9..84a037ed20 100644
--- a/src/static_libs/rg_etc/meson.build
+++ b/src/static_libs/rg_etc/meson.build
@@ -9,3 +9,7 @@ rg_etc = declare_dependency(
9 include_directories: include_directories('.'), 9 include_directories: include_directories('.'),
10 sources : rg_etc_src 10 sources : rg_etc_src
11) 11)
12
13rg_etc_simple = declare_dependency(
14 include_directories: include_directories('.'),
15)
diff --git a/src/tests/elementary/meson.build b/src/tests/elementary/meson.build
index 1b43da7064..273ee418dc 100644
--- a/src/tests/elementary/meson.build
+++ b/src/tests/elementary/meson.build
@@ -108,7 +108,7 @@ elementary_suite_src = [
108 108
109elementary_suite = executable('elementary_suite', 109elementary_suite = executable('elementary_suite',
110 elementary_suite_src, 110 elementary_suite_src,
111 dependencies: [check, eina, elementary, elementary_deps], 111 dependencies: [check, eina, elementary, elementary_deps, intl],
112 include_directories : [config_dir] + [elementary_config_dir], 112 include_directories : [config_dir] + [elementary_config_dir],
113 c_args : [ 113 c_args : [
114 '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"', 114 '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
@@ -172,7 +172,7 @@ efl_ui_suite_src = [
172 172
173efl_ui_suite = executable('efl_ui_suite', 173efl_ui_suite = executable('efl_ui_suite',
174 efl_ui_suite_src, priv_eo_file_target, 174 efl_ui_suite_src, priv_eo_file_target,
175 dependencies: [check, eina, elementary, elementary_deps], 175 dependencies: [check, eina, elementary, elementary_deps, intl],
176 include_directories : [config_dir] + [elementary_config_dir], 176 include_directories : [config_dir] + [elementary_config_dir],
177 c_args : [ 177 c_args : [
178 '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"', 178 '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
diff --git a/src/tests/evas/meson.build b/src/tests/evas/meson.build
index fee57d91dd..b76d4572b3 100644
--- a/src/tests/evas/meson.build
+++ b/src/tests/evas/meson.build
@@ -25,7 +25,7 @@ evas_suite_src = [
25 25
26evas_suite = executable('evas_suite', 26evas_suite = executable('evas_suite',
27 evas_suite_src, 27 evas_suite_src,
28 dependencies: [evas_bin, evas, ecore_evas, dl, check], 28 dependencies: [evas_bin, evas, ecore_evas, dl, check, evas_ext_deps], #external deps needed here since tests do include internal headers
29 include_directories: include_directories(join_paths('..', '..', 'modules', 'evas', 'engines', 'buffer')), 29 include_directories: include_directories(join_paths('..', '..', 'modules', 'evas', 'engines', 'buffer')),
30 c_args : [ 30 c_args : [
31 '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"', 31 '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
diff --git a/src/wayland_protocol/meson.build b/src/wayland_protocol/meson.build
index 5301adbe71..f08e84b31c 100644
--- a/src/wayland_protocol/meson.build
+++ b/src/wayland_protocol/meson.build
@@ -66,3 +66,8 @@ wayland_protocol = declare_dependency(
66 sources: gen_obj_header, 66 sources: gen_obj_header,
67 dependencies : [wayland_client] 67 dependencies : [wayland_client]
68) 68)
69
70wayland_protocol_simple = declare_dependency(
71 include_directories: include_directories('.'),
72 sources: gen_obj_header,
73)