summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2021-12-21 09:59:17 +0100
committerBruno Haible <bruno@clisp.org>2021-12-21 09:59:17 +0100
commit83a0d5891db50c00e283e70df694b6003b1f485d (patch)
tree0ab4aea2af4f9e6bd08d18426945a42b07bb7264
parentf8eed11b15e9141d061900e4068ea1f3ba9b63f6 (diff)
Optimize redundant 'mkdir -p .' invocations.
Reported by Paul Eggert. * gnulib-tool (func_emit_lib_Makefile_am, func_emit_tests_Makefile_am): Eliminate @NMD@ tokens. * modules/alloca-opt (Makefile.am): Prefix the "$(MKDIR_P) '%reldir%'" line with @NMD@. * modules/argz (Makefile.am): Likewise. * modules/assert-h (Makefile.am): Likewise. * modules/byteswap (Makefile.am): Likewise. * modules/configmake (Makefile.am): Likewise. * modules/ctype (Makefile.am): Likewise. * modules/dirent (Makefile.am): Likewise. * modules/errno (Makefile.am): Likewise. * modules/execinfo (Makefile.am): Likewise. * modules/fcntl-h (Makefile.am): Likewise. * modules/float (Makefile.am): Likewise. * modules/fnmatch-h (Makefile.am): Likewise. * modules/getopt-posix (Makefile.am): Likewise. * modules/glob-h (Makefile.am): Likewise. * modules/iconv-h (Makefile.am): Likewise. * modules/ieee754-h (Makefile.am): Likewise. * modules/inttypes-incomplete (Makefile.am): Likewise. * modules/langinfo (Makefile.am): Likewise. * modules/libtextstyle-optional (Makefile.am): Likewise. * modules/limits-h (Makefile.am): Likewise. * modules/locale (Makefile.am): Likewise. * modules/malloc-h (Makefile.am): Likewise. * modules/math (Makefile.am): Likewise. * modules/monetary (Makefile.am): Likewise. * modules/netdb (Makefile.am): Likewise. * modules/openmp-init (Makefile.am): Likewise. * modules/poll-h (Makefile.am): Likewise. * modules/posix-shell (Makefile.am): Likewise. * modules/pthread-h (Makefile.am): Likewise. * modules/pty (Makefile.am): Likewise. * modules/sched (Makefile.am): Likewise. * modules/search (Makefile.am): Likewise. * modules/signal-h (Makefile.am): Likewise. * modules/sigsegv (Makefile.am): Likewise. * modules/snippet/link-warning (Makefile.am): Likewise. * modules/spawn (Makefile.am): Likewise. * modules/stdalign (Makefile.am): Likewise. * modules/stdarg (Makefile.am): Likewise. * modules/stdbool (Makefile.am): Likewise. * modules/stddef (Makefile.am): Likewise. * modules/stdint (Makefile.am): Likewise. * modules/stdio (Makefile.am): Likewise. * modules/stdlib (Makefile.am): Likewise. * modules/stdnoreturn (Makefile.am): Likewise. * modules/string (Makefile.am): Likewise. * modules/strings (Makefile.am): Likewise. * modules/sysexits (Makefile.am): Likewise. * modules/termios (Makefile.am): Likewise. * modules/threads-h (Makefile.am): Likewise. * modules/time (Makefile.am): Likewise. * modules/uchar (Makefile.am): Likewise. * modules/unicase/base (Makefile.am): Likewise. * modules/uniconv/base (Makefile.am): Likewise. * modules/unictype/base (Makefile.am): Likewise. * modules/unigbrk/base (Makefile.am): Likewise. * modules/unilbrk/base (Makefile.am): Likewise. * modules/uniname/base (Makefile.am): Likewise. * modules/uninorm/base (Makefile.am): Likewise. * modules/unistd (Makefile.am): Likewise. * modules/unistdio/base (Makefile.am): Likewise. * modules/unistr/base (Makefile.am): Likewise. * modules/unitypes (Makefile.am): Likewise. * modules/uniwbrk/base (Makefile.am): Likewise. * modules/uniwidth/base (Makefile.am): Likewise. * modules/utime-h (Makefile.am): Likewise. * modules/wchar (Makefile.am): Likewise. * modules/wctype-h (Makefile.am): Likewise.
-rw-r--r--ChangeLog75
-rwxr-xr-xgnulib-tool18
-rw-r--r--modules/alloca-opt2
-rw-r--r--modules/argz2
-rw-r--r--modules/assert-h2
-rw-r--r--modules/byteswap2
-rw-r--r--modules/configmake2
-rw-r--r--modules/ctype2
-rw-r--r--modules/dirent2
-rw-r--r--modules/errno2
-rw-r--r--modules/execinfo2
-rw-r--r--modules/fcntl-h2
-rw-r--r--modules/float2
-rw-r--r--modules/fnmatch-h2
-rw-r--r--modules/getopt-posix2
-rw-r--r--modules/glob-h2
-rw-r--r--modules/iconv-h2
-rw-r--r--modules/ieee754-h2
-rw-r--r--modules/inttypes-incomplete2
-rw-r--r--modules/langinfo2
-rw-r--r--modules/libtextstyle-optional2
-rw-r--r--modules/limits-h2
-rw-r--r--modules/locale2
-rw-r--r--modules/malloc-h2
-rw-r--r--modules/math2
-rw-r--r--modules/monetary2
-rw-r--r--modules/netdb2
-rw-r--r--modules/openmp-init2
-rw-r--r--modules/poll-h2
-rw-r--r--modules/posix-shell2
-rw-r--r--modules/pthread-h2
-rw-r--r--modules/pty2
-rw-r--r--modules/sched2
-rw-r--r--modules/search2
-rw-r--r--modules/signal-h2
-rw-r--r--modules/sigsegv2
-rw-r--r--modules/snippet/link-warning2
-rw-r--r--modules/spawn2
-rw-r--r--modules/stdalign2
-rw-r--r--modules/stdarg2
-rw-r--r--modules/stdbool2
-rw-r--r--modules/stddef2
-rw-r--r--modules/stdint2
-rw-r--r--modules/stdio2
-rw-r--r--modules/stdlib2
-rw-r--r--modules/stdnoreturn2
-rw-r--r--modules/string2
-rw-r--r--modules/strings2
-rw-r--r--modules/sysexits2
-rw-r--r--modules/termios2
-rw-r--r--modules/threads-h2
-rw-r--r--modules/time2
-rw-r--r--modules/uchar2
-rw-r--r--modules/unicase/base2
-rw-r--r--modules/uniconv/base2
-rw-r--r--modules/unictype/base2
-rw-r--r--modules/unigbrk/base2
-rw-r--r--modules/unilbrk/base2
-rw-r--r--modules/uniname/base2
-rw-r--r--modules/uninorm/base2
-rw-r--r--modules/unistd2
-rw-r--r--modules/unistdio/base2
-rw-r--r--modules/unistr/base2
-rw-r--r--modules/unitypes2
-rw-r--r--modules/uniwbrk/base2
-rw-r--r--modules/uniwidth/base2
-rw-r--r--modules/utime-h2
-rw-r--r--modules/wchar2
-rw-r--r--modules/wctype-h2
69 files changed, 158 insertions, 69 deletions
diff --git a/ChangeLog b/ChangeLog
index b2c5b61..2fb6603 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,78 @@
+2021-12-21 Bruno Haible <bruno@clisp.org>
+
+ Optimize redundant 'mkdir -p .' invocations.
+ Reported by Paul Eggert.
+ * gnulib-tool (func_emit_lib_Makefile_am, func_emit_tests_Makefile_am):
+ Eliminate @NMD@ tokens.
+ * modules/alloca-opt (Makefile.am): Prefix the "$(MKDIR_P) '%reldir%'"
+ line with @NMD@.
+ * modules/argz (Makefile.am): Likewise.
+ * modules/assert-h (Makefile.am): Likewise.
+ * modules/byteswap (Makefile.am): Likewise.
+ * modules/configmake (Makefile.am): Likewise.
+ * modules/ctype (Makefile.am): Likewise.
+ * modules/dirent (Makefile.am): Likewise.
+ * modules/errno (Makefile.am): Likewise.
+ * modules/execinfo (Makefile.am): Likewise.
+ * modules/fcntl-h (Makefile.am): Likewise.
+ * modules/float (Makefile.am): Likewise.
+ * modules/fnmatch-h (Makefile.am): Likewise.
+ * modules/getopt-posix (Makefile.am): Likewise.
+ * modules/glob-h (Makefile.am): Likewise.
+ * modules/iconv-h (Makefile.am): Likewise.
+ * modules/ieee754-h (Makefile.am): Likewise.
+ * modules/inttypes-incomplete (Makefile.am): Likewise.
+ * modules/langinfo (Makefile.am): Likewise.
+ * modules/libtextstyle-optional (Makefile.am): Likewise.
+ * modules/limits-h (Makefile.am): Likewise.
+ * modules/locale (Makefile.am): Likewise.
+ * modules/malloc-h (Makefile.am): Likewise.
+ * modules/math (Makefile.am): Likewise.
+ * modules/monetary (Makefile.am): Likewise.
+ * modules/netdb (Makefile.am): Likewise.
+ * modules/openmp-init (Makefile.am): Likewise.
+ * modules/poll-h (Makefile.am): Likewise.
+ * modules/posix-shell (Makefile.am): Likewise.
+ * modules/pthread-h (Makefile.am): Likewise.
+ * modules/pty (Makefile.am): Likewise.
+ * modules/sched (Makefile.am): Likewise.
+ * modules/search (Makefile.am): Likewise.
+ * modules/signal-h (Makefile.am): Likewise.
+ * modules/sigsegv (Makefile.am): Likewise.
+ * modules/snippet/link-warning (Makefile.am): Likewise.
+ * modules/spawn (Makefile.am): Likewise.
+ * modules/stdalign (Makefile.am): Likewise.
+ * modules/stdarg (Makefile.am): Likewise.
+ * modules/stdbool (Makefile.am): Likewise.
+ * modules/stddef (Makefile.am): Likewise.
+ * modules/stdint (Makefile.am): Likewise.
+ * modules/stdio (Makefile.am): Likewise.
+ * modules/stdlib (Makefile.am): Likewise.
+ * modules/stdnoreturn (Makefile.am): Likewise.
+ * modules/string (Makefile.am): Likewise.
+ * modules/strings (Makefile.am): Likewise.
+ * modules/sysexits (Makefile.am): Likewise.
+ * modules/termios (Makefile.am): Likewise.
+ * modules/threads-h (Makefile.am): Likewise.
+ * modules/time (Makefile.am): Likewise.
+ * modules/uchar (Makefile.am): Likewise.
+ * modules/unicase/base (Makefile.am): Likewise.
+ * modules/uniconv/base (Makefile.am): Likewise.
+ * modules/unictype/base (Makefile.am): Likewise.
+ * modules/unigbrk/base (Makefile.am): Likewise.
+ * modules/unilbrk/base (Makefile.am): Likewise.
+ * modules/uniname/base (Makefile.am): Likewise.
+ * modules/uninorm/base (Makefile.am): Likewise.
+ * modules/unistd (Makefile.am): Likewise.
+ * modules/unistdio/base (Makefile.am): Likewise.
+ * modules/unistr/base (Makefile.am): Likewise.
+ * modules/unitypes (Makefile.am): Likewise.
+ * modules/uniwbrk/base (Makefile.am): Likewise.
+ * modules/uniwidth/base (Makefile.am): Likewise.
+ * modules/utime-h (Makefile.am): Likewise.
+ * modules/wchar (Makefile.am): Likewise.
+ * modules/wctype-h (Makefile.am): Likewise.
+
2021-12-19 Bruno Haible <bruno@clisp.org>
non-recursive-gnulib-prefix-hack: Deprecate module.
diff --git a/gnulib-tool b/gnulib-tool
index 678d334..2870c29 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -3692,6 +3692,7 @@ func_update_file ()
# - auxdir directory relative to destdir where to place build aux files
# - gnu_make true if --gnu-make was given, false otherwise
# - makefile_name from --makefile-name
+# - automake_subdir true if --automake-subdir was given, false otherwise
# - libtool true if libtool will be used, false or blank otherwise
# - macro_prefix prefix of gl_LIBOBJS macros to use
# - module_indicator_prefix prefix of GNULIB_<modulename> variables to use
@@ -3725,6 +3726,13 @@ func_emit_lib_Makefile_am ()
perhapsLT=
sed_eliminate_LDFLAGS='/^lib_LDFLAGS[ ]*+=/d'
fi
+ # 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@//'
+ else
+ sed_eliminate_NMD='/@NMD@/d'
+ fi
if $for_test; then
# When creating a package for testing: Attempt to provoke failures,
# especially link errors, already during "make" rather than during
@@ -3735,8 +3743,9 @@ func_emit_lib_Makefile_am ()
sed_transform_check_PROGRAMS="$sed_noop"
fi
echo "## DO NOT EDIT! GENERATED AUTOMATICALLY!"
- $gnu_make ||
- echo "## Process this file with automake to produce Makefile.in."
+ if ! $gnu_make; then
+ echo "## Process this file with automake to produce Makefile.in."
+ fi
func_emit_copyright_notice
if test -n "$actioncmd"; then
printf '# Reproduce by:\n%s\n' "$actioncmd"
@@ -3753,6 +3762,7 @@ func_emit_lib_Makefile_am ()
sed -e 's,lib_LIBRARIES,lib%_LIBRARIES,g' \
-e 's,lib_LTLIBRARIES,lib%_LTLIBRARIES,g' \
-e "$sed_eliminate_LDFLAGS" \
+ -e "$sed_eliminate_NMD" \
-e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' \
-e 's,\$(GNULIB_,$('"${module_indicator_prefix}"'_GNULIB_,' \
-e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \
@@ -4097,6 +4107,9 @@ func_emit_tests_Makefile_am ()
perhapsLT=
sed_eliminate_LDFLAGS='/^lib_LDFLAGS[ ]*+=/d'
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'
if $for_test; then
# When creating a package for testing: Attempt to provoke failures,
# especially link errors, already during "make" rather than during
@@ -4126,6 +4139,7 @@ func_emit_tests_Makefile_am ()
sed -e 's,lib_LIBRARIES,lib%_LIBRARIES,g' \
-e 's,lib_LTLIBRARIES,lib%_LTLIBRARIES,g' \
-e "$sed_eliminate_LDFLAGS" \
+ -e "$sed_eliminate_NMD" \
-e 's,lib_\([A-Z][A-Z]*\),libtests_a_\1,g' \
-e 's,\$(GNULIB_,$('"${module_indicator_prefix}"'_GNULIB_,' \
-e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \
diff --git a/modules/alloca-opt b/modules/alloca-opt
index 30d0ad4..b335229 100644
--- a/modules/alloca-opt
+++ b/modules/alloca-opt
@@ -22,7 +22,7 @@ BUILT_SOURCES += $(ALLOCA_H)
if GL_GENERATE_ALLOCA_H
alloca.h: alloca.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''HAVE_ALLOCA_H''@|$(HAVE_ALLOCA_H)|g' < $(srcdir)/alloca.in.h; \
} > $@-t && \
diff --git a/modules/argz b/modules/argz
index bfa630c..0d89267 100644
--- a/modules/argz
+++ b/modules/argz
@@ -30,7 +30,7 @@ BUILT_SOURCES += $(ARGZ_H)
if GL_GENERATE_ARGZ_H
argz.h: argz.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/argz.in.h; \
} > $@-t && \
diff --git a/modules/assert-h b/modules/assert-h
index b5bed41..da6c85b 100644
--- a/modules/assert-h
+++ b/modules/assert-h
@@ -22,7 +22,7 @@ BUILT_SOURCES += $(ASSERT_H)
if GL_GENERATE_ASSERT_H
assert.h: assert.in.h verify.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
diff --git a/modules/byteswap b/modules/byteswap
index ef48fac..577811e 100644
--- a/modules/byteswap
+++ b/modules/byteswap
@@ -20,7 +20,7 @@ BUILT_SOURCES += $(BYTESWAP_H)
if GL_GENERATE_BYTESWAP_H
byteswap.h: byteswap.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/byteswap.in.h; \
} > $@-t && \
diff --git a/modules/configmake b/modules/configmake
index 05a0f4a..7295908 100644
--- a/modules/configmake
+++ b/modules/configmake
@@ -17,7 +17,7 @@ Makefile.am:
# listed in the Automake 1.10a+ documentation.
configmake.h: Makefile
$(AM_V_GEN)rm -f $@-t && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
echo '#if HAVE_WINSOCK2_H'; \
echo '# include <winsock2.h> /* avoid mingw pollution on DATADIR */'; \
diff --git a/modules/ctype b/modules/ctype
index 4d35c8a..ef5b22a 100644
--- a/modules/ctype
+++ b/modules/ctype
@@ -23,7 +23,7 @@ BUILT_SOURCES += ctype.h
# 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)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ 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/dirent b/modules/dirent
index 3d56548..08d42e7 100644
--- a/modules/dirent
+++ b/modules/dirent
@@ -25,7 +25,7 @@ BUILT_SOURCES += dirent.h
# 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)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's|@''HAVE_DIRENT_H''@|$(HAVE_DIRENT_H)|g' \
diff --git a/modules/errno b/modules/errno
index e8c3bed..b149897 100644
--- a/modules/errno
+++ b/modules/errno
@@ -21,7 +21,7 @@ BUILT_SOURCES += $(ERRNO_H)
if GL_GENERATE_ERRNO_H
errno.h: errno.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ 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/execinfo b/modules/execinfo
index 1846377..0c47c5c 100644
--- a/modules/execinfo
+++ b/modules/execinfo
@@ -25,7 +25,7 @@ BUILT_SOURCES += $(EXECINFO_H)
if GL_GENERATE_EXECINFO_H
execinfo.h: execinfo.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/execinfo.in.h; \
} > $@-t && \
diff --git a/modules/fcntl-h b/modules/fcntl-h
index 41dc983..d546217 100644
--- a/modules/fcntl-h
+++ b/modules/fcntl-h
@@ -28,7 +28,7 @@ BUILT_SOURCES += fcntl.h
# 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)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ 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/float b/modules/float
index 4dcab5a..feaf509 100644
--- a/modules/float
+++ b/modules/float
@@ -29,7 +29,7 @@ BUILT_SOURCES += $(FLOAT_H)
if GL_GENERATE_FLOAT_H
float.h: float.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ 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/fnmatch-h b/modules/fnmatch-h
index a0cca9e..aa15d0d 100644
--- a/modules/fnmatch-h
+++ b/modules/fnmatch-h
@@ -25,7 +25,7 @@ BUILT_SOURCES += $(FNMATCH_H)
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)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's|@''HAVE_FNMATCH_H''@|$(HAVE_FNMATCH_H)|g' \
diff --git a/modules/getopt-posix b/modules/getopt-posix
index ff950f2..0b1a6f3 100644
--- a/modules/getopt-posix
+++ b/modules/getopt-posix
@@ -42,7 +42,7 @@ BUILT_SOURCES += $(GETOPT_H) $(GETOPT_CDEFS_H)
if GL_GENERATE_GETOPT_H
getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H)
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \
diff --git a/modules/glob-h b/modules/glob-h
index 549a9bb..0392f46 100644
--- a/modules/glob-h
+++ b/modules/glob-h
@@ -29,7 +29,7 @@ BUILT_SOURCES += $(GLOB_H)
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)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's|@''HAVE_GLOB_H''@|$(HAVE_GLOB_H)|g' \
diff --git a/modules/iconv-h b/modules/iconv-h
index c3aed0b..9cf25f9 100644
--- a/modules/iconv-h
+++ b/modules/iconv-h
@@ -25,7 +25,7 @@ BUILT_SOURCES += $(ICONV_H)
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)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ 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/ieee754-h b/modules/ieee754-h
index 343db6c..9c5c964 100644
--- a/modules/ieee754-h
+++ b/modules/ieee754-h
@@ -20,7 +20,7 @@ BUILT_SOURCES += $(IEEE754_H)
if GL_GENERATE_IEEE754_H
ieee754.h: ieee754.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's/ifndef _GL_GNULIB_HEADER/if 0/g' \
$(srcdir)/ieee754.in.h; \
diff --git a/modules/inttypes-incomplete b/modules/inttypes-incomplete
index af49908..903112c 100644
--- a/modules/inttypes-incomplete
+++ b/modules/inttypes-incomplete
@@ -25,7 +25,7 @@ BUILT_SOURCES += inttypes.h
# 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)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
diff --git a/modules/langinfo b/modules/langinfo
index 9c1665d..68ad36d 100644
--- a/modules/langinfo
+++ b/modules/langinfo
@@ -23,7 +23,7 @@ BUILT_SOURCES += langinfo.h
# <langinfo.h> 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)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's|@''HAVE_LANGINFO_H''@|$(HAVE_LANGINFO_H)|g' \
diff --git a/modules/libtextstyle-optional b/modules/libtextstyle-optional
index a965680..36448ab 100644
--- a/modules/libtextstyle-optional
+++ b/modules/libtextstyle-optional
@@ -29,7 +29,7 @@ BUILT_SOURCES += $(TEXTSTYLE_H)
if GL_GENERATE_TEXTSTYLE_H
textstyle.h: textstyle.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/textstyle.in.h; \
} > $@-t && \
diff --git a/modules/limits-h b/modules/limits-h
index 14205e4..a1a875e 100644
--- a/modules/limits-h
+++ b/modules/limits-h
@@ -21,7 +21,7 @@ BUILT_SOURCES += $(LIMITS_H)
if GL_GENERATE_LIMITS_H
limits.h: limits.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ 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/locale b/modules/locale
index 7bb7cfc..2f067cf 100644
--- a/modules/locale
+++ b/modules/locale
@@ -25,7 +25,7 @@ BUILT_SOURCES += locale.h
# 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)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ 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/malloc-h b/modules/malloc-h
index 9a902e0..810106f 100644
--- a/modules/malloc-h
+++ b/modules/malloc-h
@@ -21,7 +21,7 @@ BUILT_SOURCES += malloc.h
# We need the following in order to create <malloc.h> when we add workarounds.
malloc.h: malloc.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's|@''HAVE_MALLOC_H''@|$(HAVE_MALLOC_H)|g' \
diff --git a/modules/math b/modules/math
index da84455..822e668 100644
--- a/modules/math
+++ b/modules/math
@@ -27,7 +27,7 @@ lib_SOURCES += math.c
# 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)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's|@''INCLUDE_NEXT_AS_FIRST_DIRECTIVE''@|$(INCLUDE_NEXT_AS_FIRST_DIRECTIVE)|g' \
diff --git a/modules/monetary b/modules/monetary
index 63d36e9..4c3de53 100644
--- a/modules/monetary
+++ b/modules/monetary
@@ -25,7 +25,7 @@ BUILT_SOURCES += $(MONETARY_H)
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)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's|@''HAVE_MONETARY_H''@|$(HAVE_MONETARY_H)|g' \
diff --git a/modules/netdb b/modules/netdb
index 9ad12eb..efbd171 100644
--- a/modules/netdb
+++ b/modules/netdb
@@ -24,7 +24,7 @@ BUILT_SOURCES += netdb.h
# 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)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ 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/openmp-init b/modules/openmp-init
index f3fd23e..a11b083 100644
--- a/modules/openmp-init
+++ b/modules/openmp-init
@@ -23,7 +23,7 @@ BUILT_SOURCES += omp.h
omp.h: omp.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
$(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ 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/poll-h b/modules/poll-h
index 4287299..2b6bb09 100644
--- a/modules/poll-h
+++ b/modules/poll-h
@@ -24,7 +24,7 @@ BUILT_SOURCES += poll.h
# doesn't have one.
poll.h: poll.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's|@''HAVE_POLL_H''@|$(HAVE_POLL_H)|g' \
diff --git a/modules/posix-shell b/modules/posix-shell
index 0773691..e88dccc 100644
--- a/modules/posix-shell
+++ b/modules/posix-shell
@@ -14,7 +14,7 @@ Makefile.am:
##Sample usage of posix-shell module:
#script: script.in
# rm -f $@-t $@
-# $(MKDIR_P) '%reldir%'
+#@NMD@ $(MKDIR_P) '%reldir%'
# 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 cecf439..6f595d1 100644
--- a/modules/pthread-h
+++ b/modules/pthread-h
@@ -31,7 +31,7 @@ BUILT_SOURCES += pthread.h
# 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)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's|@''HAVE_PTHREAD_H''@|$(HAVE_PTHREAD_H)|g' \
diff --git a/modules/pty b/modules/pty
index 2814d3c..9388dd7 100644
--- a/modules/pty
+++ b/modules/pty
@@ -22,7 +22,7 @@ BUILT_SOURCES += pty.h
# 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)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's|@''HAVE_PTY_H''@|$(HAVE_PTY_H)|g' \
diff --git a/modules/sched b/modules/sched
index ea706e8..aac7668 100644
--- a/modules/sched
+++ b/modules/sched
@@ -23,7 +23,7 @@ BUILT_SOURCES += sched.h
# the system doesn't have one.
sched.h: sched.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's|@''HAVE_SCHED_H''@|$(HAVE_SCHED_H)|g' \
diff --git a/modules/search b/modules/search
index d24c37b..1a07bae 100644
--- a/modules/search
+++ b/modules/search
@@ -23,7 +23,7 @@ BUILT_SOURCES += search.h
# 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)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's|@''HAVE_SEARCH_H''@|$(HAVE_SEARCH_H)|g' \
diff --git a/modules/signal-h b/modules/signal-h
index a0285f2..b3a027b 100644
--- a/modules/signal-h
+++ b/modules/signal-h
@@ -25,7 +25,7 @@ BUILT_SOURCES += signal.h
# 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)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ 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/sigsegv b/modules/sigsegv
index ef0a5fc..3d70828 100644
--- a/modules/sigsegv
+++ b/modules/sigsegv
@@ -71,7 +71,7 @@ BUILT_SOURCES += $(SIGSEGV_H)
if GL_GENERATE_SIGSEGV_H
sigsegv.h: sigsegv.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/sigsegv.in.h; \
} > $@-t && \
diff --git a/modules/snippet/link-warning b/modules/snippet/link-warning
index 6727eed..118ed09 100644
--- a/modules/snippet/link-warning
+++ b/modules/snippet/link-warning
@@ -26,7 +26,7 @@ Makefile.am:
BUILT_SOURCES += link-warning.h
link-warning.h: $(top_srcdir)/build-aux/snippet/link-warning.h
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
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' \
diff --git a/modules/spawn b/modules/spawn
index 8ad028c..6f4011d 100644
--- a/modules/spawn
+++ b/modules/spawn
@@ -26,7 +26,7 @@ BUILT_SOURCES += spawn.h
# 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)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's|@''HAVE_SPAWN_H''@|$(HAVE_SPAWN_H)|g' \
diff --git a/modules/stdalign b/modules/stdalign
index b17c8ef..9e8cd9f 100644
--- a/modules/stdalign
+++ b/modules/stdalign
@@ -20,7 +20,7 @@ BUILT_SOURCES += $(STDALIGN_H)
if GL_GENERATE_STDALIGN_H
stdalign.h: stdalign.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/stdalign.in.h; \
} > $@-t && \
diff --git a/modules/stdarg b/modules/stdarg
index 5bfd500..703cf4f 100644
--- a/modules/stdarg
+++ b/modules/stdarg
@@ -26,7 +26,7 @@ BUILT_SOURCES += $(STDARG_H)
if GL_GENERATE_STDARG_H
stdarg.h: stdarg.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ 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/stdbool b/modules/stdbool
index 9128b45..0bbdd3a 100644
--- a/modules/stdbool
+++ b/modules/stdbool
@@ -21,7 +21,7 @@ BUILT_SOURCES += $(STDBOOL_H)
if GL_GENERATE_STDBOOL_H
stdbool.h: stdbool.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \
} > $@-t && \
diff --git a/modules/stddef b/modules/stddef
index 0967bc1..8e0f410 100644
--- a/modules/stddef
+++ b/modules/stddef
@@ -24,7 +24,7 @@ BUILT_SOURCES += $(STDDEF_H)
if GL_GENERATE_STDDEF_H
stddef.h: stddef.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ 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/stdint b/modules/stdint
index bdec953..92045c0 100644
--- a/modules/stdint
+++ b/modules/stdint
@@ -33,7 +33,7 @@ BUILT_SOURCES += $(STDINT_H)
if GL_GENERATE_STDINT_H
stdint.h: stdint.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
diff --git a/modules/stdio b/modules/stdio
index f286f4b..0d5b68c 100644
--- a/modules/stdio
+++ b/modules/stdio
@@ -52,7 +52,7 @@ BUILT_SOURCES += stdio.h
# 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)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ 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/stdlib b/modules/stdlib
index f4a3388..56e64af 100644
--- a/modules/stdlib
+++ b/modules/stdlib
@@ -27,7 +27,7 @@ BUILT_SOURCES += stdlib.h
stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
$(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ 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/stdnoreturn b/modules/stdnoreturn
index 963a692..3c102f5 100644
--- a/modules/stdnoreturn
+++ b/modules/stdnoreturn
@@ -21,7 +21,7 @@ BUILT_SOURCES += $(STDNORETURN_H)
if GL_GENERATE_STDNORETURN_H
stdnoreturn.h: stdnoreturn.in.h $(top_builddir)/config.status $(_NORETURN_H)
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e '/definition of _Noreturn/r $(_NORETURN_H)' \
< $(srcdir)/stdnoreturn.in.h; \
diff --git a/modules/string b/modules/string
index 64f543e..a6c049b 100644
--- a/modules/string
+++ b/modules/string
@@ -27,7 +27,7 @@ BUILT_SOURCES += string.h
# 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)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ 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/strings b/modules/strings
index e3b7b28..8a66206 100644
--- a/modules/strings
+++ b/modules/strings
@@ -24,7 +24,7 @@ BUILT_SOURCES += strings.h
# 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)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's|@''HAVE_STRINGS_H''@|$(HAVE_STRINGS_H)|g' \
diff --git a/modules/sysexits b/modules/sysexits
index a395833..a87b279 100644
--- a/modules/sysexits
+++ b/modules/sysexits
@@ -22,7 +22,7 @@ BUILT_SOURCES += $(SYSEXITS_H)
if GL_GENERATE_SYSEXITS_H
sysexits.h: sysexits.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's|@''HAVE_SYSEXITS_H''@|$(HAVE_SYSEXITS_H)|g' \
diff --git a/modules/termios b/modules/termios
index b1a6c57..1865f07 100644
--- a/modules/termios
+++ b/modules/termios
@@ -23,7 +23,7 @@ BUILT_SOURCES += termios.h
# version does not have all declarations.
termios.h: termios.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ 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/threads-h b/modules/threads-h
index 0c01f8d..a101c0d 100644
--- a/modules/threads-h
+++ b/modules/threads-h
@@ -40,7 +40,7 @@ BUILT_SOURCES += threads.h
# 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)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's|@''HAVE_THREADS_H''@|$(HAVE_THREADS_H)|g' \
diff --git a/modules/time b/modules/time
index 2b5d9a3..8961d2a 100644
--- a/modules/time
+++ b/modules/time
@@ -25,7 +25,7 @@ BUILT_SOURCES += time.h
# 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)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ 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/uchar b/modules/uchar
index 1cf8b7a..f9f3b60 100644
--- a/modules/uchar
+++ b/modules/uchar
@@ -22,7 +22,7 @@ BUILT_SOURCES += uchar.h
uchar.h: uchar.in.h $(top_builddir)/config.status $(CXXDEFS_H)
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's/@''HAVE_UCHAR_H''@/$(HAVE_UCHAR_H)/g' \
diff --git a/modules/unicase/base b/modules/unicase/base
index 2dfea48..3d073c2 100644
--- a/modules/unicase/base
+++ b/modules/unicase/base
@@ -19,7 +19,7 @@ BUILT_SOURCES += $(LIBUNISTRING_UNICASE_H)
unicase.h: unicase.in.h
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/unicase.in.h; \
} > $@-t && \
diff --git a/modules/uniconv/base b/modules/uniconv/base
index 0d27e23..b9e76db 100644
--- a/modules/uniconv/base
+++ b/modules/uniconv/base
@@ -20,7 +20,7 @@ BUILT_SOURCES += $(LIBUNISTRING_UNICONV_H)
uniconv.h: uniconv.in.h
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/uniconv.in.h; \
} > $@-t && \
diff --git a/modules/unictype/base b/modules/unictype/base
index 25c16fa..d28c370 100644
--- a/modules/unictype/base
+++ b/modules/unictype/base
@@ -18,7 +18,7 @@ BUILT_SOURCES += $(LIBUNISTRING_UNICTYPE_H)
unictype.h: unictype.in.h
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/unictype.in.h; \
} > $@-t && \
diff --git a/modules/unigbrk/base b/modules/unigbrk/base
index fa3f869..e9a56cd 100644
--- a/modules/unigbrk/base
+++ b/modules/unigbrk/base
@@ -18,7 +18,7 @@ BUILT_SOURCES += $(LIBUNISTRING_UNIGBRK_H)
unigbrk.h: unigbrk.in.h
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/unigbrk.in.h; \
} > $@-t && \
diff --git a/modules/unilbrk/base b/modules/unilbrk/base
index de3d29d..4215570 100644
--- a/modules/unilbrk/base
+++ b/modules/unilbrk/base
@@ -18,7 +18,7 @@ BUILT_SOURCES += $(LIBUNISTRING_UNILBRK_H)
unilbrk.h: unilbrk.in.h
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/unilbrk.in.h; \
} > $@-t && \
diff --git a/modules/uniname/base b/modules/uniname/base
index c316cc4..b710c29 100644
--- a/modules/uniname/base
+++ b/modules/uniname/base
@@ -17,7 +17,7 @@ BUILT_SOURCES += $(LIBUNISTRING_UNINAME_H)
uniname.h: uniname.in.h
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/uniname.in.h; \
} > $@-t && \
diff --git a/modules/uninorm/base b/modules/uninorm/base
index edaf088..ab5cbd6 100644
--- a/modules/uninorm/base
+++ b/modules/uninorm/base
@@ -17,7 +17,7 @@ BUILT_SOURCES += $(LIBUNISTRING_UNINORM_H)
uninorm.h: uninorm.in.h
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/uninorm.in.h; \
} > $@-t && \
diff --git a/modules/unistd b/modules/unistd
index fd81e2b..ea1bea6 100644
--- a/modules/unistd
+++ b/modules/unistd
@@ -31,7 +31,7 @@ lib_SOURCES += unistd.c
# <unistd.h> 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)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
diff --git a/modules/unistdio/base b/modules/unistdio/base
index 9f2203b..d358618 100644
--- a/modules/unistdio/base
+++ b/modules/unistdio/base
@@ -17,7 +17,7 @@ BUILT_SOURCES += $(LIBUNISTRING_UNISTDIO_H)
unistdio.h: unistdio.in.h
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/unistdio.in.h; \
} > $@-t && \
diff --git a/modules/unistr/base b/modules/unistr/base
index e0f2113..054cd6d 100644
--- a/modules/unistr/base
+++ b/modules/unistr/base
@@ -19,7 +19,7 @@ BUILT_SOURCES += $(LIBUNISTRING_UNISTR_H)
unistr.h: unistr.in.h
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/unistr.in.h; \
} > $@-t && \
diff --git a/modules/unitypes b/modules/unitypes
index a8e4413..94952f1 100644
--- a/modules/unitypes
+++ b/modules/unitypes
@@ -33,7 +33,7 @@ BUILT_SOURCES += $(LIBUNISTRING_UNITYPES_H)
unitypes.h: unitypes.in.h
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/unitypes.in.h; \
} > $@-t && \
diff --git a/modules/uniwbrk/base b/modules/uniwbrk/base
index f9a947b..a23e796 100644
--- a/modules/uniwbrk/base
+++ b/modules/uniwbrk/base
@@ -17,7 +17,7 @@ BUILT_SOURCES += $(LIBUNISTRING_UNIWBRK_H)
uniwbrk.h: uniwbrk.in.h
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/uniwbrk.in.h; \
} > $@-t && \
diff --git a/modules/uniwidth/base b/modules/uniwidth/base
index ac7167d..5d1c820 100644
--- a/modules/uniwidth/base
+++ b/modules/uniwidth/base
@@ -18,7 +18,7 @@ BUILT_SOURCES += $(LIBUNISTRING_UNIWIDTH_H)
uniwidth.h: uniwidth.in.h
$(AM_V_GEN)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/uniwidth.in.h; \
} > $@-t && \
diff --git a/modules/utime-h b/modules/utime-h
index 0b2a341..1cd337d 100644
--- a/modules/utime-h
+++ b/modules/utime-h
@@ -23,7 +23,7 @@ BUILT_SOURCES += utime.h
# 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)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's/@''HAVE_UTIME_H''@/$(HAVE_UTIME_H)/g' \
diff --git a/modules/wchar b/modules/wchar
index 9c37594..56620eb 100644
--- a/modules/wchar
+++ b/modules/wchar
@@ -28,7 +28,7 @@ BUILT_SOURCES += wchar.h
# 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)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ 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/wctype-h b/modules/wctype-h
index 0993a7c..34ccc04 100644
--- a/modules/wctype-h
+++ b/modules/wctype-h
@@ -26,7 +26,7 @@ lib_SOURCES += wctype-h.c
# 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)rm -f $@-t $@ && \
- $(MKDIR_P) '%reldir%' && \
+@NMD@ $(MKDIR_P) '%reldir%' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \