From b4c57b4240992832fa89a02dc620c4fa5ac36973 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 24 Dec 2021 17:22:00 -0800 Subject: [PATCH] maint: avoid empty lines in recipes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit AIX 7.2 ‘make’ complains about recipe lines that are empty after macro expansion, and I suppose there’s a good chance some non-POSIX ‘make’ would prohibit them. Rework macros so that we can avoid them. * gnulib-tool (func_emit_lib_Makefile_am) (func_emit_lib_Makefile_am): Support @!NMD@ too. * modules/gen-header (@gl_V_at): New macro. * modules/alloca-opt, modules/argz, modules/assert-h: * modules/byteswap, modules/configmake, modules/ctype: * modules/dirent, modules/errno, modules/execinfo, modules/fcntl-h: * modules/float, modules/fnmatch-h, modules/getopt-posix: * modules/glob-h, modules/iconv-h, modules/ieee754-h: * modules/inttypes-incomplete, modules/langinfo: * modules/libtextstyle-optional, modules/limits-h, modules/locale: * modules/malloc-h, modules/math, modules/monetary, modules/netdb: * modules/openmp-init, modules/poll-h, modules/posix-shell: * modules/pthread-h, modules/pty, modules/sched, modules/search: * modules/signal-h, modules/sigsegv, modules/snippet/link-warning: * modules/spawn, modules/stdalign, modules/stdarg, modules/stdbool: * modules/stddef, modules/stdint, modules/stdio, modules/stdlib: * modules/stdnoreturn, modules/string, modules/strings: * modules/sysexits, modules/termios, modules/threads-h: * modules/time, modules/uchar, modules/unicase/base: * modules/uniconv/base, modules/unictype/base, modules/unigbrk/base: * modules/unilbrk/base, modules/uniname/base, modules/uninorm/base: * modules/unistd, modules/unistdio/base, modules/unistr/base: * modules/unitypes, modules/uniwbrk/base, modules/uniwidth/base: * modules/utime-h, modules/wchar, modules/wctype-h: Use it. --- ChangeLog | 31 +++++++++++++++++++++++++++++++ gnulib-tool | 6 +++--- modules/alloca-opt | 5 ++--- modules/argz | 5 ++--- modules/assert-h | 5 ++--- modules/byteswap | 5 ++--- modules/configmake | 6 +++--- modules/ctype | 5 ++--- modules/dirent | 5 ++--- modules/errno | 5 ++--- modules/execinfo | 5 ++--- modules/fcntl-h | 5 ++--- modules/float | 5 ++--- modules/fnmatch-h | 5 ++--- modules/gen-header | 5 +++++ modules/getopt-posix | 5 ++--- modules/glob-h | 5 ++--- modules/iconv-h | 5 ++--- modules/ieee754-h | 5 ++--- modules/inttypes-incomplete | 5 ++--- modules/langinfo | 5 ++--- modules/libtextstyle-optional | 5 ++--- modules/limits-h | 5 ++--- modules/locale | 5 ++--- modules/malloc-h | 5 ++--- modules/math | 5 ++--- modules/monetary | 5 ++--- modules/netdb | 5 ++--- modules/openmp-init | 5 ++--- modules/poll-h | 5 ++--- modules/posix-shell | 6 +++--- modules/pthread-h | 5 ++--- modules/pty | 5 ++--- modules/sched | 5 ++--- modules/search | 5 ++--- modules/signal-h | 5 ++--- modules/sigsegv | 5 ++--- modules/snippet/link-warning | 6 +++--- modules/spawn | 5 ++--- modules/stdalign | 5 ++--- modules/stdarg | 5 ++--- modules/stdbool | 5 ++--- modules/stddef | 5 ++--- modules/stdint | 5 ++--- modules/stdio | 5 ++--- modules/stdlib | 5 ++--- modules/stdnoreturn | 5 ++--- modules/string | 5 ++--- modules/strings | 5 ++--- modules/sys_types | 2 +- modules/sysexits | 5 ++--- modules/termios | 5 ++--- modules/threads-h | 5 ++--- modules/time | 5 ++--- modules/uchar | 5 ++--- modules/unicase/base | 5 ++--- modules/uniconv/base | 5 ++--- modules/unictype/base | 5 ++--- modules/unigbrk/base | 5 ++--- modules/unilbrk/base | 5 ++--- modules/uniname/base | 5 ++--- modules/uninorm/base | 5 ++--- modules/unistd | 5 ++--- modules/unistdio/base | 5 ++--- modules/unistr/base | 5 ++--- modules/unitypes | 5 ++--- modules/uniwbrk/base | 5 ++--- modules/uniwidth/base | 5 ++--- modules/utime-h | 5 ++--- modules/wchar | 5 ++--- modules/wctype-h | 5 ++--- 71 files changed, 177 insertions(+), 205 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7cfcc2893b..34c680e107 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,36 @@ 2021-12-24 Paul Eggert + maint: avoid empty lines in recipes + AIX 7.2 ‘make’ complains about recipe lines that are empty after + macro expansion, and I suppose there’s a good chance some + non-POSIX ‘make’ would prohibit them. Rework macros so + that we can avoid them. + * gnulib-tool (func_emit_lib_Makefile_am) + (func_emit_lib_Makefile_am): Support @!NMD@ too. + * modules/gen-header (@gl_V_at): New macro. + * modules/alloca-opt, modules/argz, modules/assert-h: + * modules/byteswap, modules/configmake, modules/ctype: + * modules/dirent, modules/errno, modules/execinfo, modules/fcntl-h: + * modules/float, modules/fnmatch-h, modules/getopt-posix: + * modules/glob-h, modules/iconv-h, modules/ieee754-h: + * modules/inttypes-incomplete, modules/langinfo: + * modules/libtextstyle-optional, modules/limits-h, modules/locale: + * modules/malloc-h, modules/math, modules/monetary, modules/netdb: + * modules/openmp-init, modules/poll-h, modules/posix-shell: + * modules/pthread-h, modules/pty, modules/sched, modules/search: + * modules/signal-h, modules/sigsegv, modules/snippet/link-warning: + * modules/spawn, modules/stdalign, modules/stdarg, modules/stdbool: + * modules/stddef, modules/stdint, modules/stdio, modules/stdlib: + * modules/stdnoreturn, modules/string, modules/strings: + * modules/sysexits, modules/termios, modules/threads-h: + * modules/time, modules/uchar, modules/unicase/base: + * modules/uniconv/base, modules/unictype/base, modules/unigbrk/base: + * modules/unilbrk/base, modules/uniname/base, modules/uninorm/base: + * modules/unistd, modules/unistdio/base, modules/unistr/base: + * modules/unitypes, modules/uniwbrk/base, modules/uniwidth/base: + * modules/utime-h, modules/wchar, modules/wctype-h: + Use it. + maint: tight-scope-mk need not be read-only * top/maint.mk (tight-scope.mk): Don’t bother to make tight-scope.mk read-only either. diff --git a/gnulib-tool b/gnulib-tool index 2870c2984a..0d4f246d8c 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -3729,9 +3729,9 @@ func_emit_lib_Makefile_am () # Replace NMD, so as to remove redundant "$(MKDIR_P) '.'" invocations. # The logic is similar to how we define gl_source_base_prefix. if $automake_subdir; then - sed_eliminate_NMD='s/@NMD@//' + sed_eliminate_NMD='s/@NMD@//;/@!NMD@/d' else - sed_eliminate_NMD='/@NMD@/d' + sed_eliminate_NMD='/@NMD@/d;s/@!NMD@//' fi if $for_test; then # When creating a package for testing: Attempt to provoke failures, @@ -4109,7 +4109,7 @@ func_emit_tests_Makefile_am () fi # Replace NMD, so as to remove redundant "$(MKDIR_P) '.'" invocations. # The logic is similar to how we define gl_source_base_prefix. - sed_eliminate_NMD='/@NMD@/d' + sed_eliminate_NMD='/@NMD@/d;s/@!NMD@//' if $for_test; then # When creating a package for testing: Attempt to provoke failures, # especially link errors, already during "make" rather than during diff --git a/modules/alloca-opt b/modules/alloca-opt index a08b424eef..0448b5da4d 100644 --- a/modules/alloca-opt +++ b/modules/alloca-opt @@ -22,9 +22,8 @@ BUILT_SOURCES += $(ALLOCA_H) # doesn't have one that works with the given compiler. if GL_GENERATE_ALLOCA_H alloca.h: alloca.in.h $(top_builddir)/config.status - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''HAVE_ALLOCA_H''@|$(HAVE_ALLOCA_H)|g' \ $(srcdir)/alloca.in.h > $@-t $(AM_V_at)mv $@-t $@ diff --git a/modules/argz b/modules/argz index 6d07062548..058aa65bc3 100644 --- a/modules/argz +++ b/modules/argz @@ -30,9 +30,8 @@ BUILT_SOURCES += $(ARGZ_H) # doesn't have one that works with the given compiler. if GL_GENERATE_ARGZ_H argz.h: argz.in.h $(top_builddir)/config.status - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/argz.in.h +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/argz.in.h $(AM_V_at)mv $@-t $@ else argz.h: $(top_builddir)/config.status diff --git a/modules/assert-h b/modules/assert-h index 572f43d252..bf7565dc21 100644 --- a/modules/assert-h +++ b/modules/assert-h @@ -22,9 +22,8 @@ BUILT_SOURCES += $(ASSERT_H) # doesn't have one that works with the given compiler. if GL_GENERATE_ASSERT_H assert.h: assert.in.h verify.h $(top_builddir)/config.status - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at){ $(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at){ $(SED_HEADER_STDOUT) \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ diff --git a/modules/byteswap b/modules/byteswap index 960134810a..68fe6b78ae 100644 --- a/modules/byteswap +++ b/modules/byteswap @@ -20,9 +20,8 @@ BUILT_SOURCES += $(BYTESWAP_H) # doesn't have one. if GL_GENERATE_BYTESWAP_H byteswap.h: byteswap.in.h $(top_builddir)/config.status - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/byteswap.in.h +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/byteswap.in.h $(AM_V_at)mv $@-t $@ else byteswap.h: $(top_builddir)/config.status diff --git a/modules/configmake b/modules/configmake index 398b635257..5dcafb6305 100644 --- a/modules/configmake +++ b/modules/configmake @@ -5,6 +5,7 @@ Files: m4/configmake.m4 Depends-on: +gen-header configure.ac: gl_CONFIGMAKE_PREP @@ -16,9 +17,8 @@ Makefile.am: # The Automake-defined pkg* macros are appended, in the order # listed in the Automake 1.10a+ documentation. configmake.h: Makefile - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ echo '#if HAVE_WINSOCK2_H'; \ echo '# include /* avoid mingw pollution on DATADIR */'; \ echo '#endif'; \ diff --git a/modules/ctype b/modules/ctype index 2c1c2b06ab..ca22800163 100644 --- a/modules/ctype +++ b/modules/ctype @@ -23,9 +23,8 @@ BUILT_SOURCES += ctype.h # We need the following in order to create when the system # doesn't have one that works with the given compiler. ctype.h: ctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ diff --git a/modules/dirent b/modules/dirent index 446ac1b358..8ae7bbfc4e 100644 --- a/modules/dirent +++ b/modules/dirent @@ -25,9 +25,8 @@ 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 $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's|@''HAVE_DIRENT_H''@|$(HAVE_DIRENT_H)|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ diff --git a/modules/errno b/modules/errno index c512930102..e245492124 100644 --- a/modules/errno +++ b/modules/errno @@ -21,9 +21,8 @@ BUILT_SOURCES += $(ERRNO_H) # doesn't have one that is POSIX compliant. if GL_GENERATE_ERRNO_H errno.h: errno.in.h $(top_builddir)/config.status - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ diff --git a/modules/execinfo b/modules/execinfo index ef8caaea51..4ac772ba49 100644 --- a/modules/execinfo +++ b/modules/execinfo @@ -25,9 +25,8 @@ BUILT_SOURCES += $(EXECINFO_H) # doesn't have one that works. if GL_GENERATE_EXECINFO_H execinfo.h: execinfo.in.h $(top_builddir)/config.status - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/execinfo.in.h +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/execinfo.in.h $(AM_V_at)mv $@-t $@ else execinfo.h: $(top_builddir)/config.status diff --git a/modules/fcntl-h b/modules/fcntl-h index 815b17538c..a6346a5077 100644 --- a/modules/fcntl-h +++ b/modules/fcntl-h @@ -28,9 +28,8 @@ 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 $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ diff --git a/modules/float b/modules/float index f894969d10..d308d4412f 100644 --- a/modules/float +++ b/modules/float @@ -29,9 +29,8 @@ BUILT_SOURCES += $(FLOAT_H) # doesn't have one that works with the given compiler. if GL_GENERATE_FLOAT_H float.h: float.in.h $(top_builddir)/config.status - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ diff --git a/modules/fnmatch-h b/modules/fnmatch-h index 1e4f55c47d..7bb6034b33 100644 --- a/modules/fnmatch-h +++ b/modules/fnmatch-h @@ -25,9 +25,8 @@ BUILT_SOURCES += $(FNMATCH_H) # We need the following in order to create . if GL_GENERATE_FNMATCH_H fnmatch.h: fnmatch.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's|@''HAVE_FNMATCH_H''@|$(HAVE_FNMATCH_H)|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ diff --git a/modules/gen-header b/modules/gen-header index 12c5581956..ab1858d65f 100644 --- a/modules/gen-header +++ b/modules/gen-header @@ -30,6 +30,11 @@ SED_HEADER_TO_AT_t = sed -n \ -e x \ -e 'w $@-t' +# Use $(gl_V_at) instead of $(AM_V_GEN) or $(AM_V_at) on a line that +# is its recipe's first line if and only if @NMD@ lines are absent. +@NMD@gl_V_at = $(AM_V_at) +@!NMD@gl_V_at = $(AM_V_GEN) + Include: License: diff --git a/modules/getopt-posix b/modules/getopt-posix index c925465ae0..fe9da36f28 100644 --- a/modules/getopt-posix +++ b/modules/getopt-posix @@ -42,9 +42,8 @@ BUILT_SOURCES += $(GETOPT_H) $(GETOPT_CDEFS_H) # doesn't have one that works with the given compiler. if GL_GENERATE_GETOPT_H getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H) - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ diff --git a/modules/glob-h b/modules/glob-h index 963693ca73..60d7cde096 100644 --- a/modules/glob-h +++ b/modules/glob-h @@ -29,9 +29,8 @@ BUILT_SOURCES += $(GLOB_H) # We need the following in order to create . if GL_GENERATE_GLOB_H glob.h: glob.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's|@''HAVE_GLOB_H''@|$(HAVE_GLOB_H)|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ diff --git a/modules/iconv-h b/modules/iconv-h index dc39894401..a7b68a6790 100644 --- a/modules/iconv-h +++ b/modules/iconv-h @@ -25,9 +25,8 @@ BUILT_SOURCES += $(ICONV_H) # doesn't have one that works with the given compiler. if GL_GENERATE_ICONV_H iconv.h: iconv.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ diff --git a/modules/ieee754-h b/modules/ieee754-h index 80eeb6299b..4c1b7234d9 100644 --- a/modules/ieee754-h +++ b/modules/ieee754-h @@ -20,9 +20,8 @@ BUILT_SOURCES += $(IEEE754_H) # doesn't have one that works with the given compiler. if GL_GENERATE_IEEE754_H ieee754.h: ieee754.in.h $(top_builddir)/config.status - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's/ifndef _GL_GNULIB_HEADER/if 0/g' \ $(srcdir)/ieee754.in.h > $@-t $(AM_V_at)mv $@-t $@ diff --git a/modules/inttypes-incomplete b/modules/inttypes-incomplete index d32d04b03e..38177e1e19 100644 --- a/modules/inttypes-incomplete +++ b/modules/inttypes-incomplete @@ -25,9 +25,8 @@ 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 $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H) - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ diff --git a/modules/langinfo b/modules/langinfo index dab6862da4..24d14883b8 100644 --- a/modules/langinfo +++ b/modules/langinfo @@ -23,9 +23,8 @@ BUILT_SOURCES += langinfo.h # We need the following in order to create an empty placeholder for # when the system doesn't have one. langinfo.h: langinfo.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's|@''HAVE_LANGINFO_H''@|$(HAVE_LANGINFO_H)|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ diff --git a/modules/libtextstyle-optional b/modules/libtextstyle-optional index cd05be2eee..616f17eadc 100644 --- a/modules/libtextstyle-optional +++ b/modules/libtextstyle-optional @@ -29,9 +29,8 @@ BUILT_SOURCES += $(TEXTSTYLE_H) # when the system doesn't have one. if GL_GENERATE_TEXTSTYLE_H textstyle.h: textstyle.in.h $(top_builddir)/config.status - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/textstyle.in.h +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/textstyle.in.h $(AM_V_at)mv $@-t $@ else textstyle.h: $(top_builddir)/config.status diff --git a/modules/limits-h b/modules/limits-h index c5eb139eb2..b24c96c4a2 100644 --- a/modules/limits-h +++ b/modules/limits-h @@ -21,9 +21,8 @@ BUILT_SOURCES += $(LIMITS_H) # doesn't have one that is compatible with GNU. if GL_GENERATE_LIMITS_H limits.h: limits.in.h $(top_builddir)/config.status - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ diff --git a/modules/locale b/modules/locale index 8c88ab1a1a..3b08ae90bb 100644 --- a/modules/locale +++ b/modules/locale @@ -25,9 +25,8 @@ 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 $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ diff --git a/modules/malloc-h b/modules/malloc-h index 7caada9c7c..085471e1ef 100644 --- a/modules/malloc-h +++ b/modules/malloc-h @@ -21,9 +21,8 @@ BUILT_SOURCES += malloc.h # We need the following in order to create when we add workarounds. malloc.h: malloc.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's|@''HAVE_MALLOC_H''@|$(HAVE_MALLOC_H)|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ diff --git a/modules/math b/modules/math index c4d72b30c7..83c66d3da8 100644 --- a/modules/math +++ b/modules/math @@ -27,9 +27,8 @@ lib_SOURCES += math.c # 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 $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's|@''INCLUDE_NEXT_AS_FIRST_DIRECTIVE''@|$(INCLUDE_NEXT_AS_FIRST_DIRECTIVE)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ diff --git a/modules/monetary b/modules/monetary index 95b04f67a7..9b9239770d 100644 --- a/modules/monetary +++ b/modules/monetary @@ -25,9 +25,8 @@ BUILT_SOURCES += $(MONETARY_H) # doesn't have one that works with the given compiler. if GL_GENERATE_MONETARY_H monetary.h: monetary.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H) - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's|@''HAVE_MONETARY_H''@|$(HAVE_MONETARY_H)|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ diff --git a/modules/netdb b/modules/netdb index 8f71cc878a..b81d389cd1 100644 --- a/modules/netdb +++ b/modules/netdb @@ -24,9 +24,8 @@ 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 $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ diff --git a/modules/openmp-init b/modules/openmp-init index 3b857d039a..321da3559b 100644 --- a/modules/openmp-init +++ b/modules/openmp-init @@ -23,9 +23,8 @@ BUILT_SOURCES += omp.h # doesn't have one that works with the given compiler. omp.h: omp.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ $(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ diff --git a/modules/poll-h b/modules/poll-h index ef5bd7535e..ebb7fe533d 100644 --- a/modules/poll-h +++ b/modules/poll-h @@ -24,9 +24,8 @@ BUILT_SOURCES += poll.h # We need the following in order to create when the system # doesn't have one. poll.h: poll.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's|@''HAVE_POLL_H''@|$(HAVE_POLL_H)|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ diff --git a/modules/posix-shell b/modules/posix-shell index 59fce0e4cd..25ff5fd5ed 100644 --- a/modules/posix-shell +++ b/modules/posix-shell @@ -5,6 +5,7 @@ Files: m4/posix-shell.m4 Depends-on: +gen-header configure.ac: gl_POSIX_SHELL @@ -13,9 +14,8 @@ AC_PROG_MKDIR_P Makefile.am: ##Sample usage of posix-shell module: #script: script.in -# $(AM_V_GEN) -#@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' -# $(AM_V_at)sed \ +#@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' +# $(gl_V_at)sed \ # -e 's#@''PREFERABLY_POSIX_SHELL''@#$(PREFERABLY_POSIX_SHELL)#g' \ # -e 's#@''POSIX_SHELL''@#$(POSIX_SHELL)#g' \ # -e $(srcdir)/$@.in > $@-t diff --git a/modules/pthread-h b/modules/pthread-h index 2d792209c1..a505f8a887 100644 --- a/modules/pthread-h +++ b/modules/pthread-h @@ -31,9 +31,8 @@ BUILT_SOURCES += pthread.h # We need the following in order to create when the system # doesn't have one that works with the given compiler. pthread.h: pthread.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's|@''HAVE_PTHREAD_H''@|$(HAVE_PTHREAD_H)|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ diff --git a/modules/pty b/modules/pty index 523af17c41..8f3da034fc 100644 --- a/modules/pty +++ b/modules/pty @@ -22,9 +22,8 @@ BUILT_SOURCES += pty.h # We need the following in order to create when the system # doesn't have one that works with the given compiler. pty.h: pty.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's|@''HAVE_PTY_H''@|$(HAVE_PTY_H)|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ diff --git a/modules/sched b/modules/sched index 71445a140f..042aa8be04 100644 --- a/modules/sched +++ b/modules/sched @@ -23,9 +23,8 @@ 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 $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's|@''HAVE_SCHED_H''@|$(HAVE_SCHED_H)|g' \ -e 's|@''HAVE_SYS_CDEFS_H''@|$(HAVE_SYS_CDEFS_H)|g' \ diff --git a/modules/search b/modules/search index 04029b1433..ad9382fc1b 100644 --- a/modules/search +++ b/modules/search @@ -23,9 +23,8 @@ 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 $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's|@''HAVE_SEARCH_H''@|$(HAVE_SEARCH_H)|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ diff --git a/modules/signal-h b/modules/signal-h index cd45d5a040..be4cf1991b 100644 --- a/modules/signal-h +++ b/modules/signal-h @@ -25,9 +25,8 @@ 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 $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ diff --git a/modules/sigsegv b/modules/sigsegv index 4b58adf0cc..b723bd6814 100644 --- a/modules/sigsegv +++ b/modules/sigsegv @@ -71,9 +71,8 @@ BUILT_SOURCES += $(SIGSEGV_H) if GL_GENERATE_SIGSEGV_H sigsegv.h: sigsegv.in.h $(top_builddir)/config.status - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/sigsegv.in.h +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/sigsegv.in.h $(AM_V_at)mv $@-t $@ else sigsegv.h: $(top_builddir)/config.status diff --git a/modules/snippet/link-warning b/modules/snippet/link-warning index 611c108c18..bff134bb71 100644 --- a/modules/snippet/link-warning +++ b/modules/snippet/link-warning @@ -8,6 +8,7 @@ Files: build-aux/snippet/link-warning.h Depends-on: +gen-header configure.ac: AC_REQUIRE([gl_FEATURES_H]) @@ -25,9 +26,8 @@ Makefile.am: BUILT_SOURCES += link-warning.h link-warning.h: $(top_srcdir)/build-aux/snippet/link-warning.h - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)sed -n -e '/HAVE_FEATURES_H/,$$p' \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)sed -n -e '/HAVE_FEATURES_H/,$$p' \ < $(top_srcdir)/build-aux/snippet/link-warning.h \ | sed -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \ > $@-t diff --git a/modules/spawn b/modules/spawn index ebb3f2ec0e..6639c67910 100644 --- a/modules/spawn +++ b/modules/spawn @@ -26,9 +26,8 @@ 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 $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's|@''HAVE_SPAWN_H''@|$(HAVE_SPAWN_H)|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ diff --git a/modules/stdalign b/modules/stdalign index e89eb8a3d1..24c79ec493 100644 --- a/modules/stdalign +++ b/modules/stdalign @@ -20,9 +20,8 @@ BUILT_SOURCES += $(STDALIGN_H) # doesn't have one that works. if GL_GENERATE_STDALIGN_H stdalign.h: stdalign.in.h $(top_builddir)/config.status - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/stdalign.in.h +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/stdalign.in.h $(AM_V_at)mv $@-t $@ else stdalign.h: $(top_builddir)/config.status diff --git a/modules/stdarg b/modules/stdarg index 086019aa4c..98668cfba1 100644 --- a/modules/stdarg +++ b/modules/stdarg @@ -26,9 +26,8 @@ BUILT_SOURCES += $(STDARG_H) # doesn't have one that works with the given compiler. if GL_GENERATE_STDARG_H stdarg.h: stdarg.in.h $(top_builddir)/config.status - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ diff --git a/modules/stdbool b/modules/stdbool index bda6904c0e..c33d036bb7 100644 --- a/modules/stdbool +++ b/modules/stdbool @@ -21,9 +21,8 @@ BUILT_SOURCES += $(STDBOOL_H) # doesn't have one that works. if GL_GENERATE_STDBOOL_H stdbool.h: stdbool.in.h $(top_builddir)/config.status - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' \ $(srcdir)/stdbool.in.h > $@-t $(AM_V_at)mv $@-t $@ diff --git a/modules/stddef b/modules/stddef index 11cec9b137..fb7214138e 100644 --- a/modules/stddef +++ b/modules/stddef @@ -24,9 +24,8 @@ BUILT_SOURCES += $(STDDEF_H) # doesn't have one that works with the given compiler. if GL_GENERATE_STDDEF_H stddef.h: stddef.in.h $(top_builddir)/config.status - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ diff --git a/modules/stdint b/modules/stdint index 89f2fa0302..3c37c0846b 100644 --- a/modules/stdint +++ b/modules/stdint @@ -33,9 +33,8 @@ BUILT_SOURCES += $(STDINT_H) # doesn't have one that works with the given compiler. if GL_GENERATE_STDINT_H stdint.h: stdint.in.h $(top_builddir)/config.status - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ diff --git a/modules/stdio b/modules/stdio index 69e770bccc..dab8d4e8be 100644 --- a/modules/stdio +++ b/modules/stdio @@ -52,9 +52,8 @@ 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 $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ diff --git a/modules/stdlib b/modules/stdlib index 7f0d7ca934..a5a3c9f75e 100644 --- a/modules/stdlib +++ b/modules/stdlib @@ -27,9 +27,8 @@ BUILT_SOURCES += stdlib.h # doesn't have one that works with the given compiler. stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ $(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ diff --git a/modules/stdnoreturn b/modules/stdnoreturn index 2a785afd39..1ef894d51f 100644 --- a/modules/stdnoreturn +++ b/modules/stdnoreturn @@ -21,9 +21,8 @@ BUILT_SOURCES += $(STDNORETURN_H) # doesn't have one that works. if GL_GENERATE_STDNORETURN_H stdnoreturn.h: stdnoreturn.in.h $(top_builddir)/config.status $(_NORETURN_H) - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e '/definition of _Noreturn/r $(_NORETURN_H)' \ $(srcdir)/stdnoreturn.in.h > $@-t $(AM_V_at)mv $@-t $@ diff --git a/modules/string b/modules/string index 445c865476..6711ed74ab 100644 --- a/modules/string +++ b/modules/string @@ -27,9 +27,8 @@ 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 $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ diff --git a/modules/strings b/modules/strings index ebee51631d..6e8ef48684 100644 --- a/modules/strings +++ b/modules/strings @@ -24,9 +24,8 @@ 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 $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H) - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's|@''HAVE_STRINGS_H''@|$(HAVE_STRINGS_H)|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ diff --git a/modules/sys_types b/modules/sys_types index db64116702..96849aa3b1 100644 --- a/modules/sys_types +++ b/modules/sys_types @@ -8,7 +8,7 @@ m4/off_t.m4 m4/pid_t.m4 Depends-on: -sed-header +gen-header include_next ssize_t diff --git a/modules/sysexits b/modules/sysexits index 2f4f46307c..263c76e474 100644 --- a/modules/sysexits +++ b/modules/sysexits @@ -22,9 +22,8 @@ BUILT_SOURCES += $(SYSEXITS_H) # doesn't have one that works with the given compiler. if GL_GENERATE_SYSEXITS_H sysexits.h: sysexits.in.h $(top_builddir)/config.status - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's|@''HAVE_SYSEXITS_H''@|$(HAVE_SYSEXITS_H)|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ diff --git a/modules/termios b/modules/termios index 2a256482fb..abc954ceb4 100644 --- a/modules/termios +++ b/modules/termios @@ -23,9 +23,8 @@ BUILT_SOURCES += termios.h # We need the following in order to create when the system # version does not have all declarations. termios.h: termios.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ diff --git a/modules/threads-h b/modules/threads-h index e2c2617740..1cde2afc9f 100644 --- a/modules/threads-h +++ b/modules/threads-h @@ -40,9 +40,8 @@ BUILT_SOURCES += threads.h # We need the following in order to create when the system # doesn't have one. threads.h: threads.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's|@''HAVE_THREADS_H''@|$(HAVE_THREADS_H)|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ diff --git a/modules/time b/modules/time index 449bbcd1ec..fe38a50485 100644 --- a/modules/time +++ b/modules/time @@ -25,9 +25,8 @@ 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 $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ diff --git a/modules/uchar b/modules/uchar index d6ee0ceb84..2c947ed243 100644 --- a/modules/uchar +++ b/modules/uchar @@ -22,9 +22,8 @@ Makefile.am: BUILT_SOURCES += uchar.h uchar.h: uchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's/@''HAVE_UCHAR_H''@/$(HAVE_UCHAR_H)/g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ diff --git a/modules/unicase/base b/modules/unicase/base index 658da2415b..f273200f99 100644 --- a/modules/unicase/base +++ b/modules/unicase/base @@ -19,9 +19,8 @@ Makefile.am: BUILT_SOURCES += $(LIBUNISTRING_UNICASE_H) unicase.h: unicase.in.h - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/unicase.in.h +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/unicase.in.h $(AM_V_at)mv $@-t $@ MOSTLYCLEANFILES += unicase.h unicase.h-t diff --git a/modules/uniconv/base b/modules/uniconv/base index 1b6f363ee0..9f059498c4 100644 --- a/modules/uniconv/base +++ b/modules/uniconv/base @@ -20,9 +20,8 @@ Makefile.am: BUILT_SOURCES += $(LIBUNISTRING_UNICONV_H) uniconv.h: uniconv.in.h - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/uniconv.in.h +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/uniconv.in.h $(AM_V_at)mv $@-t $@ MOSTLYCLEANFILES += uniconv.h uniconv.h-t diff --git a/modules/unictype/base b/modules/unictype/base index f63605c409..42be0b3075 100644 --- a/modules/unictype/base +++ b/modules/unictype/base @@ -18,9 +18,8 @@ Makefile.am: BUILT_SOURCES += $(LIBUNISTRING_UNICTYPE_H) unictype.h: unictype.in.h - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/unictype.in.h +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/unictype.in.h $(AM_V_at)mv $@-t $@ MOSTLYCLEANFILES += unictype.h unictype.h-t diff --git a/modules/unigbrk/base b/modules/unigbrk/base index 4c5663698e..599f52ba67 100644 --- a/modules/unigbrk/base +++ b/modules/unigbrk/base @@ -18,9 +18,8 @@ Makefile.am: BUILT_SOURCES += $(LIBUNISTRING_UNIGBRK_H) unigbrk.h: unigbrk.in.h - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/unigbrk.in.h +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/unigbrk.in.h $(AM_V_at)mv $@-t $@ MOSTLYCLEANFILES += unigbrk.h unigbrk.h-t diff --git a/modules/unilbrk/base b/modules/unilbrk/base index 4b1ca60f5b..919dfc7bc5 100644 --- a/modules/unilbrk/base +++ b/modules/unilbrk/base @@ -18,9 +18,8 @@ Makefile.am: BUILT_SOURCES += $(LIBUNISTRING_UNILBRK_H) unilbrk.h: unilbrk.in.h - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/unilbrk.in.h +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/unilbrk.in.h $(AM_V_at)mv $@-t $@ MOSTLYCLEANFILES += unilbrk.h unilbrk.h-t diff --git a/modules/uniname/base b/modules/uniname/base index d5a9c64948..f6bac4ebdc 100644 --- a/modules/uniname/base +++ b/modules/uniname/base @@ -17,9 +17,8 @@ Makefile.am: BUILT_SOURCES += $(LIBUNISTRING_UNINAME_H) uniname.h: uniname.in.h - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/uniname.in.h +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/uniname.in.h $(AM_V_at)mv $@-t $@ MOSTLYCLEANFILES += uniname.h uniname.h-t diff --git a/modules/uninorm/base b/modules/uninorm/base index 40f40c6fe7..65c8fe61c9 100644 --- a/modules/uninorm/base +++ b/modules/uninorm/base @@ -17,9 +17,8 @@ Makefile.am: BUILT_SOURCES += $(LIBUNISTRING_UNINORM_H) uninorm.h: uninorm.in.h - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/uninorm.in.h +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/uninorm.in.h $(AM_V_at)mv $@-t $@ MOSTLYCLEANFILES += uninorm.h uninorm.h-t diff --git a/modules/unistd b/modules/unistd index b0052ef3ae..faec2da651 100644 --- a/modules/unistd +++ b/modules/unistd @@ -31,9 +31,8 @@ lib_SOURCES += unistd.c # We need the following in order to create an empty placeholder for # when the system doesn't have one. unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ diff --git a/modules/unistdio/base b/modules/unistdio/base index 883305f6e5..ee27aa3ca9 100644 --- a/modules/unistdio/base +++ b/modules/unistdio/base @@ -17,9 +17,8 @@ Makefile.am: BUILT_SOURCES += $(LIBUNISTRING_UNISTDIO_H) unistdio.h: unistdio.in.h - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/unistdio.in.h +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/unistdio.in.h $(AM_V_at)mv $@-t $@ MOSTLYCLEANFILES += unistdio.h unistdio.h-t diff --git a/modules/unistr/base b/modules/unistr/base index da47fde431..47e10d4371 100644 --- a/modules/unistr/base +++ b/modules/unistr/base @@ -19,9 +19,8 @@ Makefile.am: BUILT_SOURCES += $(LIBUNISTRING_UNISTR_H) unistr.h: unistr.in.h - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/unistr.in.h +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/unistr.in.h $(AM_V_at)mv $@-t $@ MOSTLYCLEANFILES += unistr.h unistr.h-t diff --git a/modules/unitypes b/modules/unitypes index c753b36197..9c5625af2e 100644 --- a/modules/unitypes +++ b/modules/unitypes @@ -33,9 +33,8 @@ Makefile.am: BUILT_SOURCES += $(LIBUNISTRING_UNITYPES_H) unitypes.h: unitypes.in.h - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/unitypes.in.h +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/unitypes.in.h $(AM_V_at)mv $@-t $@ MOSTLYCLEANFILES += unitypes.h unitypes.h-t diff --git a/modules/uniwbrk/base b/modules/uniwbrk/base index 94f7641c49..556bb002cc 100644 --- a/modules/uniwbrk/base +++ b/modules/uniwbrk/base @@ -17,9 +17,8 @@ Makefile.am: BUILT_SOURCES += $(LIBUNISTRING_UNIWBRK_H) uniwbrk.h: uniwbrk.in.h - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/uniwbrk.in.h +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/uniwbrk.in.h $(AM_V_at)mv $@-t $@ MOSTLYCLEANFILES += uniwbrk.h uniwbrk.h-t diff --git a/modules/uniwidth/base b/modules/uniwidth/base index 6065de69f9..8d8615ff22 100644 --- a/modules/uniwidth/base +++ b/modules/uniwidth/base @@ -18,9 +18,8 @@ Makefile.am: BUILT_SOURCES += $(LIBUNISTRING_UNIWIDTH_H) uniwidth.h: uniwidth.in.h - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/uniwidth.in.h +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/uniwidth.in.h $(AM_V_at)mv $@-t $@ MOSTLYCLEANFILES += uniwidth.h uniwidth.h-t diff --git a/modules/utime-h b/modules/utime-h index 834034c898..95d6986413 100644 --- a/modules/utime-h +++ b/modules/utime-h @@ -23,9 +23,8 @@ BUILT_SOURCES += utime.h # We need the following in order to create when the system # doesn't have one that works with the given compiler. utime.h: utime.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's/@''HAVE_UTIME_H''@/$(HAVE_UTIME_H)/g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ diff --git a/modules/wchar b/modules/wchar index 556701fd85..58c2d1f368 100644 --- a/modules/wchar +++ b/modules/wchar @@ -28,9 +28,8 @@ 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 $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ diff --git a/modules/wctype-h b/modules/wctype-h index f4949fab77..2d0392a9c6 100644 --- a/modules/wctype-h +++ b/modules/wctype-h @@ -26,9 +26,8 @@ lib_SOURCES += wctype-h.c # 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 $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) - $(AM_V_GEN) -@NMD@ $(AM_V_at)$(MKDIR_P) '%reldir%' - $(AM_V_at)$(SED_HEADER_STDOUT) \ +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \