Attached is the patch to primary files, thus sans the
libposix subdirectory files. The changes fall into
several categories:
1. ChangeLog (1/3 of total)
2. gnulib-tool -- support for new variables:
echo "nodist_pkginclude_HEADERS ="
echo "nobase_nodist_pkginclude_HEADERS ="
echo "EXTRA_HEADERS ="
3. lib/*-die.c -- error() call avoidance. (abort() is
called instead.)
4. modules files (specifying which headers should be installed
when libposix is to be installed -- these are stripped out
by gnulib-tool when run for not-libposix.)
Everything seems to work fine with my testing.
I'd like to get this stuff wrapped up so I can
actually use it. Has anyone tried out the libposix
installation tarball I put up? Help, please?
Thank you!
Regards, Bruce
diff -ru gnulib-ori/.git/COMMIT_EDITMSG gnulib/.git/COMMIT_EDITMSG
--- gnulib-ori/.git/COMMIT_EDITMSG 2011-01-31 16:15:14.000000000 -0800
+++ gnulib/.git/COMMIT_EDITMSG 2011-02-03 08:15:14.000000000 -0800
@@ -1 +1 @@
-merge from master
+Remove whitespace diff to match master
diff -ru gnulib-ori/.git/HEAD gnulib/.git/HEAD
--- gnulib-ori/.git/HEAD 2011-02-02 09:37:06.000000000 -0800
+++ gnulib/.git/HEAD 2011-02-03 08:09:10.000000000 -0800
@@ -1 +1 @@
-ref: refs/heads/master
+ref: refs/heads/topic/libposix
diff -ru gnulib-ori/.git/ORIG_HEAD gnulib/.git/ORIG_HEAD
--- gnulib-ori/.git/ORIG_HEAD 2011-02-02 09:37:34.000000000 -0800
+++ gnulib/.git/ORIG_HEAD 2011-02-03 08:12:19.000000000 -0800
@@ -1 +1 @@
-ddf6704b29173e809f3b0150c015ca282e06388f
+364ae235716562062cdcaad7f2b5e9c0cce4c5c2
Files gnulib-ori/.git/index and gnulib/.git/index differ
diff -ru gnulib-ori/.git/logs/HEAD gnulib/.git/logs/HEAD
--- gnulib-ori/.git/logs/HEAD 2011-02-02 09:37:35.000000000 -0800
+++ gnulib/.git/logs/HEAD 2011-02-03 08:15:14.000000000 -0800
@@ -7,3 +7,6 @@
632ca6488daee0d75d84d42ae09bb273682f32cc 364ae235716562062cdcaad7f2b5e9c0cce4c5c2 Bruce Korb <[email protected]> 1296519314 -0800 commit (merge): merge from master
364ae235716562062cdcaad7f2b5e9c0cce4c5c2 ddf6704b29173e809f3b0150c015ca282e06388f Bruce Korb <[email protected]> 1296668226 -0800 checkout: moving from topic/libposix to master
ddf6704b29173e809f3b0150c015ca282e06388f a036b7684f9671ee53999773785d1865603c3849 Bruce Korb <[email protected]> 1296668255 -0800 pull : Fast-forward
+a036b7684f9671ee53999773785d1865603c3849 364ae235716562062cdcaad7f2b5e9c0cce4c5c2 Bruce Korb <[email protected]> 1296749350 -0800 checkout: moving from master to topic/libposix
+364ae235716562062cdcaad7f2b5e9c0cce4c5c2 4b918808a2e81b66210efa0d8c45b1253a2aa014 Bruce Korb <[email protected]> 1296749539 -0800 merge master: Merge made by recursive.
+4b918808a2e81b66210efa0d8c45b1253a2aa014 bffb3c8b838b54ee925805b6fe198affed1eb39c Bruce Korb <[email protected]> 1296749714 -0800 commit: Remove whitespace diff to match master
diff -ru gnulib-ori/.git/logs/refs/heads/topic/libposix gnulib/.git/logs/refs/heads/topic/libposix
--- gnulib-ori/.git/logs/refs/heads/topic/libposix 2011-01-31 16:15:14.000000000 -0800
+++ gnulib/.git/logs/refs/heads/topic/libposix 2011-02-03 08:15:14.000000000 -0800
@@ -1,2 +1,4 @@
0000000000000000000000000000000000000000 632ca6488daee0d75d84d42ae09bb273682f32cc Bruce Korb <[email protected]> 1296237050 -0800 branch: Created from refs/remotes/origin/topic/libposix
632ca6488daee0d75d84d42ae09bb273682f32cc 364ae235716562062cdcaad7f2b5e9c0cce4c5c2 Bruce Korb <[email protected]> 1296519314 -0800 commit (merge): merge from master
+364ae235716562062cdcaad7f2b5e9c0cce4c5c2 4b918808a2e81b66210efa0d8c45b1253a2aa014 Bruce Korb <[email protected]> 1296749539 -0800 merge master: Merge made by recursive.
+4b918808a2e81b66210efa0d8c45b1253a2aa014 bffb3c8b838b54ee925805b6fe198affed1eb39c Bruce Korb <[email protected]> 1296749714 -0800 commit: Remove whitespace diff to match master
Only in gnulib/.git/objects: 0a
Only in gnulib/.git/objects: 39
Only in gnulib/.git/objects/42: d4ab96b7dbf405464b3f938854aba9de7be39d
Only in gnulib/.git/objects: 4b
Only in gnulib/.git/objects: 66
Only in gnulib/.git/objects: ac
Only in gnulib/.git/objects: bf
diff -ru gnulib-ori/.git/refs/heads/topic/libposix gnulib/.git/refs/heads/topic/libposix
--- gnulib-ori/.git/refs/heads/topic/libposix 2011-01-31 16:15:14.000000000 -0800
+++ gnulib/.git/refs/heads/topic/libposix 2011-02-03 08:15:14.000000000 -0800
@@ -1 +1 @@
-364ae235716562062cdcaad7f2b5e9c0cce4c5c2
+bffb3c8b838b54ee925805b6fe198affed1eb39c
diff -ru gnulib-ori/.gitignore gnulib/.gitignore
--- gnulib-ori/.gitignore 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/.gitignore 2011-02-03 08:09:10.000000000 -0800
@@ -6,3 +6,5 @@
allsnippets.tmp
amsnippet.tmp
testdir*
+*.diff
+*.patch
diff -ru gnulib-ori/ChangeLog gnulib/ChangeLog
--- gnulib-ori/ChangeLog 2011-02-02 09:37:34.000000000 -0800
+++ gnulib/ChangeLog 2011-02-03 08:12:19.000000000 -0800
@@ -1395,6 +1395,12 @@
we now support aggregates. Also specify exactly
when the GCC warn_unused_result feature was added.
+2011-01-07 Bruce Korb <[email protected]>
+
+ libposix/bootstrap: disable testing of error-module-using modules
+ * libposix/bootstrap (opts): append --avoid=${mod}-tests
+ for each module that has the error reference removed
+
2011-01-06 Eric Blake <[email protected]>
ignore-value: support aggregate types
@@ -1835,6 +1841,18 @@
* doc/posix-functions/gmtime_r.texi: Document the HP-UX 11 problem.
* doc/posix-functions/localtime_r.texi: Likewise.
+2010-12-30 Bruce Korb <[email protected]>
+
+ * libposix/bootstrap (posix_list): remove unnecessary temp file
+ (modules): install all modules to tmp/modules that reference
+ the 'error' module.
+ * libposix/configure.ac (GNULIB_LIBPOSIX): define this in
+ config.h so that openat-die.c can omit calls to error().
+ * lib/openat-die.c: remove error module stuff when GNULIB_LIBPOSIX
+ is defined.
+ * lib/xalloc-die.c: Same thing.
+ * libposix/lib/mk-lpx-config-h.sh (GNULIB_TEST): remove these defines
+
2010-12-29 Eric Blake <[email protected]>
mountlist: tweak previous commit
@@ -3001,6 +3019,32 @@
* doc/posix-functions/pipe.texi (pipe): Update documentation.
* MODULES.html.sh (File descriptor based Input/Output): Likewise.
+2010-12-08 Gary V. Vaughan <[email protected]>
+
+ libposix: generate compile and runtime versions with configure
+ * libposix/lib/version.c, libposix/lib/version.h.in: Templates
+ for code to allow runtime and compile time checking of libposix
+ version numbers.
+ * libposix/configure.ac (AC_CONFIG_FILES): Use the already
+ calculated libposix version number to generate libposix/
+ lib/version.h.
+ * libposix/mk-tarball (func_mkver): Removed. Adjust all callers.
+ Don't generate files required by the build in an optionally
+ used script, and incidentally avoid recalculating the version
+ number that configure already knows.
+
+2010-12-07 Gary V. Vaughan <[email protected]>
+
+ libposix: version filter script was adding a newline
+ * libposix/configure.ac (AC_INIT): Use the output of
+ git-version-gen unmodified, os per other GNU projects...
+ otherwise the spurious newline added to the version number
+ breaks operation of the configure script (tested with
+ Autoconf-2.68).
+ * libposix/mk-tarball: Remove the filter here too, otherwise
+ we'll end up with two conflicting version numbers in the same
+ release!
+
2010-12-07 Bruno Haible <[email protected]>
unistr/u8-strcmp: Avoid collision with libc function on Solaris 11.
@@ -3441,6 +3485,28 @@
maint.mk: add a URL discussing the no-@acronym policy
* top/maint.mk (sc_texinfo_acronym): Add a URL in a comment.
+2010-11-17 Bruce Korb <[email protected]>
+
+ * libposix/lib/Makefile.am (lpx-config.h): generate the new header
+ and install it.
+ * libposix/lib/mk-lpx-config-h.sh: script for creating the header
+ by massaging the config.h header.
+
+2010-11-17 Bruce Korb <[email protected]>
+
+ * libposix/mk-tarball: script to make a libposix distribution
+ tarball.
+ * libposix/bootstrap: cleanup and ensure the mkdir's are invoked
+ only when needed.
+ * libposix/configure.ac (m4_esyscmd): fix git version suffix
+ * libposix/lib/Makefile.am (HEADERS): include version info
+
+2010-11-17 Bruce Korb <[email protected]>
+
+ * tests/test-dprintf-posix2.c (main): call malloc & free before
+ setrlimit under Linux. Avoid setrlimit/malloc interaction bug.
+ * tests/test-fprintf-posix3.c: ditto
+
2010-11-18 Paul Eggert <[email protected]>
ftoastr: depend on snprintf, improve comments
@@ -3480,6 +3546,14 @@
* lib/ftoastr.h, lib/ftoastr.c, lib/dtoastr.c, lib/ldtoastr.c:
* modules/ftoastr: New files.
+2010-11-16 Bruce Korb <[email protected]>
+
+ * libposix/bootstrap: generate libposix module file on the fly.
+ * modules/libposix: remove
+ * modules/*: Use pkginclude_HEADERS instead of plain "include".
+ * libposix/lib/Makefile.am: adjust here, too
+ * gnulib-tool: adjust here, too
+
2010-11-15 Paul Eggert <[email protected]>
bootstrap: port to Solaris sed
@@ -3705,6 +3779,13 @@
* modules/vasnprintf-posix-tests (Files): Add it.
(TESTS, check_PROGRAMS): Add test-vasnprintf-posix3.
+2010-11-06 Gary V. Vaughan <[email protected]>
+
+ libposix: vastly simplified bootstrap sanity check
+ * libposix/bootstrap: Use a much simpler script to ensure that the
+ output of the posix-modules script remains in sync with the module
+ list of the libposix module.
+
2010-11-05 Thien-Thi Nguyen <[email protected]> (tiny change)
[html] Fix copy/paste bug: Use unique name for compiler warnings.
@@ -4059,6 +4140,95 @@
and use malloc rather than the stack for the same reason as
mentioned in the comment justifying the other allocation.
+2010-10-13 Gary V. Vaughan <[email protected]>
+
+ libposix: reindent with spaces instead of tabs
+ * libposix/Makefile.am: Reindent with spaces instead of tabs.
+ * libposix/bootstrap: Likewise.
+
+2010-10-12 Gary V. Vaughan <[email protected]>
+
+ 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.
+ * libposix/bootstrap: Add git-version-gen to gnulib-tool
+ invocation.
+ * libposix/configure.ac (AC_INIT): Use it to get a unique
+ version number, and a configure time banner.
+
+ libposix: raw files to import an installable libposix project
+ * libposix/bootstrap: New script to import gnulib posix modules
+ and bootstrap configury so that the result is an installable
+ libposix.la.
+ * libposix/configure.ac: New file to configure the new libposix
+ subdirectory.
+ * libposix/Makefile.am: New file to delegate build duties to the
+ generated libposix/lib/Makefile at make time.
+ * libposix/lib/Makefile.am: New file to make sure `-version-info'
+ is passed to libtool at libposix.la link-time.
+
+ 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 <[email protected]>
+ Gary V. Vaughan <[email protected]>
+
+ 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 <[email protected]>
stdlib: Allow multiple gnulib generated replacements to coexist.
diff -ru gnulib-ori/gnulib-tool gnulib/gnulib-tool
--- gnulib-ori/gnulib-tool 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/gnulib-tool 2011-02-03 08:09:10.000000000 -0800
@@ -2815,6 +2815,11 @@
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 @@
-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 @@
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 @@
echo "pkgdata_DATA ="
fi
echo "EXTRA_DIST ="
+ echo "EXTRA_HEADERS ="
echo "BUILT_SOURCES ="
echo "SUFFIXES ="
fi
@@ -2914,11 +2923,18 @@
&& 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 @@
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 @@
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 @@
echo "pkgdata_DATA ="
fi
echo "EXTRA_DIST ="
+ echo "EXTRA_HEADERS ="
echo "BUILT_SOURCES ="
echo "SUFFIXES ="
echo "MOSTLYCLEANFILES = core *.stackdump"
@@ -3847,6 +3867,9 @@
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/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 -ru gnulib-ori/lib/openat-die.c gnulib/lib/openat-die.c
--- gnulib-ori/lib/openat-die.c 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/lib/openat-die.c 2011-02-03 08:09:10.000000000 -0800
@@ -21,7 +21,9 @@
#include <stdlib.h>
+#ifndef GNULIB_LIBPOSIX
#include "error.h"
+#endif /* GNULIB_LIBPOSIX */
#include "exitfail.h"
#include "gettext.h"
@@ -30,9 +32,10 @@
void
openat_save_fail (int errnum)
{
+#ifndef GNULIB_LIBPOSIX
error (exit_failure, errnum,
_("unable to record current working directory"));
-
+#endif /* GNULIB_LIBPOSIX */
/* 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 +51,10 @@
void
openat_restore_fail (int errnum)
{
+#ifndef GNULIB_LIBPOSIX
error (exit_failure, errnum,
_("failed to return to initial working directory"));
+#endif /* GNULIB_LIBPOSIX */
/* As above. */
abort ();
diff -ru gnulib-ori/lib/xalloc-die.c gnulib/lib/xalloc-die.c
--- gnulib-ori/lib/xalloc-die.c 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/lib/xalloc-die.c 2011-02-03 08:09:10.000000000 -0800
@@ -22,7 +22,10 @@
#include <stdlib.h>
+#ifndef GNULIB_LIBPOSIX
#include "error.h"
+#endif /* GNULIB_LIBPOSIX */
+
#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 /* GNULIB_LIBPOSIX */
/* The `noreturn' cannot be given to error, since it may return if
its first argument is 0. To help compilers understand the
Only in gnulib: libposix
diff -ru gnulib-ori/modules/alloca-opt gnulib/modules/alloca-opt
--- gnulib-ori/modules/alloca-opt 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/alloca-opt 2011-02-03 08:09:10.000000000 -0800
@@ -13,6 +13,9 @@
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 -ru gnulib-ori/modules/arg-nonnull gnulib/modules/arg-nonnull
--- gnulib-ori/modules/arg-nonnull 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/arg-nonnull 2011-02-03 08:09:10.000000000 -0800
@@ -12,6 +12,8 @@
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 -ru gnulib-ori/modules/argz gnulib/modules/argz
--- gnulib-ori/modules/argz 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/argz 2011-02-03 08:09:10.000000000 -0800
@@ -18,6 +18,9 @@
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 -ru gnulib-ori/modules/arpa_inet gnulib/modules/arpa_inet
--- gnulib-ori/modules/arpa_inet 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/arpa_inet 2011-02-03 08:09:10.000000000 -0800
@@ -17,6 +17,8 @@
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 -ru gnulib-ori/modules/byteswap gnulib/modules/byteswap
--- gnulib-ori/modules/byteswap 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/byteswap 2011-02-03 08:09:10.000000000 -0800
@@ -11,6 +11,9 @@
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 -ru gnulib-ori/modules/c++defs gnulib/modules/c++defs
--- gnulib-ori/modules/c++defs 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/c++defs 2011-02-03 08:09:10.000000000 -0800
@@ -12,6 +12,8 @@
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 -ru gnulib-ori/modules/ctype gnulib/modules/ctype
--- gnulib-ori/modules/ctype 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/ctype 2011-02-03 08:09:10.000000000 -0800
@@ -14,6 +14,8 @@
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 -ru gnulib-ori/modules/dirent gnulib/modules/dirent
--- gnulib-ori/modules/dirent 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/dirent 2011-02-03 08:09:10.000000000 -0800
@@ -16,6 +16,8 @@
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 -ru gnulib-ori/modules/errno gnulib/modules/errno
--- gnulib-ori/modules/errno 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/errno 2011-02-03 08:09:10.000000000 -0800
@@ -12,6 +12,9 @@
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 -ru gnulib-ori/modules/fcntl-h gnulib/modules/fcntl-h
--- gnulib-ori/modules/fcntl-h 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/fcntl-h 2011-02-03 08:09:10.000000000 -0800
@@ -18,6 +18,8 @@
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 -ru gnulib-ori/modules/float gnulib/modules/float
--- gnulib-ori/modules/float 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/float 2011-02-03 08:09:10.000000000 -0800
@@ -12,6 +12,9 @@
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 -ru gnulib-ori/modules/fnmatch gnulib/modules/fnmatch
--- gnulib-ori/modules/fnmatch 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/fnmatch 2011-02-03 08:09:10.000000000 -0800
@@ -24,6 +24,9 @@
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 -ru gnulib-ori/modules/getopt-posix gnulib/modules/getopt-posix
--- gnulib-ori/modules/getopt-posix 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/getopt-posix 2011-02-03 08:09:10.000000000 -0800
@@ -19,6 +19,9 @@
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 -ru gnulib-ori/modules/glob gnulib/modules/glob
--- gnulib-ori/modules/glob 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/glob 2011-02-03 08:09:10.000000000 -0800
@@ -30,6 +30,9 @@
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 -ru gnulib-ori/modules/iconv-h gnulib/modules/iconv-h
--- gnulib-ori/modules/iconv-h 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/iconv-h 2011-02-03 08:09:10.000000000 -0800
@@ -15,6 +15,9 @@
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 -ru gnulib-ori/modules/iconv_open gnulib/modules/iconv_open
--- gnulib-ori/modules/iconv_open 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/iconv_open 2011-02-03 08:09:10.000000000 -0800
@@ -21,6 +21,9 @@
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-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 -ru gnulib-ori/modules/inttypes gnulib/modules/inttypes
--- gnulib-ori/modules/inttypes 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/inttypes 2011-02-03 08:09:10.000000000 -0800
@@ -17,6 +17,8 @@
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 -ru gnulib-ori/modules/langinfo gnulib/modules/langinfo
--- gnulib-ori/modules/langinfo 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/langinfo 2011-02-03 08:09:10.000000000 -0800
@@ -15,6 +15,8 @@
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 -ru gnulib-ori/modules/link-warning gnulib/modules/link-warning
--- gnulib-ori/modules/link-warning 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/link-warning 2011-02-03 08:09:10.000000000 -0800
@@ -13,6 +13,8 @@
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 -ru gnulib-ori/modules/locale gnulib/modules/locale
--- gnulib-ori/modules/locale 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/locale 2011-02-03 08:09:10.000000000 -0800
@@ -17,6 +17,8 @@
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 -ru gnulib-ori/modules/math gnulib/modules/math
--- gnulib-ori/modules/math 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/math 2011-02-03 08:09:10.000000000 -0800
@@ -15,6 +15,8 @@
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 -ru gnulib-ori/modules/netdb gnulib/modules/netdb
--- gnulib-ori/modules/netdb 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/netdb 2011-02-03 08:09:10.000000000 -0800
@@ -16,6 +16,8 @@
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 -ru gnulib-ori/modules/netinet_in gnulib/modules/netinet_in
--- gnulib-ori/modules/netinet_in 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/netinet_in 2011-02-03 08:09:10.000000000 -0800
@@ -14,6 +14,9 @@
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 -ru gnulib-ori/modules/poll-h gnulib/modules/poll-h
--- gnulib-ori/modules/poll-h 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/poll-h 2011-02-03 08:09:10.000000000 -0800
@@ -15,6 +15,8 @@
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 -ru gnulib-ori/modules/pthread gnulib/modules/pthread
--- gnulib-ori/modules/pthread 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/pthread 2011-02-03 08:09:10.000000000 -0800
@@ -13,6 +13,9 @@
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 -ru gnulib-ori/modules/pty gnulib/modules/pty
--- gnulib-ori/modules/pty 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/pty 2011-02-03 08:09:10.000000000 -0800
@@ -14,6 +14,8 @@
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 -ru gnulib-ori/modules/sched gnulib/modules/sched
--- gnulib-ori/modules/sched 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/sched 2011-02-03 08:09:10.000000000 -0800
@@ -12,6 +12,9 @@
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 -ru gnulib-ori/modules/search gnulib/modules/search
--- gnulib-ori/modules/search 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/search 2011-02-03 08:09:10.000000000 -0800
@@ -15,6 +15,8 @@
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 -ru gnulib-ori/modules/selinux-h gnulib/modules/selinux-h
--- gnulib-ori/modules/selinux-h 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/selinux-h 2011-02-03 08:09:10.000000000 -0800
@@ -18,6 +18,8 @@
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 -ru gnulib-ori/modules/signal gnulib/modules/signal
--- gnulib-ori/modules/signal 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/signal 2011-02-03 08:09:10.000000000 -0800
@@ -15,6 +15,8 @@
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 -ru gnulib-ori/modules/spawn gnulib/modules/spawn
--- gnulib-ori/modules/spawn 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/spawn 2011-02-03 08:09:10.000000000 -0800
@@ -16,6 +16,8 @@
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 -ru gnulib-ori/modules/stdarg gnulib/modules/stdarg
--- gnulib-ori/modules/stdarg 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/stdarg 2011-02-03 08:09:10.000000000 -0800
@@ -19,6 +19,9 @@
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 -ru gnulib-ori/modules/stdbool gnulib/modules/stdbool
--- gnulib-ori/modules/stdbool 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/stdbool 2011-02-03 08:09:10.000000000 -0800
@@ -12,6 +12,9 @@
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 -ru gnulib-ori/modules/stddef gnulib/modules/stddef
--- gnulib-ori/modules/stddef 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/stddef 2011-02-03 08:09:10.000000000 -0800
@@ -13,6 +13,9 @@
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 -ru gnulib-ori/modules/stdint gnulib/modules/stdint
--- gnulib-ori/modules/stdint 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/stdint 2011-02-03 08:09:10.000000000 -0800
@@ -20,6 +20,9 @@
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 -ru gnulib-ori/modules/stdio gnulib/modules/stdio
--- gnulib-ori/modules/stdio 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/stdio 2011-02-03 08:09:10.000000000 -0800
@@ -19,6 +19,8 @@
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 -ru gnulib-ori/modules/stdlib gnulib/modules/stdlib
--- gnulib-ori/modules/stdlib 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/stdlib 2011-02-03 08:09:10.000000000 -0800
@@ -18,6 +18,8 @@
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 -ru gnulib-ori/modules/string gnulib/modules/string
--- gnulib-ori/modules/string 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/string 2011-02-03 08:09:10.000000000 -0800
@@ -17,6 +17,8 @@
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 -ru gnulib-ori/modules/strings gnulib/modules/strings
--- gnulib-ori/modules/strings 2011-02-02 09:37:05.000000000 -0800
+++ gnulib/modules/strings 2011-02-03 08:09:10.000000000 -0800
@@ -14,6 +14,8 @@
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 -ru gnulib-ori/modules/sys_file gnulib/modules/sys_file
--- gnulib-ori/modules/sys_file 2011-02-02 09:37:06.000000000 -0800
+++ gnulib/modules/sys_file 2011-02-03 08:09:10.000000000 -0800
@@ -14,6 +14,8 @@
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 -ru gnulib-ori/modules/sys_ioctl gnulib/modules/sys_ioctl
--- gnulib-ori/modules/sys_ioctl 2011-02-02 09:37:06.000000000 -0800
+++ gnulib/modules/sys_ioctl 2011-02-03 08:09:10.000000000 -0800
@@ -16,6 +16,8 @@
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 -ru gnulib-ori/modules/sys_select gnulib/modules/sys_select
--- gnulib-ori/modules/sys_select 2011-02-02 09:37:06.000000000 -0800
+++ gnulib/modules/sys_select 2011-02-03 08:09:10.000000000 -0800
@@ -17,6 +17,8 @@
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 -ru gnulib-ori/modules/sys_socket gnulib/modules/sys_socket
--- gnulib-ori/modules/sys_socket 2011-02-02 09:37:06.000000000 -0800
+++ gnulib/modules/sys_socket 2011-02-03 08:09:10.000000000 -0800
@@ -20,6 +20,8 @@
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 -ru gnulib-ori/modules/sys_stat gnulib/modules/sys_stat
--- gnulib-ori/modules/sys_stat 2011-02-02 09:37:06.000000000 -0800
+++ gnulib/modules/sys_stat 2011-02-03 08:09:10.000000000 -0800
@@ -18,6 +18,8 @@
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 -ru gnulib-ori/modules/sys_time gnulib/modules/sys_time
--- gnulib-ori/modules/sys_time 2011-02-02 09:37:06.000000000 -0800
+++ gnulib/modules/sys_time 2011-02-03 08:09:10.000000000 -0800
@@ -16,6 +16,8 @@
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 -ru gnulib-ori/modules/sys_times gnulib/modules/sys_times
--- gnulib-ori/modules/sys_times 2011-02-02 09:37:06.000000000 -0800
+++ gnulib/modules/sys_times 2011-02-03 08:09:10.000000000 -0800
@@ -15,6 +15,8 @@
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 -ru gnulib-ori/modules/sys_utsname gnulib/modules/sys_utsname
--- gnulib-ori/modules/sys_utsname 2011-02-02 09:37:06.000000000 -0800
+++ gnulib/modules/sys_utsname 2011-02-03 08:09:10.000000000 -0800
@@ -15,6 +15,8 @@
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 -ru gnulib-ori/modules/sys_wait gnulib/modules/sys_wait
--- gnulib-ori/modules/sys_wait 2011-02-02 09:37:06.000000000 -0800
+++ gnulib/modules/sys_wait 2011-02-03 08:09:10.000000000 -0800
@@ -15,6 +15,8 @@
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 -ru gnulib-ori/modules/sysexits gnulib/modules/sysexits
--- gnulib-ori/modules/sysexits 2011-02-02 09:37:06.000000000 -0800
+++ gnulib/modules/sysexits 2011-02-03 08:09:10.000000000 -0800
@@ -12,6 +12,9 @@
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 -ru gnulib-ori/modules/termios gnulib/modules/termios
--- gnulib-ori/modules/termios 2011-02-02 09:37:06.000000000 -0800
+++ gnulib/modules/termios 2011-02-03 08:09:10.000000000 -0800
@@ -14,6 +14,8 @@
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 -ru gnulib-ori/modules/time gnulib/modules/time
--- gnulib-ori/modules/time 2011-02-02 09:37:06.000000000 -0800
+++ gnulib/modules/time 2011-02-03 08:09:10.000000000 -0800
@@ -17,6 +17,8 @@
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 -ru gnulib-ori/modules/unistd gnulib/modules/unistd
--- gnulib-ori/modules/unistd 2011-02-02 09:37:06.000000000 -0800
+++ gnulib/modules/unistd 2011-02-03 08:09:10.000000000 -0800
@@ -16,6 +16,8 @@
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 -ru gnulib-ori/modules/unitypes gnulib/modules/unitypes
--- gnulib-ori/modules/unitypes 2011-02-02 09:37:06.000000000 -0800
+++ gnulib/modules/unitypes 2011-02-03 08:09:10.000000000 -0800
@@ -12,6 +12,9 @@
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 -ru gnulib-ori/modules/unused-parameter gnulib/modules/unused-parameter
--- gnulib-ori/modules/unused-parameter 2011-02-02 09:37:06.000000000 -0800
+++ gnulib/modules/unused-parameter 2011-02-03 08:09:10.000000000 -0800
@@ -12,6 +12,8 @@
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 -ru gnulib-ori/modules/warn-on-use gnulib/modules/warn-on-use
--- gnulib-ori/modules/warn-on-use 2011-02-02 09:37:06.000000000 -0800
+++ gnulib/modules/warn-on-use 2011-02-03 08:09:10.000000000 -0800
@@ -13,6 +13,8 @@
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 -ru gnulib-ori/modules/wchar gnulib/modules/wchar
--- gnulib-ori/modules/wchar 2011-02-02 09:37:06.000000000 -0800
+++ gnulib/modules/wchar 2011-02-03 08:09:10.000000000 -0800
@@ -17,6 +17,8 @@
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 -ru gnulib-ori/modules/wctype gnulib/modules/wctype
--- gnulib-ori/modules/wctype 2011-02-02 09:37:06.000000000 -0800
+++ gnulib/modules/wctype 2011-02-03 08:09:10.000000000 -0800
@@ -16,6 +16,8 @@
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
