diff options
| author | Scott Anderson <scott@anderso.nz> | 2018-08-24 19:35:02 +1200 |
|---|---|---|
| committer | Scott Anderson <scott@anderso.nz> | 2018-08-24 19:35:02 +1200 |
| commit | fd3fa760d336312acafeb6812b5b0068f5851f27 (patch) | |
| tree | 6876337b81c01c13d53d6c4f2e3680c51fd9e204 /backend/meson.build | |
| parent | 9c886f20b97b6ab1ac85b849f1fe7f16eb199ff0 (diff) | |
Revert "Revert "Merge pull request #1194 from ascent12/meson_feature""
This reverts commit 9c886f20b97b6ab1ac85b849f1fe7f16eb199ff0.
Diffstat (limited to 'backend/meson.build')
| -rw-r--r-- | backend/meson.build | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/backend/meson.build b/backend/meson.build index 52abe64d..dd1f4df3 100644 --- a/backend/meson.build +++ b/backend/meson.build @@ -1,3 +1,4 @@ +backend_parts = [] backend_files = files( 'backend.c', 'drm/atomic.c', @@ -44,28 +45,17 @@ else backend_files += files('session/direct.c') endif -if conf_data.get('WLR_HAS_SYSTEMD', false) +if logind.found() backend_files += files('session/logind.c') - backend_deps += systemd + backend_deps += logind endif -if conf_data.get('WLR_HAS_X11_BACKEND', false) - backend_files += files( - 'x11/backend.c', - 'x11/input_device.c', - 'x11/output.c', - ) - backend_deps += xcb_xkb -endif - -if conf_data.get('WLR_HAS_ELOGIND', false) - backend_files += files('session/logind.c') - backend_deps += elogind -endif +subdir('x11') lib_wlr_backend = static_library( 'wlr_backend', backend_files, include_directories: wlr_inc, + link_whole: backend_parts, dependencies: backend_deps, ) |