[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 5/7] add _HEADERS primaries to Makefile.am snippets for installab
|
From: |
Gary V. Vaughan |
|
Subject: |
[PATCH 5/7] add _HEADERS primaries to Makefile.am snippets for installable headers |
|
Date: |
Tue, 12 Oct 2010 23:08:40 +0700 |
Originally, I added noinst_HEADERS to the module definition files,
and then changed them all to nobase_nodist_include_HEADERS and
EXTRA_HEADERS in gnulib-tool if the gnulib library is installable.
However, I think it is much more flexible to add the
'nodist_include_HEADERS' or 'nobase_nodist_include_ HEADERS' and
'EXTRA_HEADERS' as appropriate to the circumstances in each module
file, and then have gnulib-tool simply delete all those lines when
they are not necessary for a shorter Makefile.am in the common case.
* modules/alloca-opt, modules/arg-nonnull, modules/argz,
modules/arpa_inet, modules/byteswap, modules/c++defs, modules/ctype,
modules/dirent, modules/errno, modules/fcntl-h, modules/float,
modules/fnmatch, modules/getopt-posix, modules/glob, modules/iconv-h,
modules/iconv_open, modules/inttypes, modules/langinfo,
modules/link-warning, modules/locale, modules/math, modules/netdb,
modules/netinet_in, modules/poll-h, modules/pthread, modules/pty,
modules/sched, modules/search, modules/selinux-h, modules/signal,
modules/spawn, modules/stdarg, modules/stdbool, modules/stddef,
modules/stdint, modules/stdio, modules/stdlib, modules/string,
modules/strings, modules/sys_file, modules/sys_ioctl,
modules/sys_select, modules/sys_socket, modules/sys_stat,
modules/sys_time, modules/sys_times, modules/sys_utsname,
modules/sys_wait, modules/sysexits, modules/termios, modules/time,
modules/unistd, modules/unitypes, modules/unused-parameter,
modules/warn-on-use, modules/wchar, modules/wctype (Makefile.am):
Add nodist_include_HEADERS, nobase_nodist_include_HEADERS and
EXTRA_HEADERS declarations for potentially installable header files.
* gnulib-tool: Initialize nodist_include_HEADERS,
nobase_nodist_include_HEADERS and EXTRA_HEADERS to prime for new
`.*_HEADERS +=' declarations.
(func_emit_lib_Makefile_am): Edit away new nodist_include_HEADERS,
nobase_nodist_include_HEADERS and EXTRA_HEADERS declarations by
default, reverting the Makefile.am snippets above to their original
condition prior to this change *unless* the gnulib library is being
installed.
---
ChangeLog | 28 ++++++++++++++++++++++++++++
gnulib-tool | 16 +++++++++++++++-
modules/alloca-opt | 3 +++
modules/arg-nonnull | 2 ++
modules/argz | 3 +++
modules/arpa_inet | 2 ++
modules/byteswap | 3 +++
modules/c++defs | 2 ++
modules/ctype | 2 ++
modules/dirent | 2 ++
modules/errno | 3 +++
modules/fcntl-h | 2 ++
modules/float | 3 +++
modules/fnmatch | 3 +++
modules/getopt-posix | 3 +++
modules/glob | 3 +++
modules/iconv-h | 3 +++
modules/iconv_open | 1 +
modules/inttypes | 2 ++
modules/langinfo | 2 ++
modules/link-warning | 2 ++
modules/locale | 2 ++
modules/math | 2 ++
modules/netdb | 2 ++
modules/netinet_in | 3 +++
modules/poll-h | 2 ++
modules/pthread | 3 +++
modules/pty | 2 ++
modules/sched | 3 +++
modules/search | 2 ++
modules/selinux-h | 2 ++
modules/signal | 2 ++
modules/spawn | 2 ++
modules/stdarg | 3 +++
modules/stdbool | 3 +++
modules/stddef | 3 +++
modules/stdint | 3 +++
modules/stdio | 2 ++
modules/stdlib | 2 ++
modules/string | 2 ++
modules/strings | 2 ++
modules/sys_file | 2 ++
modules/sys_ioctl | 2 ++
modules/sys_select | 2 ++
modules/sys_socket | 2 ++
modules/sys_stat | 2 ++
modules/sys_time | 2 ++
modules/sys_times | 2 ++
modules/sys_utsname | 2 ++
modules/sys_wait | 2 ++
modules/sysexits | 3 +++
modules/termios | 2 ++
modules/time | 2 ++
modules/unistd | 2 ++
modules/unitypes | 3 +++
modules/unused-parameter | 2 ++
modules/warn-on-use | 2 ++
modules/wchar | 2 ++
modules/wctype | 2 ++
59 files changed, 174 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1f43a79..f9e0b47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,33 @@
2010-10-12 Gary V. Vaughan <address@hidden>
+ add _HEADERS primaries to Makefile.am snippets for installable headers
+ * modules/alloca-opt, modules/arg-nonnull, modules/argz,
+ modules/arpa_inet, modules/byteswap, modules/c++defs, modules/ctype,
+ modules/dirent, modules/errno, modules/fcntl-h, modules/float,
+ modules/fnmatch, modules/getopt-posix, modules/glob, modules/iconv-h,
+ modules/iconv_open, modules/inttypes, modules/langinfo,
+ modules/link-warning, modules/locale, modules/math, modules/netdb,
+ modules/netinet_in, modules/poll-h, modules/pthread, modules/pty,
+ modules/sched, modules/search, modules/selinux-h, modules/signal,
+ modules/spawn, modules/stdarg, modules/stdbool, modules/stddef,
+ modules/stdint, modules/stdio, modules/stdlib, modules/string,
+ modules/strings, modules/sys_file, modules/sys_ioctl,
+ modules/sys_select, modules/sys_socket, modules/sys_stat,
+ modules/sys_time, modules/sys_times, modules/sys_utsname,
+ modules/sys_wait, modules/sysexits, modules/termios, modules/time,
+ modules/unistd, modules/unitypes, modules/unused-parameter,
+ modules/warn-on-use, modules/wchar, modules/wctype (Makefile.am):
+ Add nodist_include_HEADERS, nobase_nodist_include_HEADERS and
+ EXTRA_HEADERS declarations for potentially installable header files.
+ * gnulib-tool: Initialize nodist_include_HEADERS,
+ nobase_nodist_include_HEADERS and EXTRA_HEADERS to prime for new
+ `.*_HEADERS +=' declarations.
+ (func_emit_lib_Makefile_am): Edit away new nodist_include_HEADERS,
+ nobase_nodist_include_HEADERS and EXTRA_HEADERS declarations by
+ default, reverting the Makefile.am snippets above to their original
+ condition prior to this change *unless* the gnulib library is being
+ installed.
+
New module `libposix'.
* modules/libposix: New module to facilitate an installable
library of posix modules.
diff --git a/gnulib-tool b/gnulib-tool
index 04b4aa2..ab0b378 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -2872,6 +2872,8 @@ func_emit_lib_Makefile_am ()
echo
if test -z "$makefile_name"; then
echo "SUBDIRS ="
+ echo "nodist_include_HEADERS ="
+ echo "nobase_nodist_include_HEADERS ="
echo "noinst_HEADERS ="
echo "noinst_LIBRARIES ="
echo "noinst_LTLIBRARIES ="
@@ -2881,6 +2883,7 @@ func_emit_lib_Makefile_am ()
echo "pkgdata_DATA ="
fi
echo "EXTRA_DIST ="
+ echo "EXTRA_HEADERS ="
echo "BUILT_SOURCES ="
echo "SUFFIXES ="
fi
@@ -2920,11 +2923,18 @@ func_emit_lib_Makefile_am ()
&& test -f "$sourcebase/Makefile.am" \
&& LC_ALL=C grep "^[a-zA-Z0-9_]*_${perhapsLT}LIBRARIES *+\{0,1\}=
*$libname\\.$libext\$" "$sourcebase/Makefile.am" > /dev/null; \
}; then
+ # Install associated header files, per module Makefile.am snippets.
+ sed_transform_HEADERS_primaries="$sed_noop"
# One of the snippets or the user's Makefile.am already specifies an
# installation location for the library. Don't confuse automake by saying
# it should not be installed.
:
else
+ # Don't install header files when generated library is not installed.
+ sed_transform_HEADERS_primaries="\
+ /^\(nobase_\)\{0,1\}nodist_include_HEADERS *=.*$/d
+ /^EXTRA_HEADERS *=.*$/d
+ "
# By default, the generated library should not be installed.
echo "noinst_${perhapsLT}LIBRARIES += $libname.$libext"
fi
@@ -2956,7 +2966,8 @@ func_emit_lib_Makefile_am ()
echo
fi
cat "$tmp"/allsnippets \
- | sed -e 's|\$(top_srcdir)/build-aux/|$(top_srcdir)/'"$auxdir"'/|g'
+ | sed -e 's|\$(top_srcdir)/build-aux/|$(top_srcdir)/'"$auxdir"'/|g' \
+ -e "$sed_transform_HEADERS_primaries"
echo
echo "mostlyclean-local: mostlyclean-generic"
echo " @for dir in '' \$(MOSTLYCLEANDIRS); do \\"
@@ -3170,6 +3181,8 @@ func_emit_tests_Makefile_am ()
if ! $for_test; then
echo "check_PROGRAMS ="
fi
+ echo "nodist_include_HEADERS ="
+ echo "nobase_nodist_include_HEADERS ="
echo "noinst_HEADERS ="
echo "noinst_LIBRARIES ="
if $use_libtests; then
@@ -3185,6 +3198,7 @@ func_emit_tests_Makefile_am ()
echo "pkgdata_DATA ="
fi
echo "EXTRA_DIST ="
+ echo "EXTRA_HEADERS ="
echo "BUILT_SOURCES ="
echo "SUFFIXES ="
echo "MOSTLYCLEANFILES = core *.stackdump"
diff --git a/modules/alloca-opt b/modules/alloca-opt
index 9ced93b..c2f4af7 100644
--- a/modules/alloca-opt
+++ b/modules/alloca-opt
@@ -13,6 +13,9 @@ configure.ac:
gl_FUNC_ALLOCA
Makefile.am:
+nodist_include_HEADERS += $(ALLOCA_H)
+EXTRA_HEADERS += alloca.h
+
BUILT_SOURCES += $(ALLOCA_H)
# We need the following in order to create <alloca.h> when the system
diff --git a/modules/arg-nonnull b/modules/arg-nonnull
index d4e4d13..4776c6e 100644
--- a/modules/arg-nonnull
+++ b/modules/arg-nonnull
@@ -12,6 +12,8 @@ Depends-on:
configure.ac:
Makefile.am:
+nodist_include_HEADERS += arg-nonnull.h
+
# The BUILT_SOURCES created by this Makefile snippet are not used via #include
# statements but through direct file reference. Therefore this snippet must be
# present in all Makefile.am that need it. This is ensured by the applicability
diff --git a/modules/argz b/modules/argz
index 5f9c749..43aced3 100644
--- a/modules/argz
+++ b/modules/argz
@@ -18,6 +18,9 @@ configure.ac:
gl_FUNC_ARGZ
Makefile.am:
+nodist_include_HEADERS += $(ARGZ_H)
+EXTRA_HEADERS += argz.h
+
BUILT_SOURCES += $(ARGZ_H)
# We need the following in order to create <argz.h> when the system
diff --git a/modules/arpa_inet b/modules/arpa_inet
index d751873..6e1bb88 100644
--- a/modules/arpa_inet
+++ b/modules/arpa_inet
@@ -16,6 +16,8 @@ gl_HEADER_ARPA_INET
AC_PROG_MKDIR_P
Makefile.am:
+nobase_nodist_include_HEADERS += arpa/inet.h
+
BUILT_SOURCES += arpa/inet.h
# We need the following in order to create <arpa/inet.h> when the system
diff --git a/modules/byteswap b/modules/byteswap
index 6a3ce15..226cf04 100644
--- a/modules/byteswap
+++ b/modules/byteswap
@@ -11,6 +11,9 @@ configure.ac:
gl_BYTESWAP
Makefile.am:
+nodist_include_HEADERS += $(BYTESWAP_H)
+EXTRA_HEADERS += byteswap.h
+
BUILT_SOURCES += $(BYTESWAP_H)
# We need the following in order to create <byteswap.h> when the system
diff --git a/modules/c++defs b/modules/c++defs
index 186584f..9a3d405 100644
--- a/modules/c++defs
+++ b/modules/c++defs
@@ -12,6 +12,8 @@ Depends-on:
configure.ac:
Makefile.am:
+nodist_include_HEADERS += c++defs.h
+
# The BUILT_SOURCES created by this Makefile snippet are not used via #include
# statements but through direct file reference. Therefore this snippet must be
# present in all Makefile.am that need it. This is ensured by the applicability
diff --git a/modules/ctype b/modules/ctype
index f0ec911..3601bf4 100644
--- a/modules/ctype
+++ b/modules/ctype
@@ -14,6 +14,8 @@ configure.ac:
gl_CTYPE_H
Makefile.am:
+nodist_include_HEADERS += ctype.h
+
BUILT_SOURCES += ctype.h
# We need the following in order to create <ctype.h> when the system
diff --git a/modules/dirent b/modules/dirent
index 3029d73..f305c92 100644
--- a/modules/dirent
+++ b/modules/dirent
@@ -16,6 +16,8 @@ configure.ac:
gl_DIRENT_H
Makefile.am:
+nodist_include_HEADERS += dirent.h
+
BUILT_SOURCES += dirent.h
# We need the following in order to create <dirent.h> when the system
diff --git a/modules/errno b/modules/errno
index b730071..ccf574f 100644
--- a/modules/errno
+++ b/modules/errno
@@ -12,6 +12,9 @@ configure.ac:
gl_HEADER_ERRNO_H
Makefile.am:
+nodist_include_HEADERS += $(ERRNO_H)
+EXTRA_HEADERS += errno.h
+
BUILT_SOURCES += $(ERRNO_H)
# We need the following in order to create <errno.h> when the system
diff --git a/modules/fcntl-h b/modules/fcntl-h
index c275a4e..237f409 100644
--- a/modules/fcntl-h
+++ b/modules/fcntl-h
@@ -18,6 +18,8 @@ configure.ac:
gl_FCNTL_H
Makefile.am:
+nodist_include_HEADERS += fcntl.h
+
BUILT_SOURCES += fcntl.h
# We need the following in order to create <fcntl.h> when the system
diff --git a/modules/float b/modules/float
index c98853b..376a705 100644
--- a/modules/float
+++ b/modules/float
@@ -12,6 +12,9 @@ configure.ac:
gl_FLOAT_H
Makefile.am:
+nodist_include_HEADERS += $(FLOAT_H)
+EXTRA_HEADERS += float.h
+
BUILT_SOURCES += $(FLOAT_H)
# We need the following in order to create <float.h> when the system
diff --git a/modules/fnmatch b/modules/fnmatch
index 6849b4d..ee86ce8 100644
--- a/modules/fnmatch
+++ b/modules/fnmatch
@@ -24,6 +24,9 @@ configure.ac:
gl_FUNC_FNMATCH_POSIX
Makefile.am:
+nodist_include_HEADERS += $(FNMATCH_H)
+EXTRA_HEADERS += fnmatch.h
+
BUILT_SOURCES += $(FNMATCH_H)
# We need the following in order to create <fnmatch.h> when the system
diff --git a/modules/getopt-posix b/modules/getopt-posix
index 39b10a4..ed93e13 100644
--- a/modules/getopt-posix
+++ b/modules/getopt-posix
@@ -19,6 +19,9 @@ configure.ac:
gl_FUNC_GETOPT_POSIX
Makefile.am:
+nodist_include_HEADERS += $(GETOPT_H)
+EXTRA_HEADERS += getopt.h
+
BUILT_SOURCES += $(GETOPT_H)
# We need the following in order to create <getopt.h> when the system
diff --git a/modules/glob b/modules/glob
index 0caaeef..4e9222d 100644
--- a/modules/glob
+++ b/modules/glob
@@ -30,6 +30,9 @@ configure.ac:
gl_GLOB
Makefile.am:
+nodist_include_HEADERS += $(GLOB_H)
+EXTRA_HEADERS += glob.h
+
BUILT_SOURCES += $(GLOB_H)
# We need the following in order to create <glob.h> when the system
diff --git a/modules/iconv-h b/modules/iconv-h
index 46399cd..9978baa 100644
--- a/modules/iconv-h
+++ b/modules/iconv-h
@@ -15,6 +15,9 @@ configure.ac:
gl_ICONV_H
Makefile.am:
+nodist_include_HEADERS += $(ICONV_H)
+EXTRA_HEADERS += iconv.h
+
BUILT_SOURCES += $(ICONV_H)
# We need the following in order to create <iconv.h> when the system
diff --git a/modules/iconv_open b/modules/iconv_open
index 1a51f08..096a39f 100644
--- a/modules/iconv_open
+++ b/modules/iconv_open
@@ -22,6 +22,7 @@ gl_FUNC_ICONV_OPEN
Makefile.am:
iconv_headers = iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h
iconv_open-osf.h iconv_open-solaris.h
+nodist_include_HEADERS += $(iconv_headers)
iconv_open-aix.h: iconv_open-aix.gperf
$(GPERF) -m 10 $(srcdir)/iconv_open-aix.gperf >
$(srcdir)/iconv_open-aix.h-t
diff --git a/modules/inttypes b/modules/inttypes
index 674d83e..be48a9e 100644
--- a/modules/inttypes
+++ b/modules/inttypes
@@ -17,6 +17,8 @@ configure.ac:
gl_INTTYPES_H
Makefile.am:
+nodist_include_HEADERS += inttypes.h
+
BUILT_SOURCES += inttypes.h
# We need the following in order to create <inttypes.h> when the system
diff --git a/modules/langinfo b/modules/langinfo
index fd23db9..e616c1f 100644
--- a/modules/langinfo
+++ b/modules/langinfo
@@ -15,6 +15,8 @@ configure.ac:
gl_LANGINFO_H
Makefile.am:
+nodist_include_HEADERS += langinfo.h
+
BUILT_SOURCES += langinfo.h
# We need the following in order to create an empty placeholder for
diff --git a/modules/link-warning b/modules/link-warning
index 935f66a..4495d8f 100644
--- a/modules/link-warning
+++ b/modules/link-warning
@@ -12,6 +12,8 @@ Depends-on:
configure.ac:
Makefile.am:
+nodist_include_HEADERS += link-warning.h
+
# The BUILT_SOURCES created by this Makefile snippet are not used via #include
# statements but through direct file reference. Therefore this snippet must be
# present in all Makefile.am that need it. This is ensured by the applicability
diff --git a/modules/locale b/modules/locale
index b80b513..31cfe2e 100644
--- a/modules/locale
+++ b/modules/locale
@@ -17,6 +17,8 @@ configure.ac:
gl_LOCALE_H
Makefile.am:
+nodist_include_HEADERS += locale.h
+
BUILT_SOURCES += locale.h
# We need the following in order to create <locale.h> when the system
diff --git a/modules/math b/modules/math
index ca9aa1a..c6c8481 100644
--- a/modules/math
+++ b/modules/math
@@ -15,6 +15,8 @@ configure.ac:
gl_MATH_H
Makefile.am:
+nodist_include_HEADERS += math.h
+
BUILT_SOURCES += math.h
# We need the following in order to create <math.h> when the system
diff --git a/modules/netdb b/modules/netdb
index ea7dc63..b5614a0 100644
--- a/modules/netdb
+++ b/modules/netdb
@@ -16,6 +16,8 @@ configure.ac:
gl_HEADER_NETDB
Makefile.am:
+nodist_include_HEADERS += netdb.h
+
BUILT_SOURCES += netdb.h
# We need the following in order to create <netdb.h> when the system
diff --git a/modules/netinet_in b/modules/netinet_in
index 06df756..1bf08a0 100644
--- a/modules/netinet_in
+++ b/modules/netinet_in
@@ -14,6 +14,9 @@ gl_HEADER_NETINET_IN
AC_PROG_MKDIR_P
Makefile.am:
+nobase_nodist_include_HEADERS += $(NETINET_IN_H)
+EXTRA_HEADERS += netinet/in.h
+
BUILT_SOURCES += $(NETINET_IN_H)
# We need the following in order to create <netinet/in.h> when the system
diff --git a/modules/poll-h b/modules/poll-h
index 347fc60..867a85e 100644
--- a/modules/poll-h
+++ b/modules/poll-h
@@ -15,6 +15,8 @@ configure.ac:
gl_POLL_H
Makefile.am:
+nodist_include_HEADERS += poll.h
+
BUILT_SOURCES += poll.h
# We need the following in order to create <poll.h> when the system
diff --git a/modules/pthread b/modules/pthread
index e29016a..ec245a5 100644
--- a/modules/pthread
+++ b/modules/pthread
@@ -13,6 +13,9 @@ configure.ac:
gl_PTHREAD_CHECK
Makefile.am:
+nodist_include_HEADERS += $(PTHREAD_H)
+EXTRA_HEADERS += pthread.h
+
BUILT_SOURCES += $(PTHREAD_H)
# We need the following in order to create <pthread.h> when the system
diff --git a/modules/pty b/modules/pty
index 93f280c..3e71243 100644
--- a/modules/pty
+++ b/modules/pty
@@ -14,6 +14,8 @@ configure.ac:
gl_PTY_H
Makefile.am:
+nodist_include_HEADERS += pty.h
+
BUILT_SOURCES += pty.h
# We need the following in order to create <pty.h> when the system
diff --git a/modules/sched b/modules/sched
index d126fc7..07c5dd6 100644
--- a/modules/sched
+++ b/modules/sched
@@ -12,6 +12,9 @@ configure.ac:
gl_SCHED_H
Makefile.am:
+nodist_include_HEADERS += $(SCHED_H)
+EXTRA_HEADERS += sched.h
+
BUILT_SOURCES += $(SCHED_H)
# We need the following in order to create a replacement for <sched.h> when
diff --git a/modules/search b/modules/search
index ceed3ff..a9e0cd6 100644
--- a/modules/search
+++ b/modules/search
@@ -15,6 +15,8 @@ configure.ac:
gl_SEARCH_H
Makefile.am:
+nodist_include_HEADERS += search.h
+
BUILT_SOURCES += search.h
# We need the following in order to create <search.h> when the system
diff --git a/modules/selinux-h b/modules/selinux-h
index 745ea49..3fed8f4 100644
--- a/modules/selinux-h
+++ b/modules/selinux-h
@@ -18,6 +18,8 @@ gl_HEADERS_SELINUX_CONTEXT_H
AC_REQUIRE([AC_C_INLINE])
Makefile.am:
+nobase_nodist_include_HEADERS += selinux/selinux.h
+
lib_SOURCES += se-context.in.h se-selinux.in.h
BUILT_SOURCES += selinux/selinux.h
diff --git a/modules/signal b/modules/signal
index c9ff197..ea4f4e2 100644
--- a/modules/signal
+++ b/modules/signal
@@ -15,6 +15,8 @@ configure.ac:
gl_SIGNAL_H
Makefile.am:
+nodist_include_HEADERS += signal.h
+
BUILT_SOURCES += signal.h
# We need the following in order to create <signal.h> when the system
diff --git a/modules/spawn b/modules/spawn
index 61e5e07..1b6b7ba 100644
--- a/modules/spawn
+++ b/modules/spawn
@@ -16,6 +16,8 @@ configure.ac:
gl_SPAWN_H
Makefile.am:
+nodist_include_HEADERS += spawn.h
+
BUILT_SOURCES += spawn.h
# We need the following in order to create a replacement for <spawn.h> when
diff --git a/modules/stdarg b/modules/stdarg
index 05a01db..4c96b05 100644
--- a/modules/stdarg
+++ b/modules/stdarg
@@ -19,6 +19,9 @@ configure.ac:
gl_STDARG_H
Makefile.am:
+nodist_include_HEADERS += $(STDARG_H)
+EXTRA_HEADERS += stdarg.h
+
BUILT_SOURCES += $(STDARG_H)
# We need the following in order to create <stdarg.h> when the system
diff --git a/modules/stdbool b/modules/stdbool
index 80fe2db..00372d7 100644
--- a/modules/stdbool
+++ b/modules/stdbool
@@ -12,6 +12,9 @@ configure.ac:
AM_STDBOOL_H
Makefile.am:
+nodist_include_HEADERS += $(STDBOOL_H)
+EXTRA_HEADERS += stdbool.h
+
BUILT_SOURCES += $(STDBOOL_H)
# We need the following in order to create <stdbool.h> when the system
diff --git a/modules/stddef b/modules/stddef
index 4836bc7..ae7af30 100644
--- a/modules/stddef
+++ b/modules/stddef
@@ -13,6 +13,9 @@ configure.ac:
gl_STDDEF_H
Makefile.am:
+nodist_include_HEADERS += $(STDDEF_H)
+EXTRA_HEADERS += stddef.h
+
BUILT_SOURCES += $(STDDEF_H)
# We need the following in order to create <stddef.h> when the system
diff --git a/modules/stdint b/modules/stdint
index 9e5f7ad..de0c196 100644
--- a/modules/stdint
+++ b/modules/stdint
@@ -20,6 +20,9 @@ configure.ac:
gl_STDINT_H
Makefile.am:
+nodist_include_HEADERS += $(STDINT_H)
+EXTRA_HEADERS += stdint.h
+
BUILT_SOURCES += $(STDINT_H)
# We need the following in order to create <stdint.h> when the system
diff --git a/modules/stdio b/modules/stdio
index f27322e..082917a 100644
--- a/modules/stdio
+++ b/modules/stdio
@@ -19,6 +19,8 @@ configure.ac:
gl_STDIO_H
Makefile.am:
+nodist_include_HEADERS += stdio.h
+
BUILT_SOURCES += stdio.h
# We need the following in order to create <stdio.h> when the system
diff --git a/modules/stdlib b/modules/stdlib
index 4b889a1..db650a7 100644
--- a/modules/stdlib
+++ b/modules/stdlib
@@ -18,6 +18,8 @@ configure.ac:
gl_STDLIB_H
Makefile.am:
+nodist_include_HEADERS += stdlib.h
+
BUILT_SOURCES += stdlib.h
# We need the following in order to create <stdlib.h> when the system
diff --git a/modules/string b/modules/string
index f22c389..60429b1 100644
--- a/modules/string
+++ b/modules/string
@@ -17,6 +17,8 @@ configure.ac:
gl_HEADER_STRING_H
Makefile.am:
+nodist_include_HEADERS += string.h
+
BUILT_SOURCES += string.h
# We need the following in order to create <string.h> when the system
diff --git a/modules/strings b/modules/strings
index 9b7a48e..c8913c7 100644
--- a/modules/strings
+++ b/modules/strings
@@ -14,6 +14,8 @@ configure.ac:
gl_HEADER_STRINGS_H
Makefile.am:
+nodist_include_HEADERS += strings.h
+
BUILT_SOURCES += strings.h
# We need the following in order to create <strings.h> when the system
diff --git a/modules/sys_file b/modules/sys_file
index 1da1655..29e22aa 100644
--- a/modules/sys_file
+++ b/modules/sys_file
@@ -14,6 +14,8 @@ gl_HEADER_SYS_FILE_H
AC_PROG_MKDIR_P
Makefile.am:
+nobase_nodist_include_HEADERS += sys/file.h
+
BUILT_SOURCES += sys/file.h
# We need the following in order to create <sys/file.h> when the system
diff --git a/modules/sys_ioctl b/modules/sys_ioctl
index 669f70b..5cd656f 100644
--- a/modules/sys_ioctl
+++ b/modules/sys_ioctl
@@ -16,6 +16,8 @@ gl_SYS_IOCTL_H
AC_PROG_MKDIR_P
Makefile.am:
+nobase_nodist_include_HEADERS += sys/ioctl.h
+
BUILT_SOURCES += sys/ioctl.h
# We need the following in order to create <sys/ioctl.h> when the system
diff --git a/modules/sys_select b/modules/sys_select
index 3fbbd57..03df5cc 100644
--- a/modules/sys_select
+++ b/modules/sys_select
@@ -17,6 +17,8 @@ gl_HEADER_SYS_SELECT
AC_PROG_MKDIR_P
Makefile.am:
+nobase_nodist_include_HEADERS += sys/select.h
+
BUILT_SOURCES += sys/select.h
# We need the following in order to create <sys/select.h> when the system
diff --git a/modules/sys_socket b/modules/sys_socket
index deef2c7..0c9da25 100644
--- a/modules/sys_socket
+++ b/modules/sys_socket
@@ -20,6 +20,8 @@ gl_HEADER_SYS_SOCKET
AC_PROG_MKDIR_P
Makefile.am:
+nobase_nodist_include_HEADERS += sys/socket.h
+
BUILT_SOURCES += sys/socket.h
# We need the following in order to create <sys/socket.h> when the system
diff --git a/modules/sys_stat b/modules/sys_stat
index 40bcf6d..cf828b8 100644
--- a/modules/sys_stat
+++ b/modules/sys_stat
@@ -18,6 +18,8 @@ gl_HEADER_SYS_STAT_H
AC_PROG_MKDIR_P
Makefile.am:
+nobase_nodist_include_HEADERS += sys/stat.h
+
BUILT_SOURCES += sys/stat.h
# We need the following in order to create <sys/stat.h> when the system
diff --git a/modules/sys_time b/modules/sys_time
index 92f2ebb..d6c3de4 100644
--- a/modules/sys_time
+++ b/modules/sys_time
@@ -16,6 +16,8 @@ gl_HEADER_SYS_TIME_H
AC_PROG_MKDIR_P
Makefile.am:
+nobase_nodist_include_HEADERS += sys/time.h
+
BUILT_SOURCES += sys/time.h
# We need the following in order to create <sys/time.h> when the system
diff --git a/modules/sys_times b/modules/sys_times
index 7a543b4..b31aef8 100644
--- a/modules/sys_times
+++ b/modules/sys_times
@@ -15,6 +15,8 @@ gl_SYS_TIMES_H
AC_PROG_MKDIR_P
Makefile.am:
+nobase_nodist_include_HEADERS += sys/times.h
+
BUILT_SOURCES += sys/times.h
# We need the following in order to create <sys/times.h> when the system
diff --git a/modules/sys_utsname b/modules/sys_utsname
index 4dec661..b8df06d 100644
--- a/modules/sys_utsname
+++ b/modules/sys_utsname
@@ -15,6 +15,8 @@ gl_SYS_UTSNAME_H
AC_PROG_MKDIR_P
Makefile.am:
+nobase_nodist_include_HEADERS += sys/utsname.h
+
BUILT_SOURCES += sys/utsname.h
# We need the following in order to create <sys/utsname.h> when the system
diff --git a/modules/sys_wait b/modules/sys_wait
index 0299f9e..0397bc6 100644
--- a/modules/sys_wait
+++ b/modules/sys_wait
@@ -15,6 +15,8 @@ gl_SYS_WAIT_H
AC_PROG_MKDIR_P
Makefile.am:
+nobase_nodist_include_HEADERS += sys/wait.h
+
BUILT_SOURCES += sys/wait.h
# We need the following in order to create <sys/wait.h> when the system
diff --git a/modules/sysexits b/modules/sysexits
index fc47260..8d06137 100644
--- a/modules/sysexits
+++ b/modules/sysexits
@@ -12,6 +12,9 @@ configure.ac:
gl_SYSEXITS
Makefile.am:
+nodist_include_HEADERS += $(SYSEXITS_H)
+EXTRA_HEADERS += sysexits.h
+
BUILT_SOURCES += $(SYSEXITS_H)
# We need the following in order to create <sysexits.h> when the system
diff --git a/modules/termios b/modules/termios
index 2930c1a..c69f157 100644
--- a/modules/termios
+++ b/modules/termios
@@ -14,6 +14,8 @@ configure.ac:
gl_TERMIOS_H
Makefile.am:
+nodist_include_HEADERS += termios.h
+
BUILT_SOURCES += termios.h
# We need the following in order to create <termios.h> when the system
diff --git a/modules/time b/modules/time
index 71da97d..f90cc41 100644
--- a/modules/time
+++ b/modules/time
@@ -17,6 +17,8 @@ configure.ac:
gl_HEADER_TIME_H
Makefile.am:
+nodist_include_HEADERS += time.h
+
BUILT_SOURCES += time.h
# We need the following in order to create <time.h> when the system
diff --git a/modules/unistd b/modules/unistd
index eab8ce9..decedd1 100644
--- a/modules/unistd
+++ b/modules/unistd
@@ -16,6 +16,8 @@ configure.ac:
gl_UNISTD_H
Makefile.am:
+nodist_include_HEADERS += unistd.h
+
BUILT_SOURCES += unistd.h
# We need the following in order to create an empty placeholder for
diff --git a/modules/unitypes b/modules/unitypes
index 7cd1a19..53b9ea1 100644
--- a/modules/unitypes
+++ b/modules/unitypes
@@ -12,6 +12,9 @@ configure.ac:
gl_LIBUNISTRING_LIBHEADER([0.9], [unitypes.h])
Makefile.am:
+nodist_include_HEADERS += $(LIBUNISTRING_UNITYPES_H)
+EXTRA_HEADERS += unitypes.h
+
BUILT_SOURCES += $(LIBUNISTRING_UNITYPES_H)
unitypes.h: unitypes.in.h
diff --git a/modules/unused-parameter b/modules/unused-parameter
index 196aa78..2f90475 100644
--- a/modules/unused-parameter
+++ b/modules/unused-parameter
@@ -12,6 +12,8 @@ Depends-on:
configure.ac:
Makefile.am:
+nodist_include_HEADERS += unused-parameter.h
+
# The BUILT_SOURCES created by this Makefile snippet are not used via #include
# statements but through direct file reference. Therefore this snippet must be
# present in all Makefile.am that need it. This is ensured by the applicability
diff --git a/modules/warn-on-use b/modules/warn-on-use
index f0ee83b..60ef38e 100644
--- a/modules/warn-on-use
+++ b/modules/warn-on-use
@@ -13,6 +13,8 @@ Depends-on:
configure.ac:
Makefile.am:
+nodist_include_HEADERS += warn-on-use.h
+
BUILT_SOURCES += warn-on-use.h
# The warn-on-use.h that gets inserted into generated .h files is the same as
# build-aux/warn-on-use.h, except that it has the copyright header cut off.
diff --git a/modules/wchar b/modules/wchar
index c9d5c46..ad23e5c 100644
--- a/modules/wchar
+++ b/modules/wchar
@@ -17,6 +17,8 @@ configure.ac:
gl_WCHAR_H
Makefile.am:
+nodist_include_HEADERS += wchar.h
+
BUILT_SOURCES += wchar.h
# We need the following in order to create <wchar.h> when the system
diff --git a/modules/wctype b/modules/wctype
index b0fc26d..5e78481 100644
--- a/modules/wctype
+++ b/modules/wctype
@@ -15,6 +15,8 @@ configure.ac:
gl_WCTYPE_H
Makefile.am:
+nodist_include_HEADERS += wctype.h
+
BUILT_SOURCES += wctype.h
# We need the following in order to create <wctype.h> when the system
--
1.7.3
[PATCH 1/7] gnulib-tool: transform include guards with `--macro-prefix', Gary V. Vaughan, 2010/10/12