brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use distinct filenames for all code generation tempories

Browse Source 
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
This commit is contained in:
Owen W. Taylor 2009-08-11 14:21:13 -04:00
parent 36ee36283a
commit 83b1cedb86
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Makefile-big.am
View File

@ -36,18 +36,18 @@ stamp-big-enum-types.h: $(big_source_h) big/big-enum-types.h.in
$(AM_V_GEN) ( cd $(srcdir) && \ $(AM_V_GEN) ( cd $(srcdir) && \
$(GLIB_MKENUMS) \ $(GLIB_MKENUMS) \
--template $(srcdir)/big/big-enum-types.h.in \ --template $(srcdir)/big/big-enum-types.h.in \
$(big_source_h) ) >> xgen-teth && \ $(big_source_h) ) >> xgen-beth && \
(cmp -s xgen-teth big-enum-types.h || cp xgen-teth big-enum-types.h) && \ (cmp -s xgen-beth big-enum-types.h || cp xgen-beth big-enum-types.h) && \
rm -f xgen-teth && \ rm -f xgen-beth && \
echo timestamp > $(@F) echo timestamp > $(@F)
big-enum-types.c: stamp-big-enum-types.h big/big-enum-types.c.in big-enum-types.c: stamp-big-enum-types.h big/big-enum-types.c.in
$(AM_V_GEN) ( cd $(srcdir) && \ $(AM_V_GEN) ( cd $(srcdir) && \
$(GLIB_MKENUMS) \ $(GLIB_MKENUMS) \
--template $(srcdir)/big/big-enum-types.c.in \ --template $(srcdir)/big/big-enum-types.c.in \
$(big_source_h) ) >> xgen-tetc && \ $(big_source_h) ) >> xgen-betc && \
cp xgen-tetc big-enum-types.c && \ cp xgen-betc big-enum-types.c && \
rm -f xgen-tetc rm -f xgen-betc
noinst_LTLIBRARIES += libbig-1.0.la noinst_LTLIBRARIES += libbig-1.0.la

12
src/Makefile.am
View File

@ -126,9 +126,9 @@ stamp-shell-marshal.h: Makefile shell-marshal.list
$(AM_V_GEN) $(GLIB_GENMARSHAL) \ $(AM_V_GEN) $(GLIB_GENMARSHAL) \
--prefix=_shell_marshal \ --prefix=_shell_marshal \
--header \ --header \
$(srcdir)/shell-marshal.list > xgen-tmh && \ $(srcdir)/shell-marshal.list > xgen-smh && \
(cmp -s xgen-tmh shell-marshal.h || cp -f xgen-tmh shell-marshal.h) && \ (cmp -s xgen-smh shell-marshal.h || cp -f xgen-smh shell-marshal.h) && \
rm -f xgen-tmh && \ rm -f xgen-smh && \
echo timestamp > $(@F) echo timestamp > $(@F)
shell-marshal.c: Makefile shell-marshal.list shell-marshal.c: Makefile shell-marshal.list
@ -136,9 +136,9 @@ shell-marshal.c: Makefile shell-marshal.list
$(GLIB_GENMARSHAL) \ $(GLIB_GENMARSHAL) \
--prefix=_shell_marshal \ --prefix=_shell_marshal \
--body \ --body \
$(srcdir)/shell-marshal.list ) > xgen-tmc && \ $(srcdir)/shell-marshal.list ) > xgen-smc && \
cp -f xgen-tmc shell-marshal.c && \ cp -f xgen-smc shell-marshal.c && \
rm -f xgen-tmc rm -f xgen-smc
libgnome_shell_la_LDFLAGS = -avoid-version -module libgnome_shell_la_LDFLAGS = -avoid-version -module
libgnome_shell_la_LIBADD = \ libgnome_shell_la_LIBADD = \