diff options
| author | Alberts Muktupāvels <alberts.muktupavels@gmail.com> | 2020-04-30 03:28:32 +0300 |
|---|---|---|
| committer | Alberts Muktupāvels <alberts.muktupavels@gmail.com> | 2020-04-30 03:51:37 +0300 |
| commit | 8bd7484bfd0d39328a4ccfbb48e5d935a9d61433 (patch) | |
| tree | 9855f625389e8a3a1628307b6abe08adb036ba85 /src | |
| parent | fbe4ece42047932e8a16c2eb3dbc12e615775b11 (diff) | |
| download | metacity-8bd7484bfd0d39328a4ccfbb48e5d935a9d61433.tar.gz | |
build: fix enum type generation
Replace filename with basename in template file and also regenerate
enum types if Makefile.am changes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/core/meta-enum-types.c.in | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 97104dd0..029e50b5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -200,11 +200,11 @@ ENUM_TYPES = \ $(srcdir)/core/window-private.h \ $(NULL) -core/meta-enum-types.c: core/meta-enum-types.c.in core/meta-enum-types.h $(ENUM_TYPES) +core/meta-enum-types.c: core/meta-enum-types.c.in $(ENUM_TYPES) Makefile.am $(AM_V_GEN) $(GLIB_MKENUMS) --template $(srcdir)/core/meta-enum-types.c.in $(ENUM_TYPES) > \ meta-enum-types.c.tmp && mv meta-enum-types.c.tmp core/meta-enum-types.c -core/meta-enum-types.h: core/meta-enum-types.h.in $(ENUM_TYPES) +core/meta-enum-types.h: core/meta-enum-types.h.in $(ENUM_TYPES) Makefile.am $(AM_V_GEN) $(GLIB_MKENUMS) --template $(srcdir)/core/meta-enum-types.h.in $(ENUM_TYPES) > \ meta-enum-types.h.tmp && mv meta-enum-types.h.tmp core/meta-enum-types.h diff --git a/src/core/meta-enum-types.c.in b/src/core/meta-enum-types.c.in index 03e8b8fa..9225fc2a 100644 --- a/src/core/meta-enum-types.c.in +++ b/src/core/meta-enum-types.c.in @@ -4,7 +4,7 @@ /*** END file-header ***/ /*** BEGIN file-production ***/ -#include "@filename@" +#include "@basename@" /*** END file-production ***/ /*** BEGIN value-header ***/ |