build: Fix enum types rules

The list of files being parsed for enumerations include the header file
we are building with the enumeration types.

Additionally, we are concatenating multiple runs in the same temporary
files; on failure, the temporary files are left around, which means we
end up with broken headers and sources.
This commit is contained in:
Emmanuele Bassi 2017-07-16 11:39:03 +01:00
parent ef13ee4488
commit 0e3f80d238

View File

@ -580,7 +580,7 @@ stamp-meta-enum-types.h: $(libmutterinclude_headers) meta-enum-types.h.in
$(AM_V_GEN) ( cd $(srcdir) && \
$(GLIB_MKENUMS) \
--template meta-enum-types.h.in \
$(libmutterinclude_base_headers) ) >> xgen-teth && \
$(libmutterinclude_headers) ) > xgen-teth && \
(cmp -s xgen-teth meta/meta-enum-types.h || cp xgen-teth meta/meta-enum-types.h) && \
rm -f xgen-teth && \
echo timestamp > $(@F)
@ -589,7 +589,7 @@ meta-enum-types.c: stamp-meta-enum-types.h meta-enum-types.c.in
$(AM_V_GEN) ( cd $(srcdir) && \
$(GLIB_MKENUMS) \
--template meta-enum-types.c.in \
$(libmutterinclude_base_headers) ) >> xgen-tetc && \
$(libmutterinclude_headers) ) > xgen-tetc && \
cp xgen-tetc meta-enum-types.c && \
rm -f xgen-tetc