[gnome-shell] Use distinct filenames for all code generation tempories
- From: Owen Taylor <otaylor src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-shell] Use distinct filenames for all code generation tempories
- Date: Tue, 11 Aug 2009 20:41:13 +0000 (UTC)
commit 83b1cedb86d04cc9d584f39244426e99bdd20559
Author: Owen W. Taylor <otaylor fishsoup net>
Date: Tue Aug 11 14:21:13 2009 -0400
Use distinct filenames for all code generation tempories
Because of a history of cut and paste, the different enumeration
and marshal generation generation shell snippets were using the
same temporary file names. This caused problems for parallel
builds.
http://bugzilla.gnome.org/show_bug.cgi?id=591474
src/Makefile-big.am | 12 ++++++------
src/Makefile.am | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/src/Makefile-big.am b/src/Makefile-big.am
index fb4a482..613bb19 100644
--- a/src/Makefile-big.am
+++ b/src/Makefile-big.am
@@ -36,18 +36,18 @@ stamp-big-enum-types.h: $(big_source_h) big/big-enum-types.h.in
$(AM_V_GEN) ( cd $(srcdir) && \
$(GLIB_MKENUMS) \
--template $(srcdir)/big/big-enum-types.h.in \
- $(big_source_h) ) >> xgen-teth && \
- (cmp -s xgen-teth big-enum-types.h || cp xgen-teth big-enum-types.h) && \
- rm -f xgen-teth && \
+ $(big_source_h) ) >> xgen-beth && \
+ (cmp -s xgen-beth big-enum-types.h || cp xgen-beth big-enum-types.h) && \
+ rm -f xgen-beth && \
echo timestamp > $(@F)
big-enum-types.c: stamp-big-enum-types.h big/big-enum-types.c.in
$(AM_V_GEN) ( cd $(srcdir) && \
$(GLIB_MKENUMS) \
--template $(srcdir)/big/big-enum-types.c.in \
- $(big_source_h) ) >> xgen-tetc && \
- cp xgen-tetc big-enum-types.c && \
- rm -f xgen-tetc
+ $(big_source_h) ) >> xgen-betc && \
+ cp xgen-betc big-enum-types.c && \
+ rm -f xgen-betc
noinst_LTLIBRARIES += libbig-1.0.la
diff --git a/src/Makefile.am b/src/Makefile.am
index 874b55f..ca87573 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -126,9 +126,9 @@ stamp-shell-marshal.h: Makefile shell-marshal.list
$(AM_V_GEN) $(GLIB_GENMARSHAL) \
--prefix=_shell_marshal \
--header \
- $(srcdir)/shell-marshal.list > xgen-tmh && \
- (cmp -s xgen-tmh shell-marshal.h || cp -f xgen-tmh shell-marshal.h) && \
- rm -f xgen-tmh && \
+ $(srcdir)/shell-marshal.list > xgen-smh && \
+ (cmp -s xgen-smh shell-marshal.h || cp -f xgen-smh shell-marshal.h) && \
+ rm -f xgen-smh && \
echo timestamp > $(@F)
shell-marshal.c: Makefile shell-marshal.list
@@ -136,9 +136,9 @@ shell-marshal.c: Makefile shell-marshal.list
$(GLIB_GENMARSHAL) \
--prefix=_shell_marshal \
--body \
- $(srcdir)/shell-marshal.list ) > xgen-tmc && \
- cp -f xgen-tmc shell-marshal.c && \
- rm -f xgen-tmc
+ $(srcdir)/shell-marshal.list ) > xgen-smc && \
+ cp -f xgen-smc shell-marshal.c && \
+ rm -f xgen-smc
libgnome_shell_la_LDFLAGS = -avoid-version -module
libgnome_shell_la_LIBADD = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]