From d65304205163e218774beded3123fa3c9e381f41 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Wed, 9 Sep 2020 19:35:41 +0100
Subject: [PATCH] pressure-vessel: Correctly track dependencies on generated
 headers

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 pressure-vessel/meson.build | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pressure-vessel/meson.build b/pressure-vessel/meson.build
index 3cf43bad9..b492352c0 100644
--- a/pressure-vessel/meson.build
+++ b/pressure-vessel/meson.build
@@ -105,6 +105,10 @@ pressure_vessel_utils = static_library(
   include_directories : pv_include_dirs,
   install: false,
 )
+pressure_vessel_utils_dep = declare_dependency(
+  link_with : pressure_vessel_utils,
+  sources : launcher1[1],
+)
 
 launcher_codegen = static_library(
   'pressure-vessel-launcher-codegen',
@@ -116,6 +120,10 @@ launcher_codegen = static_library(
   include_directories : pv_include_dirs,
   install: false,
 )
+launcher_codegen_dep = declare_dependency(
+  link_with : launcher_codegen,
+  sources : launcher1[1],
+)
 
 executable(
   'pressure-vessel-adverb',
@@ -126,13 +134,11 @@ executable(
   ],
   c_args : pv_c_args,
   dependencies : [
+    pressure_vessel_utils_dep,
     threads,
     gio_unix,
     libglnx.get_variable('libglnx_dep'),
   ],
-  link_with : [
-    pressure_vessel_utils,
-  ],
   include_directories : pv_include_dirs,
   install : true,
   install_dir : pv_bindir,
@@ -147,13 +153,11 @@ executable(
   ],
   c_args : pv_c_args,
   dependencies : [
+    pressure_vessel_utils_dep,
     threads,
     gio_unix,
     libglnx.get_variable('libglnx_dep'),
   ],
-  link_with : [
-    pressure_vessel_utils,
-  ],
   include_directories : pv_include_dirs,
   install : true,
   install_dir : pv_bindir,
@@ -168,14 +172,12 @@ executable(
   ],
   c_args : pv_c_args,
   dependencies : [
+    launcher_codegen_dep,
+    pressure_vessel_utils_dep,
     threads,
     gio_unix,
     libglnx.get_variable('libglnx_dep'),
   ],
-  link_with : [
-    launcher_codegen,
-    pressure_vessel_utils,
-  ],
   include_directories : pv_include_dirs,
   install : true,
   install_dir : pv_bindir,
@@ -201,14 +203,12 @@ executable(
   ] + enums,
   c_args : pv_c_args,
   dependencies : [
+    pressure_vessel_utils_dep,
     libsteamrt_static_dep,
     gio_unix,
     xau,
     libglnx.get_variable('libglnx_dep'),
   ],
-  link_with : [
-    pressure_vessel_utils,
-  ],
   include_directories : pv_include_dirs,
   install : true,
   install_dir : pv_bindir,
-- 
GitLab