From af59a63c473ee9b726050b0331643bbf6c3ad76d Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Thu, 15 Nov 2018 19:20:50 -0800 Subject: [PATCH] meson: fix VNC server build to not override the last module. The module name and installation directory where previously picked from the last engine being processed instead of being unique to the VNC Server module. This patch ensure that we do not write over another engine and break everything when the VNC Server support is turned on. Reviewed-by: Marcel Hollerbach Differential Revision: https://phab.enlightenment.org/D7290 --- src/modules/ecore_evas/meson.build | 2 ++ src/modules/ecore_evas/vnc_server/meson.build | 17 ++--------------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/modules/ecore_evas/meson.build b/src/modules/ecore_evas/meson.build index 6ca8ca90a6..7fa4d1d305 100644 --- a/src/modules/ecore_evas/meson.build +++ b/src/modules/ecore_evas/meson.build @@ -36,5 +36,7 @@ endforeach if get_option('vnc-server') + mod_install_dir = join_paths(dir_lib, package_name, engine, version_name) + subdir(join_paths('vnc_server')) endif diff --git a/src/modules/ecore_evas/vnc_server/meson.build b/src/modules/ecore_evas/vnc_server/meson.build index 67f8f8e4a9..e458532097 100644 --- a/src/modules/ecore_evas/vnc_server/meson.build +++ b/src/modules/ecore_evas/vnc_server/meson.build @@ -7,25 +7,12 @@ engine_src = files([ ]) engine_deps = [ecore, ecore_input, ecore_evas, evas] +engine_deps += dependency('libvncserver') engine_available = false -if get_option('x11') - engine_deps += [ecore_x] - engine_available = true -endif - -if get_option('fb') - engine_deps += [ecore_fb] - engine_available = true -endif - engine_include_dir += include_directories(join_paths('..', '..', '..', 'lib', 'ecore_fb')) -if engine_available == false - error('at least x11 or fb needs to be build to build vnc') -endif - -shared_module(mod_full_name, engine_src, +shared_module('vnc_server', engine_src, include_directories : config_dir + [engine_include_dir], dependencies : [eina, ecore_evas, ecore_input_evas] + engine_deps, install : true,