summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2021-12-21 10:43:56 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2021-12-21 10:44:48 -0800
commit46540554bb4564e2929d5fecdae194701142777d (patch)
tree03b117f7a71d0e18ae6a17f55c1711507e74de70
parentbe45484142c443dd2f5992f6a6489d816e568289 (diff)
downloadgnulib-46540554bb4564e2929d5fecdae194701142777d.tar.gz
Move AM_V_GEN to recipe start
This is especially needed when building Emacs, as it uses ‘AM_V_GEN=@$(info GEN $@)', which means the GEN line is output by GNU make just before the recipe runs, regardless of where AM_V_GEN appears in the recipe. And it’s also good practice even if the default Automake ‘AM_V_GEN=@echo GEN $@;’ is used, as it’s better to output the GEN line consistently at the start of every recipe, even if this precedes a preparatory command that almost always works silently. * modules/arpa_inet, modules/dynarray, modules/net_if: * modules/netinet_in, modules/scratch_buffer, modules/selinux-h: * modules/sys_file, modules/sys_ioctl, modules/sys_random: * modules/sys_resource, modules/sys_select, modules/sys_socket: * modules/sys_stat, modules/sys_time, modules/sys_times: * modules/sys_types, modules/sys_uio, modules/sys_utsname: * modules/sys_wait, modules/unicase/special-casing, top/maint.mk: Use AM_V_GEN only at the start of each recipe.
-rw-r--r--ChangeLog20
-rw-r--r--modules/arpa_inet4
-rw-r--r--modules/dynarray8
-rw-r--r--modules/net_if4
-rw-r--r--modules/netinet_in4
-rw-r--r--modules/scratch_buffer4
-rw-r--r--modules/selinux-h12
-rw-r--r--modules/sys_file4
-rw-r--r--modules/sys_ioctl4
-rw-r--r--modules/sys_random4
-rw-r--r--modules/sys_resource4
-rw-r--r--modules/sys_select4
-rw-r--r--modules/sys_socket4
-rw-r--r--modules/sys_stat4
-rw-r--r--modules/sys_time4
-rw-r--r--modules/sys_times4
-rw-r--r--modules/sys_types4
-rw-r--r--modules/sys_uio4
-rw-r--r--modules/sys_utsname4
-rw-r--r--modules/sys_wait4
-rw-r--r--modules/unicase/special-casing4
-rw-r--r--top/maint.mk2
22 files changed, 67 insertions, 47 deletions
diff --git a/ChangeLog b/ChangeLog
index d2d4a3cfa0..e4055c12ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2021-12-21 Paul Eggert <eggert@cs.ucla.edu>
+
+ Move AM_V_GEN to recipe start
+ This is especially needed when building Emacs, as it uses
+ ‘AM_V_GEN=@$(info GEN $@)', which means the GEN line is output by
+ GNU make just before the recipe runs, regardless of where AM_V_GEN
+ appears in the recipe. And it’s also good practice even if the
+ default Automake ‘AM_V_GEN=@echo GEN $@;’ is used, as it’s better
+ to output the GEN line consistently at the start of every recipe,
+ even if this precedes a preparatory command that almost always
+ works silently.
+ * modules/arpa_inet, modules/dynarray, modules/net_if:
+ * modules/netinet_in, modules/scratch_buffer, modules/selinux-h:
+ * modules/sys_file, modules/sys_ioctl, modules/sys_random:
+ * modules/sys_resource, modules/sys_select, modules/sys_socket:
+ * modules/sys_stat, modules/sys_time, modules/sys_times:
+ * modules/sys_types, modules/sys_uio, modules/sys_utsname:
+ * modules/sys_wait, modules/unicase/special-casing, top/maint.mk:
+ Use AM_V_GEN only at the start of each recipe.
+
2021-12-21 Bruno Haible <bruno@clisp.org>
c-xvasprintf: Fix declarations (regression 2021-08-07).
diff --git a/modules/arpa_inet b/modules/arpa_inet
index 4655998c81..5344fe3eac 100644
--- a/modules/arpa_inet
+++ b/modules/arpa_inet
@@ -25,8 +25,8 @@ BUILT_SOURCES += arpa/inet.h
# 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 $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H)
- $(AM_V_at)$(MKDIR_P) '%reldir%/arpa'
- $(AM_V_GEN)rm -f $@-t $@ && \
+ $(AM_V_GEN)$(MKDIR_P) '%reldir%/arpa'
+ $(AM_V_at)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
diff --git a/modules/dynarray b/modules/dynarray
index 37d1f6c753..e79fe42a81 100644
--- a/modules/dynarray
+++ b/modules/dynarray
@@ -26,8 +26,8 @@ Makefile.am:
BUILT_SOURCES += malloc/dynarray.gl.h malloc/dynarray-skeleton.gl.h
malloc/dynarray.gl.h: malloc/dynarray.h
- $(AM_V_at)$(MKDIR_P) '%reldir%/malloc'
- $(AM_V_GEN)rm -f $@-t $@ && \
+ $(AM_V_GEN)$(MKDIR_P) '%reldir%/malloc'
+ $(AM_V_at)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e '/libc_hidden_proto/d' < $(srcdir)/malloc/dynarray.h; \
} > $@-t && \
@@ -35,8 +35,8 @@ malloc/dynarray.gl.h: malloc/dynarray.h
MOSTLYCLEANFILES += malloc/dynarray.gl.h malloc/dynarray.gl.h-t
malloc/dynarray-skeleton.gl.h: malloc/dynarray-skeleton.c
- $(AM_V_at)$(MKDIR_P) '%reldir%/malloc'
- $(AM_V_GEN)rm -f $@-t $@ && \
+ $(AM_V_GEN)$(MKDIR_P) '%reldir%/malloc'
+ $(AM_V_at)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|<malloc/dynarray\.h>|<malloc/dynarray.gl.h>|g' \
-e 's|__attribute_maybe_unused__|_GL_ATTRIBUTE_MAYBE_UNUSED|g' \
diff --git a/modules/net_if b/modules/net_if
index 092116bcb4..b60ccc95e6 100644
--- a/modules/net_if
+++ b/modules/net_if
@@ -21,8 +21,8 @@ BUILT_SOURCES += $(NET_IF_H)
# doesn't have one.
if GL_GENERATE_NET_IF_H
net/if.h: net_if.in.h $(top_builddir)/config.status
- $(AM_V_at)$(MKDIR_P) '%reldir%/net'
- $(AM_V_GEN)rm -f $@-t $@ && \
+ $(AM_V_GEN)$(MKDIR_P) '%reldir%/net'
+ $(AM_V_at)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
diff --git a/modules/netinet_in b/modules/netinet_in
index 29b26c906e..4d0067414e 100644
--- a/modules/netinet_in
+++ b/modules/netinet_in
@@ -21,8 +21,8 @@ BUILT_SOURCES += $(NETINET_IN_H)
# doesn't have one.
if GL_GENERATE_NETINET_IN_H
netinet/in.h: netinet_in.in.h $(top_builddir)/config.status
- $(AM_V_at)$(MKDIR_P) '%reldir%/netinet'
- $(AM_V_GEN)rm -f $@-t $@ && \
+ $(AM_V_GEN)$(MKDIR_P) '%reldir%/netinet'
+ $(AM_V_at)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
diff --git a/modules/scratch_buffer b/modules/scratch_buffer
index 336a534725..4b72958c67 100644
--- a/modules/scratch_buffer
+++ b/modules/scratch_buffer
@@ -26,8 +26,8 @@ Makefile.am:
BUILT_SOURCES += malloc/scratch_buffer.gl.h
malloc/scratch_buffer.gl.h: malloc/scratch_buffer.h
- $(AM_V_at)$(MKDIR_P) '%reldir%/malloc'
- $(AM_V_GEN)rm -f $@-t $@ && \
+ $(AM_V_GEN)$(MKDIR_P) '%reldir%/malloc'
+ $(AM_V_at)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|__always_inline|inline _GL_ATTRIBUTE_ALWAYS_INLINE|g' \
-e 's|__glibc_likely|_GL_LIKELY|g' \
diff --git a/modules/selinux-h b/modules/selinux-h
index d6304e8ffb..dd1e811405 100644
--- a/modules/selinux-h
+++ b/modules/selinux-h
@@ -34,8 +34,8 @@ lib_SOURCES += se-context.in.h se-label.in.h se-selinux.in.h \
BUILT_SOURCES += selinux/selinux.h
selinux/selinux.h: se-selinux.in.h $(top_builddir)/config.status
- $(AM_V_at)$(MKDIR_P) '%reldir%/selinux'
- $(AM_V_GEN)rm -f $@-t $@ && \
+ $(AM_V_GEN)$(MKDIR_P) '%reldir%/selinux'
+ $(AM_V_at)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@@ -50,8 +50,8 @@ MOSTLYCLEANFILES += selinux/selinux.h selinux/selinux.h-t
BUILT_SOURCES += $(SELINUX_CONTEXT_H)
if GL_GENERATE_SELINUX_CONTEXT_H
selinux/context.h: se-context.in.h $(top_builddir)/config.status
- $(AM_V_at)$(MKDIR_P) '%reldir%/selinux'
- $(AM_V_GEN)rm -f $@-t $@ && \
+ $(AM_V_GEN)$(MKDIR_P) '%reldir%/selinux'
+ $(AM_V_at)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
cat $(srcdir)/se-context.in.h; \
} > $@-t && \
@@ -65,8 +65,8 @@ MOSTLYCLEANFILES += selinux/context.h selinux/context.h-t
BUILT_SOURCES += $(SELINUX_LABEL_H)
if GL_GENERATE_SELINUX_LABEL_H
selinux/label.h: se-label.in.h $(top_builddir)/config.status
- $(AM_V_at)$(MKDIR_P) '%reldir%/selinux'
- $(AM_V_GEN)rm -f $@-t $@ && \
+ $(AM_V_GEN)$(MKDIR_P) '%reldir%/selinux'
+ $(AM_V_at)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
cat $(srcdir)/se-label.in.h; \
} > $@-t && \
diff --git a/modules/sys_file b/modules/sys_file
index 753f6e1e8e..bb3a99b8c1 100644
--- a/modules/sys_file
+++ b/modules/sys_file
@@ -20,8 +20,8 @@ BUILT_SOURCES += sys/file.h
# 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 $(top_builddir)/config.status $(WARN_ON_USE_H)
- $(AM_V_at)$(MKDIR_P) '%reldir%/sys'
- $(AM_V_GEN)rm -f $@-t $@ && \
+ $(AM_V_GEN)$(MKDIR_P) '%reldir%/sys'
+ $(AM_V_at)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's/@''HAVE_SYS_FILE_H''@/$(HAVE_SYS_FILE_H)/g' \
diff --git a/modules/sys_ioctl b/modules/sys_ioctl
index 571dc822b7..5da91b7476 100644
--- a/modules/sys_ioctl
+++ b/modules/sys_ioctl
@@ -22,8 +22,8 @@ BUILT_SOURCES += sys/ioctl.h
# 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 $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
- $(AM_V_at)$(MKDIR_P) '%reldir%/sys'
- $(AM_V_GEN)rm -f $@-t $@ && \
+ $(AM_V_GEN)$(MKDIR_P) '%reldir%/sys'
+ $(AM_V_at)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's|@''HAVE_SYS_IOCTL_H''@|$(HAVE_SYS_IOCTL_H)|g' \
diff --git a/modules/sys_random b/modules/sys_random
index 331103ae6b..ad6cd583af 100644
--- a/modules/sys_random
+++ b/modules/sys_random
@@ -22,8 +22,8 @@ BUILT_SOURCES += sys/random.h
# We need the following in order to create <sys/random.h> when the system
# doesn't have one.
sys/random.h: sys_random.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
- $(AM_V_at)$(MKDIR_P) '%reldir%/sys'
- $(AM_V_GEN)rm -f $@-t $@ && \
+ $(AM_V_GEN)$(MKDIR_P) '%reldir%/sys'
+ $(AM_V_at)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
diff --git a/modules/sys_resource b/modules/sys_resource
index 5c68b981b0..203e44adad 100644
--- a/modules/sys_resource
+++ b/modules/sys_resource
@@ -23,8 +23,8 @@ BUILT_SOURCES += sys/resource.h
# We need the following in order to create <sys/resource.h> when the system
# doesn't have one.
sys/resource.h: sys_resource.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
- $(AM_V_at)$(MKDIR_P) '%reldir%/sys'
- $(AM_V_GEN)rm -f $@-t $@ && \
+ $(AM_V_GEN)$(MKDIR_P) '%reldir%/sys'
+ $(AM_V_at)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
diff --git a/modules/sys_select b/modules/sys_select
index 61e78f8270..1601b3976f 100644
--- a/modules/sys_select
+++ b/modules/sys_select
@@ -24,8 +24,8 @@ BUILT_SOURCES += sys/select.h
# 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 $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
- $(AM_V_at)$(MKDIR_P) '%reldir%/sys'
- $(AM_V_GEN)rm -f $@-t $@ && \
+ $(AM_V_GEN)$(MKDIR_P) '%reldir%/sys'
+ $(AM_V_at)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
diff --git a/modules/sys_socket b/modules/sys_socket
index dae62f250e..263d356482 100644
--- a/modules/sys_socket
+++ b/modules/sys_socket
@@ -31,8 +31,8 @@ lib_SOURCES += sys_socket.c
# 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 $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H)
- $(AM_V_at)$(MKDIR_P) '%reldir%/sys'
- $(AM_V_GEN)rm -f $@-t $@ && \
+ $(AM_V_GEN)$(MKDIR_P) '%reldir%/sys'
+ $(AM_V_at)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
diff --git a/modules/sys_stat b/modules/sys_stat
index b778038c7c..38ff7e141c 100644
--- a/modules/sys_stat
+++ b/modules/sys_stat
@@ -26,8 +26,8 @@ BUILT_SOURCES += sys/stat.h
# 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 $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
- $(AM_V_at)$(MKDIR_P) '%reldir%/sys'
- $(AM_V_GEN)rm -f $@-t $@ && \
+ $(AM_V_GEN)$(MKDIR_P) '%reldir%/sys'
+ $(AM_V_at)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
diff --git a/modules/sys_time b/modules/sys_time
index 07838d2cd1..1014d2d357 100644
--- a/modules/sys_time
+++ b/modules/sys_time
@@ -23,8 +23,8 @@ BUILT_SOURCES += sys/time.h
# 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 $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
- $(AM_V_at)$(MKDIR_P) '%reldir%/sys'
- $(AM_V_GEN)rm -f $@-t $@ && \
+ $(AM_V_GEN)$(MKDIR_P) '%reldir%/sys'
+ $(AM_V_at)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's/@''HAVE_SYS_TIME_H''@/$(HAVE_SYS_TIME_H)/g' \
diff --git a/modules/sys_times b/modules/sys_times
index 704fc17cb7..68cb605185 100644
--- a/modules/sys_times
+++ b/modules/sys_times
@@ -21,8 +21,8 @@ BUILT_SOURCES += sys/times.h
# 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 $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG_NONNULL_H)
- $(AM_V_at)$(MKDIR_P) '%reldir%/sys'
- $(AM_V_GEN)rm -f $@-t $@ && \
+ $(AM_V_GEN)$(MKDIR_P) '%reldir%/sys'
+ $(AM_V_at)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's/@''HAVE_SYS_TIMES_H''@/$(HAVE_SYS_TIMES_H)/g' \
diff --git a/modules/sys_types b/modules/sys_types
index e7d9511a6b..4532338032 100644
--- a/modules/sys_types
+++ b/modules/sys_types
@@ -22,8 +22,8 @@ BUILT_SOURCES += sys/types.h
# We need the following in order to create <sys/types.h> when the system
# doesn't have one that works with the given compiler.
sys/types.h: sys_types.in.h $(top_builddir)/config.status
- $(AM_V_at)$(MKDIR_P) '%reldir%/sys'
- $(AM_V_GEN)rm -f $@-t $@ && \
+ $(AM_V_GEN)$(MKDIR_P) '%reldir%/sys'
+ $(AM_V_at)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
diff --git a/modules/sys_uio b/modules/sys_uio
index 1cb23da97b..1906544be3 100644
--- a/modules/sys_uio
+++ b/modules/sys_uio
@@ -21,8 +21,8 @@ BUILT_SOURCES += sys/uio.h
# We need the following in order to create <sys/uio.h> when the system
# doesn't have one that works with the given compiler.
sys/uio.h: sys_uio.in.h $(top_builddir)/config.status
- $(AM_V_at)$(MKDIR_P) '%reldir%/sys'
- $(AM_V_GEN)rm -f $@-t $@ && \
+ $(AM_V_GEN)$(MKDIR_P) '%reldir%/sys'
+ $(AM_V_at)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
diff --git a/modules/sys_utsname b/modules/sys_utsname
index d3f70dbabf..a05589e5fc 100644
--- a/modules/sys_utsname
+++ b/modules/sys_utsname
@@ -21,8 +21,8 @@ BUILT_SOURCES += sys/utsname.h
# 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 $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG_NONNULL_H)
- $(AM_V_at)$(MKDIR_P) '%reldir%/sys'
- $(AM_V_GEN)rm -f $@-t $@ && \
+ $(AM_V_GEN)$(MKDIR_P) '%reldir%/sys'
+ $(AM_V_at)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's/@''HAVE_SYS_UTSNAME_H''@/$(HAVE_SYS_UTSNAME_H)/g' \
diff --git a/modules/sys_wait b/modules/sys_wait
index e46fbb9d9e..18a317c394 100644
--- a/modules/sys_wait
+++ b/modules/sys_wait
@@ -22,8 +22,8 @@ BUILT_SOURCES += sys/wait.h
# 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 $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
- $(AM_V_at)$(MKDIR_P) '%reldir%/sys'
- $(AM_V_GEN)rm -f $@-t $@ && \
+ $(AM_V_GEN)$(MKDIR_P) '%reldir%/sys'
+ $(AM_V_at)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
diff --git a/modules/unicase/special-casing b/modules/unicase/special-casing
index 352ac60fac..79d9b93803 100644
--- a/modules/unicase/special-casing
+++ b/modules/unicase/special-casing
@@ -25,8 +25,8 @@ EXTRA_DIST += unicase/special-casing-table.h
# Generate special-casing.h with a declaration that depends on the gperf version.
unicase/special-casing.h: unicase/special-casing.in.h unicase/special-casing-table.h
- $(AM_V_at)$(MKDIR_P) '%reldir%/unicase'
- $(AM_V_GEN)rm -f $@-t $@ && \
+ $(AM_V_GEN)$(MKDIR_P) '%reldir%/unicase'
+ $(AM_V_at)rm -f $@-t $@ && \
declaration=`grep '^gl_unicase_special_lookup' $(srcdir)/unicase/special-casing-table.h | sed -e 's/register //g'` && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e "/gl_unicase_special_lookup/s/gl_unicase_special_lookup.*/$${declaration};/" $(srcdir)/unicase/special-casing.in.h; \
diff --git a/top/maint.mk b/top/maint.mk
index a03bc2e21e..a61bfda134 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -1522,7 +1522,7 @@ alpha beta stable: $(local-check) writable-files $(submodule-checks)
release:
$(AM_V_GEN)$(MAKE) _version
- $(AM_V_GEN)$(MAKE) $(release-type)
+ $(AM_V_at)$(MAKE) $(release-type)
# Override this in cfg.mk if you follow different procedures.
release-prep-hook ?= release-prep