diff options
| author |  Simon Ser <contact@emersion.fr> | 2022-10-04 09:48:29 +0200 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2022-10-04 09:48:29 +0200 |
| commit | 04f8a655e7cf555ddf068756916346b8246395d1 (patch) | |
| tree | fe9173ceab60f7d2fe4ccdaf749049aae01ddfaa /protocols | |
| parent | swaymsg: show mode picture aspect ratio (diff) | |
| download | sway-04f8a655e7cf555ddf068756916346b8246395d1.tar.gz sway-04f8a655e7cf555ddf068756916346b8246395d1.tar.zst sway-04f8a655e7cf555ddf068756916346b8246395d1.zip | |
build: simplify protocol paths
No need for arrays here.
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/meson.build | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/protocols/meson.build b/protocols/meson.build index df24a4e5..f18ab6f4 100644 --- a/protocols/meson.build +++ b/protocols/meson.build | |||
| @@ -11,29 +11,28 @@ else | |||
| 11 | endif | 11 | endif |
| 12 | 12 | ||
| 13 | protocols = [ | 13 | protocols = [ |
| 14 | [wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'], | 14 | wl_protocol_dir / 'stable/xdg-shell/xdg-shell.xml', |
| 15 | [wl_protocol_dir, 'unstable/xdg-output/xdg-output-unstable-v1.xml'], | 15 | wl_protocol_dir / 'unstable/xdg-output/xdg-output-unstable-v1.xml', |
| 16 | [wl_protocol_dir, 'unstable/pointer-constraints/pointer-constraints-unstable-v1.xml'], | 16 | wl_protocol_dir / 'unstable/pointer-constraints/pointer-constraints-unstable-v1.xml', |
| 17 | [wl_protocol_dir, 'unstable/tablet/tablet-unstable-v2.xml'], | 17 | wl_protocol_dir / 'unstable/tablet/tablet-unstable-v2.xml', |
| 18 | [wl_protocol_dir, 'unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml'], | 18 | wl_protocol_dir / 'unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml', |
| 19 | ['wlr-layer-shell-unstable-v1.xml'], | 19 | 'wlr-layer-shell-unstable-v1.xml', |
| 20 | ['idle.xml'], | 20 | 'idle.xml', |
| 21 | ['wlr-input-inhibitor-unstable-v1.xml'], | 21 | 'wlr-input-inhibitor-unstable-v1.xml', |
| 22 | ['wlr-output-power-management-unstable-v1.xml'], | 22 | 'wlr-output-power-management-unstable-v1.xml', |
| 23 | ] | 23 | ] |
| 24 | 24 | ||
| 25 | client_protocols = [ | 25 | client_protocols = [ |
| 26 | [wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'], | 26 | wl_protocol_dir / 'stable/xdg-shell/xdg-shell.xml', |
| 27 | [wl_protocol_dir, 'unstable/xdg-output/xdg-output-unstable-v1.xml'], | 27 | wl_protocol_dir / 'unstable/xdg-output/xdg-output-unstable-v1.xml', |
| 28 | ['wlr-layer-shell-unstable-v1.xml'], | 28 | 'wlr-layer-shell-unstable-v1.xml', |
| 29 | ['wlr-input-inhibitor-unstable-v1.xml'], | 29 | 'wlr-input-inhibitor-unstable-v1.xml', |
| 30 | ] | 30 | ] |
| 31 | 31 | ||
| 32 | wl_protos_src = [] | 32 | wl_protos_src = [] |
| 33 | wl_protos_headers = [] | 33 | wl_protos_headers = [] |
| 34 | 34 | ||
| 35 | foreach p : protocols | 35 | foreach xml : protocols |
| 36 | xml = join_paths(p) | ||
| 37 | wl_protos_src += custom_target( | 36 | wl_protos_src += custom_target( |
| 38 | xml.underscorify() + '_server_c', | 37 | xml.underscorify() + '_server_c', |
| 39 | input: xml, | 38 | input: xml, |
| @@ -48,8 +47,7 @@ foreach p : protocols | |||
| 48 | ) | 47 | ) |
| 49 | endforeach | 48 | endforeach |
| 50 | 49 | ||
| 51 | foreach p : client_protocols | 50 | foreach xml : client_protocols |
| 52 | xml = join_paths(p) | ||
| 53 | wl_protos_headers += custom_target( | 51 | wl_protos_headers += custom_target( |
| 54 | xml.underscorify() + '_client_h', | 52 | xml.underscorify() + '_client_h', |
| 55 | input: xml, | 53 | input: xml, |