[gnome-control-center] common: Add a missing dependency on cc-common-resources.h



commit 9401881a38dbfd46559c75c72a9b8161e528a915
Author: Dor Askayo <dor askayo gmail com>
Date:   Sun Feb 20 01:26:12 2022 +0200

    common: Add a missing dependency on cc-common-resources.h
    
    cc-common-resources.h is used by both libwidgets and liblanguage, and
    so must be generated before they build. However, Meson wasn't aware
    of this dependency which resulted in a race condition during build.
    
    Conveniently, "generates_sources_dep" already contains other generated
    sources used by these two libraries, so adding cc-common-resources.h
    to this list is enough to declare the dependency.

 panels/common/meson.build | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/panels/common/meson.build b/panels/common/meson.build
index 20b9dcf16..13557c1ff 100644
--- a/panels/common/meson.build
+++ b/panels/common/meson.build
@@ -24,6 +24,22 @@ common_sources += gnome.mkenums(
   vtail: '      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static ("@EnumName@", values);\n  
}\n  return etype;\n}\n'
 )
 
+resource_data = files(
+  'cc-language-chooser.ui',
+  'cc-language-row.ui',
+  'cc-list-row.ui',
+  'cc-time-editor.ui',
+  'cc-permission-infobar.ui',
+)
+
+common_sources += gnome.compile_resources(
+  'cc-common-resources',
+  'common.gresource.xml',
+  c_name: 'cc_common',
+  dependencies: resource_data,
+  export: true
+)
+
 generates_sources_dep = declare_dependency(
   sources: common_sources,
 )
@@ -55,22 +71,6 @@ sources = common_sources + files(
   'cc-util.c'
 )
 
-resource_data = files(
-  'cc-language-chooser.ui',
-  'cc-language-row.ui',
-  'cc-list-row.ui',
-  'cc-time-editor.ui',
-  'cc-permission-infobar.ui',
-)
-
-sources += gnome.compile_resources(
-  'cc-common-resources',
-  'common.gresource.xml',
-  c_name: 'cc_common',
-  dependencies: resource_data,
-  export: true
-)
-
 deps = common_deps + [
   generates_sources_dep,
   gnome_desktop_dep,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]