brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix out-of-tree build.

Browse Source 
This patch fixes an issue encountered when building mutter
out-of-tree:

  * When generating mutter-enum-types.[ch], the glib-mkenums command is
    executed from $(srcdir), so it is wrong to prepend $(srcdir) to the
    template file.

https://bugzilla.gnome.org/show_bug.cgi?id=624910
This commit is contained in:
Thierry Reding 2010-08-13 15:06:35 +02:00 committed by Owen W. Taylor
parent d95da2dfbe
commit 8033184134
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

@ -336,7 +336,7 @@ mutter-enum-types.h: stamp-mutter-enum-types.h Makefile
stamp-mutter-enum-types.h: $(libmutterinclude_base_headers) mutter-enum-types.h.in stamp-mutter-enum-types.h: $(libmutterinclude_base_headers) mutter-enum-types.h.in
$(AM_V_GEN) ( cd $(srcdir) && \ $(AM_V_GEN) ( cd $(srcdir) && \
$(GLIB_MKENUMS) \ $(GLIB_MKENUMS) \
--template $(srcdir)/mutter-enum-types.h.in \ --template mutter-enum-types.h.in \
$(libmutterinclude_base_headers) ) >> xgen-teth && \ $(libmutterinclude_base_headers) ) >> xgen-teth && \
(cmp -s xgen-teth mutter-enum-types.h || cp xgen-teth mutter-enum-types.h) && \ (cmp -s xgen-teth mutter-enum-types.h || cp xgen-teth mutter-enum-types.h) && \
rm -f xgen-teth && \ rm -f xgen-teth && \
@ -345,7 +345,7 @@ stamp-mutter-enum-types.h: $(libmutterinclude_base_headers) mutter-enum-types.h.
mutter-enum-types.c: stamp-mutter-enum-types.h mutter-enum-types.c.in mutter-enum-types.c: stamp-mutter-enum-types.h mutter-enum-types.c.in
$(AM_V_GEN) ( cd $(srcdir) && \ $(AM_V_GEN) ( cd $(srcdir) && \
$(GLIB_MKENUMS) \ $(GLIB_MKENUMS) \
--template $(srcdir)/mutter-enum-types.c.in \ --template mutter-enum-types.c.in \
$(libmutterinclude_base_headers) ) >> xgen-tetc && \ $(libmutterinclude_base_headers) ) >> xgen-tetc && \
cp xgen-tetc mutter-enum-types.c && \ cp xgen-tetc mutter-enum-types.c && \
rm -f xgen-tetc rm -f xgen-tetc