From 004f061dca2d7b5d4fbfceef3908cd5946cc461f Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Mon, 21 Aug 2023 05:14:33 +0200
Subject: [PATCH] build: Don't use configure_file() when custom_target() works

These two files don't need to be built when configuring, they are only
needed during build.
---
 gsk/meson.build                  |  6 +-----
 gsk/vulkan/resources/meson.build | 14 +++++++-------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/gsk/meson.build b/gsk/meson.build
index 489024572a..877057e81e 100644
--- a/gsk/meson.build
+++ b/gsk/meson.build
@@ -97,10 +97,6 @@ if have_vulkan
 endif
 
 gsk_private_vulkan_shaders = []
-# This is an odd split because we use configure_file() below to workaround
-# a limitation in meson preventing using custom_target() with gnome.compile_resources()
-# and that requires file paths, but we also need to have dependencies during development
-# on constantly regenerated files.
 gsk_private_vulkan_compiled_shaders = []
 gsk_private_vulkan_compiled_shaders_deps = []
 gsk_private_vulkan_shader_headers = []
@@ -148,7 +144,7 @@ if get_variable('broadway_enabled')
   ])
 endif
 
-gsk_resources_xml = configure_file(output: 'gsk.resources.xml',
+gsk_resources_xml = custom_target(output: 'gsk.resources.xml',
   input: 'gen-gsk-gresources-xml.py',
   command: [
     find_program('gen-gsk-gresources-xml.py'),
diff --git a/gsk/vulkan/resources/meson.build b/gsk/vulkan/resources/meson.build
index 444a1dce38..d53c0ef0e3 100644
--- a/gsk/vulkan/resources/meson.build
+++ b/gsk/vulkan/resources/meson.build
@@ -93,12 +93,12 @@ foreach shader: gsk_private_vulkan_shaders
 endforeach
 
 foreach shader: gsk_private_vulkan_vertex_shaders
-  shader_header = configure_file(output: '@0@.h'.format(shader),
-                                 input: shader,
-                                 command: [
-                                   find_program('generate-header.py'),
-                                   '@INPUT@',
-                                 ],
-                                 capture: true)
+  shader_header = custom_target(output: '@0@.h'.format(shader),
+                                input: shader,
+                                command: [
+                                  find_program('generate-header.py'),
+                                  '@INPUT@',
+                                ],
+                                capture: true)
   gsk_private_vulkan_shader_headers += shader_header
 endforeach
-- 
2.30.2