summaryrefslogtreecommitdiff
path: root/protocols
diff options
context:
space:
mode:
Diffstat (limited to 'protocols')
-rw-r--r--protocols/meson.build75
1 files changed, 18 insertions, 57 deletions
diff --git a/protocols/meson.build b/protocols/meson.build
index df24a4e5..904aead4 100644
--- a/protocols/meson.build
+++ b/protocols/meson.build
@@ -1,81 +1,42 @@
wl_protocol_dir = wayland_protos.get_variable('pkgdatadir')
-wayland_scanner_dep = dependency('wayland-scanner', required: false, native: true)
-if wayland_scanner_dep.found()
- wayland_scanner = find_program(
- wayland_scanner_dep.get_variable(pkgconfig: 'wayland_scanner'),
- native: true,
- )
-else
- wayland_scanner = find_program('wayland-scanner', native: true)
-endif
+wayland_scanner_dep = dependency('wayland-scanner', native: true)
+wayland_scanner = find_program(
+ wayland_scanner_dep.get_variable(pkgconfig: 'wayland_scanner'),
+ native: true,
+)
protocols = [
- [wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'],
- [wl_protocol_dir, 'unstable/xdg-output/xdg-output-unstable-v1.xml'],
- [wl_protocol_dir, 'unstable/pointer-constraints/pointer-constraints-unstable-v1.xml'],
- [wl_protocol_dir, 'unstable/tablet/tablet-unstable-v2.xml'],
- [wl_protocol_dir, 'unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml'],
- ['wlr-layer-shell-unstable-v1.xml'],
- ['idle.xml'],
- ['wlr-input-inhibitor-unstable-v1.xml'],
- ['wlr-output-power-management-unstable-v1.xml'],
-]
-
-client_protocols = [
- [wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'],
- [wl_protocol_dir, 'unstable/xdg-output/xdg-output-unstable-v1.xml'],
- ['wlr-layer-shell-unstable-v1.xml'],
- ['wlr-input-inhibitor-unstable-v1.xml'],
+ wl_protocol_dir / 'stable/xdg-shell/xdg-shell.xml',
+ wl_protocol_dir / 'unstable/xdg-output/xdg-output-unstable-v1.xml',
+ wl_protocol_dir / 'unstable/pointer-constraints/pointer-constraints-unstable-v1.xml',
+ wl_protocol_dir / 'unstable/tablet/tablet-unstable-v2.xml',
+ wl_protocol_dir / 'unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml',
+ 'wlr-layer-shell-unstable-v1.xml',
+ 'idle.xml',
+ 'wlr-input-inhibitor-unstable-v1.xml',
+ 'wlr-output-power-management-unstable-v1.xml',
]
wl_protos_src = []
-wl_protos_headers = []
-foreach p : protocols
- xml = join_paths(p)
+foreach xml : protocols
wl_protos_src += custom_target(
- xml.underscorify() + '_server_c',
+ xml.underscorify() + '_c',
input: xml,
output: '@[email protected]',
command: [wayland_scanner, 'private-code', '@INPUT@', '@OUTPUT@'],
)
- wl_protos_headers += custom_target(
+ wl_protos_src += custom_target(
xml.underscorify() + '_server_h',
input: xml,
output: '@[email protected]',
command: [wayland_scanner, 'server-header', '@INPUT@', '@OUTPUT@'],
)
-endforeach
-
-foreach p : client_protocols
- xml = join_paths(p)
- wl_protos_headers += custom_target(
+ wl_protos_src += custom_target(
xml.underscorify() + '_client_h',
input: xml,
output: '@[email protected]',
command: [wayland_scanner, 'client-header', '@INPUT@', '@OUTPUT@'],
)
endforeach
-
-lib_client_protos = static_library(
- 'client_protos',
- wl_protos_src + wl_protos_headers,
- dependencies: wayland_client.partial_dependency(compile_args: true),
-)
-
-client_protos = declare_dependency(
- link_with: lib_client_protos,
- sources: wl_protos_headers,
-)
-
-lib_server_protos = static_library(
- 'server_protos',
- wl_protos_src + wl_protos_headers,
- dependencies: wayland_server.partial_dependency(compile_args: true),
-)
-
-server_protos = declare_dependency(
- link_with: lib_server_protos,
- sources: wl_protos_headers,
-)