[gimp] libgimpbase: avoid build-time race between the two generated enum files



commit 8f362941a52ed131aec67026f74e4b658cabeaf7
Author: Ell <ell_se yahoo com>
Date:   Sun Feb 19 15:18:15 2017 -0500

    libgimpbase: avoid build-time race between the two generated enum files

 libgimpbase/Makefile.am |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/libgimpbase/Makefile.am b/libgimpbase/Makefile.am
index bbe4cea..04766bf 100644
--- a/libgimpbase/Makefile.am
+++ b/libgimpbase/Makefile.am
@@ -198,7 +198,7 @@ EXTRA_PROGRAMS = test-cpu-accel
 # rules to generate built sources
 #
 
-gen_sources = xgen-bec
+gen_sources = xgen-bec xgen-cec
 CLEANFILES = $(EXTRA_PROGRAMS) $(gen_sources)
 
 $(srcdir)/gimpbaseenums.c: $(srcdir)/gimpbaseenums.h $(GIMP_MKENUMS)
@@ -226,9 +226,9 @@ $(srcdir)/gimpcompatenums.c: $(srcdir)/gimpcompatenums.h $(GIMP_MKENUMS)
                --dhead "  static const Gimp@Type@Desc descs[] =\n  {" \
                --dprod "    { @VALUENAME@, @valuedesc@, @valuehelp@ }," \
                --dtail "    { 0, NULL, NULL }\n  };\n\n  static GType type = 0;\n\n  if (G_UNLIKELY (! 
type))\n    {\n      type = g_@type@_register_static (\"@EnumName@\", values);\n      
gimp_type_set_translation_domain (type, GETTEXT_PACKAGE \"-libgimp\");\n      
gimp_type_set_translation_context (type, \"@enumnick@\");\n      gimp_@type@_set_value_descriptions (type, 
descs);\n    }\n\n  return type;\n}\n" \
-               $(srcdir)/gimpcompatenums.h > xgen-bec \
-       && cp xgen-bec $(@F) \
-       && rm -f xgen-bec
+               $(srcdir)/gimpcompatenums.h > xgen-cec \
+       && cp xgen-cec $(@F) \
+       && rm -f xgen-cec
 
 
 DISTCLEANFILES = gimpversion.h


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