From 47a8dd64accd4e522331866a73bb79adc2d6ca78 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 22 Aug 2009 11:28:08 +0200 Subject: [PATCH] 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". Improved-by: Bruno Haible * 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. --- ChangeLog | 59 ++++++++++++++++++++++++++++++++++++++ modules/alloca-opt | 4 +-- modules/argz | 4 +-- modules/arpa_inet | 6 ++-- modules/byteswap | 4 +-- modules/configmake | 4 +-- modules/dirent | 4 +-- modules/errno | 4 +-- modules/fcntl | 4 +-- modules/float | 4 +-- modules/fnmatch | 4 +-- modules/getopt-posix | 4 +-- modules/glob | 4 +-- modules/iconv_open | 4 +-- modules/inttypes | 4 +-- modules/localcharset | 8 +++--- modules/locale | 4 +-- modules/math | 4 +-- modules/netdb | 4 +-- modules/netinet_in | 6 ++-- modules/poll | 4 +-- modules/posix_spawnp-tests | 8 +++--- modules/sched | 4 +-- modules/search | 4 +-- modules/selinux-h | 16 +++++------ modules/signal | 4 +-- modules/spawn | 4 +-- modules/stdarg | 4 +-- modules/stdbool | 4 +-- modules/stddef | 4 +-- modules/stdint | 4 +-- modules/stdio | 4 +-- modules/stdlib | 4 +-- modules/string | 4 +-- modules/strings | 4 +-- modules/sys_file | 6 ++-- modules/sys_ioctl | 6 ++-- modules/sys_select | 6 ++-- modules/sys_socket | 6 ++-- modules/sys_stat | 6 ++-- modules/sys_time | 6 ++-- modules/sys_times | 6 ++-- modules/sys_utsname | 6 ++-- modules/sys_wait | 6 ++-- modules/sysexits | 4 +-- modules/time | 4 +-- modules/unistd | 4 +-- modules/wchar | 4 +-- modules/wctype | 4 +-- 49 files changed, 176 insertions(+), 117 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8999317662..85cbf60814 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,62 @@ +2009-08-22 Jim Meyering + Bruno Haible + + 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. + 2009-08-22 Jim Meyering announce-gen: detect write failure diff --git a/modules/alloca-opt b/modules/alloca-opt index e132ab8039..5bd042521f 100644 --- a/modules/alloca-opt +++ b/modules/alloca-opt @@ -18,10 +18,10 @@ 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 $@ + $(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 diff --git a/modules/argz b/modules/argz index 7c95859c09..5f9c7499d1 100644 --- a/modules/argz +++ b/modules/argz @@ -23,10 +23,10 @@ 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 $@ + $(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 diff --git a/modules/arpa_inet b/modules/arpa_inet index d799403a78..55aa68f6c5 100644 --- a/modules/arpa_inet +++ b/modules/arpa_inet @@ -20,8 +20,8 @@ BUILT_SOURCES += $(ARPA_INET_H) # We need the following in order to create 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 @@ arpa/inet.h: arpa_inet.in.h -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 diff --git a/modules/byteswap b/modules/byteswap index c5057bb66a..6a3ce1525c 100644 --- a/modules/byteswap +++ b/modules/byteswap @@ -16,10 +16,10 @@ 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 $@ + $(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 diff --git a/modules/configmake b/modules/configmake index 2c5dfaab16..881a40bf8d 100644 --- a/modules/configmake +++ b/modules/configmake @@ -26,7 +26,7 @@ Makefile.am: # 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 @@ configmake.h: Makefile 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 \ diff --git a/modules/dirent b/modules/dirent index ca784f844a..8df7c354aa 100644 --- a/modules/dirent +++ b/modules/dirent @@ -19,7 +19,7 @@ BUILT_SOURCES += $(DIRENT_H) # We need the following in order to create 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 @@ dirent.h: dirent.in.h -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 diff --git a/modules/errno b/modules/errno index 8806621d5e..70fbd8f378 100644 --- a/modules/errno +++ b/modules/errno @@ -17,7 +17,7 @@ BUILT_SOURCES += $(ERRNO_H) # We need the following in order to create 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 @@ errno.h: errno.in.h -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 diff --git a/modules/fcntl b/modules/fcntl index de0aeb988d..8e2af03e65 100644 --- a/modules/fcntl +++ b/modules/fcntl @@ -19,7 +19,7 @@ BUILT_SOURCES += $(FCNTL_H) # We need the following in order to create 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 @@ fcntl.h: fcntl.in.h -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 diff --git a/modules/float b/modules/float index 7199dc4887..b7f068e978 100644 --- a/modules/float +++ b/modules/float @@ -17,13 +17,13 @@ BUILT_SOURCES += $(FLOAT_H) # We need the following in order to create 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 diff --git a/modules/fnmatch b/modules/fnmatch index 64d3cd9e68..78344cae8b 100644 --- a/modules/fnmatch +++ b/modules/fnmatch @@ -28,10 +28,10 @@ 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 $@ + $(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 diff --git a/modules/getopt-posix b/modules/getopt-posix index 6b20f15462..b9d2658309 100644 --- a/modules/getopt-posix +++ b/modules/getopt-posix @@ -22,10 +22,10 @@ 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 $@ + $(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 diff --git a/modules/glob b/modules/glob index bf7af7c68b..c5fd73f470 100644 --- a/modules/glob +++ b/modules/glob @@ -32,11 +32,11 @@ 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 $@ + $(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 diff --git a/modules/iconv_open b/modules/iconv_open index 04a1ff9f5d..9800dce641 100644 --- a/modules/iconv_open +++ b/modules/iconv_open @@ -28,7 +28,7 @@ BUILT_SOURCES += $(ICONV_H) # We need the following in order to create 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 @@ iconv.h: iconv.in.h -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 diff --git a/modules/inttypes b/modules/inttypes index 61c5d3f305..9f0dc4e43a 100644 --- a/modules/inttypes +++ b/modules/inttypes @@ -21,7 +21,7 @@ BUILT_SOURCES += $(INTTYPES_H) # We need the following in order to create 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 @@ inttypes.h: inttypes.in.h -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 diff --git a/modules/localcharset b/modules/localcharset index d01da33e55..46020b0a04 100644 --- a/modules/localcharset +++ b/modules/localcharset @@ -82,14 +82,14 @@ uninstall-localcharset: all-local 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 diff --git a/modules/locale b/modules/locale index 0afc5cb6b9..41f9e536e8 100644 --- a/modules/locale +++ b/modules/locale @@ -18,13 +18,13 @@ BUILT_SOURCES += $(LOCALE_H) # We need the following in order to create 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 diff --git a/modules/math b/modules/math index 039de46e94..cdbe810513 100644 --- a/modules/math +++ b/modules/math @@ -18,7 +18,7 @@ BUILT_SOURCES += math.h # We need the following in order to create 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 @@ math.h: math.in.h -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 diff --git a/modules/netdb b/modules/netdb index afac88be73..b4927209e0 100644 --- a/modules/netdb +++ b/modules/netdb @@ -18,7 +18,7 @@ BUILT_SOURCES += $(NETDB_H) # We need the following in order to create 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 @@ netdb.h: netdb.in.h -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 diff --git a/modules/netinet_in b/modules/netinet_in index ee0c9ae15c..2c1a21a0e1 100644 --- a/modules/netinet_in +++ b/modules/netinet_in @@ -19,15 +19,15 @@ BUILT_SOURCES += $(NETINET_IN_H) # We need the following in order to create 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 diff --git a/modules/poll b/modules/poll index 612189b1b5..9a3ec49647 100644 --- a/modules/poll +++ b/modules/poll @@ -22,10 +22,10 @@ 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 $@ + $(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 diff --git a/modules/posix_spawnp-tests b/modules/posix_spawnp-tests index 61ea8e4b5d..f63fe4d806 100644 --- a/modules/posix_spawnp-tests +++ b/modules/posix_spawnp-tests @@ -36,15 +36,15 @@ 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 + $(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 diff --git a/modules/sched b/modules/sched index 4bba3ddaed..4ce23571ab 100644 --- a/modules/sched +++ b/modules/sched @@ -17,7 +17,7 @@ BUILT_SOURCES += $(SCHED_H) # We need the following in order to create a replacement for 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 @@ sched.h: sched.in.h -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 diff --git a/modules/search b/modules/search index 8ba2a1c2a2..57b425a485 100644 --- a/modules/search +++ b/modules/search @@ -18,7 +18,7 @@ BUILT_SOURCES += search.h # We need the following in order to create 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 @@ search.h: search.in.h -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 diff --git a/modules/selinux-h b/modules/selinux-h index b7b8d82b29..c0b097f20e 100644 --- a/modules/selinux-h +++ b/modules/selinux-h @@ -20,19 +20,19 @@ lib_SOURCES += se-context.in.h se-selinux.in.h 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 diff --git a/modules/signal b/modules/signal index bfef96f41b..0aa8c54fad 100644 --- a/modules/signal +++ b/modules/signal @@ -18,7 +18,7 @@ BUILT_SOURCES += signal.h # We need the following in order to create 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 @@ signal.h: signal.in.h -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 diff --git a/modules/spawn b/modules/spawn index f2d15aba33..55c17f6e10 100644 --- a/modules/spawn +++ b/modules/spawn @@ -19,7 +19,7 @@ BUILT_SOURCES += $(SPAWN_H) # We need the following in order to create a replacement for 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 @@ spawn.h: spawn.in.h -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 diff --git a/modules/stdarg b/modules/stdarg index 46be58f143..1ee158156c 100644 --- a/modules/stdarg +++ b/modules/stdarg @@ -24,13 +24,13 @@ BUILT_SOURCES += $(STDARG_H) # We need the following in order to create 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 diff --git a/modules/stdbool b/modules/stdbool index 709981c58a..bd3fd6ab44 100644 --- a/modules/stdbool +++ b/modules/stdbool @@ -17,10 +17,10 @@ BUILT_SOURCES += $(STDBOOL_H) # We need the following in order to create 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 diff --git a/modules/stddef b/modules/stddef index c68e00bfc6..ac28e953ca 100644 --- a/modules/stddef +++ b/modules/stddef @@ -18,7 +18,7 @@ BUILT_SOURCES += $(STDDEF_H) # We need the following in order to create 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 @@ stddef.h: stddef.in.h -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 diff --git a/modules/stdint b/modules/stdint index 97a9288150..a907fa12c4 100644 --- a/modules/stdint +++ b/modules/stdint @@ -25,7 +25,7 @@ BUILT_SOURCES += $(STDINT_H) # We need the following in order to create 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 @@ stdint.h: stdint.in.h -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 diff --git a/modules/stdio b/modules/stdio index 98c0aeed76..b1e297e7ff 100644 --- a/modules/stdio +++ b/modules/stdio @@ -21,7 +21,7 @@ BUILT_SOURCES += stdio.h # We need the following in order to create 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 @@ stdio.h: stdio.in.h -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 diff --git a/modules/stdlib b/modules/stdlib index 49798ad8bc..dea611f257 100644 --- a/modules/stdlib +++ b/modules/stdlib @@ -21,7 +21,7 @@ BUILT_SOURCES += stdlib.h # We need the following in order to create 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 @@ stdlib.h: stdlib.in.h -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 diff --git a/modules/string b/modules/string index 738deebf95..40731467d6 100644 --- a/modules/string +++ b/modules/string @@ -20,7 +20,7 @@ BUILT_SOURCES += string.h # We need the following in order to create 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 @@ string.h: string.in.h -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 diff --git a/modules/strings b/modules/strings index 7936bc167e..64c650542d 100644 --- a/modules/strings +++ b/modules/strings @@ -18,7 +18,7 @@ BUILT_SOURCES += strings.h # We need the following in order to create 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 @@ strings.h: strings.in.h -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 diff --git a/modules/sys_file b/modules/sys_file index 2c1f8f8e51..8e155c8d22 100644 --- a/modules/sys_file +++ b/modules/sys_file @@ -19,8 +19,8 @@ BUILT_SOURCES += $(SYS_FILE_H) # We need the following in order to create 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 @@ sys/file.h: sys_file.in.h -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 diff --git a/modules/sys_ioctl b/modules/sys_ioctl index 73ae825229..eb224f25df 100644 --- a/modules/sys_ioctl +++ b/modules/sys_ioctl @@ -20,8 +20,8 @@ BUILT_SOURCES += $(SYS_IOCTL_H) # We need the following in order to create 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 @@ sys/ioctl.h: sys_ioctl.in.h -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 diff --git a/modules/sys_select b/modules/sys_select index e3a108aaf8..2f6bdaecac 100644 --- a/modules/sys_select +++ b/modules/sys_select @@ -21,8 +21,8 @@ BUILT_SOURCES += $(SYS_SELECT_H) # We need the following in order to create 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 @@ sys/select.h: sys_select.in.h -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 diff --git a/modules/sys_socket b/modules/sys_socket index 37e9e45bb3..58158d4d36 100644 --- a/modules/sys_socket +++ b/modules/sys_socket @@ -22,8 +22,8 @@ BUILT_SOURCES += $(SYS_SOCKET_H) # We need the following in order to create 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 @@ sys/socket.h: sys_socket.in.h -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 diff --git a/modules/sys_stat b/modules/sys_stat index 56a11c247c..60563c21f2 100644 --- a/modules/sys_stat +++ b/modules/sys_stat @@ -19,8 +19,8 @@ BUILT_SOURCES += $(SYS_STAT_H) # We need the following in order to create 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 @@ sys/stat.h: sys_stat.in.h -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 diff --git a/modules/sys_time b/modules/sys_time index 77a20d6cda..1e3953b92b 100644 --- a/modules/sys_time +++ b/modules/sys_time @@ -18,8 +18,8 @@ BUILT_SOURCES += $(SYS_TIME_H) # We need the following in order to create 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 @@ sys/time.h: sys_time.in.h -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 diff --git a/modules/sys_times b/modules/sys_times index 1b6f8375b6..4cbaae5215 100644 --- a/modules/sys_times +++ b/modules/sys_times @@ -18,13 +18,13 @@ BUILT_SOURCES += $(SYS_TIMES_H) # We need the following in order to create 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 diff --git a/modules/sys_utsname b/modules/sys_utsname index 9aff99d9e0..7ea102ccdb 100644 --- a/modules/sys_utsname +++ b/modules/sys_utsname @@ -18,14 +18,14 @@ BUILT_SOURCES += $(SYS_UTSNAME_H) # We need the following in order to create 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 diff --git a/modules/sys_wait b/modules/sys_wait index a287d45ec4..7907e53efa 100644 --- a/modules/sys_wait +++ b/modules/sys_wait @@ -19,15 +19,15 @@ BUILT_SOURCES += $(SYS_WAIT_H) # We need the following in order to create 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 diff --git a/modules/sysexits b/modules/sysexits index 99bcdd33b8..53a68d3e4a 100644 --- a/modules/sysexits +++ b/modules/sysexits @@ -17,14 +17,14 @@ 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 $@ + $(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 diff --git a/modules/time b/modules/time index 6450cb3472..ea946219d8 100644 --- a/modules/time +++ b/modules/time @@ -19,7 +19,7 @@ BUILT_SOURCES += time.h # We need the following in order to create 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 @@ time.h: time.in.h -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 diff --git a/modules/unistd b/modules/unistd index 5977bf9860..0c6cd9cd06 100644 --- a/modules/unistd +++ b/modules/unistd @@ -19,7 +19,7 @@ BUILT_SOURCES += unistd.h # We need the following in order to create an empty placeholder for # 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 @@ unistd.h: unistd.in.h -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 diff --git a/modules/wchar b/modules/wchar index d4dad6c809..e416db62e8 100644 --- a/modules/wchar +++ b/modules/wchar @@ -20,7 +20,7 @@ BUILT_SOURCES += $(WCHAR_H) # We need the following in order to create 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 @@ wchar.h: wchar.in.h -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 diff --git a/modules/wctype b/modules/wctype index 73c92717ea..ce6ed156bd 100644 --- a/modules/wctype +++ b/modules/wctype @@ -18,7 +18,7 @@ BUILT_SOURCES += $(WCTYPE_H) # We need the following in order to create 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 @@ wctype.h: wctype.in.h -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 -- 2.30.2