From 48e13deb6c3ce737eee56fd035d48204f368df80 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Mon, 18 May 2020 10:53:17 +0100
Subject: [PATCH] build: Only instantiate libglnx subproject once

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 meson.build | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/meson.build b/meson.build
index b16bd8c3d..f90647db0 100644
--- a/meson.build
+++ b/meson.build
@@ -127,6 +127,8 @@ endforeach
 supported_warning_cflags = c_compiler.get_supported_arguments(project_warning_cflags)
 add_project_arguments(supported_warning_cflags, language : 'c')
 
+libglnx = subproject('libglnx')
+
 scripts = [
   'pressure-vessel-locale-gen',
   'pressure-vessel-test-ui',
@@ -217,7 +219,7 @@ executable(
   ],
   dependencies : [
     dependency('gio-unix-2.0', required : true),
-    subproject('libglnx').get_variable('libglnx_dep'),
+    libglnx.get_variable('libglnx_dep'),
   ],
   include_directories : project_include_dirs,
   install : true,
@@ -264,7 +266,7 @@ executable(
     ),
     dependency('gio-unix-2.0', required : true),
     dependency('xau', required : true),
-    subproject('libglnx').get_variable('libglnx_dep'),
+    libglnx.get_variable('libglnx_dep'),
   ],
   include_directories : project_include_dirs,
   install : true,
@@ -299,7 +301,7 @@ executable(
   ],
   dependencies : [
     dependency('gio-unix-2.0', required : true),
-    subproject('libglnx').get_variable('libglnx_dep'),
+    libglnx.get_variable('libglnx_dep'),
   ],
   include_directories : project_include_dirs,
   install : false,
-- 
GitLab