From 04f8a655e7cf555ddf068756916346b8246395d1 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Tue, 4 Oct 2022 09:48:29 +0200
Subject: build: simplify protocol paths

No need for arrays here.
---
 protocols/meson.build | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

(limited to 'protocols')

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
 endif
 
 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'],
+	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',
+	'wlr-layer-shell-unstable-v1.xml',
+	'wlr-input-inhibitor-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',
 		input: xml,
@@ -48,8 +47,7 @@ foreach p : protocols
 	)
 endforeach
 
-foreach p : client_protocols
-	xml = join_paths(p)
+foreach xml : client_protocols
 	wl_protos_headers += custom_target(
 		xml.underscorify() + '_client_h',
 		input: xml,
-- 
cgit v1.2.3