[gnome-panel/gnome-3-36] build: fix enum type generation

[Alberts Muktupāvels <muktupavels src gnome org>]

commit c54761c1edb781cce56cf855ccc85cf592c0c645
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Thu Apr 30 03:52:52 2020 +0300

    build: fix enum type generation
    
    Replace filename with basename in template file and also regenerate
    enum types if Makefile.am changes.

 gnome-panel/Makefile.am           | 8 ++++----
 libgnome-panel/gp-enum-types.c.in | 2 +-
 modules/clock/Makefile.am         | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/gnome-panel/Makefile.am b/gnome-panel/Makefile.am
index 583c0c998..4d3028ad0 100644
--- a/gnome-panel/Makefile.am
+++ b/gnome-panel/Makefile.am
@@ -126,11 +126,11 @@ panel_enum_headers =                                              \
        $(top_srcdir)/gnome-panel/panel-enums-gsettings.h       \
        $(top_srcdir)/gnome-panel/panel-types.h
 
-panel-typebuiltins.c: $(panel_enum_headers)
+panel-typebuiltins.c: $(panel_enum_headers) Makefile.am
        $(AM_V_GEN)glib-mkenums \
                        --fhead "#include \"panel-typebuiltins.h\"\n\n" \
-                       --fprod "\n/* enumerations from \"@filename@\" */" \
-                       --fprod "\n#include \"@filename@\"\n" \
+                       --fprod "\n/* enumerations from \"@basename@\" */" \
+                       --fprod "\n#include \"@basename@\"\n" \
                        --vhead "static const GEnumValue _@enum_name@_values[] = {" \
                        --vprod "  { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
                        --vtail "  { 0, NULL, NULL }\n};\n\n" \
@@ -141,7 +141,7 @@ panel-typebuiltins.c: $(panel_enum_headers)
                        --vtail "  return type;\n}\n\n" \
                $(panel_enum_headers) > $@
 
-panel-typebuiltins.h: $(panel_enum_headers)
+panel-typebuiltins.h: $(panel_enum_headers) Makefile.am
        $(AM_V_GEN)glib-mkenums \
                        --fhead "#ifndef __PANEL_TYPEBUILTINS_H__\n" \
                        --fhead "#define __PANEL_TYPEBUILTINS_H__ 1\n\n" \
diff --git a/libgnome-panel/gp-enum-types.c.in b/libgnome-panel/gp-enum-types.c.in
index b55c6e4c4..5cb8b9201 100644
--- a/libgnome-panel/gp-enum-types.c.in
+++ b/libgnome-panel/gp-enum-types.c.in
@@ -3,7 +3,7 @@
 /*** END file-header ***/
 
 /*** BEGIN file-production ***/
-#include "@filename@"
+#include "@basename@"
 /*** END file-production ***/
 
 /*** BEGIN value-header ***/
diff --git a/modules/clock/Makefile.am b/modules/clock/Makefile.am
index b4bc70750..b34f04040 100644
--- a/modules/clock/Makefile.am
+++ b/modules/clock/Makefile.am
@@ -75,12 +75,12 @@ clock_enum_headers = \
        $(srcdir)/clock-utils.h \
        $(NULL)
 
-clock-typebuiltins.c: $(clock_enum_headers)
+clock-typebuiltins.c: $(clock_enum_headers) Makefile.am
        $(AM_V_GEN)glib-mkenums \
                        --fhead "#include <glib-object.h>\n" \
                        --fhead "#include \"clock-typebuiltins.h\"\n\n" \
-                       --fprod "\n/* enumerations from \"@filename@\" */" \
-                       --fprod "\n#include \"@filename@\"\n" \
+                       --fprod "\n/* enumerations from \"@basename@\" */" \
+                       --fprod "\n#include \"@basename@\"\n" \
                        --vhead "static const GEnumValue _@enum_name@_values[] = {" \
                        --vprod "  { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
                        --vtail "  { 0, NULL, NULL }\n};\n\n" \
@@ -91,7 +91,7 @@ clock-typebuiltins.c: $(clock_enum_headers)
                        --vtail "  return type;\n}\n\n" \
                $(clock_enum_headers) > $@
 
-clock-typebuiltins.h: $(clock_enum_headers)
+clock-typebuiltins.h: $(clock_enum_headers) Makefile.am
        $(AM_V_GEN)glib-mkenums \
                        --fhead "#ifndef __CLOCK_TYPEBUILTINS_H__\n" \
                        --fhead "#define __CLOCK_TYPEBUILTINS_H__ 1\n\n" \