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 11:42:45 +0300 |
| commit | 1c9d9ebda933aaae93cff242e6dff4726fa79ba3 (patch) | |
| tree | eecce80f378f9aebc399eea05da32ee0644a7d56 | |
| parent | c654569491b7b28371dc1b721141445e0e5229c4 (diff) | |
| download | metacity-1c9d9ebda933aaae93cff242e6dff4726fa79ba3.tar.gz | |
build: fix enum type generation
Replace filename with basename in template file and also regenerate
enum types if Makefile.am changes.
| -rw-r--r-- | libmetacity/Makefile.am | 4 | ||||
| -rw-r--r-- | libmetacity/meta-enum-types.c.in | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/core/meta-enum-types.c.in | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/libmetacity/Makefile.am b/libmetacity/Makefile.am index cc64c7cf..40e3ab7f 100644 --- a/libmetacity/Makefile.am +++ b/libmetacity/Makefile.am @@ -82,11 +82,11 @@ ENUM_TYPES = \ $(srcdir)/meta-theme.h \ $(NULL) -meta-enum-types.c: meta-enum-types.c.in meta-enum-types.h $(ENUM_TYPES) +meta-enum-types.c: meta-enum-types.c.in $(ENUM_TYPES) Makefile.am $(AM_V_GEN) $(GLIB_MKENUMS) --template $(srcdir)/meta-enum-types.c.in $(ENUM_TYPES) > \ meta-enum-types.c.tmp && mv meta-enum-types.c.tmp meta-enum-types.c -meta-enum-types.h: meta-enum-types.h.in $(ENUM_TYPES) +meta-enum-types.h: meta-enum-types.h.in $(ENUM_TYPES) Makefile.am $(AM_V_GEN) $(GLIB_MKENUMS) --template $(srcdir)/meta-enum-types.h.in $(ENUM_TYPES) > \ meta-enum-types.h.tmp && mv meta-enum-types.h.tmp meta-enum-types.h diff --git a/libmetacity/meta-enum-types.c.in b/libmetacity/meta-enum-types.c.in index 49f3441c..53e1673c 100644 --- a/libmetacity/meta-enum-types.c.in +++ b/libmetacity/meta-enum-types.c.in @@ -5,7 +5,7 @@ /*** END file-header ***/ /*** BEGIN file-production ***/ -#include "@filename@" +#include "@basename@" /*** END file-production ***/ /*** BEGIN value-header ***/ 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 ***/ |