]> Savannah Git Hosting - gnulib.git/commitdiff
gen-header: new module
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 25 Dec 2021 01:21:59 +0000 (17:21 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 25 Dec 2021 01:27:25 +0000 (17:27 -0800)
Simplify header generation by using Makefile variables
defined by a new gen-header module.
* modules/gen-header: New module.
* modules/alloca-opt, modules/argz, modules/arpa_inet:
* modules/assert-h, modules/byteswap:
* modules/ctype, modules/dirent, modules/dynarray, modules/errno:
* modules/execinfo, modules/fcntl-h, modules/float:
* modules/fnmatch-h, modules/getopt-posix, modules/glob-h:
* modules/iconv-h, modules/ieee754-h, modules/inttypes-incomplete:
* modules/langinfo, modules/libtextstyle-optional, modules/limits-h:
* modules/locale, modules/malloc-h, modules/math, modules/monetary:
* modules/net_if, modules/netdb, modules/netinet_in:
* modules/openmp-init, modules/poll-h:
* modules/pthread-h, modules/pty, modules/sched:
* modules/scratch_buffer, modules/search, modules/selinux-h:
* modules/signal-h, modules/sigsegv:
* modules/spawn, modules/stdalign, modules/stdarg, modules/stdbool:
* modules/stddef, modules/stdint, modules/stdio, modules/stdlib:
* modules/stdnoreturn, modules/string, modules/strings:
* 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/sysexits, modules/termios:
* modules/threads-h, modules/time, modules/uchar:
* modules/unicase/base, modules/unicase/special-casing:
* modules/uniconv/base, modules/unictype/base, modules/unigbrk/base:
* modules/unilbrk/base, modules/uniname/base, modules/uninorm/base:
* modules/unistd, modules/unistdio/base, modules/unistr/base:
* modules/unitypes, modules/uniwbrk/base, modules/uniwidth/base:
* modules/utime-h, modules/wchar, modules/wctype-h:
Depend on gen-header, and use its macros to simplify
header generation.

86 files changed:
ChangeLog
modules/alloca-opt
modules/argz
modules/arpa_inet
modules/assert-h
modules/byteswap
modules/ctype
modules/dirent
modules/dynarray
modules/errno
modules/execinfo
modules/fcntl-h
modules/float
modules/fnmatch-h
modules/gen-header [new file with mode: 0644]
modules/getopt-posix
modules/glob-h
modules/iconv-h
modules/ieee754-h
modules/inttypes-incomplete
modules/langinfo
modules/libtextstyle-optional
modules/limits-h
modules/locale
modules/malloc-h
modules/math
modules/monetary
modules/net_if
modules/netdb
modules/netinet_in
modules/openmp-init
modules/poll-h
modules/pthread-h
modules/pty
modules/sched
modules/scratch_buffer
modules/search
modules/selinux-h
modules/signal-h
modules/sigsegv
modules/spawn
modules/stdalign
modules/stdarg
modules/stdbool
modules/stddef
modules/stdint
modules/stdio
modules/stdlib
modules/stdnoreturn
modules/string
modules/strings
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/sysexits
modules/termios
modules/threads-h
modules/time
modules/uchar
modules/unicase/base
modules/unicase/special-casing
modules/uniconv/base
modules/unictype/base
modules/unigbrk/base
modules/unilbrk/base
modules/uniname/base
modules/uninorm/base
modules/unistd
modules/unistdio/base
modules/unistr/base
modules/unitypes
modules/uniwbrk/base
modules/uniwidth/base
modules/utime-h
modules/wchar
modules/wctype-h

index 4cf5222bb5c14bf7b6c1fc5e0d110528c7640ad9..c73ea866d42e9c742d98bd9f327d0281edc395bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,40 @@
+2021-12-24  Paul Eggert  <eggert@cs.ucla.edu>
+
+       gen-header: new module
+       Simplify header generation by using Makefile variables
+       defined by a new gen-header module.
+       * modules/gen-header: New module.
+       * modules/alloca-opt, modules/argz, modules/arpa_inet:
+       * modules/assert-h, modules/byteswap:
+       * modules/ctype, modules/dirent, modules/dynarray, modules/errno:
+       * modules/execinfo, modules/fcntl-h, modules/float:
+       * modules/fnmatch-h, modules/getopt-posix, modules/glob-h:
+       * modules/iconv-h, modules/ieee754-h, modules/inttypes-incomplete:
+       * modules/langinfo, modules/libtextstyle-optional, modules/limits-h:
+       * modules/locale, modules/malloc-h, modules/math, modules/monetary:
+       * modules/net_if, modules/netdb, modules/netinet_in:
+       * modules/openmp-init, modules/poll-h:
+       * modules/pthread-h, modules/pty, modules/sched:
+       * modules/scratch_buffer, modules/search, modules/selinux-h:
+       * modules/signal-h, modules/sigsegv:
+       * modules/spawn, modules/stdalign, modules/stdarg, modules/stdbool:
+       * modules/stddef, modules/stdint, modules/stdio, modules/stdlib:
+       * modules/stdnoreturn, modules/string, modules/strings:
+       * 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/sysexits, modules/termios:
+       * modules/threads-h, modules/time, modules/uchar:
+       * modules/unicase/base, modules/unicase/special-casing:
+       * modules/uniconv/base, modules/unictype/base, modules/unigbrk/base:
+       * modules/unilbrk/base, modules/uniname/base, modules/uninorm/base:
+       * modules/unistd, modules/unistdio/base, modules/unistr/base:
+       * modules/unitypes, modules/uniwbrk/base, modules/uniwidth/base:
+       * modules/utime-h, modules/wchar, modules/wctype-h:
+       Depend on gen-header, and use its macros to simplify
+       header generation.
+
 2021-12-24  Bruno Haible  <bruno@clisp.org>
 
        passfd: Fix compilation error on IRIX.
index b8ab4217c2ed44ee0e06342105da32b0ad4dbe15..a08b424eefea5a4153759baab94870d6386c6bb0 100644 (file)
@@ -8,6 +8,7 @@ lib/alloca.in.h
 m4/alloca.m4
 
 Depends-on:
+gen-header
 
 configure.ac:
 gl_FUNC_ALLOCA
@@ -23,10 +24,10 @@ if GL_GENERATE_ALLOCA_H
 alloca.h: alloca.in.h $(top_builddir)/config.status
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''HAVE_ALLOCA_H''@|$(HAVE_ALLOCA_H)|g' < $(srcdir)/alloca.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+         -e 's|@''HAVE_ALLOCA_H''@|$(HAVE_ALLOCA_H)|g' \
+         $(srcdir)/alloca.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 else
 alloca.h: $(top_builddir)/config.status
        rm -f $@
index cb85d9866588230901d04723d5746800e4dfe835..6d070625480c589472233039e17a0a700eae47d4 100644 (file)
@@ -7,6 +7,7 @@ lib/argz.c
 m4/argz.m4
 
 Depends-on:
+gen-header
 memmove         [test -n "$ARGZ_H"]
 mempcpy         [test -n "$ARGZ_H"]
 stpcpy          [test -n "$ARGZ_H"]
@@ -31,10 +32,8 @@ if GL_GENERATE_ARGZ_H
 argz.h: argz.in.h $(top_builddir)/config.status
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         cat $(srcdir)/argz.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+       $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/argz.in.h
+       $(AM_V_at)mv $@-t $@
 else
 argz.h: $(top_builddir)/config.status
        rm -f $@
index 51b14f160f4dfa99117e8b8d55e26b521de313fe..3a6fd695618a47b6e05434c8fc92d568fc6ad5eb 100644 (file)
@@ -8,6 +8,7 @@ m4/sys_socket_h.m4
 m4/socklen.m4
 
 Depends-on:
+gen-header
 include_next
 snippet/arg-nonnull
 snippet/c++defs
@@ -26,8 +27,8 @@ BUILT_SOURCES += arpa/inet.h
 # 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_GEN)$(MKDIR_P) '%reldir%/arpa'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
@@ -44,9 +45,8 @@ arpa/inet.h: arpa_inet.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $(srcdir)/arpa_inet.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/arpa_inet.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += arpa/inet.h arpa/inet.h-t
 MOSTLYCLEANDIRS += arpa
 
index ad3566bfa237a336ca1625e194abc962da6c5148..572f43d252bc350338628d9ba1a2d44d79b3b803 100644 (file)
@@ -7,6 +7,7 @@ lib/verify.h
 m4/assert_h.m4
 
 Depends-on:
+gen-header
 include_next
 
 configure.ac:
@@ -23,8 +24,8 @@ if GL_GENERATE_ASSERT_H
 assert.h: assert.in.h verify.h $(top_builddir)/config.status
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+       $(AM_V_at){ $(SED_HEADER_STDOUT) \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
              -e 's|@''NEXT_ASSERT_H''@|$(NEXT_ASSERT_H)|g' \
@@ -34,8 +35,8 @@ assert.h: assert.in.h verify.h $(top_builddir)/config.status
              -e 's|_GL_VERIFY|_GL_STATIC_ASSERT|g' \
              -e 's|_GL\(_STATIC_ASSERT_H\)|_${gl_include_guard_prefix}\1|g' \
              < $(srcdir)/verify.h; \
-       } > $@-t && \
-       mv $@-t $@
+       } > $@-t
+       $(AM_V_at)mv $@-t $@
 else
 assert.h: $(top_builddir)/config.status
        rm -f $@
index 6e9af748a2dcb2017a72e8a8cac5305aa103215c..960134810ab7fe730c6192a1bf99439b213544a4 100644 (file)
@@ -6,6 +6,7 @@ lib/byteswap.in.h
 m4/byteswap.m4
 
 Depends-on:
+gen-header
 
 configure.ac:
 gl_BYTESWAP
@@ -21,10 +22,8 @@ if GL_GENERATE_BYTESWAP_H
 byteswap.h: byteswap.in.h $(top_builddir)/config.status
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         cat $(srcdir)/byteswap.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+       $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/byteswap.in.h
+       $(AM_V_at)mv $@-t $@
 else
 byteswap.h: $(top_builddir)/config.status
        rm -f $@
index 10d6db43ba678c41a3eed6c35f3664a833a73eff..2c1c2b06aba03e89dc8bf9e5902c1dbb52dde9f4 100644 (file)
@@ -7,6 +7,7 @@ m4/ctype_h.m4
 
 Depends-on:
 extern-inline
+gen-header
 include_next
 snippet/c++defs
 snippet/warn-on-use
@@ -24,8 +25,8 @@ BUILT_SOURCES += ctype.h
 ctype.h: ctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
@@ -34,9 +35,8 @@ ctype.h: ctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
              -e 's/@''HAVE_ISBLANK''@/$(HAVE_ISBLANK)/g' \
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $(srcdir)/ctype.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/ctype.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += ctype.h ctype.h-t
 
 Include:
index 0a0989dffb304bd9ca42c6bc1f366277107d2ecc..446ac1b35874607ba99a27b519344c714c684148 100644 (file)
@@ -8,6 +8,7 @@ m4/unistd_h.m4
 m4/pid_t.m4
 
 Depends-on:
+gen-header
 include_next
 snippet/arg-nonnull
 snippet/c++defs
@@ -26,8 +27,8 @@ BUILT_SOURCES += dirent.h
 dirent.h: dirent.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''HAVE_DIRENT_H''@|$(HAVE_DIRENT_H)|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
@@ -57,9 +58,8 @@ dirent.h: dirent.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $(srcdir)/dirent.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/dirent.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += dirent.h dirent.h-t
 
 Include:
index 3e5a98425bf9ba9455bf01d536ff749db58b0df2..668959482e7288ec7ff6cb51693e17d2b55226e4 100644 (file)
@@ -14,6 +14,7 @@ lib/malloc/dynarray_resize_clear.c
 Depends-on:
 c99
 builtin-expect
+gen-header
 libc-config
 stdbool
 stddef
@@ -27,24 +28,23 @@ BUILT_SOURCES += malloc/dynarray.gl.h malloc/dynarray-skeleton.gl.h
 
 malloc/dynarray.gl.h: malloc/dynarray.h
        $(AM_V_GEN)$(MKDIR_P) '%reldir%/malloc'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e '/libc_hidden_proto/d' < $(srcdir)/malloc/dynarray.h; \
-       } > $@-t && \
-       mv $@-t $@
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+         -e '/libc_hidden_proto/d' \
+         $(srcdir)/malloc/dynarray.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += malloc/dynarray.gl.h malloc/dynarray.gl.h-t
 
 malloc/dynarray-skeleton.gl.h: malloc/dynarray-skeleton.c
        $(AM_V_GEN)$(MKDIR_P) '%reldir%/malloc'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|<malloc/dynarray\.h>|<malloc/dynarray.gl.h>|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|<malloc/dynarray\.h>|<malloc/dynarray.gl.h>|g' \
              -e 's|__attribute_maybe_unused__|_GL_ATTRIBUTE_MAYBE_UNUSED|g' \
              -e 's|__attribute_nonnull__|_GL_ATTRIBUTE_NONNULL|g' \
              -e 's|__attribute_warn_unused_result__|_GL_ATTRIBUTE_NODISCARD|g' \
              -e 's|__glibc_likely|_GL_LIKELY|g' \
              -e 's|__glibc_unlikely|_GL_UNLIKELY|g' \
-             < $(srcdir)/malloc/dynarray-skeleton.c; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/malloc/dynarray-skeleton.c > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += malloc/dynarray-skeleton.gl.h malloc/dynarray-skeleton.gl.h-t
 
 lib_SOURCES += malloc/dynarray_at_failure.c \
index e3f1dc01c5d6491147c4c903ceedbbef0638d991..c5129301021816f51dcbe3ed22193cdd1a87ea50 100644 (file)
@@ -6,6 +6,7 @@ lib/errno.in.h
 m4/errno_h.m4
 
 Depends-on:
+gen-header
 include_next
 
 configure.ac:
@@ -22,8 +23,8 @@ if GL_GENERATE_ERRNO_H
 errno.h: errno.in.h $(top_builddir)/config.status
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
@@ -34,9 +35,8 @@ errno.h: errno.in.h $(top_builddir)/config.status
              -e 's|@''ENOLINK_VALUE''@|$(ENOLINK_VALUE)|g' \
              -e 's|@''EOVERFLOW_HIDDEN''@|$(EOVERFLOW_HIDDEN)|g' \
              -e 's|@''EOVERFLOW_VALUE''@|$(EOVERFLOW_VALUE)|g' \
-             < $(srcdir)/errno.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/errno.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 else
 errno.h: $(top_builddir)/config.status
        rm -f $@
index 779669fa5b6c2164b7634f15df281d28048875c8..ef8caaea516fbbfa6fc852ac9d71a465b5084bd8 100644 (file)
@@ -8,6 +8,7 @@ m4/execinfo.m4
 
 Depends-on:
 extern-inline
+gen-header
 
 configure.ac:
 gl_EXECINFO_H
@@ -26,10 +27,8 @@ if GL_GENERATE_EXECINFO_H
 execinfo.h: execinfo.in.h $(top_builddir)/config.status
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         cat $(srcdir)/execinfo.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+       $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/execinfo.in.h
+       $(AM_V_at)mv $@-t $@
 else
 execinfo.h: $(top_builddir)/config.status
        rm -f $@
index a80e6bd458671b6bafedb916e24f91a3ef6d86b0..815b17538ce0b40e9ef3d6b3002e9df94244253a 100644 (file)
@@ -9,6 +9,7 @@ m4/pid_t.m4
 
 Depends-on:
 extensions
+gen-header
 include_next
 snippet/arg-nonnull
 snippet/c++defs
@@ -29,8 +30,8 @@ BUILT_SOURCES += fcntl.h
 fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
@@ -51,9 +52,8 @@ fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $(srcdir)/fcntl.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/fcntl.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += fcntl.h fcntl.h-t
 
 Include:
index 6551e454b4648e04992e5ec5b2ec70d7ff12a244..f894969d105da0e36afaf9e4d16c68830922fe04 100644 (file)
@@ -8,6 +8,7 @@ lib/itold.c
 m4/float_h.m4
 
 Depends-on:
+gen-header
 include_next
 
 configure.ac:
@@ -30,16 +31,15 @@ if GL_GENERATE_FLOAT_H
 float.h: float.in.h $(top_builddir)/config.status
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
              -e 's|@''NEXT_FLOAT_H''@|$(NEXT_FLOAT_H)|g' \
              -e 's|@''REPLACE_ITOLD''@|$(REPLACE_ITOLD)|g' \
-             < $(srcdir)/float.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/float.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 else
 float.h: $(top_builddir)/config.status
        rm -f $@
index 260bbd57506550147d8a9d40dcd5309241f53e40..1e4f55c47d08a9dc45f8edf95536e996deb79c09 100644 (file)
@@ -7,6 +7,7 @@ m4/fnmatch_h.m4
 
 Depends-on:
 extensions
+gen-header
 include_next
 snippet/arg-nonnull
 snippet/c++defs
@@ -26,8 +27,8 @@ if GL_GENERATE_FNMATCH_H
 fnmatch.h: fnmatch.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''HAVE_FNMATCH_H''@|$(HAVE_FNMATCH_H)|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
@@ -39,9 +40,8 @@ fnmatch.h: fnmatch.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $(srcdir)/fnmatch.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/fnmatch.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 else
 fnmatch.h: $(top_builddir)/config.status
        rm -f $@
diff --git a/modules/gen-header b/modules/gen-header
new file mode 100644 (file)
index 0000000..12c5581
--- /dev/null
@@ -0,0 +1,39 @@
+Description:
+Generating header files
+
+Applicability:
+all
+
+Files:
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+# In 'sed', prepend a "DO NOT EDIT" comment to the pattern space.
+SED_HEADER_NOEDIT = s,^,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,
+
+# '$(SED_HEADER_STDOUT) -e "..."' runs 'sed' but first outputs "DO NOT EDIT".
+SED_HEADER_STDOUT = sed \
+  -e x \
+  -e '1$(SED_HEADER_NOEDIT)p' \
+  -e x
+
+# '$(SED_HEADER_TO_AT_t) FILE' copies FILE to $@-t, prepending a leading
+# "DO_NOT_EDIT".  Although this could be done more simply via:
+#      SED_HEADER_TO_AT_t = $(SED_HEADER_STDOUT) > $@-t
+# the -n and 'w's avoid a fork+exec, at least when GNU Make is used.
+SED_HEADER_TO_AT_t = sed -n \
+  -e x \
+  -e '1$(SED_HEADER_NOEDIT)w $@-t' \
+  -e x \
+  -e 'w $@-t'
+
+Include:
+
+License:
+LGPLv2+
+
+Maintainer:
+bug-gnulib@gnu.org
index d6704e7c289f120e849f8c0e527afcefef36e620..c925465ae043f171245e0995a4a33821b134657e 100644 (file)
@@ -17,6 +17,7 @@ Depends-on:
 unistd
 extensions
 include_next
+gen-header
 gettext-h       [test $REPLACE_GETOPT = 1]
 snippet/arg-nonnull
 
@@ -43,17 +44,16 @@ if GL_GENERATE_GETOPT_H
 getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H)
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
              -e 's|@''NEXT_GETOPT_H''@|$(NEXT_GETOPT_H)|g' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-             < $(srcdir)/getopt.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/getopt.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 else
 getopt.h: $(top_builddir)/config.status
        rm -f $@
@@ -61,11 +61,10 @@ endif
 
 if GL_GENERATE_GETOPT_CDEFS_H
 getopt-cdefs.h: getopt-cdefs.in.h $(top_builddir)/config.status
-       $(AM_V_GEN){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-          sed -e 's|@''HAVE_SYS_CDEFS_H''@|$(HAVE_SYS_CDEFS_H)|g' \
-             < $(srcdir)/getopt-cdefs.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+       $(AM_V_GEN)$(SED_HEADER_STDOUT) \
+         -e 's|@''HAVE_SYS_CDEFS_H''@|$(HAVE_SYS_CDEFS_H)|g' \
+         $(srcdir)/getopt-cdefs.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 else
 getopt-cdefs.h: $(top_builddir)/config.status
        rm -f $@
index 97dd26543c38fdb30e31ae1a95c5d767a768395c..963693ca7366c433b7880787e8bb61b40aef98c0 100644 (file)
@@ -8,6 +8,7 @@ m4/glob_h.m4
 
 Depends-on:
 extensions
+gen-header
 include_next
 snippet/arg-nonnull
 snippet/c++defs
@@ -30,8 +31,8 @@ if GL_GENERATE_GLOB_H
 glob.h: glob.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''HAVE_GLOB_H''@|$(HAVE_GLOB_H)|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
@@ -45,9 +46,8 @@ glob.h: glob.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $(srcdir)/glob.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/glob.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 else
 glob.h: $(top_builddir)/config.status
        rm -f $@
@@ -57,8 +57,8 @@ MOSTLYCLEANFILES += glob.h glob.h-t
 BUILT_SOURCES += glob-libc.gl.h
 
 glob-libc.gl.h: glob-libc.h
-       $(AM_V_GEN){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e '/__BEGIN_DECLS/{ s/__BEGIN_DECLS/#ifdef __cplusplus%extern "C" {%#endif/; y/%/\n/; }' \
+       $(AM_V_GEN)$(SED_HEADER_STDOUT) \
+             -e '/__BEGIN_DECLS/{ s/__BEGIN_DECLS/#ifdef __cplusplus%extern "C" {%#endif/; y/%/\n/; }' \
              -e '/__END_DECLS/{ s/__END_DECLS/#ifdef __cplusplus%}%#endif/; y/%/\n/; }' \
              -e 's|__THROWNL||g' \
              -e 's|__THROW||g' \
@@ -66,9 +66,8 @@ glob-libc.gl.h: glob-libc.h
              -e 's|defined __USE_MISC|1|' \
              -e 's|ifdef __USE_GNU|if 1|' \
              -e 's|ifdef __USE_LARGEFILE64|if 0|' \
-             < $(srcdir)/glob-libc.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/glob-libc.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += glob-libc.gl.h glob-libc.gl.h-t
 
 
index 41579fb5429949775d4a39fa4300bcd0c86aab2c..dc39894401d9844146da8036b782c79eb71b5b3c 100644 (file)
@@ -6,6 +6,7 @@ lib/iconv.in.h
 m4/iconv_h.m4
 
 Depends-on:
+gen-header
 include_next
 snippet/arg-nonnull
 snippet/c++defs
@@ -26,8 +27,8 @@ if GL_GENERATE_ICONV_H
 iconv.h: iconv.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
@@ -40,9 +41,8 @@ iconv.h: iconv.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $(srcdir)/iconv.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/iconv.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 else
 iconv.h: $(top_builddir)/config.status
        rm -f $@
index 124f368cfbc8e32ff2c15cd3dd977f103c90f061..80eeb6299b6d9154530d08925f5907020c543a35 100644 (file)
@@ -6,6 +6,7 @@ lib/ieee754.in.h
 m4/ieee754-h.m4
 
 Depends-on:
+gen-header
 
 configure.ac:
 gl_IEEE754_H
@@ -21,11 +22,10 @@ if GL_GENERATE_IEEE754_H
 ieee754.h: ieee754.in.h $(top_builddir)/config.status
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's/ifndef _GL_GNULIB_HEADER/if 0/g' \
-           $(srcdir)/ieee754.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+         -e 's/ifndef _GL_GNULIB_HEADER/if 0/g' \
+         $(srcdir)/ieee754.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 else
 ieee754.h: $(top_builddir)/config.status
        rm -f $@
index 71165720d90bb1301c1f33fc40132516c2fbeb84..d32d04b03ec852cc208c0bfaaf37093135c9e691 100644 (file)
@@ -6,6 +6,7 @@ lib/inttypes.in.h
 m4/inttypes.m4
 
 Depends-on:
+gen-header
 include_next
 multiarch
 snippet/arg-nonnull
@@ -26,8 +27,8 @@ BUILT_SOURCES += inttypes.h
 inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H)
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
@@ -52,9 +53,8 @@ inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $(srcdir)/inttypes.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/inttypes.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += inttypes.h inttypes.h-t
 
 Include:
index d6b74c9aa75b5a5da3b86e121c6763622128e115..dab6862da48bb49fab2386f77aa900e14100a047 100644 (file)
@@ -7,6 +7,7 @@ m4/langinfo_h.m4
 
 Depends-on:
 extensions
+gen-header
 include_next
 snippet/c++defs
 snippet/warn-on-use
@@ -24,8 +25,8 @@ BUILT_SOURCES += langinfo.h
 langinfo.h: langinfo.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''HAVE_LANGINFO_H''@|$(HAVE_LANGINFO_H)|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
@@ -41,9 +42,8 @@ langinfo.h: langinfo.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U
              -e 's|@''REPLACE_NL_LANGINFO''@|$(REPLACE_NL_LANGINFO)|g' \
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $(srcdir)/langinfo.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/langinfo.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += langinfo.h langinfo.h-t
 
 Include:
index 0a51639298cbd4b3dbf52aeaf4f9c01427b29cf6..cd05be2eee02f8de43be8f861cf6299528f14df6 100644 (file)
@@ -6,6 +6,7 @@ lib/textstyle.in.h
 m4/libtextstyle-optional.m4
 
 Depends-on:
+gen-header
 libtextstyle
 stdbool
 stdio
@@ -30,10 +31,8 @@ if GL_GENERATE_TEXTSTYLE_H
 textstyle.h: textstyle.in.h $(top_builddir)/config.status
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         cat $(srcdir)/textstyle.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+       $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/textstyle.in.h
+       $(AM_V_at)mv $@-t $@
 else
 textstyle.h: $(top_builddir)/config.status
        rm -f $@
index 9fc0a2e4cc507e4986d3af56dcdbd201adb528fc..c5eb139eb26d5768f557a42952fc4053376bc73a 100644 (file)
@@ -6,6 +6,7 @@ lib/limits.in.h
 m4/limits-h.m4
 
 Depends-on:
+gen-header
 include_next
 
 configure.ac:
@@ -22,15 +23,14 @@ if GL_GENERATE_LIMITS_H
 limits.h: limits.in.h $(top_builddir)/config.status
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
              -e 's|@''NEXT_LIMITS_H''@|$(NEXT_LIMITS_H)|g' \
-             < $(srcdir)/limits.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/limits.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 else
 limits.h: $(top_builddir)/config.status
        rm -f $@
index 60bfbe66995cc3ff3209d4d9b0549861e013049a..8c88ab1a1ac5ff90678e0e72e9f7cf9f977d7b0b 100644 (file)
@@ -7,6 +7,7 @@ m4/locale_h.m4
 
 Depends-on:
 extensions
+gen-header
 include_next
 snippet/arg-nonnull
 snippet/c++defs
@@ -26,8 +27,8 @@ BUILT_SOURCES += locale.h
 locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
@@ -51,9 +52,8 @@ locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $(srcdir)/locale.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/locale.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += locale.h locale.h-t
 
 Include:
index 3d7afad1550e24610cf0885abe0513fa4b549cf0..7caada9c7c193dd6e658116f9495a994ea64db9a 100644 (file)
@@ -6,6 +6,7 @@ lib/malloc.in.h
 m4/malloc_h.m4
 
 Depends-on:
+gen-header
 include_next
 snippet/c++defs
 snippet/warn-on-use
@@ -22,8 +23,8 @@ BUILT_SOURCES += malloc.h
 malloc.h: malloc.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''HAVE_MALLOC_H''@|$(HAVE_MALLOC_H)|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
@@ -34,9 +35,8 @@ malloc.h: malloc.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H
              -e 's|@''REPLACE_MEMALIGN''@|$(REPLACE_MEMALIGN)|g' \
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-           < $(srcdir)/malloc.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/malloc.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += malloc.h malloc.h-t
 
 Include:
index e62ee44092f63e2140f899d65b00e3a2134578c9..c4d72b30c76e29a803325c7f4d3f0d1d85fb56f9 100644 (file)
@@ -8,6 +8,7 @@ m4/math_h.m4
 
 Depends-on:
 extern-inline
+gen-header
 include_next
 snippet/arg-nonnull
 snippet/c++defs
@@ -28,8 +29,8 @@ lib_SOURCES += math.c
 math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''INCLUDE_NEXT_AS_FIRST_DIRECTIVE''@|$(INCLUDE_NEXT_AS_FIRST_DIRECTIVE)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
@@ -316,9 +317,9 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
              -e 's|@''REPLACE_TRUNCL''@|$(REPLACE_TRUNCL)|g' \
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
-       } > $@-t && \
-       mv $@-t $@
+             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+             > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += math.h math.h-t
 
 Include:
index 1b1b91d4ce78dc68e4b3d64f087789eca0e38c21..95b04f67a72e6eee07714283d712669ae1192b1e 100644 (file)
@@ -6,6 +6,7 @@ lib/monetary.in.h
 m4/monetary_h.m4
 
 Depends-on:
+gen-header
 include_next
 snippet/arg-nonnull
 snippet/c++defs
@@ -26,8 +27,8 @@ if GL_GENERATE_MONETARY_H
 monetary.h: monetary.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H)
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''HAVE_MONETARY_H''@|$(HAVE_MONETARY_H)|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
@@ -40,9 +41,8 @@ monetary.h: monetary.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $(srcdir)/monetary.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/monetary.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 else
 monetary.h: $(top_builddir)/config.status
        rm -f $@
index cc1b27f55066e6a55dac9c96115c6da733597635..d1b4865bdbcfd4fb412c4b8dd511e6f3eb14297d 100644 (file)
@@ -6,6 +6,7 @@ lib/net_if.in.h
 m4/net_if_h.m4
 
 Depends-on:
+gen-header
 include_next
 sys_socket
 
@@ -22,16 +23,15 @@ BUILT_SOURCES += $(NET_IF_H)
 if GL_GENERATE_NET_IF_H
 net/if.h: net_if.in.h $(top_builddir)/config.status
        $(AM_V_GEN)$(MKDIR_P) '%reldir%/net'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
              -e 's|@''NEXT_NET_IF_H''@|$(NEXT_NET_IF_H)|g' \
              -e 's|@''HAVE_NET_IF_H''@|$(HAVE_NET_IF_H)|g' \
-             < $(srcdir)/net_if.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/net_if.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 else
 net/if.h: $(top_builddir)/config.status
        rm -f $@
index be8280c868f5549077487a5aafb4673aa7a23410..8f71cc878a18272b337ec049f6a21b2d39c531b6 100644 (file)
@@ -6,6 +6,7 @@ lib/netdb.in.h
 m4/netdb_h.m4
 
 Depends-on:
+gen-header
 include_next
 snippet/arg-nonnull
 snippet/c++defs
@@ -25,8 +26,8 @@ BUILT_SOURCES += netdb.h
 netdb.h: netdb.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
@@ -43,9 +44,8 @@ netdb.h: netdb.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $(srcdir)/netdb.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/netdb.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += netdb.h netdb.h-t
 
 Include:
index f97e24b75ac4603207402609685ca78a8da464bc..8a51447c62d21b95ffc7064a44b578be59dc710b 100644 (file)
@@ -6,6 +6,7 @@ lib/netinet_in.in.h
 m4/netinet_in_h.m4
 
 Depends-on:
+gen-header
 include_next
 sys_socket
 
@@ -22,16 +23,15 @@ BUILT_SOURCES += $(NETINET_IN_H)
 if GL_GENERATE_NETINET_IN_H
 netinet/in.h: netinet_in.in.h $(top_builddir)/config.status
        $(AM_V_GEN)$(MKDIR_P) '%reldir%/netinet'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
              -e 's|@''NEXT_NETINET_IN_H''@|$(NEXT_NETINET_IN_H)|g' \
              -e 's|@''HAVE_NETINET_IN_H''@|$(HAVE_NETINET_IN_H)|g' \
-             < $(srcdir)/netinet_in.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/netinet_in.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 else
 netinet/in.h: $(top_builddir)/config.status
        rm -f $@
index 2c08e5725efc1248c48fe29bf127193641a422ec..3b857d039abd409b2e213cb5afb825c58bdf9b14 100644 (file)
@@ -7,6 +7,7 @@ lib/omp-init.c
 m4/omp_h.m4
 
 Depends-on:
+gen-header
 include_next
 c-ctype
 setenv
@@ -24,15 +25,14 @@ omp.h: omp.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
   $(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
              -e 's|@''NEXT_OMP_H''@|$(NEXT_OMP_H)|g' \
-             < $(srcdir)/omp.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/omp.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += omp.h omp.h-t
 
 lib_SOURCES += omp-init.c
index ccd5fa4a596d2e7a2e8c28013e2f689f2e9da2b9..ef5bd7535e0d6f9517453b6f7d174a4b3e4daa84 100644 (file)
@@ -8,6 +8,7 @@ m4/sys_socket_h.m4
 
 Depends-on:
 extensions
+gen-header
 include_next
 snippet/c++defs
 snippet/warn-on-use
@@ -25,8 +26,8 @@ BUILT_SOURCES += poll.h
 poll.h: poll.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''HAVE_POLL_H''@|$(HAVE_POLL_H)|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
@@ -38,9 +39,8 @@ poll.h: poll.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
              -e 's|@''REPLACE_POLL''@|$(REPLACE_POLL)|g' \
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $(srcdir)/poll.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/poll.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += poll.h poll.h-t
 
 Include:
index e4f3073ba0fbde8bc812613439db31fa0fad7f40..2d792209c1ab9c67f67d640d00049d377b418533 100644 (file)
@@ -9,6 +9,7 @@ m4/threadlib.m4
 Depends-on:
 extensions
 extern-inline
+gen-header
 sched
 time
 snippet/c++defs
@@ -32,8 +33,8 @@ BUILT_SOURCES += pthread.h
 pthread.h: pthread.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''HAVE_PTHREAD_H''@|$(HAVE_PTHREAD_H)|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
@@ -159,9 +160,9 @@ pthread.h: pthread.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(_NORETURN_H
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _Noreturn/r $(_NORETURN_H)' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
-       } > $@-t && \
-       mv $@-t $@
+             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+             > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += pthread.h pthread.h-t
 
 Include:
index 2bce0226474542718094d401f16097a24c8a57fd..523af17c41f1aa68275fa1db322c01f29c977700 100644 (file)
@@ -6,6 +6,7 @@ lib/pty.in.h
 m4/pty_h.m4
 
 Depends-on:
+gen-header
 include_next
 snippet/c++defs
 snippet/warn-on-use
@@ -23,8 +24,8 @@ BUILT_SOURCES += pty.h
 pty.h: pty.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''HAVE_PTY_H''@|$(HAVE_PTY_H)|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
@@ -40,9 +41,8 @@ pty.h: pty.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
              -e 's|@''REPLACE_OPENPTY''@|$(REPLACE_OPENPTY)|g' \
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $(srcdir)/pty.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/pty.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += pty.h pty.h-t
 
 Include:
index 2babbd61bb49b475762b0abc80e0cb205a556f08..71445a140f5376b9048e5f4cda536037e51d86f8 100644 (file)
@@ -7,6 +7,7 @@ m4/sched_h.m4
 m4/pid_t.m4
 
 Depends-on:
+gen-header
 include_next
 snippet/c++defs
 snippet/warn-on-use
@@ -24,8 +25,8 @@ BUILT_SOURCES += sched.h
 sched.h: sched.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''HAVE_SCHED_H''@|$(HAVE_SCHED_H)|g' \
              -e 's|@''HAVE_SYS_CDEFS_H''@|$(HAVE_SYS_CDEFS_H)|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@@ -38,9 +39,8 @@ sched.h: sched.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
              -e 's|@''REPLACE_SCHED_YIELD''@|$(REPLACE_SCHED_YIELD)|g' \
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $(srcdir)/sched.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/sched.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += sched.h sched.h-t
 
 Include:
index f350586afa80011b4deb2f44c0c9b0ccfbe12e38..921c8f549754ccfc07fb2c22d2ccee2beeb1af3f 100644 (file)
@@ -12,6 +12,7 @@ lib/malloc/scratch_buffer_set_array_size.c
 Depends-on:
 c99
 builtin-expect
+gen-header
 libc-config
 stdbool
 stddef
@@ -27,14 +28,13 @@ BUILT_SOURCES += malloc/scratch_buffer.gl.h
 
 malloc/scratch_buffer.gl.h: malloc/scratch_buffer.h
        $(AM_V_GEN)$(MKDIR_P) '%reldir%/malloc'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|__always_inline|inline _GL_ATTRIBUTE_ALWAYS_INLINE|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|__always_inline|inline _GL_ATTRIBUTE_ALWAYS_INLINE|g' \
              -e 's|__glibc_likely|_GL_LIKELY|g' \
              -e 's|__glibc_unlikely|_GL_UNLIKELY|g' \
              -e '/libc_hidden_proto/d' \
-             < $(srcdir)/malloc/scratch_buffer.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/malloc/scratch_buffer.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += malloc/scratch_buffer.gl.h malloc/scratch_buffer.gl.h-t
 
 lib_SOURCES += malloc/scratch_buffer_dupfree.c \
index 8c3c4fccec37f162762b1e0d00e436f7e4ded8ea..04029b14333c96211b9aab35c11cce8b2e05707e 100644 (file)
@@ -6,6 +6,7 @@ lib/search.in.h
 m4/search_h.m4
 
 Depends-on:
+gen-header
 include_next
 snippet/arg-nonnull
 snippet/c++defs
@@ -24,8 +25,8 @@ BUILT_SOURCES += search.h
 search.h: search.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''HAVE_SEARCH_H''@|$(HAVE_SEARCH_H)|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
@@ -41,9 +42,8 @@ search.h: search.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $(srcdir)/search.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/search.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += search.h search.h-t
 
 Include:
index 4b6c3b2f5dd54399cf1a4b723820a6d43bd9b3f0..6eaaaa83d624e3753ef074e9dcf10add2e677813 100644 (file)
@@ -16,6 +16,7 @@ m4/selinux-selinux-h.m4
 Depends-on:
 errno
 extern-inline
+gen-header
 
 configure.ac:
 gl_HEADERS_SELINUX_SELINUX_H
@@ -35,25 +36,22 @@ 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_GEN)$(MKDIR_P) '%reldir%/selinux'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
              -e 's|@''NEXT_SELINUX_SELINUX_H''@|$(NEXT_SELINUX_SELINUX_H)|g' \
-             < $(srcdir)/se-selinux.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/se-selinux.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 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_GEN)$(MKDIR_P) '%reldir%/selinux'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         cat $(srcdir)/se-context.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+       $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/se-context.in.h
+       $(AM_V_at)mv $@-t $@
 else
 selinux/context.h: $(top_builddir)/config.status
        rm -f $@
@@ -64,10 +62,8 @@ BUILT_SOURCES += $(SELINUX_LABEL_H)
 if GL_GENERATE_SELINUX_LABEL_H
 selinux/label.h: se-label.in.h $(top_builddir)/config.status
        $(AM_V_GEN)$(MKDIR_P) '%reldir%/selinux'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         cat $(srcdir)/se-label.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+       $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/se-label.in.h
+       $(AM_V_at)mv $@-t $@
 else
 selinux/label.h: $(top_builddir)/config.status
        rm -f $@
index b12879a7b5c0db39bb93b7a76dd5868099851e4f..cd45d5a04015285b2929e98bc4b6d9957543f7df 100644 (file)
@@ -7,6 +7,7 @@ m4/signal_h.m4
 m4/pid_t.m4
 
 Depends-on:
+gen-header
 include_next
 snippet/arg-nonnull
 snippet/c++defs
@@ -26,8 +27,8 @@ BUILT_SOURCES += signal.h
 signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
@@ -51,9 +52,8 @@ signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $(srcdir)/signal.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/signal.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += signal.h signal.h-t
 
 Include:
index 747eb78dbd4cdd9fa01d2b201057a4752fd0ad9d..4b58adf0cc220ab0076e8233620e73b3533b82a7 100644 (file)
@@ -23,6 +23,7 @@ m4/libsigsegv.m4
 m4/sigsegv.m4
 
 Depends-on:
+gen-header
 havelib
 host-cpu-c-abi
 stdint
@@ -72,10 +73,8 @@ if GL_GENERATE_SIGSEGV_H
 sigsegv.h: sigsegv.in.h $(top_builddir)/config.status
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         cat $(srcdir)/sigsegv.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+       $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/sigsegv.in.h
+       $(AM_V_at)mv $@-t $@
 else
 sigsegv.h: $(top_builddir)/config.status
        rm -f $@
index c2d35ef55551419d00a212faa7cf77d5a940d377..ebb3f2ec0ef8c91ebd99e761ed35aabe764b6524 100644 (file)
@@ -7,6 +7,7 @@ m4/spawn_h.m4
 m4/pid_t.m4
 
 Depends-on:
+gen-header
 include_next
 sched
 signal-h
@@ -27,8 +28,8 @@ BUILT_SOURCES += spawn.h
 spawn.h: spawn.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''HAVE_SPAWN_H''@|$(HAVE_SPAWN_H)|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
@@ -71,9 +72,8 @@ spawn.h: spawn.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $(srcdir)/spawn.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/spawn.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += spawn.h spawn.h-t
 
 Include:
index af363fa9e797ecdc610a36d0deb677ea53968f33..e89eb8a3d137178ec200afa22114c121eb858e88 100644 (file)
@@ -6,6 +6,7 @@ lib/stdalign.in.h
 m4/stdalign.m4
 
 Depends-on:
+gen-header
 
 configure.ac:
 gl_STDALIGN_H
@@ -21,10 +22,8 @@ if GL_GENERATE_STDALIGN_H
 stdalign.h: stdalign.in.h $(top_builddir)/config.status
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         cat $(srcdir)/stdalign.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+       $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/stdalign.in.h
+       $(AM_V_at)mv $@-t $@
 else
 stdalign.h: $(top_builddir)/config.status
        rm -f $@
index 5502f6c1d5d152ef0184fed6886cbb14f5b523b9..086019aa4cbf8fbf3423bde925ecf12ad739dcd9 100644 (file)
@@ -6,6 +6,7 @@ lib/stdarg.in.h
 m4/stdarg.m4
 
 Depends-on:
+gen-header
 include_next
 
 configure.ac-early:
@@ -27,15 +28,14 @@ if GL_GENERATE_STDARG_H
 stdarg.h: stdarg.in.h $(top_builddir)/config.status
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
              -e 's|@''NEXT_STDARG_H''@|$(NEXT_STDARG_H)|g' \
-             < $(srcdir)/stdarg.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/stdarg.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 else
 stdarg.h: $(top_builddir)/config.status
        rm -f $@
index a07d7c4be1c2790751c33e68a0af2794a8173ebc..bda6904c0e9a49f3b58f57a0647748f7c5cb5d05 100644 (file)
@@ -7,6 +7,7 @@ lib/stdbool.in.h
 m4/stdbool.m4
 
 Depends-on:
+gen-header
 
 configure.ac:
 gl_STDBOOL_H
@@ -22,10 +23,10 @@ if GL_GENERATE_STDBOOL_H
 stdbool.h: stdbool.in.h $(top_builddir)/config.status
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+         -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' \
+         $(srcdir)/stdbool.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 else
 stdbool.h: $(top_builddir)/config.status
        rm -f $@
index 547ade16336286585b3fcd968e3405463e234dbe..11cec9b137271e93af1286b42246227c05e9e28d 100644 (file)
@@ -7,6 +7,7 @@ m4/stddef_h.m4
 m4/wchar_t.m4
 
 Depends-on:
+gen-header
 include_next
 extensions
 
@@ -25,8 +26,8 @@ if GL_GENERATE_STDDEF_H
 stddef.h: stddef.in.h $(top_builddir)/config.status
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
@@ -34,9 +35,8 @@ stddef.h: stddef.in.h $(top_builddir)/config.status
              -e 's|@''HAVE_MAX_ALIGN_T''@|$(HAVE_MAX_ALIGN_T)|g' \
              -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \
              -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \
-             < $(srcdir)/stddef.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/stddef.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 else
 stddef.h: $(top_builddir)/config.status
        rm -f $@
index 8279c39adf2f31ecee7e112254837b474af4ffac..89f2fa03022cd16632c370a380b9bdb7041c15eb 100644 (file)
@@ -13,6 +13,7 @@ m4/stdint.m4
 m4/wint_t.m4
 
 Depends-on:
+gen-header
 include_next
 limits-h
 multiarch
@@ -34,8 +35,8 @@ if GL_GENERATE_STDINT_H
 stdint.h: stdint.in.h $(top_builddir)/config.status
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
@@ -62,9 +63,8 @@ stdint.h: stdint.in.h $(top_builddir)/config.status
              -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \
              -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \
              -e 's/@''GNULIBHEADERS_OVERRIDE_WINT_T''@/$(GNULIBHEADERS_OVERRIDE_WINT_T)/g' \
-             < $(srcdir)/stdint.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/stdint.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 else
 stdint.h: $(top_builddir)/config.status
        rm -f $@
index f16e6d20fe20a0cf90d2b2e5014c5a36e84fc6c1..69e770bccc78bdbbbaddef1361da15075628369a 100644 (file)
@@ -7,6 +7,7 @@ m4/stdio_h.m4
 
 Depends-on:
 extensions
+gen-header
 include_next
 snippet/arg-nonnull
 snippet/c++defs
@@ -53,8 +54,8 @@ BUILT_SOURCES += stdio.h
 stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
@@ -171,9 +172,9 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
              -e 's|@''ASM_SYMBOL_PREFIX''@|$(ASM_SYMBOL_PREFIX)|g' \
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
-       } > $@-t && \
-       mv $@-t $@
+             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+             > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += stdio.h stdio.h-t
 
 Include:
index f2d685ee9dcb474204f22f33612b3a0ca9130970..7f0d7ca934afb5f3756cb1e729dd21e64d04bf24 100644 (file)
@@ -6,6 +6,7 @@ lib/stdlib.in.h
 m4/stdlib_h.m4
 
 Depends-on:
+gen-header
 include_next
 snippet/arg-nonnull
 snippet/c++defs
@@ -28,8 +29,8 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
   $(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
@@ -154,9 +155,9 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _Noreturn/r $(_NORETURN_H)' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
-       } > $@-t && \
-       mv $@-t $@
+             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+             > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += stdlib.h stdlib.h-t
 
 Include:
index 05d88a18d3cb7be2147d13d9615ac9f3f35fab97..2a785afd397fb3eafa3254e236980574e854b708 100644 (file)
@@ -6,6 +6,7 @@ lib/stdnoreturn.in.h
 m4/stdnoreturn.m4
 
 Depends-on:
+gen-header
 snippet/_Noreturn
 
 configure.ac:
@@ -22,11 +23,10 @@ if GL_GENERATE_STDNORETURN_H
 stdnoreturn.h: stdnoreturn.in.h $(top_builddir)/config.status $(_NORETURN_H)
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e '/definition of _Noreturn/r $(_NORETURN_H)' \
-              < $(srcdir)/stdnoreturn.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+         -e '/definition of _Noreturn/r $(_NORETURN_H)' \
+         $(srcdir)/stdnoreturn.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 else
 stdnoreturn.h: $(top_builddir)/config.status
        rm -f $@
index 53d52bb69b313d8767ae3c40ad7f2eb8636e9a8b..445c86547623f5a82c9387e14efc4f4650c7b5fb 100644 (file)
@@ -8,6 +8,7 @@ m4/string_h.m4
 Depends-on:
 extensions
 extern-inline
+gen-header
 include_next
 snippet/arg-nonnull
 snippet/c++defs
@@ -28,8 +29,8 @@ BUILT_SOURCES += string.h
 string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
@@ -123,10 +124,9 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
              -e 's|@''UNDEFINE_STRTOK_R''@|$(UNDEFINE_STRTOK_R)|g' \
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
-             < $(srcdir)/string.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+             > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += string.h string.h-t
 
 Include:
index 5da6ad082038a5eca49f5226a61ed153bc948f38..ebee51631d1b74eeffbbcb351e12a371ff2221ab 100644 (file)
@@ -6,6 +6,7 @@ lib/strings.in.h
 m4/strings_h.m4
 
 Depends-on:
+gen-header
 include_next
 snippet/arg-nonnull
 snippet/c++defs
@@ -25,8 +26,8 @@ BUILT_SOURCES += strings.h
 strings.h: strings.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H)
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''HAVE_STRINGS_H''@|$(HAVE_STRINGS_H)|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
@@ -39,9 +40,8 @@ strings.h: strings.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $(srcdir)/strings.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/strings.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += strings.h strings.h-t
 
 Include:
index bf50d920d39aa7f557a4e54d3f9ee522d732eb11..a06a2f43760ce1feaad9c9bd625ff70466c213f3 100644 (file)
@@ -6,6 +6,7 @@ lib/sys_file.in.h
 m4/sys_file_h.m4
 
 Depends-on:
+gen-header
 include_next
 snippet/warn-on-use
 
@@ -21,8 +22,8 @@ BUILT_SOURCES += sys/file.h
 # has one that is incomplete.
 sys/file.h: sys_file.in.h $(top_builddir)/config.status $(WARN_ON_USE_H)
        $(AM_V_GEN)$(MKDIR_P) '%reldir%/sys'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's/@''HAVE_SYS_FILE_H''@/$(HAVE_SYS_FILE_H)/g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
@@ -31,9 +32,8 @@ sys/file.h: sys_file.in.h $(top_builddir)/config.status $(WARN_ON_USE_H)
              -e 's/@''HAVE_FLOCK''@/$(HAVE_FLOCK)/g' \
              -e 's/@''GNULIB_FLOCK''@/$(GNULIB_FLOCK)/g' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $(srcdir)/sys_file.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/sys_file.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += sys/file.h sys/file.h-t
 MOSTLYCLEANDIRS += sys
 
index 83db3046aec798a34efdcc428c5b32ef1bf88e42..cf99b56252abf0ed21ee7d89466944c04f465f7f 100644 (file)
@@ -6,6 +6,7 @@ lib/sys_ioctl.in.h
 m4/sys_ioctl_h.m4
 
 Depends-on:
+gen-header
 include_next
 snippet/c++defs
 snippet/warn-on-use
@@ -23,8 +24,8 @@ BUILT_SOURCES += sys/ioctl.h
 # 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_GEN)$(MKDIR_P) '%reldir%/sys'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''HAVE_SYS_IOCTL_H''@|$(HAVE_SYS_IOCTL_H)|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
@@ -36,9 +37,8 @@ sys/ioctl.h: sys_ioctl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON
              -e 's|@''REPLACE_IOCTL''@|$(REPLACE_IOCTL)|g' \
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $(srcdir)/sys_ioctl.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/sys_ioctl.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += sys/ioctl.h sys/ioctl.h-t
 MOSTLYCLEANDIRS += sys
 
index f550dd0790caaf535f5e502b6161ffb31f0985e1..1f86b97b9bf7d34552a5bcaba39a0a699e3dbcee 100644 (file)
@@ -6,6 +6,7 @@ lib/sys_random.in.h
 m4/sys_random_h.m4
 
 Depends-on:
+gen-header
 include_next
 snippet/arg-nonnull
 snippet/c++defs
@@ -23,8 +24,8 @@ BUILT_SOURCES += sys/random.h
 # 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_GEN)$(MKDIR_P) '%reldir%/sys'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
@@ -36,9 +37,8 @@ sys/random.h: sys_random.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_N
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $(srcdir)/sys_random.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/sys_random.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += sys/random.h sys/random.h-t
 MOSTLYCLEANDIRS += sys
 
index 24bc561774582c6212e1096c9b914614fb1868c4..3cdac75a18326a8832f61e0e273d602ac2b3d41c 100644 (file)
@@ -6,6 +6,7 @@ lib/sys_resource.in.h
 m4/sys_resource_h.m4
 
 Depends-on:
+gen-header
 include_next
 snippet/arg-nonnull
 snippet/c++defs
@@ -24,8 +25,8 @@ BUILT_SOURCES += sys/resource.h
 # 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_GEN)$(MKDIR_P) '%reldir%/sys'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
@@ -36,9 +37,8 @@ sys/resource.h: sys_resource.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(A
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $(srcdir)/sys_resource.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/sys_resource.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += sys/resource.h sys/resource.h-t
 MOSTLYCLEANDIRS += sys
 
index a3790184d09bc18204f14f63792b70f9a05869c6..5c8934ec290952a79d29aaab44104c86070896fe 100644 (file)
@@ -7,6 +7,7 @@ m4/sys_select_h.m4
 m4/sys_socket_h.m4
 
 Depends-on:
+gen-header
 include_next
 signal-h
 snippet/c++defs
@@ -25,8 +26,8 @@ BUILT_SOURCES += sys/select.h
 # 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_GEN)$(MKDIR_P) '%reldir%/sys'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
@@ -40,9 +41,8 @@ sys/select.h: sys_select.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_
              -e 's|@''REPLACE_SELECT''@|$(REPLACE_SELECT)|g' \
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $(srcdir)/sys_select.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/sys_select.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += sys/select.h sys/select.h-t
 MOSTLYCLEANDIRS += sys
 
index 928573a75572426b1e910a154533c5a7157d13e5..44b27926696acb0f6c35059b6e7e04fded4c5cbd 100644 (file)
@@ -10,6 +10,7 @@ m4/sockpfaf.m4
 Depends-on:
 errno
 extern-inline
+gen-header
 include_next
 snippet/arg-nonnull
 snippet/c++defs
@@ -32,8 +33,8 @@ lib_SOURCES += sys_socket.c
 # 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_GEN)$(MKDIR_P) '%reldir%/sys'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
@@ -64,9 +65,8 @@ sys/socket.h: sys_socket.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $(srcdir)/sys_socket.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/sys_socket.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += sys/socket.h sys/socket.h-t
 MOSTLYCLEANDIRS += sys
 
index b34773e3dfb4f84ac47df1f100accd71264d0eaa..629eac1b4158ef3d204dc1733944bf9ca26a324a 100644 (file)
@@ -8,6 +8,7 @@ m4/unistd_h.m4
 m4/pid_t.m4
 
 Depends-on:
+gen-header
 include_next
 snippet/arg-nonnull
 snippet/c++defs
@@ -27,8 +28,8 @@ BUILT_SOURCES += sys/stat.h
 # 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_GEN)$(MKDIR_P) '%reldir%/sys'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
@@ -81,9 +82,8 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $(srcdir)/sys_stat.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/sys_stat.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += sys/stat.h sys/stat.h-t
 MOSTLYCLEANDIRS += sys
 
index 0379556baf752d9c663f20bfe82b1e4573f036e1..73965fd954bcc3702b9104ee1a8c1a37917651cb 100644 (file)
@@ -7,6 +7,7 @@ m4/sys_time_h.m4
 m4/sys_socket_h.m4
 
 Depends-on:
+gen-header
 include_next
 snippet/arg-nonnull
 snippet/c++defs
@@ -24,8 +25,8 @@ BUILT_SOURCES += sys/time.h
 # 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_GEN)$(MKDIR_P) '%reldir%/sys'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's/@''HAVE_SYS_TIME_H''@/$(HAVE_SYS_TIME_H)/g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
@@ -40,9 +41,8 @@ sys/time.h: sys_time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $(srcdir)/sys_time.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/sys_time.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += sys/time.h sys/time.h-t
 
 Include:
index 91aa2436ca22072118e5a4081c6e101b1033f63e..6a4a092963eaf66f6bbd65bdfe21b8a02407c445 100644 (file)
@@ -6,6 +6,7 @@ lib/sys_times.in.h
 m4/sys_times_h.m4
 
 Depends-on:
+gen-header
 include_next
 snippet/arg-nonnull
 snippet/warn-on-use
@@ -22,8 +23,8 @@ BUILT_SOURCES += sys/times.h
 # 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_GEN)$(MKDIR_P) '%reldir%/sys'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's/@''HAVE_SYS_TIMES_H''@/$(HAVE_SYS_TIMES_H)/g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
@@ -34,9 +35,8 @@ sys/times.h: sys_times.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG
              -e 's|@''HAVE_TIMES''@|$(HAVE_TIMES)|g' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $(srcdir)/sys_times.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/sys_times.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += sys/times.h sys/times.h-t
 MOSTLYCLEANDIRS += sys
 
index 5524b731bb6686ea6371cb147cf31b044abef526..db641167025b976083577c0cf21ddbb9da54886e 100644 (file)
@@ -8,6 +8,7 @@ m4/off_t.m4
 m4/pid_t.m4
 
 Depends-on:
+sed-header
 include_next
 ssize_t
 
@@ -23,17 +24,16 @@ BUILT_SOURCES += sys/types.h
 # doesn't have one that works with the given compiler.
 sys/types.h: sys_types.in.h $(top_builddir)/config.status
        $(AM_V_GEN)$(MKDIR_P) '%reldir%/sys'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
              -e 's|@''NEXT_SYS_TYPES_H''@|$(NEXT_SYS_TYPES_H)|g' \
              -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \
              -e 's|@''WINDOWS_STAT_INODES''@|$(WINDOWS_STAT_INODES)|g' \
-             < $(srcdir)/sys_types.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/sys_types.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += sys/types.h sys/types.h-t
 
 Include:
index cdf0b934eba088fec926a4019bdb735dfeb5bbf2..d7234ee355b9ad8a5a5176c293161af0054b1cf6 100644 (file)
@@ -6,6 +6,7 @@ lib/sys_uio.in.h
 m4/sys_uio_h.m4
 
 Depends-on:
+gen-header
 include_next
 ssize_t
 sys_types
@@ -22,16 +23,15 @@ BUILT_SOURCES += sys/uio.h
 # doesn't have one that works with the given compiler.
 sys/uio.h: sys_uio.in.h $(top_builddir)/config.status
        $(AM_V_GEN)$(MKDIR_P) '%reldir%/sys'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
              -e 's|@''NEXT_SYS_UIO_H''@|$(NEXT_SYS_UIO_H)|g' \
              -e 's|@''HAVE_SYS_UIO_H''@|$(HAVE_SYS_UIO_H)|g' \
-             < $(srcdir)/sys_uio.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/sys_uio.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += sys/uio.h sys/uio.h-t
 MOSTLYCLEANDIRS += sys
 
index 0242a42e263f0f98af5df9e79329a19bf7afaf85..f8aa62f5c286bc5386dea2ed4ea83a376ef5dfde 100644 (file)
@@ -6,6 +6,7 @@ lib/sys_utsname.in.h
 m4/sys_utsname_h.m4
 
 Depends-on:
+gen-header
 include_next
 snippet/arg-nonnull
 snippet/warn-on-use
@@ -22,8 +23,8 @@ BUILT_SOURCES += sys/utsname.h
 # does not have one.
 sys/utsname.h: sys_utsname.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG_NONNULL_H)
        $(AM_V_GEN)$(MKDIR_P) '%reldir%/sys'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's/@''HAVE_SYS_UTSNAME_H''@/$(HAVE_SYS_UTSNAME_H)/g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
@@ -34,9 +35,8 @@ sys/utsname.h: sys_utsname.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $
              -e 's|@''HAVE_UNAME''@|$(HAVE_UNAME)|g' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $(srcdir)/sys_utsname.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/sys_utsname.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += sys/utsname.h sys/utsname.h-t
 MOSTLYCLEANDIRS += sys
 
index 1cb2eea1429e3b4b313d37f46c9cdcdef3bc3966..455cf961fba0d4500699716d1e8f9e5e7454deca 100644 (file)
@@ -7,6 +7,7 @@ m4/sys_wait_h.m4
 m4/pid_t.m4
 
 Depends-on:
+gen-header
 include_next
 snippet/c++defs
 snippet/warn-on-use
@@ -23,8 +24,8 @@ BUILT_SOURCES += sys/wait.h
 # has one that is incomplete.
 sys/wait.h: sys_wait.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
        $(AM_V_GEN)$(MKDIR_P) '%reldir%/sys'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
@@ -32,9 +33,8 @@ sys/wait.h: sys_wait.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U
              -e 's/@''GNULIB_WAITPID''@/$(GNULIB_WAITPID)/g' \
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $(srcdir)/sys_wait.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/sys_wait.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += sys/wait.h sys/wait.h-t
 MOSTLYCLEANDIRS += sys
 
index a6ccc03891b4005d74e4b92c548a3e61dfe806a8..2f4f46307cfe5eeccd4b6c2f2e81286ab15da5b7 100644 (file)
@@ -6,6 +6,7 @@ lib/sysexits.in.h
 m4/sysexits.m4
 
 Depends-on:
+gen-header
 include_next
 stdlib
 
@@ -23,16 +24,15 @@ if GL_GENERATE_SYSEXITS_H
 sysexits.h: sysexits.in.h $(top_builddir)/config.status
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''HAVE_SYSEXITS_H''@|$(HAVE_SYSEXITS_H)|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
              -e 's|@''NEXT_SYSEXITS_H''@|$(NEXT_SYSEXITS_H)|g' \
-             < $(srcdir)/sysexits.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/sysexits.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 else
 sysexits.h: $(top_builddir)/config.status
        rm -f $@
index fa8ed61fe40c69608aa504c83099ca1c143e0da8..2a256482fbbc9786bee8289ab8c8b1c2ef3d8c63 100644 (file)
@@ -7,6 +7,7 @@ m4/termios_h.m4
 m4/pid_t.m4
 
 Depends-on:
+gen-header
 include_next
 snippet/c++defs
 snippet/warn-on-use
@@ -24,8 +25,8 @@ BUILT_SOURCES += termios.h
 termios.h: termios.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
@@ -35,9 +36,8 @@ termios.h: termios.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE
              -e 's|@''HAVE_TERMIOS_H''@|$(HAVE_TERMIOS_H)|g' \
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-           < $(srcdir)/termios.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/termios.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += termios.h termios.h-t
 
 Include:
index ffb9309cf646f6b8a879f34ed1e575c6dfd63d5f..e2c2617740af9edccabb005bc1e40fd020607adf 100644 (file)
@@ -17,6 +17,7 @@ m4/threadlib.m4
 build-aux/config.rpath
 
 Depends-on:
+gen-header
 include_next
 snippet/c++defs
 snippet/_Noreturn
@@ -41,8 +42,8 @@ BUILT_SOURCES += threads.h
 threads.h: threads.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''HAVE_THREADS_H''@|$(HAVE_THREADS_H)|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
@@ -63,9 +64,8 @@ threads.h: threads.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(_NORETURN_H
              -e '/definition of _Noreturn/r $(_NORETURN_H)' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $(srcdir)/threads.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/threads.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += threads.h threads.h-t
 
 Include:
index 83c926202e811e179476b925451104426ac8cf5d..449bbcd1ecdce0c5b790b211e207718fe6f6be49 100644 (file)
@@ -7,6 +7,7 @@ m4/time_h.m4
 
 Depends-on:
 extensions
+gen-header
 include_next
 snippet/arg-nonnull
 snippet/c++defs
@@ -26,8 +27,8 @@ BUILT_SOURCES += time.h
 time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
@@ -67,9 +68,8 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $(srcdir)/time.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/time.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += time.h time.h-t
 
 Include:
index 608e8c8021994d200f3b2a3cc258123fb69a9049..d6ee0ceb84bb2240c7640f3faa7ff7a9f42fef85 100644 (file)
@@ -7,6 +7,7 @@ m4/uchar_h.m4
 m4/stdint.m4
 
 Depends-on:
+gen-header
 include_next
 snippet/c++defs
 stdint
@@ -23,8 +24,8 @@ BUILT_SOURCES += uchar.h
 uchar.h: uchar.in.h $(top_builddir)/config.status $(CXXDEFS_H)
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's/@''HAVE_UCHAR_H''@/$(HAVE_UCHAR_H)/g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
@@ -61,9 +62,8 @@ uchar.h: uchar.in.h $(top_builddir)/config.status $(CXXDEFS_H)
              -e 's|@''REPLACE_C32RTOMB''@|$(REPLACE_C32RTOMB)|g' \
              -e 's|@''REPLACE_MBRTOC32''@|$(REPLACE_MBRTOC32)|g' \
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-             < $(srcdir)/uchar.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/uchar.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += uchar.h uchar.h-t
 
 Include:
index 209d0b36dc6f078a5ef41fe7d29f0af8b3676183..658da2415be25de668e460430375bcd940187f9e 100644 (file)
@@ -6,6 +6,7 @@ lib/unicase.in.h
 m4/libunistring-base.m4
 
 Depends-on:
+gen-header
 unitypes
 uninorm/base
 stdbool
@@ -20,10 +21,8 @@ BUILT_SOURCES += $(LIBUNISTRING_UNICASE_H)
 unicase.h: unicase.in.h
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         cat $(srcdir)/unicase.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+       $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/unicase.in.h
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += unicase.h unicase.h-t
 
 Include:
index b4eee8e7af0281f35d6319b47fd5278a238d00d4..68847852076dc7937764966e31b8ca7e3777cb46 100644 (file)
@@ -7,6 +7,7 @@ lib/unicase/special-casing.c
 lib/unicase/special-casing-table.gperf
 
 Depends-on:
+gen-header
 gperf
 
 configure.ac:
@@ -27,10 +28,10 @@ EXTRA_DIST           += unicase/special-casing-table.h
 unicase/special-casing.h: unicase/special-casing.in.h unicase/special-casing-table.h
        $(AM_V_GEN)$(MKDIR_P) '%reldir%/unicase'
        $(AM_V_at)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; \
-       } > $@-t && \
-       mv $@-t $@
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+         -e "/gl_unicase_special_lookup/s/gl_unicase_special_lookup.*/$${declaration};/" \
+         $(srcdir)/unicase/special-casing.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 BUILT_SOURCES        += unicase/special-casing.h
 MOSTLYCLEANFILES     += unicase/special-casing.h unicase/special-casing.h-t
 
index de9188ad93209cd0e88d7331df6bc5a1cc41d9f2..1b6f363ee06450398af723af8aa57effe456dd13 100644 (file)
@@ -9,6 +9,7 @@ lib/localcharset.h
 m4/libunistring-base.m4
 
 Depends-on:
+gen-header
 unitypes
 
 configure.ac:
@@ -21,10 +22,8 @@ BUILT_SOURCES += $(LIBUNISTRING_UNICONV_H)
 uniconv.h: uniconv.in.h
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         cat $(srcdir)/uniconv.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+       $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/uniconv.in.h
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += uniconv.h uniconv.h-t
 
 Include:
index 41571dc43b76f569152fda895679fa6c579ef4b0..f63605c4093e13c99344cabdef7c2541de4b772e 100644 (file)
@@ -6,6 +6,7 @@ lib/unictype.in.h
 m4/libunistring-base.m4
 
 Depends-on:
+gen-header
 unitypes
 stdbool
 
@@ -19,10 +20,8 @@ BUILT_SOURCES += $(LIBUNISTRING_UNICTYPE_H)
 unictype.h: unictype.in.h
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         cat $(srcdir)/unictype.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+       $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/unictype.in.h
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += unictype.h unictype.h-t
 
 Include:
index 4a3404885249c4fdcd1e6ec8c71f23e1a4fe9f3b..4c5663698ed569e85af4c100437086b3d96f2b9d 100644 (file)
@@ -6,6 +6,7 @@ lib/unigbrk.in.h
 m4/libunistring-base.m4
 
 Depends-on:
+gen-header
 unitypes
 stdbool
 
@@ -19,10 +20,8 @@ BUILT_SOURCES += $(LIBUNISTRING_UNIGBRK_H)
 unigbrk.h: unigbrk.in.h
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         cat $(srcdir)/unigbrk.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+       $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/unigbrk.in.h
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += unigbrk.h unigbrk.h-t
 
 Include:
index 0edce62649fc2df5bf1d624bbfe9935ab664ae65..4b1ca60f5b8c78ee5ed467433ed1b33b33e95e08 100644 (file)
@@ -6,6 +6,7 @@ lib/unilbrk.in.h
 m4/libunistring-base.m4
 
 Depends-on:
+gen-header
 unitypes
 localcharset
 
@@ -19,10 +20,8 @@ BUILT_SOURCES += $(LIBUNISTRING_UNILBRK_H)
 unilbrk.h: unilbrk.in.h
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         cat $(srcdir)/unilbrk.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+       $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/unilbrk.in.h
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += unilbrk.h unilbrk.h-t
 
 Include:
index 80e26224f6d59d683eaaca44e954a833ed8df1a5..d5a9c6494897168829242145c59fecf8cc9a3dc9 100644 (file)
@@ -6,6 +6,7 @@ lib/uniname.in.h
 m4/libunistring-base.m4
 
 Depends-on:
+gen-header
 unitypes
 
 configure.ac:
@@ -18,10 +19,8 @@ BUILT_SOURCES += $(LIBUNISTRING_UNINAME_H)
 uniname.h: uniname.in.h
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         cat $(srcdir)/uniname.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+       $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/uniname.in.h
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += uniname.h uniname.h-t
 
 Include:
index bc23064311c55c7cf5156aac7913804cd02f2606..40f40c6fe7ff5a7d213edfb3597e1efa6f79b8dc 100644 (file)
@@ -6,6 +6,7 @@ lib/uninorm.in.h
 m4/libunistring-base.m4
 
 Depends-on:
+gen-header
 unitypes
 
 configure.ac:
@@ -18,10 +19,8 @@ BUILT_SOURCES += $(LIBUNISTRING_UNINORM_H)
 uninorm.h: uninorm.in.h
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         cat $(srcdir)/uninorm.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+       $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/uninorm.in.h
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += uninorm.h uninorm.h-t
 
 Include:
index 130b7e5f0f20331c75bc6320f58cd165fbedf498..b0052ef3aea39693b63dfc0f686d177882a4e9c6 100644 (file)
@@ -10,6 +10,7 @@ m4/pid_t.m4
 
 Depends-on:
 extern-inline
+gen-header
 include_next
 snippet/arg-nonnull
 snippet/c++defs
@@ -32,8 +33,8 @@ lib_SOURCES += unistd.c
 unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
@@ -219,9 +220,9 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
              -e 's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g' \
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
-       } > $@-t && \
-       mv $@-t $@
+             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+             > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += unistd.h unistd.h-t
 
 Include:
index 9c746835b747f1328203771181f29c88c4d1f6be..883305f6e561a1ddfd0424831bdc6422f4d0ae40 100644 (file)
@@ -6,6 +6,7 @@ lib/unistdio.in.h
 m4/libunistring-base.m4
 
 Depends-on:
+gen-header
 unitypes
 
 configure.ac:
@@ -18,10 +19,8 @@ BUILT_SOURCES += $(LIBUNISTRING_UNISTDIO_H)
 unistdio.h: unistdio.in.h
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         cat $(srcdir)/unistdio.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+       $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/unistdio.in.h
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += unistdio.h unistdio.h-t
 
 Include:
index 16806eadd15704a9fed70695e1ff48b793af449b..da47fde4317286aeca6599166c68d1545b7c3052 100644 (file)
@@ -6,6 +6,7 @@ lib/unistr.in.h
 m4/libunistring-base.m4
 
 Depends-on:
+gen-header
 unitypes
 stdbool
 inline
@@ -20,10 +21,8 @@ BUILT_SOURCES += $(LIBUNISTRING_UNISTR_H)
 unistr.h: unistr.in.h
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         cat $(srcdir)/unistr.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+       $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/unistr.in.h
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += unistr.h unistr.h-t
 
 Include:
index 14e44a2b3f830528b2f9d195bfb478e40f28997d..c753b36197ed6653f5e94090c10f457e98e8a6aa 100644 (file)
@@ -6,6 +6,7 @@ lib/unitypes.in.h
 m4/libunistring-base.m4
 
 Depends-on:
+gen-header
 stdint
 
 configure.ac:
@@ -34,10 +35,8 @@ BUILT_SOURCES += $(LIBUNISTRING_UNITYPES_H)
 unitypes.h: unitypes.in.h
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         cat $(srcdir)/unitypes.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+       $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/unitypes.in.h
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += unitypes.h unitypes.h-t
 
 Include:
index f2120f40311331f63baa34d444587ba209e997bd..94f7641c4931a72fd2ffc5590f94053237b601e3 100644 (file)
@@ -6,6 +6,7 @@ lib/uniwbrk.in.h
 m4/libunistring-base.m4
 
 Depends-on:
+gen-header
 unitypes
 
 configure.ac:
@@ -18,10 +19,8 @@ BUILT_SOURCES += $(LIBUNISTRING_UNIWBRK_H)
 uniwbrk.h: uniwbrk.in.h
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         cat $(srcdir)/uniwbrk.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+       $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/uniwbrk.in.h
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += uniwbrk.h uniwbrk.h-t
 
 Include:
index d2cff47eae75c3a652ef283663fb27a5ffe5587c..6065de69f9ffd7bcb3a2450566d92b641f425a7e 100644 (file)
@@ -7,6 +7,7 @@ lib/localcharset.h
 m4/libunistring-base.m4
 
 Depends-on:
+gen-header
 unitypes
 
 configure.ac:
@@ -19,10 +20,8 @@ BUILT_SOURCES += $(LIBUNISTRING_UNIWIDTH_H)
 uniwidth.h: uniwidth.in.h
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         cat $(srcdir)/uniwidth.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+       $(AM_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/uniwidth.in.h
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += uniwidth.h uniwidth.h-t
 
 Include:
index 54d5cfcc3b73d2870c279678935139dd8b13fe2d..834034c898eaec91beba2127d1ef403ccd6fb3f6 100644 (file)
@@ -6,6 +6,7 @@ lib/utime.in.h
 m4/utime_h.m4
 
 Depends-on:
+gen-header
 include_next
 snippet/arg-nonnull
 snippet/c++defs
@@ -24,8 +25,8 @@ BUILT_SOURCES += utime.h
 utime.h: utime.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's/@''HAVE_UTIME_H''@/$(HAVE_UTIME_H)/g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
@@ -38,9 +39,8 @@ utime.h: utime.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $(srcdir)/utime.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/utime.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += utime.h utime.h-t
 
 Include:
index a09e3511a700216ddc04e4662dd62a9a7e5203ad..556701fd85ddbd6418478cc6b98b070d2f3cabd9 100644 (file)
@@ -8,6 +8,7 @@ m4/wchar_h.m4
 m4/wint_t.m4
 
 Depends-on:
+gen-header
 include_next
 snippet/arg-nonnull
 snippet/c++defs
@@ -29,8 +30,8 @@ BUILT_SOURCES += wchar.h
 wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
@@ -145,9 +146,9 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
              -e 's|@''REPLACE_WCSTOK''@|$(REPLACE_WCSTOK)|g' \
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
-       } > $@-t && \
-       mv $@-t $@
+             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+             > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += wchar.h wchar.h-t
 
 Include:
index 7e2eaddf9f3b9f2306fa01fcfaf32c002411bf80..f4949fab77d5f93e7cad68c28c1b269d0da184b5 100644 (file)
@@ -9,6 +9,7 @@ m4/wint_t.m4
 
 Depends-on:
 extern-inline
+gen-header
 include_next
 snippet/c++defs
 snippet/warn-on-use
@@ -27,8 +28,8 @@ lib_SOURCES += wctype-h.c
 wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
        $(AM_V_GEN)
 @NMD@  $(AM_V_at)$(MKDIR_P) '%reldir%'
-       $(AM_V_at){ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
              -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
@@ -55,9 +56,8 @@ wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H
              -e 's/@''REPLACE_TOWLOWER''@/$(REPLACE_TOWLOWER)/g' \
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-             < $(srcdir)/wctype.in.h; \
-       } > $@-t && \
-       mv $@-t $@
+             $(srcdir)/wctype.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += wctype.h wctype.h-t
 
 Include: