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 <marcel-hollerbach@t-online.de>
Differential Revision: https://phab.enlightenment.org/D7290
This commit is contained in:
Cedric BAIL 2018-11-15 19:20:50 -08:00
parent dd206b4897
commit af59a63c47
2 changed files with 4 additions and 15 deletions

View File

@ -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

View File

@ -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,