consistently remove $@-t before redirecting to it

* modules/argz: Remove $@-t and $@ before redirecting to the former.
* modules/alloca-opt: Likewise.
* modules/byteswap: Likewise.
* modules/fnmatch: Likewise.
* modules/getopt-posix: Likewise.
* modules/glob: Likewise.
* modules/poll: Likewise.
* modules/posix_spawnp-tests: Likewise.
* modules/sys_socket: Likewise.
* modules/sysexits: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 580212c..8210003 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2009-08-21  Jim Meyering  <meyering@redhat.com>
+
+       consistently remove $@-t before redirecting to it
+       * modules/argz: Remove $@-t and $@ before redirecting to the former.
+       * modules/alloca-opt: Likewise.
+       * modules/byteswap: Likewise.
+       * modules/fnmatch: Likewise.
+       * modules/getopt-posix: Likewise.
+       * modules/glob: Likewise.
+       * modules/poll: Likewise.
+       * modules/posix_spawnp-tests: Likewise.
+       * modules/sys_socket: Likewise.
+       * modules/sysexits: Likewise.
+
 2009-08-21  Eric Blake  <ebb9@byu.net>
 
        popen: simplify access to original popen

diff --git a/modules/alloca-opt b/modules/alloca-opt
index 248b486..e132ab8 100644 (file)
--- a/modules/alloca-opt
+++ b/modules/alloca-opt
@@ -18,6 +18,7 @@ BUILT_SOURCES += $(ALLOCA_H)
 # We need the following in order to create <alloca.h> when the system
 # doesn't have one that works with the given compiler.
 alloca.h: alloca.in.h
+       rm -f $@-t $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          cat $(srcdir)/alloca.in.h; \
        } > $@-t

diff --git a/modules/argz b/modules/argz
index 7ef73d5..7c95859 100644 (file)
--- a/modules/argz
+++ b/modules/argz
@@ -23,6 +23,7 @@ BUILT_SOURCES += $(ARGZ_H)
 # We need the following in order to create <argz.h> when the system
 # doesn't have one that works with the given compiler.
 argz.h: argz.in.h
+       rm -f $@-t $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          cat $(srcdir)/argz.in.h; \
        } > $@-t

diff --git a/modules/byteswap b/modules/byteswap
index 320e8a4..c5057bb 100644 (file)
--- a/modules/byteswap
+++ b/modules/byteswap
@@ -16,6 +16,7 @@ BUILT_SOURCES += $(BYTESWAP_H)
 # We need the following in order to create <byteswap.h> when the system
 # doesn't have one.
 byteswap.h: byteswap.in.h
+       rm -f $@-t $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          cat $(srcdir)/byteswap.in.h; \
        } > $@-t

diff --git a/modules/fnmatch b/modules/fnmatch
index 441d5d3..64d3cd9 100644 (file)
--- a/modules/fnmatch
+++ b/modules/fnmatch
@@ -28,6 +28,7 @@ BUILT_SOURCES += $(FNMATCH_H)
 # We need the following in order to create <fnmatch.h> when the system
 # doesn't have one that supports the required API.
 fnmatch.h: fnmatch.in.h
+       rm -f $@-t $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          cat $(srcdir)/fnmatch.in.h; \
        } > $@-t

diff --git a/modules/getopt-posix b/modules/getopt-posix
index b36ed1e..6b20f15 100644 (file)
--- a/modules/getopt-posix
+++ b/modules/getopt-posix
@@ -22,6 +22,7 @@ BUILT_SOURCES += $(GETOPT_H)
 # We need the following in order to create <getopt.h> when the system
 # doesn't have one that works with the given compiler.
 getopt.h: getopt.in.h
+       rm -f $@-t $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          cat $(srcdir)/getopt.in.h; \
        } > $@-t

diff --git a/modules/glob b/modules/glob
index b765be7..bf7af7c 100644 (file)
--- a/modules/glob
+++ b/modules/glob
@@ -32,6 +32,7 @@ BUILT_SOURCES += $(GLOB_H)
 # We need the following in order to create <glob.h> when the system
 # doesn't have one that works with the given compiler.
 glob.h: glob.in.h
+       rm -f $@-t $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          sed -e 's|@''HAVE_SYS_CDEFS_H''@|$(HAVE_SYS_CDEFS_H)|g' \
              < $(srcdir)/glob.in.h; \

diff --git a/modules/poll b/modules/poll
index b83cb2b..612189b 100644 (file)
--- a/modules/poll
+++ b/modules/poll
@@ -22,6 +22,7 @@ BUILT_SOURCES += $(POLL_H)
 # We need the following in order to create <poll.h> when the system
 # doesn't have one.
 poll.h: poll.in.h
+       rm -f $@-t $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          cat $(srcdir)/poll.in.h; \
        } > $@-t

diff --git a/modules/posix_spawnp-tests b/modules/posix_spawnp-tests
index f8c7233..61ea8e4 100644 (file)
--- a/modules/posix_spawnp-tests
+++ b/modules/posix_spawnp-tests
@@ -36,12 +36,14 @@ check_PROGRAMS += test-posix_spawn1 test-posix_spawn2
 
 BUILT_SOURCES += test-posix_spawn1.sh
 test-posix_spawn1.sh: test-posix_spawn1.in.sh
+       rm -f $@-t $@
        cp $(srcdir)/test-posix_spawn1.in.sh $@-t
        mv $@-t $@
 MOSTLYCLEANFILES += test-posix_spawn1.sh test-posix_spawn1.sh-t
 
 BUILT_SOURCES += test-posix_spawn2.sh
 test-posix_spawn2.sh: test-posix_spawn2.in.sh
+       rm -f $@-t $@
        cp $(srcdir)/test-posix_spawn2.in.sh $@-t
        mv $@-t $@
 MOSTLYCLEANFILES += test-posix_spawn2.sh test-posix_spawn2.sh-t

diff --git a/modules/sys_socket b/modules/sys_socket
index e07dd05..37e9e45 100644 (file)
--- a/modules/sys_socket
+++ b/modules/sys_socket
@@ -23,6 +23,7 @@ BUILT_SOURCES += $(SYS_SOCKET_H)
 # doesn't have one that works with the given compiler.
 sys/socket.h: sys_socket.in.h
        @MKDIR_P@ sys
+       rm -f $@-t $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \

diff --git a/modules/sysexits b/modules/sysexits
index 1f84603..99bcdd3 100644 (file)
--- a/modules/sysexits
+++ b/modules/sysexits
@@ -17,6 +17,7 @@ BUILT_SOURCES += $(SYSEXITS_H)
 # We need the following in order to create <sysexits.h> when the system
 # doesn't have one that works with the given compiler.
 sysexits.h: sysexits.in.h
+       rm -f $@-t $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          sed -e 's|@''HAVE_SYSEXITS_H''@|$(HAVE_SYSEXITS_H)|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \