diff options
author | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2020-05-10 14:41:57 +0200 |
---|---|---|
committer | Stefan Schmidt <s.schmidt@samsung.com> | 2020-05-27 11:06:46 +0200 |
commit | 8e3606698eb439eecd7302a885504365aca7e564 (patch) | |
tree | 6bb354ae72ab277548fafaab00a52aeaac5e61bb /src/lib/ecore_evas | |
parent | 2d105a7e597a38a31ea88fefc02ac84b8b6e5543 (diff) |
refactor build
libraries are split into deps, external deps, and pub deps.
Evas engines are refactored to use the predefined engine deps.
this is preparation work for efl-one.
Reviewed-by: Stefan Schmidt <stefan@datenfreihafen.org>
Differential Revision: https://phab.enlightenment.org/D11806
Diffstat (limited to 'src/lib/ecore_evas')
-rw-r--r-- | src/lib/ecore_evas/meson.build | 15 |
1 files changed, 10 insertions, 5 deletions
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 @@ | |||
1 | ecore_evas_deps = [eina, ecore_input_evas, ecore_input, ecore, eet, evas, efl, eo, eina, emile] | 1 | ecore_evas_deps = [eina, ecore_input_evas, ecore_input, ecore, eet, evas, efl, eo, eina, emile, buildsystem] |
2 | ecore_evas_pub_deps = [evas, ecore] | 2 | ecore_evas_pub_deps = [evas, ecore] |
3 | ecore_evas_ext_deps = [buildsystem_simple] | ||
3 | pub_eo_file_target = [] | 4 | pub_eo_file_target = [] |
4 | 5 | ||
5 | ecore_evas_header_src = [ | 6 | ecore_evas_header_src = [ |
@@ -8,7 +9,7 @@ ecore_evas_header_src = [ | |||
8 | 9 | ||
9 | ] | 10 | ] |
10 | 11 | ||
11 | ecore_evas_src = [ | 12 | ecore_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 | |||
31 | ecore_evas_ext_deps += declare_dependency( | ||
32 | include_directories: include_directories(join_paths('..', '..', 'modules', 'evas', 'engines', 'buffer')), | ||
33 | ) | ||
29 | 34 | ||
30 | 35 | ||
31 | ecore_evas_lib = library('ecore_evas', | 36 | ecore_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 | ||
40 | ecore_evas = declare_dependency( | 45 | ecore_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], |