From bd8cfad4eb68e459d9fd24144df7a106765f8c09 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Fri, 21 Aug 2009 10:56:58 +0200 Subject: [PATCH] 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. --- ChangeLog | 14 ++++++++++++++ modules/alloca-opt | 1 + modules/argz | 1 + modules/byteswap | 1 + modules/fnmatch | 1 + modules/getopt-posix | 1 + modules/glob | 1 + modules/poll | 1 + modules/posix_spawnp-tests | 2 ++ modules/sys_socket | 1 + modules/sysexits | 1 + 11 files changed, 25 insertions(+) diff --git a/ChangeLog b/ChangeLog index 580212cd4..8210003cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2009-08-21 Jim Meyering + + 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 popen: simplify access to original popen diff --git a/modules/alloca-opt b/modules/alloca-opt index 248b48613..e132ab803 100644 --- a/modules/alloca-opt +++ b/modules/alloca-opt @@ -18,6 +18,7 @@ BUILT_SOURCES += $(ALLOCA_H) # We need the following in order to create 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 7ef73d5f5..7c95859c0 100644 --- a/modules/argz +++ b/modules/argz @@ -23,6 +23,7 @@ BUILT_SOURCES += $(ARGZ_H) # We need the following in order to create 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 320e8a442..c5057bb66 100644 --- a/modules/byteswap +++ b/modules/byteswap @@ -16,6 +16,7 @@ BUILT_SOURCES += $(BYTESWAP_H) # We need the following in order to create 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 441d5d381..64d3cd9e6 100644 --- a/modules/fnmatch +++ b/modules/fnmatch @@ -28,6 +28,7 @@ BUILT_SOURCES += $(FNMATCH_H) # We need the following in order to create 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 b36ed1e33..6b20f1546 100644 --- a/modules/getopt-posix +++ b/modules/getopt-posix @@ -22,6 +22,7 @@ BUILT_SOURCES += $(GETOPT_H) # We need the following in order to create 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 b765be706..bf7af7c68 100644 --- a/modules/glob +++ b/modules/glob @@ -32,6 +32,7 @@ BUILT_SOURCES += $(GLOB_H) # We need the following in order to create 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 b83cb2b0c..612189b1b 100644 --- a/modules/poll +++ b/modules/poll @@ -22,6 +22,7 @@ BUILT_SOURCES += $(POLL_H) # We need the following in order to create 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 f8c7233f7..61ea8e4b5 100644 --- 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 e07dd05f1..37e9e45bb 100644 --- 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 1f8460304..99bcdd33b 100644 --- a/modules/sysexits +++ b/modules/sysexits @@ -17,6 +17,7 @@ BUILT_SOURCES += $(SYSEXITS_H) # We need the following in order to create 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' \ -- 2.11.0