From b70ee941b58bb19374f01ac7f89385f0d07e90d1 Mon Sep 17 00:00:00 2001 From: Pekka Paalanen Date: Fri, 5 Apr 2019 13:14:15 +0300 Subject: [PATCH] backend-rdp: move into new subdir For consistency with other backends. Signed-off-by: Pekka Paalanen --- libweston/backend-rdp/meson.build | 38 ++++++++++++++++++ .../{compositor-rdp.c => backend-rdp/rdp.c} | 0 libweston/meson.build | 39 +------------------ 3 files changed, 39 insertions(+), 38 deletions(-) create mode 100644 libweston/backend-rdp/meson.build rename libweston/{compositor-rdp.c => backend-rdp/rdp.c} (100%) diff --git a/libweston/backend-rdp/meson.build b/libweston/backend-rdp/meson.build new file mode 100644 index 00000000..5c0a293a --- /dev/null +++ b/libweston/backend-rdp/meson.build @@ -0,0 +1,38 @@ +if not get_option('backend-rdp') + subdir_done() +endif + +config_h.set('BUILD_RDP_COMPOSITOR', '1') + +dep_frdp = dependency('freerdp2', version: '>= 2.0.0', required: false) +if not dep_frdp.found() + error('RDP-backend requires freerdp2 which was not found. Or, you can use \'-Dbackend-rdp=false\'.') +endif + +if cc.has_header('freerdp/version.h', dependencies: dep_frdp) + config_h.set('HAVE_FREERDP_VERSION_H', '1') +endif + +if cc.has_member( + 'SURFACE_BITS_COMMAND', 'bmp', + dependencies : dep_frdp, + prefix : '#include ' +) + config_h.set('HAVE_SURFACE_BITS_BMP', '1') +endif + +deps_rdp = [ + dep_libweston, + dep_frdp, +] +plugin_rdp = shared_library( + 'rdp-backend', + 'rdp.c', + include_directories: include_directories('../..', '../../shared'), + dependencies: deps_rdp, + name_prefix: '', + install: true, + install_dir: dir_module_libweston +) +env_modmap += 'rdp-backend.so=@0@;'.format(plugin_rdp.full_path()) +install_headers(backend_rdp_h, subdir: dir_include_libweston_install) diff --git a/libweston/compositor-rdp.c b/libweston/backend-rdp/rdp.c similarity index 100% rename from libweston/compositor-rdp.c rename to libweston/backend-rdp/rdp.c diff --git a/libweston/meson.build b/libweston/meson.build index 6d658ac7..7e9c87a2 100644 --- a/libweston/meson.build +++ b/libweston/meson.build @@ -185,44 +185,6 @@ dep_libinput_backend = declare_dependency( include_directories: include_directories('.') ) -if get_option('backend-rdp') - config_h.set('BUILD_RDP_COMPOSITOR', '1') - - dep_frdp = dependency('freerdp2', version: '>= 2.0.0', required: false) - if not dep_frdp.found() - error('RDP-backend requires freerdp2 which was not found. Or, you can use \'-Dbackend-rdp=false\'.') - endif - - if cc.has_header('freerdp/version.h', dependencies: dep_frdp) - config_h.set('HAVE_FREERDP_VERSION_H', '1') - endif - - if cc.has_member( - 'SURFACE_BITS_COMMAND', 'bmp', - dependencies : dep_frdp, - prefix : '#include ' - ) - config_h.set('HAVE_SURFACE_BITS_BMP', '1') - endif - - deps_rdp = [ - dep_libweston, - dep_frdp, - ] - plugin_rdp = shared_library( - 'rdp-backend', - 'compositor-rdp.c', - include_directories: include_directories('..', '../shared'), - dependencies: deps_rdp, - name_prefix: '', - install: true, - install_dir: dir_module_libweston - ) - env_modmap += 'rdp-backend.so=@0@;'.format(plugin_rdp.full_path()) - install_headers(backend_rdp_h, subdir: dir_include_libweston_install) -endif - - if get_option('backend-wayland') config_h.set('BUILD_WAYLAND_COMPOSITOR', '1') @@ -377,3 +339,4 @@ endif subdir('renderer-gl') subdir('backend-drm') subdir('backend-headless') +subdir('backend-rdp')