From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 4 Oct 2021 01:01:04 +0000 (-0400)
Subject: Add depfiles back to resource generation
X-Git-Tag: archive/raspbian/4.6.5+ds-1+rpi1~1^2~19^2~5^2~263^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8079f8ea3ceebf33ab3b7d3c9e13c76f9afc9e2b;p=gtk4.git

Add depfiles back to resource generation

The recent change to faster resource generation
lost the depfiles to ensure that we regenerate
resources when any of the contents change.
Bring it back.
---

diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build
index cffe2503e2..2248b60b19 100644
--- a/demos/gtk-demo/meson.build
+++ b/demos/gtk-demo/meson.build
@@ -171,8 +171,11 @@ if build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_ad
   gtkdemo_gresource = custom_target('gtkdemo.gresource',
       input : 'demo.gresource.xml',
       output : 'gtkdemo.gresource',
+      depfile : 'gtkdemo.gresource.d',
       command : [glib_compile_resources,
+                 '--generate',
                  '--target=@OUTPUT@',
+                 '--dependency-file=@DEPFILE@',
                  '--sourcedir=' + meson.current_source_dir(),
                  '--sourcedir=' + meson.current_build_dir(),
                  '@INPUT@'])
@@ -181,11 +184,13 @@ if build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_ad
   gtkdemo_resources_c = custom_target('gtkdemo_resources.c',
       input : 'demo.gresource.xml',
       output : 'gtkdemo_resources.c',
+      depfile : 'gtkdemo_resources.c.d',
       command : [glib_compile_resources,
+                 '--generate-source',
                  '--target=@OUTPUT@',
+                 '--dependency-file=@DEPFILE@',
                  '--sourcedir=' + meson.current_source_dir(),
                  '--sourcedir=' + meson.current_build_dir(),
-                 '--generate-source',
                  '--external-data',
                  '--c-name', '_g_binary_gtkdemo',
                  '@INPUT@'])
diff --git a/demos/widget-factory/meson.build b/demos/widget-factory/meson.build
index a7906fb83c..01d9505ef7 100644
--- a/demos/widget-factory/meson.build
+++ b/demos/widget-factory/meson.build
@@ -15,8 +15,11 @@ if build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_ad
   widgetfactory_gresource = custom_target('widgetfactory.gresource',
       input : 'widget-factory.gresource.xml',
       output : 'widgetfactory.gresource',
+      depfile: 'widgetfactory.gresource.d',
       command : [glib_compile_resources,
+                 '--generate',
                  '--target=@OUTPUT@',
+                 '--dependency-file=@DEPFILE@',
                  '--sourcedir=' + meson.current_source_dir(),
                  '--sourcedir=' + meson.current_build_dir(),
                  '@INPUT@'])
@@ -25,11 +28,13 @@ if build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_ad
   widgetfactory_resources_c = custom_target('widgetfactory_resources.c',
       input : 'widget-factory.gresource.xml',
       output : 'widgetfactory_resources.c',
+      depfile: 'widgetfactory_resources.c.d',
       command : [glib_compile_resources,
+                 '--generate-source',
                  '--target=@OUTPUT@',
+                 '--dependency-file=@DEPFILE@',
                  '--sourcedir=' + meson.current_source_dir(),
                  '--sourcedir=' + meson.current_build_dir(),
-                 '--generate-source',
                  '--external-data',
                  '--c-name', '_g_binary_widgetfactory',
                  '@INPUT@'])
diff --git a/gtk/meson.build b/gtk/meson.build
index 00b9f8a22b..e31b9e67ff 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -880,8 +880,11 @@ if build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_ad
       input : gtk_gresources_xml,
       depends : theme_deps,
       output : 'gtk.gresource',
+      depfile : 'gtk.gresource.d',
       command : [glib_compile_resources,
+                 '--generate',
                  '--target=@OUTPUT@',
+                 '--dependency-file=@DEPFILE@',
                  '--sourcedir=' + meson.current_source_dir(),
                  '--sourcedir=' + meson.current_build_dir(),
                  '@INPUT@'])
@@ -891,11 +894,13 @@ if build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_ad
       input : gtk_gresources_xml,
       depends : theme_deps,
       output : 'gtkresources.c',
+      depfile : 'gtkresources.c.d',
       command : [glib_compile_resources,
+                 '--generate-source',
                  '--target=@OUTPUT@',
+                 '--dependency-file=@DEPFILE@',
                  '--sourcedir=' + meson.current_source_dir(),
                  '--sourcedir=' + meson.current_build_dir(),
-                 '--generate-source',
                  '--external-data',
                  '--c-name', '_gtk',
                  '--manual-register',
@@ -905,11 +910,13 @@ if build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_ad
       input : gtk_gresources_xml,
       depends : theme_deps,
       output : 'gtkresources.h',
+      depfile : 'gtkresources.h.d',
       command : [glib_compile_resources,
+                 '--generate-header',
                  '--target=@OUTPUT@',
+                 '--dependency-file=@DEPFILE@',
                  '--sourcedir=' + meson.current_source_dir(),
                  '--sourcedir=' + meson.current_build_dir(),
-                 '--generate-header',
                  '--external-data',
                  '--c-name', '_gtk',
                  '--manual-register',