stefan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e1ea935daea28115ea610927035db00244386df5
commit e1ea935daea28115ea610927035db00244386df5 Author: Marcel Hollerbach <[email protected]> Date: Thu May 28 08:27:37 2020 +0200 build: split off static parts from external parts in evas this way we can use that list easily in the modules, and keep the list for later module building. Differential Revision: https://phab.enlightenment.org/D11897 --- src/lib/evas/meson.build | 23 +++++++++++++---------- src/modules/evas/engines/meson.build | 2 +- src/modules/evas/image_loaders/meson.build | 2 +- src/modules/evas/image_savers/meson.build | 2 +- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/lib/evas/meson.build b/src/lib/evas/meson.build index d923cee0df..d9f88afa42 100644 --- a/src/lib/evas/meson.build +++ b/src/lib/evas/meson.build @@ -49,7 +49,8 @@ evas_vg_savers_file = ['eet', 'svg'] rel_evas_modules = join_paths('..', '..', '..', 'modules', 'evas', 'engines', 'software_generic') evas_deps = [eo, eet, eina, efl, emile, ector, ecore, draw, buildsystem] -evas_ext_deps = [buildsystem_simple, intl, m, draw_simple, valgrind, libunibreak, lua, vg_common] +evas_ext_deps = [] +evas_ext_none_static_deps = [buildsystem_simple, intl, m, draw_simple, valgrind, libunibreak, lua, vg_common] pub_eo_file_target = [] priv_eo_files = [] @@ -138,16 +139,16 @@ evas_src += files([ evas_src_opt = [ ] -evas_ext_deps += dependency('freetype2') +evas_ext_none_static_deps += dependency('freetype2') if (get_option('fontconfig')) config_h.set('HAVE_FONTCONFIG', '1') - evas_ext_deps += dependency('fontconfig') + evas_ext_none_static_deps += dependency('fontconfig') endif if (get_option('fribidi')) config_h.set('HAVE_FRIBIDI', '1') - evas_ext_deps += dependency('fribidi') + evas_ext_none_static_deps += dependency('fribidi') endif if (get_option('pixman')) @@ -155,16 +156,16 @@ if (get_option('pixman')) foreach support : pixman_support config_h.set(support, '1') endforeach - evas_ext_deps += dependency('pixman-1') + evas_ext_none_static_deps += dependency('pixman-1') endif if (get_option('hyphen')) config_h.set('HAVE_HYPHEN', '1') hyphen = dependency('hyphen', required : false) if hyphen.found() == false - evas_ext_deps += cc.find_library('hyphen') + evas_ext_none_static_deps += cc.find_library('hyphen') endif - evas_ext_deps += hyphen + evas_ext_none_static_deps += hyphen config_h.set_quoted('EVAS_DICTS_HYPHEN_DIR', get_option('dictionaries-hyphen-dir')) endif @@ -180,12 +181,12 @@ subdir('vg') gl_deps = [] if get_option('harfbuzz') - evas_ext_deps += dependency('harfbuzz') + evas_ext_none_static_deps += dependency('harfbuzz') config_h.set('HAVE_HARFBUZZ', '1') endif if get_option('wl') - evas_ext_deps += wayland_protocol + evas_ext_none_static_deps += wayland_protocol endif @@ -210,7 +211,7 @@ if cpu_sse3 == true or cpu_neon == true and cpu_neon_intrinsics == false evas_include_directories + [vg_common_inc_dir], c_args: native_arch_opt_c_args, - dependencies: [eina, eo, ector, emile, evas_deps, evas_ext_deps], + dependencies: [eina, eo, ector, emile, evas_deps, evas_ext_none_static_deps], ) evas_link += [ evas_opt ] endif @@ -284,6 +285,8 @@ evas_ext_deps += declare_dependency( link_with: evas_link, ) +evas_ext_deps += evas_ext_none_static_deps + evas_lib = library('evas', include_directories: evas_include_directories + [vg_common_inc_dir], sources : [evas_src, pub_eo_file_target, priv_eo_file_target], diff --git a/src/modules/evas/engines/meson.build b/src/modules/evas/engines/meson.build index 1efdbbddc8..c7e4255d9c 100644 --- a/src/modules/evas/engines/meson.build +++ b/src/modules/evas/engines/meson.build @@ -46,7 +46,7 @@ foreach engine_conf : engines if build engine_include_dir = [] engine_src = [] - engine_deps = [eina, evas, evas_ext_deps] + engine_deps = [eina, evas, evas_ext_none_static_deps, eet] engine_dep = declare_dependency( include_directories: include_directories(engine), ) diff --git a/src/modules/evas/image_loaders/meson.build b/src/modules/evas/image_loaders/meson.build index 963245ecfe..11b11f79c2 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 shared_module('shared_loader_'+loader, file, c_args : package_c_args, include_directories : config_dir, - dependencies : [eina, evas, evas_ext_deps] + loader_deps, + dependencies : [eina, evas, eet, evas_ext_none_static_deps] + loader_deps, install : true, install_dir : mod_install_dir, name_suffix : sys_mod_extension diff --git a/src/modules/evas/image_savers/meson.build b/src/modules/evas/image_savers/meson.build index 7a5ebcb3b3..e30a05fe3b 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 shared_module('shared_saver_'+loader, file, c_args : package_c_args, include_directories : config_dir, - dependencies : [eina, evas, eet, evas_ext_deps] + loader_deps, + dependencies : [eina, evas, eet, evas_ext_none_static_deps] + loader_deps, install : true, install_dir : mod_install_dir, name_suffix : sys_mod_extension --
