From 5e5ee57226b421e07a7433f52f29fcf3c12abaff Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Wed, 30 Jan 2019 17:07:08 +0100 Subject: [PATCH] Revert "meson: fix race condition in building" This reverts commit e1f3a4232e65c487dcbb4d62206a8181959e712d. git push on the wrong branch - sorry --- src/modules/evas/engines/gl_generic/meson.build | 2 +- src/modules/evas/meson.build | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/modules/evas/engines/gl_generic/meson.build b/src/modules/evas/engines/gl_generic/meson.build index c9957d4..8926f24 100644 --- a/src/modules/evas/engines/gl_generic/meson.build +++ b/src/modules/evas/engines/gl_generic/meson.build @@ -39,7 +39,7 @@ engine_include_dir = include_directories(join_paths('..','software_generic')) if get_option('evas-modules') == 'shared' and not evas_force_static.contains(engine) shared_module(mod_full_name, engine_src, include_directories : config_dir + [engine_include_dir], - dependencies : [eina, evas_pre] + engine_deps + [software_generic], + dependencies : [eina, evas_pre] + engine_deps, install : true, install_dir : mod_install_dir, name_suffix : sys_mod_extension diff --git a/src/modules/evas/meson.build b/src/modules/evas/meson.build index 624137a..d2d5667 100644 --- a/src/modules/evas/meson.build +++ b/src/modules/evas/meson.build @@ -67,12 +67,6 @@ foreach engine_conf : engines dependencies : [eina, evas_pre] + engine_deps, ) - if engine == 'software_generic' - software_generic = declare_dependency( - include_directories: engine_include_dir, - link_with : tmp - ) - endif if engine == 'gl_common' #gl_common will only be used by gl_generic, NOT by libevas.so, so we work arround the static list gl_common = declare_dependency( -- 2.7.4