From c8acc5f23d7c9e611792be14ceeb9f9125de58cb Mon Sep 17 00:00:00 2001 From: Pekka Paalanen Date: Fri, 5 Apr 2019 13:23:53 +0300 Subject: [PATCH] backend-fbdev: more into new subdir For consistency with other backends. Signed-off-by: Pekka Paalanen --- .../fbdev.c} | 0 libweston/backend-fbdev/meson.build | 30 +++++++++++++++++++ libweston/meson.build | 30 +------------------ 3 files changed, 31 insertions(+), 29 deletions(-) rename libweston/{compositor-fbdev.c => backend-fbdev/fbdev.c} (100%) create mode 100644 libweston/backend-fbdev/meson.build diff --git a/libweston/compositor-fbdev.c b/libweston/backend-fbdev/fbdev.c similarity index 100% rename from libweston/compositor-fbdev.c rename to libweston/backend-fbdev/fbdev.c diff --git a/libweston/backend-fbdev/meson.build b/libweston/backend-fbdev/meson.build new file mode 100644 index 00000000..a84686e2 --- /dev/null +++ b/libweston/backend-fbdev/meson.build @@ -0,0 +1,30 @@ +if not get_option('backend-fbdev') + subdir_done() +endif + +config_h.set('BUILD_FBDEV_COMPOSITOR', '1') + +srcs_fbdev = [ + 'fbdev.c', + presentation_time_server_protocol_h, +] + +deps_fbdev = [ + dep_libweston, + dep_session_helper, + dep_libinput_backend, + dependency('libudev', version: '>= 136'), +] + +plugin_fbdev = shared_library( + 'fbdev-backend', + srcs_fbdev, + include_directories: include_directories('../..', '../../shared'), + dependencies: deps_fbdev, + name_prefix: '', + install: true, + install_dir: dir_module_libweston +) +env_modmap += 'fbdev-backend.so=@0@;'.format(plugin_fbdev.full_path()) + +install_headers(backend_fbdev_h, subdir: dir_include_libweston_install) diff --git a/libweston/meson.build b/libweston/meson.build index 357a910b..33c6cf85 100644 --- a/libweston/meson.build +++ b/libweston/meson.build @@ -185,35 +185,6 @@ dep_libinput_backend = declare_dependency( include_directories: include_directories('.') ) -if get_option('backend-fbdev') - config_h.set('BUILD_FBDEV_COMPOSITOR', '1') - - srcs_fbdev = [ - 'compositor-fbdev.c', - presentation_time_server_protocol_h, - ] - - deps_fbdev = [ - dep_libweston, - dep_session_helper, - dep_libinput_backend, - dependency('libudev', version: '>= 136'), - ] - - plugin_fbdev = shared_library( - 'fbdev-backend', - srcs_fbdev, - include_directories: include_directories('..', '../shared'), - dependencies: deps_fbdev, - name_prefix: '', - install: true, - install_dir: dir_module_libweston - ) - env_modmap += 'fbdev-backend.so=@0@;'.format(plugin_fbdev.full_path()) - - install_headers(backend_fbdev_h, subdir: dir_include_libweston_install) -endif - dep_vertex_clipping = declare_dependency( sources: 'vertex-clipping.c', include_directories: include_directories('.') @@ -239,6 +210,7 @@ endif subdir('renderer-gl') subdir('backend-drm') +subdir('backend-fbdev') subdir('backend-headless') subdir('backend-rdp') subdir('backend-wayland')