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

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

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

    build: fix enum type generation
    
    Replace filename with basename in template file and also regenerate
    enum types if Makefile.am changes.
    
    https://gitlab.gnome.org/GNOME/gnome-flashback/-/issues/52

 gnome-flashback/libcommon/Makefile.am                         | 4 ++--
 gnome-flashback/libcommon/gf-common-enum-types.c.in           | 2 +-
 gnome-flashback/libdesktop/Makefile.am                        | 4 ++--
 gnome-flashback/libdesktop/gf-desktop-enum-types.c.in         | 2 +-
 gnome-flashback/libscreensaver/Makefile.am                    | 4 ++--
 gnome-flashback/libscreensaver/gf-screensaver-enum-types.c.in | 2 +-
 gvc/Makefile.am                                               | 4 ++--
 gvc/gvc-enum-types.c.in                                       | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/gnome-flashback/libcommon/Makefile.am b/gnome-flashback/libcommon/Makefile.am
index 16a41ea..1cc4707 100644
--- a/gnome-flashback/libcommon/Makefile.am
+++ b/gnome-flashback/libcommon/Makefile.am
@@ -40,11 +40,11 @@ ENUM_TYPES = \
        $(srcdir)/gf-keybindings.h \
        $(NULL)
 
-gf-common-enum-types.c: gf-common-enum-types.c.in gf-common-enum-types.h $(ENUM_TYPES)
+gf-common-enum-types.c: gf-common-enum-types.c.in $(ENUM_TYPES) Makefile.am
        $(AM_V_GEN) $(GLIB_MKENUMS) --template $(srcdir)/gf-common-enum-types.c.in $(ENUM_TYPES) > \
                gf-common-enum-types.c.tmp && mv gf-common-enum-types.c.tmp gf-common-enum-types.c
 
-gf-common-enum-types.h: gf-common-enum-types.h.in $(ENUM_TYPES)
+gf-common-enum-types.h: gf-common-enum-types.h.in $(ENUM_TYPES) Makefile.am
        $(AM_V_GEN) $(GLIB_MKENUMS) --template $(srcdir)/gf-common-enum-types.h.in $(ENUM_TYPES) > \
                gf-common-enum-types.h.tmp && mv gf-common-enum-types.h.tmp gf-common-enum-types.h
 
diff --git a/gnome-flashback/libcommon/gf-common-enum-types.c.in 
b/gnome-flashback/libcommon/gf-common-enum-types.c.in
index f680bd2..136a480 100644
--- a/gnome-flashback/libcommon/gf-common-enum-types.c.in
+++ b/gnome-flashback/libcommon/gf-common-enum-types.c.in
@@ -4,7 +4,7 @@
 /*** END file-header ***/
 
 /*** BEGIN file-production ***/
-#include "@filename@"
+#include "@basename@"
 /*** END file-production ***/
 
 /*** BEGIN value-header ***/
diff --git a/gnome-flashback/libdesktop/Makefile.am b/gnome-flashback/libdesktop/Makefile.am
index eee2f20..1c7a695 100644
--- a/gnome-flashback/libdesktop/Makefile.am
+++ b/gnome-flashback/libdesktop/Makefile.am
@@ -68,11 +68,11 @@ ENUM_TYPES = \
        $(srcdir)/gf-desktop-enums.h \
        $(NULL)
 
-gf-desktop-enum-types.c: gf-desktop-enum-types.c.in gf-desktop-enum-types.h $(ENUM_TYPES)
+gf-desktop-enum-types.c: gf-desktop-enum-types.c.in $(ENUM_TYPES) Makefile.am
        $(AM_V_GEN) $(GLIB_MKENUMS) --template $(srcdir)/gf-desktop-enum-types.c.in $(ENUM_TYPES) > \
                gf-desktop-enum-types.c.tmp && mv gf-desktop-enum-types.c.tmp gf-desktop-enum-types.c
 
-gf-desktop-enum-types.h: gf-desktop-enum-types.h.in $(ENUM_TYPES)
+gf-desktop-enum-types.h: gf-desktop-enum-types.h.in $(ENUM_TYPES) Makefile.am
        $(AM_V_GEN) $(GLIB_MKENUMS) --template $(srcdir)/gf-desktop-enum-types.h.in $(ENUM_TYPES) > \
                gf-desktop-enum-types.h.tmp && mv gf-desktop-enum-types.h.tmp gf-desktop-enum-types.h
 
diff --git a/gnome-flashback/libdesktop/gf-desktop-enum-types.c.in 
b/gnome-flashback/libdesktop/gf-desktop-enum-types.c.in
index 310eb52..78cf146 100644
--- a/gnome-flashback/libdesktop/gf-desktop-enum-types.c.in
+++ b/gnome-flashback/libdesktop/gf-desktop-enum-types.c.in
@@ -4,7 +4,7 @@
 /*** END file-header ***/
 
 /*** BEGIN file-production ***/
-#include "@filename@"
+#include "@basename@"
 /*** END file-production ***/
 
 /*** BEGIN value-header ***/
diff --git a/gnome-flashback/libscreensaver/Makefile.am b/gnome-flashback/libscreensaver/Makefile.am
index c3e428f..238b595 100644
--- a/gnome-flashback/libscreensaver/Makefile.am
+++ b/gnome-flashback/libscreensaver/Makefile.am
@@ -69,11 +69,11 @@ ENUM_TYPES = \
        $(srcdir)/gf-unlock-dialog.h \
        $(NULL)
 
-gf-screensaver-enum-types.c: gf-screensaver-enum-types.c.in gf-screensaver-enum-types.h $(ENUM_TYPES)
+gf-screensaver-enum-types.c: gf-screensaver-enum-types.c.in $(ENUM_TYPES) Makefile.am
        $(AM_V_GEN) $(GLIB_MKENUMS) --template $(srcdir)/gf-screensaver-enum-types.c.in $(ENUM_TYPES) > \
                gf-screensaver-enum-types.c.tmp && mv gf-screensaver-enum-types.c.tmp 
gf-screensaver-enum-types.c
 
-gf-screensaver-enum-types.h: gf-screensaver-enum-types.h.in $(ENUM_TYPES)
+gf-screensaver-enum-types.h: gf-screensaver-enum-types.h.in $(ENUM_TYPES) Makefile.am
        $(AM_V_GEN) $(GLIB_MKENUMS) --template $(srcdir)/gf-screensaver-enum-types.h.in $(ENUM_TYPES) > \
                gf-screensaver-enum-types.h.tmp && mv gf-screensaver-enum-types.h.tmp 
gf-screensaver-enum-types.h
 
diff --git a/gnome-flashback/libscreensaver/gf-screensaver-enum-types.c.in 
b/gnome-flashback/libscreensaver/gf-screensaver-enum-types.c.in
index ba845f5..52693c2 100644
--- a/gnome-flashback/libscreensaver/gf-screensaver-enum-types.c.in
+++ b/gnome-flashback/libscreensaver/gf-screensaver-enum-types.c.in
@@ -4,7 +4,7 @@
 /*** END file-header ***/
 
 /*** BEGIN file-production ***/
-#include "@filename@"
+#include "@basename@"
 /*** END file-production ***/
 
 /*** BEGIN value-header ***/
diff --git a/gvc/Makefile.am b/gvc/Makefile.am
index f9f42bb..2d3d4ed 100644
--- a/gvc/Makefile.am
+++ b/gvc/Makefile.am
@@ -99,11 +99,11 @@ ENUM_TYPES = \
        $(srcdir)/gvc/gvc-mixer-stream.h \
        $(NULL)
 
-gvc-enum-types.c: gvc-enum-types.c.in gvc-enum-types.h $(ENUM_TYPES)
+gvc-enum-types.c: gvc-enum-types.c.in $(ENUM_TYPES) Makefile.am
        $(AM_V_GEN) $(GLIB_MKENUMS) --template $(srcdir)/gvc-enum-types.c.in $(ENUM_TYPES) > \
                gvc-enum-types.c.tmp && mv gvc-enum-types.c.tmp gvc-enum-types.c
 
-gvc-enum-types.h: gvc-enum-types.h.in $(ENUM_TYPES)
+gvc-enum-types.h: gvc-enum-types.h.in $(ENUM_TYPES) Makefile.am
        $(AM_V_GEN) $(GLIB_MKENUMS) --template $(srcdir)/gvc-enum-types.h.in $(ENUM_TYPES) > \
                gvc-enum-types.h.tmp && mv gvc-enum-types.h.tmp gvc-enum-types.h
 
diff --git a/gvc/gvc-enum-types.c.in b/gvc/gvc-enum-types.c.in
index b10f23e..c536957 100644
--- a/gvc/gvc-enum-types.c.in
+++ b/gvc/gvc-enum-types.c.in
@@ -4,7 +4,7 @@
 /*** END file-header ***/
 
 /*** BEGIN file-production ***/
-#include "@filename@"
+#include "@basename@"
 /*** END file-production ***/
 
 /*** BEGIN value-header ***/