From 93b103586f8537cebe76ad1a53e15de1d9c895b9 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Thu, 6 May 2010 23:25:16 +0000 Subject: [PATCH] * libc/Makefile.am (stmp-sigset, stmp-iconvset, stmp-extra, stmp-stdio64, stmp-posix,stmp-targetdep): Use unique temporary file names to allow for parallel installs. (CLEANFILES): Add new temporary file names. * libc/Makefile.in: Regenerate. --- newlib/ChangeLog | 8 ++++++++ newlib/libc/Makefile.am | 42 +++++++++++++++++++++-------------------- newlib/libc/Makefile.in | 42 +++++++++++++++++++++-------------------- 3 files changed, 52 insertions(+), 40 deletions(-) diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 9118f2f79..ac505c0ca 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,11 @@ +2010-05-05 DJ Delorie + + * libc/Makefile.am (stmp-sigset, stmp-iconvset, stmp-extra, + stmp-stdio64, stmp-posix,stmp-targetdep): Use unique temporary + file names to allow for parallel installs. + (CLEANFILES): Add new temporary file names. + * libc/Makefile.in: Regenerate. + 2010-05-03 Corinna Vinschen * libc/locale/lctype.c: Include and "setlocale.h". diff --git a/newlib/libc/Makefile.am b/newlib/libc/Makefile.am index e75bea005..3505f1271 100644 --- a/newlib/libc/Makefile.am +++ b/newlib/libc/Makefile.am @@ -151,69 +151,69 @@ libc.dvi: sigset.texi extra.texi stdio64.texi posix.texi iconvset.texi \ stmp-sigset: config.status if test -n "$(LIBC_SIGNAL_LIB)"; then \ - echo "@set SIGNALS" >tmp.texi; \ + echo "@set SIGNALS" >tmp-sigset.texi; \ else \ - echo "@clear SIGNALS" >tmp.texi; \ + echo "@clear SIGNALS" >tmp-sigset.texi; \ fi - $(SHELL) $(newlib_basedir)/../move-if-change tmp.texi sigset.texi + $(SHELL) $(newlib_basedir)/../move-if-change tmp-sigset.texi sigset.texi touch $@ sigset.texi: stmp-sigset ; @true stmp-iconvset: config.status if test -n "$(NEWLIB_ICONV_LIBS)"; then \ - echo "@set ICONV" >tmp.texi; \ + echo "@set ICONV" >tmp-iconvset.texi; \ else \ - echo "@clear ICONV" >tmp.texi; \ + echo "@clear ICONV" >tmp-iconvset.texi; \ fi - $(SHELL) $(newlib_basedir)/../move-if-change tmp.texi iconvset.texi + $(SHELL) $(newlib_basedir)/../move-if-change tmp-iconvset.texi iconvset.texi touch $@ iconvset.texi: stmp-iconvset ; @true stmp-extra: config.status if test -n "$(LIBC_EXTRA_LIB)"; then \ - echo "@set EXTRA" >tmp.texi; \ + echo "@set EXTRA" >tmp-extra.texi; \ else \ - echo "@clear EXTRA" >tmp.texi; \ + echo "@clear EXTRA" >tmp-extra.texi; \ fi - $(SHELL) $(newlib_basedir)/../move-if-change tmp.texi extra.texi + $(SHELL) $(newlib_basedir)/../move-if-change tmp-extra.texi extra.texi touch $@ extra.texi: stmp-extra ; @true stmp-stdio64: config.status if test -n "$(LIBC_STDIO64_LIB)"; then \ - echo "@set STDIO64" >tmp.texi; \ + echo "@set STDIO64" >tmp-stdio64.texi; \ else \ - echo "@clear STDIO64" >tmp.texi; \ + echo "@clear STDIO64" >tmp-stdio64.texi; \ fi - $(SHELL) $(newlib_basedir)/../move-if-change tmp.texi stdio64.texi + $(SHELL) $(newlib_basedir)/../move-if-change tmp-stdio64.texi stdio64.texi touch $@ stdio64.texi: stmp-stdio64 ; @true stmp-posix: config.status if test -n "$(LIBC_POSIX_LIB)"; then \ - echo "@set POSIX" >tmp.texi; \ + echo "@set POSIX" >tmp-posix.texi; \ else \ - echo "@clear POSIX" >tmp.texi; \ + echo "@clear POSIX" >tmp-posix.texi; \ fi - $(SHELL) $(newlib_basedir)/../move-if-change tmp.texi posix.texi + $(SHELL) $(newlib_basedir)/../move-if-change tmp-posix.texi posix.texi touch $@ posix.texi: stmp-posix ; @true stmp-targetdep: force - rm -f tmp.texi - targetdoc=`pwd`/tmp.texi; \ + rm -f tmp-targetdep.texi + targetdoc=`pwd`/tmp-targetdep.texi; \ for d in $(SUBDIRS); do \ if test "$$d" != "."; then \ (cd $$d && $(MAKE) TARGETDOC=$${targetdoc} doc) || exit 1; \ fi; \ done - cat $(srcdir)/sys.tex >>tmp.texi - $(SHELL) $(newlib_basedir)/../move-if-change tmp.texi targetdep.tex + cat $(srcdir)/sys.tex >>tmp-targetdep.texi + $(SHELL) $(newlib_basedir)/../move-if-change tmp-targetdep.texi targetdep.tex touch $@ targetdep.tex: stmp-targetdep ; @true @@ -229,7 +229,9 @@ force: CLEANFILES = $(CRT0) \ sigset.texi stmp-sigset extra.texi stmp-extra \ - stdio64.texi stmp-stdio64 tmp.texi targetdep.tex stmp-targetdep + stdio64.texi stmp-stdio64 targetdep.tex stmp-targetdep \ + tmp-sigset.texi tmp-iconvset.texi tmp-extra.texi \ + tmp-stdio64.texi tmp-posix.texi tmp-targetdep.texi ACLOCAL_AMFLAGS = -I .. -I ../.. CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host diff --git a/newlib/libc/Makefile.in b/newlib/libc/Makefile.in index e8a9cac2e..afc8ab372 100644 --- a/newlib/libc/Makefile.in +++ b/newlib/libc/Makefile.in @@ -404,7 +404,9 @@ libc_TEXINFOS = sigset.texi extra.texi posix.texi stdio64.texi iconvset.texi \ CLEANFILES = $(CRT0) \ sigset.texi stmp-sigset extra.texi stmp-extra \ - stdio64.texi stmp-stdio64 tmp.texi targetdep.tex stmp-targetdep + stdio64.texi stmp-stdio64 targetdep.tex stmp-targetdep \ + tmp-sigset.texi tmp-iconvset.texi tmp-extra.texi \ + tmp-stdio64.texi tmp-posix.texi tmp-targetdep.texi ACLOCAL_AMFLAGS = -I .. -I ../.. CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host @@ -1000,69 +1002,69 @@ libc.dvi: sigset.texi extra.texi stdio64.texi posix.texi iconvset.texi \ stmp-sigset: config.status if test -n "$(LIBC_SIGNAL_LIB)"; then \ - echo "@set SIGNALS" >tmp.texi; \ + echo "@set SIGNALS" >tmp-sigset.texi; \ else \ - echo "@clear SIGNALS" >tmp.texi; \ + echo "@clear SIGNALS" >tmp-sigset.texi; \ fi - $(SHELL) $(newlib_basedir)/../move-if-change tmp.texi sigset.texi + $(SHELL) $(newlib_basedir)/../move-if-change tmp-sigset.texi sigset.texi touch $@ sigset.texi: stmp-sigset ; @true stmp-iconvset: config.status if test -n "$(NEWLIB_ICONV_LIBS)"; then \ - echo "@set ICONV" >tmp.texi; \ + echo "@set ICONV" >tmp-iconvset.texi; \ else \ - echo "@clear ICONV" >tmp.texi; \ + echo "@clear ICONV" >tmp-iconvset.texi; \ fi - $(SHELL) $(newlib_basedir)/../move-if-change tmp.texi iconvset.texi + $(SHELL) $(newlib_basedir)/../move-if-change tmp-iconvset.texi iconvset.texi touch $@ iconvset.texi: stmp-iconvset ; @true stmp-extra: config.status if test -n "$(LIBC_EXTRA_LIB)"; then \ - echo "@set EXTRA" >tmp.texi; \ + echo "@set EXTRA" >tmp-extra.texi; \ else \ - echo "@clear EXTRA" >tmp.texi; \ + echo "@clear EXTRA" >tmp-extra.texi; \ fi - $(SHELL) $(newlib_basedir)/../move-if-change tmp.texi extra.texi + $(SHELL) $(newlib_basedir)/../move-if-change tmp-extra.texi extra.texi touch $@ extra.texi: stmp-extra ; @true stmp-stdio64: config.status if test -n "$(LIBC_STDIO64_LIB)"; then \ - echo "@set STDIO64" >tmp.texi; \ + echo "@set STDIO64" >tmp-stdio64.texi; \ else \ - echo "@clear STDIO64" >tmp.texi; \ + echo "@clear STDIO64" >tmp-stdio64.texi; \ fi - $(SHELL) $(newlib_basedir)/../move-if-change tmp.texi stdio64.texi + $(SHELL) $(newlib_basedir)/../move-if-change tmp-stdio64.texi stdio64.texi touch $@ stdio64.texi: stmp-stdio64 ; @true stmp-posix: config.status if test -n "$(LIBC_POSIX_LIB)"; then \ - echo "@set POSIX" >tmp.texi; \ + echo "@set POSIX" >tmp-posix.texi; \ else \ - echo "@clear POSIX" >tmp.texi; \ + echo "@clear POSIX" >tmp-posix.texi; \ fi - $(SHELL) $(newlib_basedir)/../move-if-change tmp.texi posix.texi + $(SHELL) $(newlib_basedir)/../move-if-change tmp-posix.texi posix.texi touch $@ posix.texi: stmp-posix ; @true stmp-targetdep: force - rm -f tmp.texi - targetdoc=`pwd`/tmp.texi; \ + rm -f tmp-targetdep.texi + targetdoc=`pwd`/tmp-targetdep.texi; \ for d in $(SUBDIRS); do \ if test "$$d" != "."; then \ (cd $$d && $(MAKE) TARGETDOC=$${targetdoc} doc) || exit 1; \ fi; \ done - cat $(srcdir)/sys.tex >>tmp.texi - $(SHELL) $(newlib_basedir)/../move-if-change tmp.texi targetdep.tex + cat $(srcdir)/sys.tex >>tmp-targetdep.texi + $(SHELL) $(newlib_basedir)/../move-if-change tmp-targetdep.texi targetdep.tex touch $@ targetdep.tex: stmp-targetdep ; @true