[mutter] Fix out-of-tree build.
- From: Owen Taylor <otaylor src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] Fix out-of-tree build.
- Date: Fri, 8 Jul 2011 20:33:23 +0000 (UTC)
commit 8033184134b1af66174cfe49d79c59f8b951eb00
Author: Thierry Reding <thierry reding avionic-design de>
Date: Fri Aug 13 15:06:35 2010 +0200
Fix out-of-tree build.
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
src/Makefile.am | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index c98214c..c313e81 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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
$(AM_V_GEN) ( cd $(srcdir) && \
$(GLIB_MKENUMS) \
- --template $(srcdir)/mutter-enum-types.h.in \
+ --template mutter-enum-types.h.in \
$(libmutterinclude_base_headers) ) >> xgen-teth && \
(cmp -s xgen-teth mutter-enum-types.h || cp xgen-teth mutter-enum-types.h) && \
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
$(AM_V_GEN) ( cd $(srcdir) && \
$(GLIB_MKENUMS) \
- --template $(srcdir)/mutter-enum-types.c.in \
+ --template mutter-enum-types.c.in \
$(libmutterinclude_base_headers) ) >> xgen-tetc && \
cp xgen-tetc mutter-enum-types.c && \
rm -f xgen-tetc
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]