Hi Jim,
> I'll wait for feedback before pushing.
OK for me in general. However, I would combine some Makefile commands
before adding the $(AM_V_GEN) placeholder. When you put $(AM_V_GEN)
in front of the 'rm -f $...@-t $@' commands but use '$(AM_V_at)' in front of
the command that actually creates the file, it's likely to be broken
in the future. Two years from now, few developers will remember or know
what $(AM_V_GEN) and $(AM_V_at) actually mean and how to place them (*),
since it's not a particularly important aspect of automake. I can easily
see people changing
$(AM_V_GEN)rm -f $...@-t $@
into
$(AM_V_GEN)rm -f $...@-t
$(AM_V_GEN)rm -f $@
- leading to duplicated GEN lines - or removing the $(AM_V_GEN)
entirely, seeing that the majority of the lines uses $(AM_V_at), -
leading to no output at all -.
(*) In fact, automake does not even document the important rule how to
distribute $(AM_V_GEN) and $(AM_V_at). The rule is: "In every target,
you should use $(AM_V_GEN) exactly once and $(AM_V_at) for all other
commands in the Makefile target." Maintainers have to gain experience
with silent-rules in order to guess this rule!
So I would propose to combine the Makefile commands and minimize the use
of $(AM_V_at):
--- modules/strings.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/strings 2009-08-22 09:13:45.000000000 +0200
@@ -18,7 +18,7 @@
# We need the following in order to create <strings.h> when the system
# doesn't have one that works with the given compiler.
strings.h: strings.in.h
- rm -f $...@-t $@
+ $(AM_V_GEN)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' \
@@ -27,7 +27,7 @@
-e 's|@''HAVE_DECL_STRNCASECMP''@|$(HAVE_DECL_STRNCASECMP)|g' \
-e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
< $(srcdir)/strings.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += strings.h strings.h-t
Here is the complete patch. This patch also handles the 'localcharset' module.
2009-08-22 Jim Meyering <meyer...@redhat.com>
Bruno Haible <br...@clisp.org>
annotate automake snippets with $(AM_V_GEN) and $(AM_V_at)
This makes it so packages using automake-1.11's silent-rules option
can print e.g., a single "GEN configmake.h" line, rather than
the 30+ statements that perform the job. If you want to see the
actual commands, you can still run "make V=1".
* modules/alloca-opt: Add $(AM_V_GEN) and $(AM_V_at) prefixes
so that make output is abbreviated when those variables are defined
appropriately.
* modules/argz: Likewise.
* modules/arpa_inet: Likewise.
* modules/byteswap: Likewise.
* modules/configmake: Likewise.
* modules/dirent: Likewise.
* modules/errno: Likewise.
* modules/fcntl: Likewise.
* modules/float: Likewise.
* modules/fnmatch: Likewise.
* modules/getopt-posix: Likewise.
* modules/glob: Likewise.
* modules/iconv_open: Likewise.
* modules/inttypes: Likewise.
* modules/localcharset: Likewise.
* modules/locale: Likewise.
* modules/math: Likewise.
* modules/netdb: Likewise.
* modules/netinet_in: Likewise.
* modules/poll: Likewise.
* modules/posix_spawnp-tests: Likewise.
* modules/sched: Likewise.
* modules/search: Likewise.
* modules/selinux-h: Likewise.
* modules/signal: Likewise.
* modules/spawn: Likewise.
* modules/stdarg: Likewise.
* modules/stdbool: Likewise.
* modules/stddef: Likewise.
* modules/stdint: Likewise.
* modules/stdio: Likewise.
* modules/stdlib: Likewise.
* modules/string: Likewise.
* modules/strings: Likewise.
* modules/sys_file: Likewise.
* modules/sys_ioctl: Likewise.
* modules/sys_select: Likewise.
* modules/sys_socket: Likewise.
* modules/sys_stat: Likewise.
* modules/sys_time: Likewise.
* modules/sys_times: Likewise.
* modules/sys_utsname: Likewise.
* modules/sys_wait: Likewise.
* modules/sysexits: Likewise.
* modules/time: Likewise.
* modules/unistd: Likewise.
* modules/wchar: Likewise.
* modules/wctype: Likewise.
--- modules/alloca-opt.orig 2009-08-22 09:33:52.000000000 +0200
+++ modules/alloca-opt 2009-08-22 09:13:40.000000000 +0200
@@ -18,10 +18,10 @@
# 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 $@
+ $(AM_V_GEN)rm -f $...@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/alloca.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv -f $...@-t $@
MOSTLYCLEANFILES += alloca.h alloca.h-t
--- modules/argz.orig 2009-08-22 09:33:52.000000000 +0200
+++ modules/argz 2009-08-22 09:13:40.000000000 +0200
@@ -23,10 +23,10 @@
# 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 $@
+ $(AM_V_GEN)rm -f $...@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/argz.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv -f $...@-t $@
MOSTLYCLEANFILES += argz.h argz.h-t
--- modules/arpa_inet.orig 2009-08-22 09:33:52.000000000 +0200
+++ modules/arpa_inet 2009-08-22 09:13:41.000000000 +0200
@@ -20,8 +20,8 @@
# We need the following in order to create <arpa/inet.h> when the system
# doesn't have one.
arpa/inet.h: arpa_inet.in.h
- @MKDIR_P@ arpa
- rm -f $...@-t $@
+ $(AM_V_at)@MKDIR_P@ arpa
+ $(AM_V_GEN)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' \
@@ -33,7 +33,7 @@
-e 's|@''HAVE_DECL_INET_PTON''@|$(HAVE_DECL_INET_PTON)|g' \
-e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
< $(srcdir)/arpa_inet.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += arpa/inet.h arpa/inet.h-t
MOSTLYCLEANDIRS += arpa
--- modules/byteswap.orig 2009-08-22 09:33:52.000000000 +0200
+++ modules/byteswap 2009-08-22 09:13:41.000000000 +0200
@@ -16,10 +16,10 @@
# 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 $@
+ $(AM_V_GEN)rm -f $...@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/byteswap.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv -f $...@-t $@
MOSTLYCLEANFILES += byteswap.h byteswap.h-t
--- modules/configmake.orig 2009-08-22 09:33:52.000000000 +0200
+++ modules/configmake 2009-08-22 09:13:41.000000000 +0200
@@ -26,7 +26,7 @@
# The Automake-defined pkg* macros are appended, in the order
# listed in the Automake 1.10a+ documentation.
configmake.h: Makefile
- rm -f $...@-t
+ $(AM_V_GEN)rm -f $...@-t && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
echo '#define PREFIX "$(prefix)"'; \
echo '#define EXEC_PREFIX "$(exec_prefix)"'; \
@@ -55,7 +55,7 @@
echo '#define PKGINCLUDEDIR "$(pkgincludedir)"'; \
echo '#define PKGLIBDIR "$(pkglibdir)"'; \
echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \
- } | sed '/""/d' > $...@-t
+ } | sed '/""/d' > $...@-t && \
if test -f $@ && cmp $...@-t $@ > /dev/null; then \
rm -f $...@-t; \
else \
--- modules/dirent.orig 2009-08-22 09:33:52.000000000 +0200
+++ modules/dirent 2009-08-22 09:13:41.000000000 +0200
@@ -19,7 +19,7 @@
# We need the following in order to create <dirent.h> when the system
# doesn't have one that works with the given compiler.
dirent.h: dirent.in.h
- rm -f $...@-t $@
+ $(AM_V_GEN)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' \
@@ -33,7 +33,7 @@
-e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \
-e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
< $(srcdir)/dirent.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += dirent.h dirent.h-t
--- modules/errno.orig 2009-08-22 09:33:52.000000000 +0200
+++ modules/errno 2009-08-22 09:13:41.000000000 +0200
@@ -17,7 +17,7 @@
# We need the following in order to create <errno.h> when the system
# doesn't have one that is POSIX compliant.
errno.h: errno.in.h
- rm -f $...@-t $@
+ $(AM_V_GEN)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' \
@@ -29,7 +29,7 @@
-e 's|@''EOVERFLOW_HIDDEN''@|$(EOVERFLOW_HIDDEN)|g' \
-e 's|@''EOVERFLOW_VALUE''@|$(EOVERFLOW_VALUE)|g' \
< $(srcdir)/errno.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += errno.h errno.h-t
--- modules/fcntl.orig 2009-08-22 09:33:52.000000000 +0200
+++ modules/fcntl 2009-08-22 09:13:42.000000000 +0200
@@ -19,7 +19,7 @@
# We need the following in order to create <fcntl.h> when the system
# doesn't have one that works with the given compiler.
fcntl.h: fcntl.in.h
- rm -f $...@-t $@
+ $(AM_V_GEN)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' \
@@ -27,7 +27,7 @@
-e 's|@''GNULIB_OPEN''@|$(GNULIB_OPEN)|g' \
-e 's|@''REPLACE_OPEN''@|$(REPLACE_OPEN)|g' \
< $(srcdir)/fcntl.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += fcntl.h fcntl.h-t
--- modules/float.orig 2009-08-22 09:33:52.000000000 +0200
+++ modules/float 2009-08-22 09:13:42.000000000 +0200
@@ -17,13 +17,13 @@
# We need the following in order to create <float.h> when the system
# doesn't have one that works with the given compiler.
float.h: float.in.h
- rm -f $...@-t $@
+ $(AM_V_GEN)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' \
-e 's|@''NEXT_FLOAT_H''@|$(NEXT_FLOAT_H)|g' \
< $(srcdir)/float.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += float.h float.h-t
--- modules/fnmatch.orig 2009-08-22 09:33:52.000000000 +0200
+++ modules/fnmatch 2009-08-22 09:13:42.000000000 +0200
@@ -28,10 +28,10 @@
# 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 $@
+ $(AM_V_GEN)rm -f $...@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/fnmatch.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv -f $...@-t $@
MOSTLYCLEANFILES += fnmatch.h fnmatch.h-t
--- modules/getopt-posix.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/getopt-posix 2009-08-22 09:13:42.000000000 +0200
@@ -22,10 +22,10 @@
# 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 $@
+ $(AM_V_GEN)rm -f $...@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/getopt.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv -f $...@-t $@
MOSTLYCLEANFILES += getopt.h getopt.h-t
--- modules/glob.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/glob 2009-08-22 09:13:42.000000000 +0200
@@ -32,11 +32,11 @@
# 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 $@
+ $(AM_V_GEN)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; \
- } > $...@-t
+ } > $...@-t && \
mv -f $...@-t $@
MOSTLYCLEANFILES += glob.h glob.h-t
--- modules/iconv_open.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/iconv_open 2009-08-22 09:14:34.000000000 +0200
@@ -28,7 +28,7 @@
# We need the following in order to create <iconv.h> when the system
# doesn't have one that works with the given compiler.
iconv.h: iconv.in.h
- rm -f $...@-t $@
+ $(AM_V_GEN)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' \
@@ -38,7 +38,7 @@
-e 's|@''REPLACE_ICONV_OPEN''@|$(REPLACE_ICONV_OPEN)|g' \
-e 's|@''REPLACE_ICONV_UTF''@|$(REPLACE_ICONV_UTF)|g' \
< $(srcdir)/iconv.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += iconv.h iconv.h-t
--- modules/inttypes.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/inttypes 2009-08-22 09:13:42.000000000 +0200
@@ -21,7 +21,7 @@
# We need the following in order to create <inttypes.h> when the system
# doesn't have one that works with the given compiler.
inttypes.h: inttypes.in.h
- rm -f $...@-t $@
+ $(AM_V_GEN)rm -f $...@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@@ -46,7 +46,7 @@
-e 's/@''UINT64_MAX_EQ_ULONG_MAX''@/$(UINT64_MAX_EQ_ULONG_MAX)/g'
\
-e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
< $(srcdir)/inttypes.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += inttypes.h inttypes.h-t
--- modules/localcharset.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/localcharset 2009-08-22 09:31:40.000000000 +0200
@@ -82,14 +82,14 @@
fi
charset.alias: config.charset
- rm -f t-$@ $@
- $(SHELL) $(srcdir)/config.charset '$(host)' > t-$@
+ $(AM_V_GEN)rm -f t-$@ $@ && \
+ $(SHELL) $(srcdir)/config.charset '$(host)' > t-$@ && \
mv t-$@ $@
SUFFIXES += .sed .sin
.sin.sed:
- rm -f t-$@ $@
- sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@
+ $(AM_V_GEN)rm -f t-$@ $@ && \
+ sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@ && \
mv t-$@ $@
CLEANFILES += charset.alias ref-add.sed ref-del.sed
--- modules/locale.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/locale 2009-08-22 09:13:43.000000000 +0200
@@ -18,13 +18,13 @@
# We need the following in order to create <locale.h> when the system
# doesn't have one that provides all definitions.
locale.h: locale.in.h
- rm -f $...@-t $@
+ $(AM_V_GEN)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' \
-e 's|@''NEXT_LOCALE_H''@|$(NEXT_LOCALE_H)|g' \
< $(srcdir)/locale.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += locale.h locale.h-t
--- modules/math.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/math 2009-08-22 09:13:43.000000000 +0200
@@ -18,7 +18,7 @@
# We need the following in order to create <math.h> when the system
# doesn't have one that works with the given compiler.
math.h: math.in.h
- rm -f $...@-t $@
+ $(AM_V_GEN)rm -f $...@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e
's|@''INCLUDE_NEXT_AS_FIRST_DIRECTIVE''@|$(INCLUDE_NEXT_AS_FIRST_DIRECTIVE)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
@@ -80,7 +80,7 @@
-e 's|@''REPLACE_TRUNCL''@|$(REPLACE_TRUNCL)|g' \
-e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
< $(srcdir)/math.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += math.h math.h-t
--- modules/netdb.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/netdb 2009-08-22 09:13:43.000000000 +0200
@@ -18,7 +18,7 @@
# We need the following in order to create <netdb.h> when the system
# doesn't have one that works with the given compiler.
netdb.h: netdb.in.h
- rm -f $...@-t $@
+ $(AM_V_GEN)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' \
@@ -31,7 +31,7 @@
-e 's|@''HAVE_DECL_GETADDRINFO''@|$(HAVE_DECL_GETADDRINFO)|g' \
-e 's|@''HAVE_DECL_GETNAMEINFO''@|$(HAVE_DECL_GETNAMEINFO)|g' \
< $(srcdir)/netdb.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += netdb.h netdb.h-t
--- modules/netinet_in.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/netinet_in 2009-08-22 09:13:43.000000000 +0200
@@ -19,15 +19,15 @@
# We need the following in order to create <netinet/in.h> when the system
# doesn't have one.
netinet/in.h: netinet_in.in.h
- @MKDIR_P@ netinet
- rm -f $...@-t $@
+ $(AM_V_at)@MKDIR_P@ netinet
+ $(AM_V_GEN)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' \
-e 's|@''NEXT_NETINET_IN_H''@|$(NEXT_NETINET_IN_H)|g' \
-e 's|@''HAVE_NETINET_IN_H''@|$(HAVE_NETINET_IN_H)|g' \
< $(srcdir)/netinet_in.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += netinet/in.h netinet/in.h-t
MOSTLYCLEANDIRS += netinet
--- modules/poll.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/poll 2009-08-22 09:13:43.000000000 +0200
@@ -22,10 +22,10 @@
# 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 $@
+ $(AM_V_GEN)rm -f $...@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/poll.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv -f $...@-t $@
MOSTLYCLEANFILES += poll.h poll.h-t
--- modules/posix_spawnp-tests.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/posix_spawnp-tests 2009-08-22 09:13:43.000000000 +0200
@@ -36,15 +36,15 @@
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
+ $(AM_V_GEN)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
+ $(AM_V_GEN)rm -f $...@-t $@ && \
+ cp $(srcdir)/test-posix_spawn2.in.sh $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += test-posix_spawn2.sh test-posix_spawn2.sh-t
endif
--- modules/sched.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/sched 2009-08-22 09:13:43.000000000 +0200
@@ -17,7 +17,7 @@
# We need the following in order to create a replacement for <sched.h> when
# the system doesn't have one.
sched.h: sched.in.h
- rm -f $...@-t $@
+ $(AM_V_GEN)rm -f $...@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''HAVE_SCHED_H''@|$(HAVE_SCHED_H)|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@@ -25,7 +25,7 @@
-e 's|@''NEXT_SCHED_H''@|$(NEXT_SCHED_H)|g' \
-e 's|@''HAVE_STRUCT_SCHED_PARAM''@|$(HAVE_STRUCT_SCHED_PARAM)|g'
\
< $(srcdir)/sched.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += sched.h sched.h-t
--- modules/search.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/search 2009-08-22 09:13:43.000000000 +0200
@@ -18,7 +18,7 @@
# We need the following in order to create <search.h> when the system
# doesn't have one that works with the given compiler.
search.h: search.in.h
- rm -f $...@-t $@
+ $(AM_V_GEN)rm -f $...@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''HAVE_SEARCH_H''@|$(HAVE_SEARCH_H)|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@@ -29,7 +29,7 @@
-e 's|@''REPLACE_TSEARCH''@|$(REPLACE_TSEARCH)|g' \
-e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
< $(srcdir)/search.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += search.h search.h-t
--- modules/selinux-h.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/selinux-h 2009-08-22 09:13:44.000000000 +0200
@@ -20,19 +20,19 @@
BUILT_SOURCES += $(SELINUX_SELINUX_H)
selinux/selinux.h: se-selinux.in.h
- rm -f $...@-t $@
- $(MKDIR_P) selinux
- cp $(srcdir)/se-selinux.in.h $...@-t
- chmod a-x $...@-t
+ $(AM_V_at)$(MKDIR_P) selinux
+ $(AM_V_GEN)rm -f $...@-t $@ && \
+ cp $(srcdir)/se-selinux.in.h $...@-t && \
+ chmod a-x $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += selinux/selinux.h selinux/selinux.h-t
BUILT_SOURCES += $(SELINUX_CONTEXT_H)
selinux/context.h: se-context.in.h
- rm -f $...@-t $@
- $(MKDIR_P) selinux
- cp $(srcdir)/se-context.in.h $...@-t
- chmod a-x $...@-t
+ $(AM_V_at)$(MKDIR_P) selinux
+ $(AM_V_GEN)rm -f $...@-t $@ && \
+ cp $(srcdir)/se-context.in.h $...@-t && \
+ chmod a-x $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += selinux/context.h selinux/context.h-t
MOSTLYCLEANDIRS += selinux
--- modules/signal.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/signal 2009-08-22 09:13:44.000000000 +0200
@@ -18,7 +18,7 @@
# We need the following in order to create <signal.h> when the system
# doesn't have a complete one.
signal.h: signal.in.h
- rm -f $...@-t $@
+ $(AM_V_GEN)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' \
@@ -34,7 +34,7 @@
-e
's|@''HAVE_TYPE_VOLATILE_SIG_ATOMIC_T''@|$(HAVE_TYPE_VOLATILE_SIG_ATOMIC_T)|g' \
-e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
< $(srcdir)/signal.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += signal.h signal.h-t
--- modules/spawn.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/spawn 2009-08-22 09:13:44.000000000 +0200
@@ -19,7 +19,7 @@
# We need the following in order to create a replacement for <spawn.h> when
# the system doesn't have one.
spawn.h: spawn.in.h
- rm -f $...@-t $@
+ $(AM_V_GEN)rm -f $...@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''HAVE_SPAWN_H''@|$(HAVE_SPAWN_H)|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@@ -50,7 +50,7 @@
-e 's|@''REPLACE_POSIX_SPAWN''@|$(REPLACE_POSIX_SPAWN)|g' \
-e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
< $(srcdir)/spawn.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += spawn.h spawn.h-t
--- modules/stdarg.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/stdarg 2009-08-22 09:13:44.000000000 +0200
@@ -24,13 +24,13 @@
# We need the following in order to create <stdarg.h> when the system
# doesn't have one that works with the given compiler.
stdarg.h: stdarg.in.h
- rm -f $...@-t $@
+ $(AM_V_GEN)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' \
-e 's|@''NEXT_STDARG_H''@|$(NEXT_STDARG_H)|g' \
< $(srcdir)/stdarg.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += stdarg.h stdarg.h-t
--- modules/stdbool.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/stdbool 2009-08-22 09:13:44.000000000 +0200
@@ -17,10 +17,10 @@
# We need the following in order to create <stdbool.h> when the system
# doesn't have one that works.
stdbool.h: stdbool.in.h
- rm -f $...@-t $@
+ $(AM_V_GEN)rm -f $...@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h;
\
- } > $...@-t
+ } > $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += stdbool.h stdbool.h-t
--- modules/stddef.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/stddef 2009-08-22 09:13:44.000000000 +0200
@@ -18,7 +18,7 @@
# We need the following in order to create <stddef.h> when the system
# doesn't have one that works with the given compiler.
stddef.h: stddef.in.h
- rm -f $...@-t $@
+ $(AM_V_GEN)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' \
@@ -26,7 +26,7 @@
-e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \
-e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \
< $(srcdir)/stddef.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += stddef.h stddef.h-t
--- modules/stdint.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/stdint 2009-08-22 09:13:44.000000000 +0200
@@ -25,7 +25,7 @@
# We need the following in order to create <stdint.h> when the system
# doesn't have one that works with the given compiler.
stdint.h: stdint.in.h
- rm -f $...@-t $@
+ $(AM_V_GEN)rm -f $...@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@@ -52,7 +52,7 @@
-e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \
-e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \
< $(srcdir)/stdint.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += stdint.h stdint.h-t
--- modules/stdio.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/stdio 2009-08-22 09:13:44.000000000 +0200
@@ -21,7 +21,7 @@
# We need the following in order to create <stdio.h> when the system
# doesn't have one that works with the given compiler.
stdio.h: stdio.in.h
- rm -f $...@-t $@
+ $(AM_V_GEN)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' \
@@ -99,7 +99,7 @@
-e 's|@''REPLACE_PERROR''@|$(REPLACE_PERROR)|g' \
-e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
< $(srcdir)/stdio.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += stdio.h stdio.h-t
--- modules/stdlib.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/stdlib 2009-08-22 09:13:45.000000000 +0200
@@ -21,7 +21,7 @@
# We need the following in order to create <stdlib.h> when the system
# doesn't have one that works with the given compiler.
stdlib.h: stdlib.in.h
- rm -f $...@-t $@
+ $(AM_V_GEN)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' \
@@ -65,7 +65,7 @@
-e 's|@''VOID_UNSETENV''@|$(VOID_UNSETENV)|g' \
-e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
< $(srcdir)/stdlib.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += stdlib.h stdlib.h-t
--- modules/string.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/string 2009-08-22 09:13:45.000000000 +0200
@@ -20,7 +20,7 @@
# We need the following in order to create <string.h> when the system
# doesn't have one that works with the given compiler.
string.h: string.in.h
- rm -f $...@-t $@
+ $(AM_V_GEN)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' \
@@ -85,7 +85,7 @@
-e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \
-e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
< $(srcdir)/string.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += string.h string.h-t
--- modules/strings.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/strings 2009-08-22 09:13:45.000000000 +0200
@@ -18,7 +18,7 @@
# We need the following in order to create <strings.h> when the system
# doesn't have one that works with the given compiler.
strings.h: strings.in.h
- rm -f $...@-t $@
+ $(AM_V_GEN)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' \
@@ -27,7 +27,7 @@
-e 's|@''HAVE_DECL_STRNCASECMP''@|$(HAVE_DECL_STRNCASECMP)|g' \
-e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
< $(srcdir)/strings.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += strings.h strings.h-t
--- modules/sys_file.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/sys_file 2009-08-22 09:13:45.000000000 +0200
@@ -19,8 +19,8 @@
# We need the following in order to create <sys/file.h> when the system
# has one that is incomplete.
sys/file.h: sys_file.in.h
- @MKDIR_P@ sys
- rm -f $...@-t $@
+ $(AM_V_at)@MKDIR_P@ sys
+ $(AM_V_GEN)rm -f $...@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's/@''HAVE_SYS_FILE_H''@/$(HAVE_SYS_FILE_H)/g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@@ -29,7 +29,7 @@
-e 's/@''HAVE_FLOCK''@/$(HAVE_FLOCK)/g' \
-e 's/@''GNULIB_FLOCK''@/$(GNULIB_FLOCK)/g' \
< $(srcdir)/sys_file.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += sys/file.h sys/file.h-t
MOSTLYCLEANDIRS += sys
--- modules/sys_ioctl.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/sys_ioctl 2009-08-22 09:13:45.000000000 +0200
@@ -20,8 +20,8 @@
# We need the following in order to create <sys/ioctl.h> when the system
# does not have a complete one.
sys/ioctl.h: sys_ioctl.in.h
- @MKDIR_P@ sys
- rm -f $...@-t $@
+ $(AM_V_at)@MKDIR_P@ sys
+ $(AM_V_GEN)rm -f $...@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''HAVE_SYS_IOCTL_H''@|$(HAVE_SYS_IOCTL_H)|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@@ -32,7 +32,7 @@
-e
's|@''SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g'
\
-e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
< $(srcdir)/sys_ioctl.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += sys/ioctl.h sys/ioctl.h-t
MOSTLYCLEANDIRS += sys
--- modules/sys_select.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/sys_select 2009-08-22 09:13:45.000000000 +0200
@@ -21,8 +21,8 @@
# We need the following in order to create <sys/select.h> when the system
# doesn't have one that works with the given compiler.
sys/select.h: sys_select.in.h
- @MKDIR_P@ sys
- rm -f $...@-t $@
+ $(AM_V_at)@MKDIR_P@ sys
+ $(AM_V_GEN)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' \
@@ -33,7 +33,7 @@
-e 's|@''REPLACE_SELECT''@|$(REPLACE_SELECT)|g' \
-e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
< $(srcdir)/sys_select.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += sys/select.h sys/select.h-t
MOSTLYCLEANDIRS += sys
--- modules/sys_socket.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/sys_socket 2009-08-22 09:13:45.000000000 +0200
@@ -22,8 +22,8 @@
# We need the following in order to create <sys/socket.h> when the system
# doesn't have one that works with the given compiler.
sys/socket.h: sys_socket.in.h
- @MKDIR_P@ sys
- rm -f $...@-t $@
+ $(AM_V_at)@MKDIR_P@ sys
+ $(AM_V_GEN)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' \
@@ -50,7 +50,7 @@
-e 's|@''HAVE_SA_FAMILY_T''@|$(HAVE_SA_FAMILY_T)|g' \
-e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
< $(srcdir)/sys_socket.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv -f $...@-t $@
MOSTLYCLEANFILES += sys/socket.h sys/socket.h-t
MOSTLYCLEANDIRS += sys
--- modules/sys_stat.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/sys_stat 2009-08-22 09:13:46.000000000 +0200
@@ -19,8 +19,8 @@
# We need the following in order to create <sys/stat.h> when the system
# has one that is incomplete.
sys/stat.h: sys_stat.in.h
- @MKDIR_P@ sys
- rm -f $...@-t $@
+ $(AM_V_at)@MKDIR_P@ sys
+ $(AM_V_GEN)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' \
@@ -33,7 +33,7 @@
-e 's|@''REPLACE_MKDIR''@|$(REPLACE_MKDIR)|g' \
-e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
< $(srcdir)/sys_stat.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += sys/stat.h sys/stat.h-t
MOSTLYCLEANDIRS += sys
--- modules/sys_time.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/sys_time 2009-08-22 09:13:46.000000000 +0200
@@ -18,8 +18,8 @@
# We need the following in order to create <sys/time.h> when the system
# doesn't have one that works with the given compiler.
sys/time.h: sys_time.in.h
- @MKDIR_P@ sys
- rm -f $...@-t $@
+ $(AM_V_at)@MKDIR_P@ sys
+ $(AM_V_GEN)rm -f $...@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's/@''HAVE_SYS_TIME_H''@/$(HAVE_SYS_TIME_H)/g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@@ -28,7 +28,7 @@
-e 's/@''REPLACE_GETTIMEOFDAY''@/$(REPLACE_GETTIMEOFDAY)/g' \
-e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \
< $(srcdir)/sys_time.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += sys/time.h sys/time.h-t
--- modules/sys_times.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/sys_times 2009-08-22 09:13:46.000000000 +0200
@@ -18,13 +18,13 @@
# We need the following in order to create <sys/times.h> when the system
# doesn't have one that works with the given compiler.
sys/times.h: sys_times.in.h
- @MKDIR_P@ sys
- rm -f $...@-t $@
+ $(AM_V_at)@MKDIR_P@ sys
+ $(AM_V_GEN)rm -f $...@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GNULIB_TIMES''@|$(GNULIB_TIMES)|g' \
-e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
< $(srcdir)/sys_times.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += sys/times.h sys/times.h-t
MOSTLYCLEANDIRS += sys
--- modules/sys_utsname.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/sys_utsname 2009-08-22 09:13:46.000000000 +0200
@@ -18,14 +18,14 @@
# We need the following in order to create <sys/utsname.h> when the system
# does not have one.
sys/utsname.h: sys_utsname.in.h
- @MKDIR_P@ sys
- rm -f $...@-t $@
+ $(AM_V_at)@MKDIR_P@ sys
+ $(AM_V_GEN)rm -f $...@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GNULIB_UNAME''@|$(GNULIB_UNAME)|g' \
-e 's|@''HAVE_UNAME''@|$(HAVE_UNAME)|g' \
-e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
< $(srcdir)/sys_utsname.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += sys/utsname.h sys/utsname.h-t
MOSTLYCLEANDIRS += sys
--- modules/sys_wait.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/sys_wait 2009-08-22 09:13:46.000000000 +0200
@@ -19,15 +19,15 @@
# We need the following in order to create <sys/wait.h> when the system
# has one that is incomplete.
sys/wait.h: sys_wait.in.h
- @MKDIR_P@ sys
- rm -f $...@-t $@
+ $(AM_V_at)@MKDIR_P@ sys
+ $(AM_V_GEN)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' \
-e 's|@''NEXT_SYS_WAIT_H''@|$(NEXT_SYS_WAIT_H)|g' \
-e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
< $(srcdir)/sys_wait.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += sys/wait.h sys/wait.h-t
MOSTLYCLEANDIRS += sys
--- modules/sysexits.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/sysexits 2009-08-22 09:13:46.000000000 +0200
@@ -17,14 +17,14 @@
# 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 $@
+ $(AM_V_GEN)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' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''NEXT_SYSEXITS_H''@|$(NEXT_SYSEXITS_H)|g' \
< $(srcdir)/sysexits.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv -f $...@-t $@
MOSTLYCLEANFILES += sysexits.h sysexits.h-t
--- modules/time.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/time 2009-08-22 09:13:46.000000000 +0200
@@ -19,7 +19,7 @@
# We need the following in order to create <time.h> when the system
# doesn't have one that works with the given compiler.
time.h: time.in.h
- rm -f $...@-t $@
+ $(AM_V_GEN)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' \
@@ -32,7 +32,7 @@
-e
's|@SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g'
\
-e
's|@TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \
< $(srcdir)/time.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += time.h time.h-t
--- modules/unistd.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/unistd 2009-08-22 09:13:46.000000000 +0200
@@ -19,7 +19,7 @@
# We need the following in order to create an empty placeholder for
# <unistd.h> when the system doesn't have one.
unistd.h: unistd.in.h
- rm -f $...@-t $@
+ $(AM_V_GEN)rm -f $...@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@@ -77,7 +77,7 @@
-e
's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g'
\
-e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
< $(srcdir)/unistd.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += unistd.h unistd.h-t
--- modules/wchar.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/wchar 2009-08-22 09:13:47.000000000 +0200
@@ -20,7 +20,7 @@
# We need the following in order to create <wchar.h> when the system
# version does not work standalone.
wchar.h: wchar.in.h
- rm -f $...@-t $@
+ $(AM_V_GEN)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' \
@@ -63,7 +63,7 @@
-e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
-e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
< $(srcdir)/wchar.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += wchar.h wchar.h-t
--- modules/wctype.orig 2009-08-22 09:33:53.000000000 +0200
+++ modules/wctype 2009-08-22 09:13:47.000000000 +0200
@@ -18,7 +18,7 @@
# We need the following in order to create <wctype.h> when the system
# doesn't have one that works with the given compiler.
wctype.h: wctype.in.h
- rm -f $...@-t $@
+ $(AM_V_GEN)rm -f $...@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@@ -28,7 +28,7 @@
-e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
-e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \
< $(srcdir)/wctype.in.h; \
- } > $...@-t
+ } > $...@-t && \
mv $...@-t $@
MOSTLYCLEANFILES += wctype.h wctype.h-t
