libposix: Add _HEADERS primaries to posix modules.

Modify gnulib-tool to strip them from generated Makefile.am-s where
they are not needed.  Also, replace M4 macro prefixes when requested.
Finally, omit calls to error() for libposix.

diff --git a/.gitignore b/.gitignore
index b95fb408d582544e98972535f58b4411a374b5a6..92cb9b57ded6f842fdfe35c88128edc2356daca5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@
 allsnippets.tmp
 amsnippet.tmp
 testdir*
+*.diff
+*.patch

diff --git a/ChangeLog b/ChangeLog
index b6c7b0072bb8424bb419938b6e5bdd3f7fc58cbb..c9620974f2c300612372f409f15dab6e090bb168 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1910,6 +1910,13 @@
        * doc/posix-functions/gmtime_r.texi: Document the HP-UX 11 problem.
        * doc/posix-functions/localtime_r.texi: Likewise.
 
+2010-12-30  Bruce Korb  <bkorb@gnu.org>
+
+       libposix: avoid calling error() within libposix
+       * lib/openat-die.c: remove error module stuff when GNULIB_LIBPOSIX
+       is defined.
+       * lib/xalloc-die.c: Same thing.
+
 2010-12-29  Eric Blake  <eblake@redhat.com>
 
        mountlist: tweak previous commit
@@ -3555,6 +3562,13 @@
        * lib/ftoastr.h, lib/ftoastr.c, lib/dtoastr.c, lib/ldtoastr.c:
        * modules/ftoastr: New files.
 
+2010-11-16  Bruce Korb  <bkorb@gnu.org>
+
+       libposix: Libposix module will be created on the fly
+       * modules/libposix: remove
+       * modules/*: Use pkginclude_HEADERS instead of plain "include".
+       * gnulib-tool: adjust here, too
+
 2010-11-15  Paul Eggert  <eggert@cs.ucla.edu>
 
        bootstrap: port to Solaris sed
@@ -4134,6 +4148,74 @@
        and use malloc rather than the stack for the same reason as
        mentioned in the comment justifying the other allocation.
 
+2010-10-12  Gary V. Vaughan  <gary@gnu.org>
+
+       libposix: use git-version-gen for version numbering
+       * build-aux/git-version-gen: In order to work inside the
+       libposix subdirectory, also check the parent directory for .git
+       before assuming git describe will not work.
+
+       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.
+       (Makefile.am): Use lib_LTLIBRARIES to mark libposix.la as
+       installable.
+       (Depends-On): List all the modules found by `posix-modules',
+       except `strdup' which is spurious, and with the addition of
+       `alloca' to satisfy an otherwise undefined LTALLOCA definition;
+       and `progname' to provide a non-extern program_name symbol so that
+       compilation with `-no-undefined' symbols can work.
+
+       iconv_open: reduce not-trivial repetition of file-list
+       * modules/iconv_open (iconv_headers): New make macro to hold list of
+       iconv header files.
+       (BUILT_SOURCES, MAINTAINERCLEANFILES, EXTRA_DIST): Use it instead of
+       multiple hard-coded copies.
+
+       gnulib-tool: transform hard-coded libgnu.a to $libname.l?a
+       * gnulib-tool (func_emit_lib_Makefile_am): transform hard-coded
+       `libgnu.a' in Makefile.am snippets to be either `$libname.a' or
+       `$libname.la', depending on whether --libtool/--no-libtool options
+       were given.
+
+2010-10-12  Sam Steingold  <sds@gnu.org>
+           Gary V. Vaughan  <gary@gnu.org>
+
+       gnulib-tool: transform include guards with `--macro-prefix'
+       * gnulib-tool (func_import): support multiple gllib directories:
+       headers are generated for each gllib differently, depending on which
+       features are actually used, so we need to be able to include all
+       these generated headers without fear that one will shadow another,
+       so we prepend the macro-prefix before the guard macros.
+
 2010-10-11  Bruno Haible  <bruno@clisp.org>
 
        stdlib: Allow multiple gnulib generated replacements to coexist.

diff --git a/gnulib-tool b/gnulib-tool
index 9375f97d44781584dba38c585e55eeb9365f09f2..0be26f5f3f7df4f0af25b80ed7ab1f412476f69d 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -2815,6 +2815,11 @@ func_emit_lib_Makefile_am ()
   echo
   uses_subdirs=
   {
+    if test false = "$libtool"; then
+      sed_transform_libgnu_a="s, libgnu\\.a, $libname.a,g"
+    else
+      sed_transform_libgnu_a="s, libgnu\\.a, $libname.la,g"
+    fi
     for module in $modules; do
       func_verify_nontests_module
       if test -n "$module"; then
@@ -2827,6 +2832,7 @@ func_emit_lib_Makefile_am ()
                 -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' \
                 -e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \
                 -e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g' \
+               -e "$sed_transform_libgnu_a" \
                 -e "$sed_transform_check_PROGRAMS"
           if test "$module" = 'alloca'; then
             echo "${libname}_${libext}_LIBADD += @${perhapsLT}ALLOCA@"
@@ -2866,6 +2872,8 @@ func_emit_lib_Makefile_am ()
   echo
   if test -z "$makefile_name"; then
     echo "SUBDIRS ="
+    echo "nodist_pkginclude_HEADERS ="
+    echo "nobase_nodist_pkginclude_HEADERS ="
     echo "noinst_HEADERS ="
     echo "noinst_LIBRARIES ="
     echo "noinst_LTLIBRARIES ="
@@ -2875,6 +2883,7 @@ func_emit_lib_Makefile_am ()
       echo "pkgdata_DATA ="
     fi
     echo "EXTRA_DIST ="
+    echo "EXTRA_HEADERS ="
     echo "BUILT_SOURCES ="
     echo "SUFFIXES ="
   fi
@@ -2914,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_pkginclude_HEADERS *=.*$/d
+        /^EXTRA_HEADERS *=.*$/d
+    "
     # By default, the generated library should not be installed.
     echo "noinst_${perhapsLT}LIBRARIES += $libname.$libext"
   fi
@@ -2950,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 \\"
@@ -3164,6 +3181,8 @@ func_emit_tests_Makefile_am ()
   if ! $for_test; then
     echo "check_PROGRAMS ="
   fi
+  echo "nodist_pkginclude_HEADERS ="
+  echo "nobase_nodist_pkginclude_HEADERS ="
   echo "noinst_HEADERS ="
   echo "noinst_LIBRARIES ="
   if $use_libtests; then
@@ -3179,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"
@@ -3847,6 +3867,9 @@ s,^\(.................................................[^ ]*\) *,
       break
     fi
   done
+  test -n "${macro_prefix}" && sed_transform_lib_file=$sed_transform_lib_file"
+    s/_GL_\(.*\)_H/_${macro_prefix}_GL_\1_H/g
+  "
   sed_transform_main_lib_file="$sed_transform_lib_file"
   if test -n "$do_copyrights"; then
     if test -n "$lgpl"; then
@@ -3885,6 +3908,10 @@ s,^\(.................................................[^ ]*\) *,
       s/version 2\(.1\)\{0,1\}\([ ,]\)/version 3\2/g
     '
   fi
+  test -n "${macro_prefix}" \
+    && sed_transform_build_aux_file=$sed_transform_build_aux_file"
+         s/_GL_\(.*\)_H/_${macro_prefix}_GL_\1_H/g
+       "
 
   # Determine script to apply to library files that go into $testsbase/.
   sed_transform_testsrelated_lib_file="$sed_transform_lib_file"

diff --git a/lib/openat-die.c b/lib/openat-die.c
index 0db20b9cd09b4e3bdba253391c63a6d6c2e81c14..b10e627c6d919c946122af35004c0e43921d07d5 100644 (file)
--- a/lib/openat-die.c
+++ b/lib/openat-die.c
@@ -21,7 +21,10 @@
 
 #include <stdlib.h>
 
+#ifndef GNULIB_LIBPOSIX
 #include "error.h"
+#endif
+
 #include "exitfail.h"
 
 #include "gettext.h"
@@ -30,9 +33,10 @@
 void
 openat_save_fail (int errnum)
 {
+#ifndef GNULIB_LIBPOSIX
   error (exit_failure, errnum,
          _("unable to record current working directory"));
-
+#endif
   /* The `noreturn' attribute cannot be applied to error, since it returns
      when its first argument is 0.  To help compilers understand that this
      function does not return, call abort.  Also, the abort is a
@@ -48,8 +52,10 @@ openat_save_fail (int errnum)
 void
 openat_restore_fail (int errnum)
 {
+#ifndef GNULIB_LIBPOSIX
   error (exit_failure, errnum,
          _("failed to return to initial working directory"));
+#endif
 
   /* As above.  */
   abort ();

diff --git a/lib/xalloc-die.c b/lib/xalloc-die.c
index aba4a068d0e5bec62382e2b944c7bef40654a67d..a714e43fc4a08c630efad31282df85c5ce8ca36d 100644 (file)
--- a/lib/xalloc-die.c
+++ b/lib/xalloc-die.c
@@ -22,7 +22,10 @@
 
 #include <stdlib.h>
 
+#ifndef GNULIB_LIBPOSIX
 #include "error.h"
+#endif
+
 #include "exitfail.h"
 
 #include "gettext.h"
@@ -31,7 +34,9 @@
 void
 xalloc_die (void)
 {
+#ifndef GNULIB_LIBPOSIX
   error (exit_failure, 0, "%s", _("memory exhausted"));
+#endif
 
   /* The `noreturn' cannot be given to error, since it may return if
      its first argument is 0.  To help compilers understand the

diff --git a/modules/alloca-opt b/modules/alloca-opt
index 9ced93b293aa8eab1c0dbe58aac57ee43facf948..4ae08b0dd8ef1ba4e6d9189351bbd94f15041cef 100644 (file)
--- a/modules/alloca-opt
+++ b/modules/alloca-opt
@@ -13,6 +13,9 @@ configure.ac:
 gl_FUNC_ALLOCA
 
 Makefile.am:
+nodist_pkginclude_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 d4e4d136632bf64cf7f9c5c17c4a853dc004bc68..37c5ea663d961fde5d17a58510d8db7b501b1c5e 100644 (file)
--- a/modules/arg-nonnull
+++ b/modules/arg-nonnull
@@ -12,6 +12,8 @@ Depends-on:
 configure.ac:
 
 Makefile.am:
+nodist_pkginclude_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 5f9c7499d1111d1460c03a8779b07f7f2563ef15..1a33f37d4019fd1ff3e31df90f886a8c3a1e6488 100644 (file)
--- a/modules/argz
+++ b/modules/argz
@@ -18,6 +18,9 @@ configure.ac:
 gl_FUNC_ARGZ
 
 Makefile.am:
+nodist_pkginclude_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 34b988161cad97b948697e7f2edb73d3562e2f90..35c2167a5756e25653a127bdf1b6d6460e5e889a 100644 (file)
--- a/modules/arpa_inet
+++ b/modules/arpa_inet
@@ -17,6 +17,8 @@ gl_HEADER_ARPA_INET
 AC_PROG_MKDIR_P
 
 Makefile.am:
+nobase_nodist_pkginclude_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 6a3ce1525c76fb93de66e232df6c2b6468374203..d16af57f6aea1186535831b7a46ef09215883d37 100644 (file)
--- a/modules/byteswap
+++ b/modules/byteswap
@@ -11,6 +11,9 @@ configure.ac:
 gl_BYTESWAP
 
 Makefile.am:
+nodist_pkginclude_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 186584f31e487fc605a3ec85114195c7068db09d..9cd5a8b9d659e76e2a4d58ee2bf074a56533f727 100644 (file)
--- a/modules/c++defs
+++ b/modules/c++defs
@@ -12,6 +12,8 @@ Depends-on:
 configure.ac:
 
 Makefile.am:
+nodist_pkginclude_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 f0ec9111b95b1f938f68e523074f9484852c7171..e37e622c64335d0e3c4d99ac614c64b2293745eb 100644 (file)
--- a/modules/ctype
+++ b/modules/ctype
@@ -14,6 +14,8 @@ configure.ac:
 gl_CTYPE_H
 
 Makefile.am:
+nodist_pkginclude_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 3029d73afcf8bf91648813e0b14f2f5aff9d8c58..094a84e2b6135d204ec5d5db7bf3f51cb3876a38 100644 (file)
--- a/modules/dirent
+++ b/modules/dirent
@@ -16,6 +16,8 @@ configure.ac:
 gl_DIRENT_H
 
 Makefile.am:
+nodist_pkginclude_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 b730071ea74b0f346d22c77819a208e41ffcac4a..221bebf0de67afcc2959d2b0d88e05607d9c7c27 100644 (file)
--- a/modules/errno
+++ b/modules/errno
@@ -12,6 +12,9 @@ configure.ac:
 gl_HEADER_ERRNO_H
 
 Makefile.am:
+nodist_pkginclude_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 c275a4e041c52f9d19897fef9716be130c17d556..6a33fc7ac042a6a98e961c81466855c8713f949d 100644 (file)
--- a/modules/fcntl-h
+++ b/modules/fcntl-h
@@ -18,6 +18,8 @@ configure.ac:
 gl_FCNTL_H
 
 Makefile.am:
+nodist_pkginclude_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 c98853b7043731f319edc697707cddc1a4b8b630..004d2bf42ae799a55f7a99af0bef5ea29b189fab 100644 (file)
--- a/modules/float
+++ b/modules/float
@@ -12,6 +12,9 @@ configure.ac:
 gl_FLOAT_H
 
 Makefile.am:
+nodist_pkginclude_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 6849b4d5e37e02d2c708111d53c491f7f9168790..cff8bad5a00336566919324b455dcfa5fbf55da0 100644 (file)
--- a/modules/fnmatch
+++ b/modules/fnmatch
@@ -24,6 +24,9 @@ configure.ac:
 gl_FUNC_FNMATCH_POSIX
 
 Makefile.am:
+nodist_pkginclude_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 39b10a40ad2a62b0b5aba59d1fd728bf488e301f..93d7fccf103095ec9a3ae7dc8af15d94527ed107 100644 (file)
--- a/modules/getopt-posix
+++ b/modules/getopt-posix
@@ -19,6 +19,9 @@ configure.ac:
 gl_FUNC_GETOPT_POSIX
 
 Makefile.am:
+nodist_pkginclude_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 0caaeefcd79ee9bbdeacc9dc7b81fdeac1afaf79..beaf476c118b8b373cf6d6dd23fe346bb1e69575 100644 (file)
--- a/modules/glob
+++ b/modules/glob
@@ -30,6 +30,9 @@ configure.ac:
 gl_GLOB
 
 Makefile.am:
+nodist_pkginclude_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 df0e0708618d9dff3da2b44c2a02781b3cf54a98..1c35ecd3e0175a49d6a1652398f3483c07812318 100644 (file)
--- a/modules/iconv-h
+++ b/modules/iconv-h
@@ -15,6 +15,9 @@ configure.ac:
 gl_ICONV_H
 
 Makefile.am:
+nodist_pkginclude_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 7b8190fe7437b4f0e32b6529dec7b855a60999fd..194440b046320aa7166b900d7df4258b0910c3fc 100644 (file)
--- a/modules/iconv_open
+++ b/modules/iconv_open
@@ -21,6 +21,9 @@ configure.ac:
 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_pkginclude_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
        mv $(srcdir)/iconv_open-aix.h-t $(srcdir)/iconv_open-aix.h
@@ -36,10 +39,10 @@ iconv_open-osf.h: iconv_open-osf.gperf
 iconv_open-solaris.h: iconv_open-solaris.gperf
        $(GPERF) -m 10 $(srcdir)/iconv_open-solaris.gperf > $(srcdir)/iconv_open-solaris.h-t
        mv $(srcdir)/iconv_open-solaris.h-t $(srcdir)/iconv_open-solaris.h
-BUILT_SOURCES        += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h
+BUILT_SOURCES        += $(iconv_headers)
 MOSTLYCLEANFILES     += iconv_open-aix.h-t iconv_open-hpux.h-t iconv_open-irix.h-t iconv_open-osf.h-t iconv_open-solaris.h-t
-MAINTAINERCLEANFILES += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h
-EXTRA_DIST           += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h
+MAINTAINERCLEANFILES += $(iconv_headers)
+EXTRA_DIST           += $(iconv_headers)
 
 Include:
 <iconv.h>

diff --git a/modules/inttypes b/modules/inttypes
index 674d83ebcb4ee884c55d3735d81c0ab4c7444776..991fe4e1a3cbb7a50046814456a6b0ae9d7b7b10 100644 (file)
--- a/modules/inttypes
+++ b/modules/inttypes
@@ -17,6 +17,8 @@ configure.ac:
 gl_INTTYPES_H
 
 Makefile.am:
+nodist_pkginclude_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 fd23db9f2aec73920f7ab847d9b5732c347d5458..e864c91a89bdd53cff133d7de1a881df2ae66e28 100644 (file)
--- a/modules/langinfo
+++ b/modules/langinfo
@@ -15,6 +15,8 @@ configure.ac:
 gl_LANGINFO_H
 
 Makefile.am:
+nodist_pkginclude_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 06f3675cb1bd81d86448ca9c7f979020759a55d9..9e57370c373e71e257f341238c059f85a9aed2d4 100644 (file)
--- a/modules/link-warning
+++ b/modules/link-warning
@@ -13,6 +13,8 @@ configure.ac:
 AC_REQUIRE([gl_FEATURES_H])
 
 Makefile.am:
+nodist_pkginclude_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 b80b5133290addce9dd9e5b1895f97b42ab8ba8e..298b924966d1eb8083eda2c87a18239f3d84acfb 100644 (file)
--- a/modules/locale
+++ b/modules/locale
@@ -17,6 +17,8 @@ configure.ac:
 gl_LOCALE_H
 
 Makefile.am:
+nodist_pkginclude_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 7ac78acf9616f3220a7027e8ad7f0bd72877875f..ca01c79bf652a5ff87a7669b7d2a75ed6f7b8955 100644 (file)
--- a/modules/math
+++ b/modules/math
@@ -15,6 +15,8 @@ configure.ac:
 gl_MATH_H
 
 Makefile.am:
+nodist_pkginclude_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 ea7dc63c1113f72371eb24694761863d1248fe7f..49f58f15d37df1e39c2685fee9621705ca9168e4 100644 (file)
--- a/modules/netdb
+++ b/modules/netdb
@@ -16,6 +16,8 @@ configure.ac:
 gl_HEADER_NETDB
 
 Makefile.am:
+nodist_pkginclude_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 06df756a81123e9a5419aef4b0422627657640ca..28b80c8e276de5a80dddc58320d14e1de7f3d875 100644 (file)
--- a/modules/netinet_in
+++ b/modules/netinet_in
@@ -14,6 +14,9 @@ gl_HEADER_NETINET_IN
 AC_PROG_MKDIR_P
 
 Makefile.am:
+nobase_nodist_pkginclude_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 347fc607f06806b4abeb296e6bc2b05bba41e8dc..8fc15cdb1a84517a9987129b0d4e7bb71bc56188 100644 (file)
--- a/modules/poll-h
+++ b/modules/poll-h
@@ -15,6 +15,8 @@ configure.ac:
 gl_POLL_H
 
 Makefile.am:
+nodist_pkginclude_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 e29016a447c13d92ab41f70adc7aab4d585b08bd..7aaaffac40ed189f43b824f00b63bb2857f53f39 100644 (file)
--- a/modules/pthread
+++ b/modules/pthread
@@ -13,6 +13,9 @@ configure.ac:
 gl_PTHREAD_CHECK
 
 Makefile.am:
+nodist_pkginclude_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 93f280ca9f117c5120409f99561c247f89f3ea1e..f490b344b81f9cf30057b28f111242291406e690 100644 (file)
--- a/modules/pty
+++ b/modules/pty
@@ -14,6 +14,8 @@ configure.ac:
 gl_PTY_H
 
 Makefile.am:
+nodist_pkginclude_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 d126fc761644ffb174b8487152ff31a3163a15de..128ec35eecd1c60a806872bc8a94603d30676068 100644 (file)
--- a/modules/sched
+++ b/modules/sched
@@ -12,6 +12,9 @@ configure.ac:
 gl_SCHED_H
 
 Makefile.am:
+nodist_pkginclude_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 ceed3ffedb25088a872946a6364d841f03fadde2..3f7ecc060c1cafd223e91f139ab41c65b8d503da 100644 (file)
--- a/modules/search
+++ b/modules/search
@@ -15,6 +15,8 @@ configure.ac:
 gl_SEARCH_H
 
 Makefile.am:
+nodist_pkginclude_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 745ea4950d7394024beebe758b89126a4d40b08c..589729df3a93c31a48e184d40cb6121c4d5862d2 100644 (file)
--- 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_pkginclude_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 c9ff197bbe6c380ca5b5aa157dba023267110a3d..ed9b14737e8357db912249d713a0da30158264d2 100644 (file)
--- a/modules/signal
+++ b/modules/signal
@@ -15,6 +15,8 @@ configure.ac:
 gl_SIGNAL_H
 
 Makefile.am:
+nodist_pkginclude_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 61e5e073eda32d253bea6d5db0da554798902823..eb0d4c13a602aa7375138aca1b67dc54adac1745 100644 (file)
--- a/modules/spawn
+++ b/modules/spawn
@@ -16,6 +16,8 @@ configure.ac:
 gl_SPAWN_H
 
 Makefile.am:
+nodist_pkginclude_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 05a01db69b6102a9851defd67b2aecebe3b08133..105a54c52deac330bb123042462070ee90949ab1 100644 (file)
--- a/modules/stdarg
+++ b/modules/stdarg
@@ -19,6 +19,9 @@ configure.ac:
 gl_STDARG_H
 
 Makefile.am:
+nodist_pkginclude_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 80fe2db8d565960ffb83cd3096540c2f7e2e80f8..5c1fe3ce36619513cc5da8c724a1d46bec87b847 100644 (file)
--- a/modules/stdbool
+++ b/modules/stdbool
@@ -12,6 +12,9 @@ configure.ac:
 AM_STDBOOL_H
 
 Makefile.am:
+nodist_pkginclude_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 4836bc7a8fa88641f66715dce32aa7c86694249e..62e874a3cffd55557e6d0cfcb5d18453fede25f9 100644 (file)
--- a/modules/stddef
+++ b/modules/stddef
@@ -13,6 +13,9 @@ configure.ac:
 gl_STDDEF_H
 
 Makefile.am:
+nodist_pkginclude_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 9e5f7ad4ebc1bb97d085a8f726536166a08788d4..bbf208a5b3e4572d7d65eef8a218ebf9ca667180 100644 (file)
--- a/modules/stdint
+++ b/modules/stdint
@@ -20,6 +20,9 @@ configure.ac:
 gl_STDINT_H
 
 Makefile.am:
+nodist_pkginclude_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 1a45909f22db4c7152e3f16c89ef771de5643303..4af57b8925b9131c478161bf7b27209e0ab4ed12 100644 (file)
--- a/modules/stdio
+++ b/modules/stdio
@@ -19,6 +19,8 @@ configure.ac:
 gl_STDIO_H
 
 Makefile.am:
+nodist_pkginclude_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 273095ec45a9ff7193aaed7c5490f26279059113..d86fb01c0c45406246a98dab5f7ece8f5fc2407e 100644 (file)
--- a/modules/stdlib
+++ b/modules/stdlib
@@ -18,6 +18,8 @@ configure.ac:
 gl_STDLIB_H
 
 Makefile.am:
+nodist_pkginclude_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 78ad32448bed6fb3851485614a89a9127e79e06a..c109bca5c40fa28e6927366e078d1f6c01a047bd 100644 (file)
--- a/modules/string
+++ b/modules/string
@@ -17,6 +17,8 @@ configure.ac:
 gl_HEADER_STRING_H
 
 Makefile.am:
+nodist_pkginclude_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 9b7a48e0f23ce0f7ea4cf9e41d2a1daf30e44712..e5ef663942f3427e728c7fc57726e9fd73a503fa 100644 (file)
--- a/modules/strings
+++ b/modules/strings
@@ -14,6 +14,8 @@ configure.ac:
 gl_HEADER_STRINGS_H
 
 Makefile.am:
+nodist_pkginclude_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 1da1655b4574547c620f9a1310e922eafa3338cc..27d87ec9f4e56dedff4b8238d1467fc7fc094c7d 100644 (file)
--- 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_pkginclude_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 669f70b08473474daac6f4150fc0e2202b5c612a..f5051be2e00922366b8019edd89f8a710266463b 100644 (file)
--- a/modules/sys_ioctl
+++ b/modules/sys_ioctl
@@ -16,6 +16,8 @@ gl_SYS_IOCTL_H
 AC_PROG_MKDIR_P
 
 Makefile.am:
+nobase_nodist_pkginclude_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 3fbbd57f4dbb568b19ffaa82fd1df983668f92fa..9c24a6d639f46941ee7d59a965b71281acaccd18 100644 (file)
--- a/modules/sys_select
+++ b/modules/sys_select
@@ -17,6 +17,8 @@ gl_HEADER_SYS_SELECT
 AC_PROG_MKDIR_P
 
 Makefile.am:
+nobase_nodist_pkginclude_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 775996fc94c9931b32294ec883274216283e4ea0..66c3164487cef3a387f8462507546fc20e979cc2 100644 (file)
--- a/modules/sys_socket
+++ b/modules/sys_socket
@@ -20,6 +20,8 @@ gl_HEADER_SYS_SOCKET
 AC_PROG_MKDIR_P
 
 Makefile.am:
+nobase_nodist_pkginclude_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 40bcf6d6d2c9533a295320385282c6688a10fc6b..ba70116eac8d63d23ec46002d10e267526161fd2 100644 (file)
--- 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_pkginclude_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 92f2ebbf354ff288f9e589957b0d89e241fb4a32..f4dfa19b90b7aa17a8077e13fd6dcb7a9da39d05 100644 (file)
--- 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_pkginclude_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 7a543b420d92a0b0d6d6103171686bf0231a27ee..2ce8e73e2f48d9f7b2ee2c2a27339c7b4b0adb94 100644 (file)
--- a/modules/sys_times
+++ b/modules/sys_times
@@ -15,6 +15,8 @@ gl_SYS_TIMES_H
 AC_PROG_MKDIR_P
 
 Makefile.am:
+nobase_nodist_pkginclude_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 4dec661ec8d25b7a51e32d861dcba727c40c0813..ff60b4ed5fab806f7374a1f33826a709bb319fc3 100644 (file)
--- a/modules/sys_utsname
+++ b/modules/sys_utsname
@@ -15,6 +15,8 @@ gl_SYS_UTSNAME_H
 AC_PROG_MKDIR_P
 
 Makefile.am:
+nobase_nodist_pkginclude_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 0299f9e2dea357fe7d3f69a645332055254c9608..ad42623fe7cedf3416d654f8b9f1c98d57e1e237 100644 (file)
--- a/modules/sys_wait
+++ b/modules/sys_wait
@@ -15,6 +15,8 @@ gl_SYS_WAIT_H
 AC_PROG_MKDIR_P
 
 Makefile.am:
+nobase_nodist_pkginclude_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 fc47260f98f73c94f464c10af52f5be63776c64f..191ba60ca93696a7087a5442e7c5651b31d7ae4d 100644 (file)
--- a/modules/sysexits
+++ b/modules/sysexits
@@ -12,6 +12,9 @@ configure.ac:
 gl_SYSEXITS
 
 Makefile.am:
+nodist_pkginclude_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 09539f611882794a14518b591360ae007e82ef1c..6af1195a3de0b3e508e4b5d4149837e6f4fdb02a 100644 (file)
--- a/modules/termios
+++ b/modules/termios
@@ -14,6 +14,8 @@ configure.ac:
 gl_TERMIOS_H
 
 Makefile.am:
+nodist_pkginclude_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 ab5efe913f678a48253bf09fdb522b4c92602f2b..8cbe99dffda23c46e59c32dc92434a537e418642 100644 (file)
--- a/modules/time
+++ b/modules/time
@@ -17,6 +17,8 @@ configure.ac:
 gl_HEADER_TIME_H
 
 Makefile.am:
+nodist_pkginclude_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 df0870e7e0665e3b8f32dc43fc2b5b6961438c9b..3a68b9878a2ef7542ac2626ca421639de3aecaf4 100644 (file)
--- a/modules/unistd
+++ b/modules/unistd
@@ -16,6 +16,8 @@ configure.ac:
 gl_UNISTD_H
 
 Makefile.am:
+nodist_pkginclude_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 7cd1a1906fae84d0b6a205c7b6f5164d5693e04e..ed061de8dcca82e3bb28021e29173123a873451b 100644 (file)
--- a/modules/unitypes
+++ b/modules/unitypes
@@ -12,6 +12,9 @@ configure.ac:
 gl_LIBUNISTRING_LIBHEADER([0.9], [unitypes.h])
 
 Makefile.am:
+nodist_pkginclude_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 196aa78e7c44106af389ad38072e05b5e7373a7b..9a3d0d41cb91953c9dbd1a08cf6934f5f10b4357 100644 (file)
--- a/modules/unused-parameter
+++ b/modules/unused-parameter
@@ -12,6 +12,8 @@ Depends-on:
 configure.ac:
 
 Makefile.am:
+nodist_pkginclude_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 f0ee83b8660f14199b2173569e1ecd5e80e67dcc..3cf3281b4be2767eabb8239bfc043cdeafb4472d 100644 (file)
--- a/modules/warn-on-use
+++ b/modules/warn-on-use
@@ -13,6 +13,8 @@ Depends-on:
 configure.ac:
 
 Makefile.am:
+nodist_pkginclude_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 a918ead7eec1509b366433597137fcaf2085018b..b3bf6eb5ec5bd9c2531b2403718b1c2ed2a0eb12 100644 (file)
--- a/modules/wchar
+++ b/modules/wchar
@@ -17,6 +17,8 @@ configure.ac:
 gl_WCHAR_H
 
 Makefile.am:
+nodist_pkginclude_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 99dbe44a55b7552c7a90f002dcd493e89799ea7d..e0568e07521fff0d2f0f9c39765d50ba409ff7a0 100644 (file)
--- a/modules/wctype
+++ b/modules/wctype
@@ -16,6 +16,8 @@ configure.ac:
 gl_WCTYPE_H
 
 Makefile.am:
+nodist_pkginclude_HEADERS += wctype.h
+
 BUILT_SOURCES += wctype.h
 
 # We need the following in order to create <wctype.h> when the system