isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-20 15:04:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Fix enum types rules

Browse Source 
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
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile.am
View File

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