From 83a0d5891db50c00e283e70df694b6003b1f485d Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 21 Dec 2021 09:59:17 +0100 Subject: [PATCH] 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. --- ChangeLog | 75 +++++++++++++++++++++++++++++++++++ gnulib-tool | 18 ++++++++- modules/alloca-opt | 2 +- modules/argz | 2 +- modules/assert-h | 2 +- modules/byteswap | 2 +- modules/configmake | 2 +- modules/ctype | 2 +- modules/dirent | 2 +- modules/errno | 2 +- modules/execinfo | 2 +- modules/fcntl-h | 2 +- modules/float | 2 +- modules/fnmatch-h | 2 +- modules/getopt-posix | 2 +- modules/glob-h | 2 +- modules/iconv-h | 2 +- modules/ieee754-h | 2 +- modules/inttypes-incomplete | 2 +- modules/langinfo | 2 +- modules/libtextstyle-optional | 2 +- modules/limits-h | 2 +- modules/locale | 2 +- modules/malloc-h | 2 +- modules/math | 2 +- modules/monetary | 2 +- modules/netdb | 2 +- modules/openmp-init | 2 +- modules/poll-h | 2 +- modules/posix-shell | 2 +- modules/pthread-h | 2 +- modules/pty | 2 +- modules/sched | 2 +- modules/search | 2 +- modules/signal-h | 2 +- modules/sigsegv | 2 +- modules/snippet/link-warning | 2 +- modules/spawn | 2 +- modules/stdalign | 2 +- modules/stdarg | 2 +- modules/stdbool | 2 +- modules/stddef | 2 +- modules/stdint | 2 +- modules/stdio | 2 +- modules/stdlib | 2 +- modules/stdnoreturn | 2 +- modules/string | 2 +- modules/strings | 2 +- modules/sysexits | 2 +- modules/termios | 2 +- modules/threads-h | 2 +- modules/time | 2 +- modules/uchar | 2 +- modules/unicase/base | 2 +- modules/uniconv/base | 2 +- modules/unictype/base | 2 +- modules/unigbrk/base | 2 +- modules/unilbrk/base | 2 +- modules/uniname/base | 2 +- modules/uninorm/base | 2 +- modules/unistd | 2 +- modules/unistdio/base | 2 +- modules/unistr/base | 2 +- modules/unitypes | 2 +- modules/uniwbrk/base | 2 +- modules/uniwidth/base | 2 +- modules/utime-h | 2 +- modules/wchar | 2 +- modules/wctype-h | 2 +- 69 files changed, 158 insertions(+), 69 deletions(-) diff --git a/ChangeLog b/ChangeLog index b2c5b61914..2fb6603c8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,78 @@ +2021-12-21 Bruno Haible + + 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 non-recursive-gnulib-prefix-hack: Deprecate module. diff --git a/gnulib-tool b/gnulib-tool index 678d334250..2870c2984a 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_ 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 30d0ad4e76..b33522997d 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 bfa630ca5f..0d89267aa3 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 b5bed41ebd..da6c85bf33 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 ef48fac2d0..577811ee4f 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 05a0f4a7ef..7295908116 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 /* avoid mingw pollution on DATADIR */'; \ diff --git a/modules/ctype b/modules/ctype index 4d35c8ae02..ef5b22aaa8 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 3d56548c4b..08d42e7067 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 e8c3bede0a..b149897dad 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 1846377796..0c47c5c82b 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 41dc983087..d546217379 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 4dcab5a761..feaf509140 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 a0cca9e942..aa15d0df2a 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 ff950f2fa0..0b1a6f3f98 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 549a9bb628..0392f46778 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 c3aed0bf49..9cf25f91b0 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 343db6c994..9c5c964ecf 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 af49908147..903112c1be 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 9c1665da89..68ad36d70a 100644 --- a/modules/langinfo +++ b/modules/langinfo @@ -23,7 +23,7 @@ BUILT_SOURCES += 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 a9656803a5..36448abe07 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 14205e457d..a1a875e395 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 7bb7cfc98b..2f067cf2ae 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 9a902e02c8..810106f488 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 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 da84455247..822e668a79 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 63d36e9209..4c3de53240 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 9ad12eb93c..efbd1711e0 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 f3fd23e774..a11b083312 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 4287299e54..2b6bb0962b 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 0773691671..e88dccc72f 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 cecf43966a..6f595d1b13 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 2814d3ca58..9388dd7ef5 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 ea706e8fc7..aac7668f71 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 d24c37b16a..1a07bae328 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 a0285f2925..b3a027b6ff 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 ef0a5fcd55..3d70828f7f 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 6727eedcae..118ed09abe 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 8ad028c10e..6f4011de0f 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 b17c8eff19..9e8cd9f4f2 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 5bfd500b63..703cf4f1cc 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 9128b453e5..0bbdd3a8e3 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 0967bc1429..8e0f4100aa 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 bdec953df5..92045c0a95 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 f286f4b445..0d5b68c3ea 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 f4a3388726..56e64af39d 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 963a6926db..3c102f555c 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 64f543e082..a6c049b569 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 e3b7b28850..8a662066a2 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 a3958332a7..a87b27931c 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 b1a6c5767e..1865f0779c 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 0c01f8d7a2..a101c0d67b 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 2b5d9a3646..8961d2ae0a 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 1cf8b7a1ea..f9f3b60f64 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 2dfea48b04..3d073c2cea 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 0d27e23c2d..b9e76db5d7 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 25c16fa1a0..d28c370b43 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 fa3f869d0b..e9a56cd60c 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 de3d29dcb1..4215570ee9 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 c316cc4bbf..b710c29771 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 edaf088f7e..ab5cbd6a1c 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 fd81e2b827..ea1bea658f 100644 --- a/modules/unistd +++ b/modules/unistd @@ -31,7 +31,7 @@ lib_SOURCES += unistd.c # 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 9f2203bbb6..d3586187b2 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 e0f2113b70..054cd6d8bd 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 a8e4413140..94952f1f41 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 f9a947bbf1..a23e796f99 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 ac7167db8f..5d1c820f04 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 0b2a341192..1cd337d37f 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 9c37594a53..56620eb6bd 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 0993a7c3c1..34ccc0439e 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' \ -- 2.39.5