enums: generate enum files in source dir

We check them into git, so this makes it easier to keep them in sync when using a separate build directory. Case in point -- this commit also syncs a few enum files that went out-of-sync with their headers.

enums: generate enum files in source dir
We check them into git, so this makes it easier to keep them in sync when using a separate build directory. Case in point -- this commit also syncs a few enum files that went out-of-sync with their headers.
1e6acbd4 · Ell · 8c814a24 · 1e6acbd4 · 1e6acbd4 · 1e6acbd4
Commit 1e6acbd4 authored May 06, 2017 by Ell
29 changed files
--- a/app/config/Makefile.am
+++ b/app/config/Makefile.am
@@ -135,8 +135,8 @@ CLEANFILES = $(EXTRA_PROGRAMS) foorc
 gen_sources = xgen-dec
 CLEANFILES += $(gen_sources)

-config-enums.c: $(srcdir)/config-enums.h $(GIMP_MKENUMS)
-	$(GIMP_MKENUMS) \
+$(srcdir)/config-enums.c: $(srcdir)/config-enums.h $(GIMP_MKENUMS)
+	$(AM_V_GEN) (cd $(srcdir) && $(GIMP_MKENUMS) \
 		--fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"config-enums.h\"\n#include\"gimp-intl.h\"" \
 		--fprod "\n/* enumerations from \"@filename@\" */" \
 		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \
@@ -145,7 +145,7 @@ config-enums.c: $(srcdir)/config-enums.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_context (type, \"@enumnick@\");\n      gimp_@type@_set_value_descriptions (type, descs);\n    }\n\n  return type;\n}\n" \
-		$(srcdir)/config-enums.h > xgen-dec \
-	&& cp xgen-dec $(@F) \
+		config-enums.h) > xgen-dec \
+	&& cp xgen-dec $@ \
 	&& rm -f xgen-dec

--- a/app/config/config-enums.c
+++ b/app/config/config-enums.c
@@ -7,7 +7,7 @@
 #include "config-enums.h"
 #include"gimp-intl.h"

-/* enumerations from "./config-enums.h" */
+/* enumerations from "config-enums.h" */
 GType
 gimp_canvas_padding_mode_get_type (void)
 {

--- a/app/core/Makefile.am
+++ b/app/core/Makefile.am
@@ -448,8 +448,8 @@ gimpmarshal.c: gimpmarshal.h
 	&& cp xgen-gmc $(@F) \
 	&& rm -f xgen-gmc xgen-gmc~

-core-enums.c: $(srcdir)/core-enums.h $(GIMP_MKENUMS)
-	$(GIMP_MKENUMS) \
+$(srcdir)/core-enums.c: $(srcdir)/core-enums.h $(GIMP_MKENUMS)
+	$(AM_V_GEN) (cd $(srcdir) && $(GIMP_MKENUMS) \
 		--fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"core-enums.h\"\n#include \"gimp-intl.h\"" \
 		--fprod "\n/* enumerations from \"@filename@\" */" \
 		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \
@@ -458,6 +458,6 @@ core-enums.c: $(srcdir)/core-enums.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_context (type, \"@enumnick@\");\n      gimp_@type@_set_value_descriptions (type, descs);\n    }\n\n  return type;\n}\n" \
-		$(srcdir)/core-enums.h > xgen-cec \
-	&& cp xgen-cec $(@F) \
+		core-enums.h) > xgen-cec \
+	&& cp xgen-cec $@ \
 	&& rm -f xgen-cec
--- a/app/core/core-enums.c
+++ b/app/core/core-enums.c
@@ -7,7 +7,7 @@
 #include "core-enums.h"
 #include "gimp-intl.h"

-/* enumerations from "./core-enums.h" */
+/* enumerations from "core-enums.h" */
 GType
 gimp_component_mask_get_type (void)
 {
@@ -853,7 +853,7 @@ gimp_undo_type_get_type (void)
    { GIMP_UNDO_GROUP_PARASITE_ATTACH, NC_("undo-type", "Attach parasite"), NULL },
    { GIMP_UNDO_GROUP_PARASITE_REMOVE, NC_("undo-type", "Remove parasite"), NULL },
    { GIMP_UNDO_GROUP_VECTORS_IMPORT, NC_("undo-type", "Import paths"), NULL },
-    { GIMP_UNDO_GROUP_MISC, NC_("undo-type", "Plug-in"), NULL },
+    { GIMP_UNDO_GROUP_MISC, NC_("undo-type", "Plug-In"), NULL },
    { GIMP_UNDO_IMAGE_TYPE, NC_("undo-type", "Image type"), NULL },
    { GIMP_UNDO_IMAGE_PRECISION, NC_("undo-type", "Image precision"), NULL },
    { GIMP_UNDO_IMAGE_SIZE, NC_("undo-type", "Image size"), NULL },

--- a/app/display/Makefile.am
+++ b/app/display/Makefile.am
@@ -178,8 +178,8 @@ libappdisplay_a_SOURCES = \
 gen_sources = xgen-dec
 CLEANFILES = $(gen_sources)

-display-enums.c: $(srcdir)/display-enums.h $(GIMP_MKENUMS)
-	$(GIMP_MKENUMS) \
+$(srcdir)/display-enums.c: $(srcdir)/display-enums.h $(GIMP_MKENUMS)
+	$(AM_V_GEN) (cd $(srcdir) && $(GIMP_MKENUMS) \
 		--fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"display-enums.h\"\n#include\"gimp-intl.h\"" \
 		--fprod "\n/* enumerations from \"@filename@\" */" \
 		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \
@@ -188,6 +188,6 @@ display-enums.c: $(srcdir)/display-enums.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_context (type, \"@enumnick@\");\n      gimp_@type@_set_value_descriptions (type, descs);\n    }\n\n  return type;\n}\n" \
-		$(srcdir)/display-enums.h > xgen-dec \
-	&& cp xgen-dec $(@F) \
+		display-enums.h) > xgen-dec \
+	&& cp xgen-dec $@ \
 	&& rm -f xgen-dec
--- a/app/display/display-enums.c
+++ b/app/display/display-enums.c
@@ -7,7 +7,7 @@
 #include "display-enums.h"
 #include"gimp-intl.h"

-/* enumerations from "./display-enums.h" */
+/* enumerations from "display-enums.h" */
 GType
 gimp_cursor_precision_get_type (void)
 {

--- a/app/gegl/Makefile.am
+++ b/app/gegl/Makefile.am
@@ -52,8 +52,8 @@ libappgegl_a_SOURCES = $(libappgegl_a_built_sources) $(libappgegl_a_sources)
 gen_sources = xgen-tec
 CLEANFILES = $(gen_sources)

-gimp-gegl-enums.c: $(srcdir)/gimp-gegl-enums.h $(GIMP_MKENUMS)
-	$(GIMP_MKENUMS) \
+$(srcdir)/gimp-gegl-enums.c: $(srcdir)/gimp-gegl-enums.h $(GIMP_MKENUMS)
+	$(AM_V_GEN) (cd $(srcdir) && $(GIMP_MKENUMS) \
 		--fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"core/core-enums.h\"\n#include \"gimp-gegl-enums.h\"\n#include \"gimp-intl.h\"" \
 		--fprod "\n/* enumerations from \"@filename@\" */" \
 		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \
@@ -62,6 +62,6 @@ gimp-gegl-enums.c: $(srcdir)/gimp-gegl-enums.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_context (type, \"@enumnick@\");\n      gimp_@type@_set_value_descriptions (type, descs);\n    }\n\n  return type;\n}\n" \
-		$(srcdir)/gimp-gegl-enums.h > xgen-tec \
-	&& cp xgen-tec $(@F) \
+		gimp-gegl-enums.h) > xgen-tec \
+	&& cp xgen-tec $@ \
 	&& rm -f xgen-tec
--- a/app/gegl/gimp-gegl-enums.c
+++ b/app/gegl/gimp-gegl-enums.c
@@ -8,7 +8,7 @@
 #include "gimp-gegl-enums.h"
 #include "gimp-intl.h"

-/* enumerations from "./gimp-gegl-enums.h" */
+/* enumerations from "gimp-gegl-enums.h" */
 GType
 gimp_cage_mode_get_type (void)
 {

--- a/app/operations/Makefile.am
+++ b/app/operations/Makefile.am
@@ -111,8 +111,8 @@ libappoperations_a_SOURCES = \
 gen_sources = xgen-pec
 CLEANFILES = $(gen_sources)

-operations-enums.c: $(srcdir)/operations-enums.h $(GIMP_MKENUMS)
-	$(GIMP_MKENUMS) \
+$(srcdir)/operations-enums.c: $(srcdir)/operations-enums.h $(GIMP_MKENUMS)
+	$(AM_V_GEN) (cd $(srcdir) && $(GIMP_MKENUMS) \
 		--fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"operations-enums.h\"\n#include \"gimp-intl.h\"" \
 		--fprod "\n/* enumerations from \"@filename@\" */" \
 		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \
@@ -121,6 +121,6 @@ operations-enums.c: $(srcdir)/operations-enums.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_context (type, \"@enumnick@\");\n      gimp_@type@_set_value_descriptions (type, descs);\n    }\n\n  return type;\n}\n" \
-		$(srcdir)/operations-enums.h > xgen-pec \
-	&& cp xgen-pec $(@F) \
+		operations-enums.h) > xgen-pec \
+	&& cp xgen-pec $@ \
 	&& rm -f xgen-pec
--- a/app/operations/operations-enums.c
+++ b/app/operations/operations-enums.c
@@ -7,7 +7,7 @@
 #include "operations-enums.h"
 #include "gimp-intl.h"

-/* enumerations from "./operations-enums.h" */
+/* enumerations from "operations-enums.h" */
 GType
 gimp_layer_color_space_get_type (void)
 {

--- a/app/paint/Makefile.am
+++ b/app/paint/Makefile.am
@@ -98,8 +98,8 @@ libapppaint_a_SOURCES = $(libapppaint_a_built_sources) $(libapppaint_a_sources)
 gen_sources = xgen-pec
 CLEANFILES = $(gen_sources)

-paint-enums.c: $(srcdir)/paint-enums.h $(GIMP_MKENUMS)
-	$(GIMP_MKENUMS) \
+$(srcdir)/paint-enums.c: $(srcdir)/paint-enums.h $(GIMP_MKENUMS)
+	$(AM_V_GEN) (cd $(srcdir) && $(GIMP_MKENUMS) \
 		--fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"paint-enums.h\"\n#include \"gimp-intl.h\"" \
 		--fprod "\n/* enumerations from \"@filename@\" */" \
 		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \
@@ -108,6 +108,6 @@ paint-enums.c: $(srcdir)/paint-enums.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_context (type, \"@enumnick@\");\n      gimp_@type@_set_value_descriptions (type, descs);\n    }\n\n  return type;\n}\n" \
-		$(srcdir)/paint-enums.h > xgen-pec \
-	&& cp xgen-pec $(@F) \
+		paint-enums.h) > xgen-pec \
+	&& cp xgen-pec $@ \
 	&& rm -f xgen-pec
--- a/app/paint/paint-enums.c
+++ b/app/paint/paint-enums.c
@@ -7,7 +7,7 @@
 #include "paint-enums.h"
 #include "gimp-intl.h"

-/* enumerations from "./paint-enums.h" */
+/* enumerations from "paint-enums.h" */
 GType
 gimp_brush_application_mode_get_type (void)
 {

--- a/app/plug-in/Makefile.am
+++ b/app/plug-in/Makefile.am
@@ -81,8 +81,8 @@ libappplug_in_a_SOURCES = \
 gen_sources = xgen-bec
 CLEANFILES = $(EXTRA_PROGRAMS) $(gen_sources)

-plug-in-enums.c: $(srcdir)/plug-in-enums.h $(GIMP_MKENUMS)
-	$(GIMP_MKENUMS) \
+$(srcdir)/plug-in-enums.c: $(srcdir)/plug-in-enums.h $(GIMP_MKENUMS)
+	$(AM_V_GEN) (cd $(srcdir) && $(GIMP_MKENUMS) \
 		--fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"plug-in-enums.h\"\n#include \"gimp-intl.h\"" \
 		--fprod "\n/* enumerations from \"@filename@\" */" \
 		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \
@@ -91,6 +91,6 @@ plug-in-enums.c: $(srcdir)/plug-in-enums.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_context (type, \"@enumnick@\");\n      gimp_@type@_set_value_descriptions (type, descs);\n    }\n\n  return type;\n}\n" \
-		$(srcdir)/plug-in-enums.h > xgen-bec \
-	&& cp xgen-bec $(@F) \
+		plug-in-enums.h) > xgen-bec \
+	&& cp xgen-bec $@ \
 	&& rm -f xgen-bec
--- a/app/plug-in/plug-in-enums.c
+++ b/app/plug-in/plug-in-enums.c
@@ -7,7 +7,7 @@
 #include "plug-in-enums.h"
 #include "gimp-intl.h"

-/* enumerations from "./plug-in-enums.h" */
+/* enumerations from "plug-in-enums.h" */
 GType
 gimp_plug_in_image_type_get_type (void)
 {

--- a/app/text/Makefile.am
+++ b/app/text/Makefile.am
@@ -57,8 +57,8 @@ libapptext_a_SOURCES = $(libapptext_a_built_sources) $(libapptext_a_sources)
 gen_sources = xgen-tec
 CLEANFILES = $(gen_sources)

-text-enums.c: $(srcdir)/text-enums.h $(GIMP_MKENUMS)
-	$(GIMP_MKENUMS) \
+$(srcdir)/text-enums.c: $(srcdir)/text-enums.h $(GIMP_MKENUMS)
+	$(AM_V_GEN) (cd $(srcdir) && $(GIMP_MKENUMS) \
 		--fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"text-enums.h\"\n#include \"gimp-intl.h\"" \
 		--fprod "\n/* enumerations from \"@filename@\" */" \
 		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \
@@ -67,6 +67,6 @@ text-enums.c: $(srcdir)/text-enums.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_context (type, \"@enumnick@\");\n      gimp_@type@_set_value_descriptions (type, descs);\n    }\n\n  return type;\n}\n" \
-		$(srcdir)/text-enums.h > xgen-tec \
-	&& cp xgen-tec $(@F) \
+		text-enums.h) > xgen-tec \
+	&& cp xgen-tec $@ \
 	&& rm -f xgen-tec
--- a/app/text/text-enums.c
+++ b/app/text/text-enums.c
@@ -7,7 +7,7 @@
 #include "text-enums.h"
 #include "gimp-intl.h"

-/* enumerations from "./text-enums.h" */
+/* enumerations from "text-enums.h" */
 GType
 gimp_text_box_mode_get_type (void)
 {

--- a/app/tools/Makefile.am
+++ b/app/tools/Makefile.am
@@ -234,8 +234,8 @@ libapptools_a_SOURCES = $(libapptools_a_built_sources) $(libapptools_a_sources)
 gen_sources = xgen-tec
 CLEANFILES = $(gen_sources)

-tools-enums.c: $(srcdir)/tools-enums.h $(GIMP_MKENUMS)
-	$(GIMP_MKENUMS) \
+$(srcdir)/tools-enums.c: $(srcdir)/tools-enums.h $(GIMP_MKENUMS)
+	$(AM_V_GEN) (cd $(srcdir) && $(GIMP_MKENUMS) \
 		--fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"core/core-enums.h\"\n#include \"tools-enums.h\"\n#include \"gimp-intl.h\"" \
 		--fprod "\n/* enumerations from \"@filename@\" */" \
 		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \
@@ -244,6 +244,6 @@ tools-enums.c: $(srcdir)/tools-enums.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_context (type, \"@enumnick@\");\n      gimp_@type@_set_value_descriptions (type, descs);\n    }\n\n  return type;\n}\n" \
-		$(srcdir)/tools-enums.h > xgen-tec \
-	&& cp xgen-tec $(@F) \
+		tools-enums.h) > xgen-tec \
+	&& cp xgen-tec $@ \
 	&& rm -f xgen-tec
--- a/app/tools/tools-enums.c
+++ b/app/tools/tools-enums.c
@@ -8,7 +8,7 @@
 #include "tools-enums.h"
 #include "gimp-intl.h"

-/* enumerations from "./tools-enums.h" */
+/* enumerations from "tools-enums.h" */
 GType
 gimp_button_press_type_get_type (void)
 {

--- a/app/widgets/Makefile.am
+++ b/app/widgets/Makefile.am
@@ -460,8 +460,8 @@ libappwidgets_a_SOURCES = \
 gen_sources = xgen-wec
 CLEANFILES = $(gen_sources)

-widgets-enums.c: $(srcdir)/widgets-enums.h $(GIMP_MKENUMS)
-	$(GIMP_MKENUMS) \
+$(srcdir)/widgets-enums.c: $(srcdir)/widgets-enums.h $(GIMP_MKENUMS)
+	$(AM_V_GEN) (cd $(srcdir) && $(GIMP_MKENUMS) \
 		--fhead "#include \"config.h\"\n#include <gtk/gtk.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"widgets-enums.h\"\n#include \"gimp-intl.h\"" \
 		--fprod "\n/* enumerations from \"@filename@\" */" \
 		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \
@@ -470,6 +470,6 @@ widgets-enums.c: $(srcdir)/widgets-enums.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_context (type, \"@enumnick@\");\n      gimp_@type@_set_value_descriptions (type, descs);\n    }\n\n  return type;\n}\n" \
-		$(srcdir)/widgets-enums.h > xgen-wec \
-	&& cp xgen-wec $(@F) \
+		widgets-enums.h) > xgen-wec \
+	&& cp xgen-wec $@ \
 	&& rm -f xgen-wec
--- a/app/widgets/widgets-enums.c
+++ b/app/widgets/widgets-enums.c
@@ -7,7 +7,7 @@
 #include "widgets-enums.h"
 #include "gimp-intl.h"

-/* enumerations from "./widgets-enums.h" */
+/* enumerations from "widgets-enums.h" */
 GType
 gimp_active_color_get_type (void)
 {

--- a/libgimp/Makefile.am
+++ b/libgimp/Makefile.am
@@ -444,7 +444,7 @@ gen_sources = xgen-cec xgen-umh xgen-umc
 CLEANFILES = $(gen_sources)

 gimpenums.c: $(srcdir)/gimpenums.h $(srcdir)/gimpenums.c.tail $(GIMP_MKENUMS)
-	$(GIMP_MKENUMS) \
+	$(AM_V_GEN) $(GIMP_MKENUMS) \
 		--fhead "#include \"config.h\"\n#include <gio/gio.h>\n#undef GIMP_DISABLE_DEPRECATED\n#include \"libgimpbase/gimpbase.h\"\n#include \"libgimpconfig/gimpconfigenums.h\"\n#include \"gimpenums.h\"" \
 		--fprod "\n/* enumerations from \"@filename@\" */" \
 		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \

--- a/libgimpbase/Makefile.am
+++ b/libgimpbase/Makefile.am
@@ -202,7 +202,7 @@ gen_sources = xgen-bec xgen-cec
 CLEANFILES = $(EXTRA_PROGRAMS) $(gen_sources)

 $(srcdir)/gimpbaseenums.c: $(srcdir)/gimpbaseenums.h $(GIMP_MKENUMS)
-	$(GIMP_MKENUMS) \
+	$(AM_V_GEN) (cd $(srcdir) && $(GIMP_MKENUMS) \
 		--fhead "#include \"config.h\"\n#include <glib-object.h>\n#undef GIMP_DISABLE_DEPRECATED\n#include \"gimpbasetypes.h\"\n#include \"libgimp/libgimp-intl.h\"" \
 		--fprod "\n/* enumerations from \"@filename@\" */" \
 		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \
@@ -211,13 +211,12 @@ $(srcdir)/gimpbaseenums.c: $(srcdir)/gimpbaseenums.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)/gimpbaseenums.h > xgen-bec \
-	&& cp xgen-bec $(@F) \
+		gimpbaseenums.h) > xgen-bec \
+	&& cp xgen-bec $@ \
 	&& rm -f xgen-bec

-
 $(srcdir)/gimpcompatenums.c: $(srcdir)/gimpcompatenums.h $(GIMP_MKENUMS)
-	$(GIMP_MKENUMS) \
+	$(AM_V_GEN) (cd $(srcdir) && $(GIMP_MKENUMS) \
 		--fhead "#include \"config.h\"\n#include <glib-object.h>\n#include \"gimpbasetypes.h\"\n#include \"gimpcompatenums.h\"\n#include \"libgimp/libgimp-intl.h\"" \
 		--fprod "\n/* enumerations from \"@filename@\" */" \
 		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \
@@ -226,8 +225,8 @@ $(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-cec \
-	&& cp xgen-cec $(@F) \
+		gimpcompatenums.h) > xgen-cec \
+	&& cp xgen-cec $@ \
 	&& rm -f xgen-cec



--- a/libgimpbase/gimpbaseenums.c
+++ b/libgimpbase/gimpbaseenums.c
@@ -7,7 +7,7 @@
 #include "gimpbasetypes.h"
 #include "libgimp/libgimp-intl.h"

-/* enumerations from "./gimpbaseenums.h" */
+/* enumerations from "gimpbaseenums.h" */
 GType
 gimp_add_mask_type_get_type (void)
 {
@@ -1327,7 +1327,7 @@ gimp_pdb_proc_type_get_type (void)
  static const GimpEnumDesc descs[] =
  {
    { GIMP_INTERNAL, NC_("pdb-proc-type", "Internal GIMP procedure"), NULL },
-    { GIMP_PLUGIN, NC_("pdb-proc-type", "GIMP Plug-in"), NULL },
+    { GIMP_PLUGIN, NC_("pdb-proc-type", "GIMP Plug-In"), NULL },
    { GIMP_EXTENSION, NC_("pdb-proc-type", "GIMP Extension"), NULL },
    { GIMP_TEMPORARY, NC_("pdb-proc-type", "Temporary Procedure"), NULL },
    { 0, NULL, NULL }

--- a/libgimpbase/gimpcompatenums.c
+++ b/libgimpbase/gimpcompatenums.c
@@ -7,7 +7,7 @@
 #include "gimpcompatenums.h"
 #include "libgimp/libgimp-intl.h"

-/* enumerations from "./gimpcompatenums.h" */
+/* enumerations from "gimpcompatenums.h" */
 GType
 gimp_add_mask_type_compat_get_type (void)
 {

--- a/libgimpconfig/Makefile.am
+++ b/libgimpconfig/Makefile.am
@@ -139,7 +139,7 @@ gen_sources = xgen-cec
 CLEANFILES = $(gen_sources)

 $(srcdir)/gimpconfigenums.c: $(srcdir)/gimpconfigenums.h $(GIMP_MKENUMS)
-	$(GIMP_MKENUMS) \
+	$(AM_V_GEN) (cd $(srcdir) && $(GIMP_MKENUMS) \
 		--fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"gimpconfigenums.h\"\n#include \"libgimp/libgimp-intl.h\"" \
 		--fprod "\n/* enumerations from \"@filename@\" */" \
 		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \
@@ -148,6 +148,6 @@ $(srcdir)/gimpconfigenums.c: $(srcdir)/gimpconfigenums.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)/gimpconfigenums.h > xgen-cec \
-	&& cp xgen-cec $(@F) \
+		gimpconfigenums.h) > xgen-cec \
+	&& cp xgen-cec $@ \
 	&& rm -f xgen-cec
--- a/libgimpconfig/gimpconfigenums.c
+++ b/libgimpconfig/gimpconfigenums.c
@@ -7,7 +7,7 @@
 #include "gimpconfigenums.h"
 #include "libgimp/libgimp-intl.h"

-/* enumerations from "./gimpconfigenums.h" */
+/* enumerations from "gimpconfigenums.h" */
 GType
 gimp_color_management_mode_get_type (void)
 {

--- a/libgimpthumb/Makefile.am
+++ b/libgimpthumb/Makefile.am
@@ -112,7 +112,7 @@ gen_sources = xgen-tec
 CLEANFILES = $(gen_sources)

 gimpthumb-enums.c: $(srcdir)/gimpthumb-enums.h $(GIMP_MKENUMS)
-	$(GIMP_MKENUMS) \
+	$(AM_V_GEN) $(GIMP_MKENUMS) \
 		--fhead "#include \"config.h\"\n#include <glib-object.h>\n#include \"gimpthumb-enums.h\"" \
 		--fprod "\n/* enumerations from \"@filename@\" */" \
 		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \

--- a/libgimpwidgets/Makefile.am
+++ b/libgimpwidgets/Makefile.am
@@ -307,8 +307,8 @@ endif
 gen_sources = xgen-wec xgen-wmh xgen-wmc
 CLEANFILES = $(gen_sources)

-gimpwidgetsenums.c: $(srcdir)/gimpwidgetsenums.h $(GIMP_MKENUMS)
-	$(AM_V_GEN) $(GIMP_MKENUMS) \
+$(srcdir)/gimpwidgetsenums.c: $(srcdir)/gimpwidgetsenums.h $(GIMP_MKENUMS)
+	$(AM_V_GEN) (cd $(srcdir) && $(GIMP_MKENUMS) \
 		--fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include \"libgimpbase/gimpbase.h\"\n#include \"gimpwidgetsenums.h\"\n#include \"libgimp/libgimp-intl.h\"" \
 		--fprod "\n/* enumerations from \"@filename@\" */" \
 		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static const G@Type@Value values[] =\n  {" \
@@ -317,8 +317,8 @@ gimpwidgetsenums.c: $(srcdir)/gimpwidgetsenums.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)/gimpwidgetsenums.h > xgen-wec \
-	&& cp xgen-wec $(@F) \
+		gimpwidgetsenums.h) > xgen-wec \
+	&& cp xgen-wec $@ \
 	&& rm -f xgen-wec

 gimpwidgetsmarshal.h: $(srcdir)/gimpwidgetsmarshal.list

--- a/libgimpwidgets/gimpwidgetsenums.c
+++ b/libgimpwidgets/gimpwidgetsenums.c
@@ -7,7 +7,7 @@
 #include "gimpwidgetsenums.h"
 #include "libgimp/libgimp-intl.h"

-/* enumerations from "./gimpwidgetsenums.h" */
+/* enumerations from "gimpwidgetsenums.h" */
 GType
 gimp_aspect_type_get_type (void)
 {