2010-10-12 Gary V. Vaughan <gary@gnu.org>
+ 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.
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 ="
echo "pkgdata_DATA ="
fi
echo "EXTRA_DIST ="
+ echo "EXTRA_HEADERS ="
echo "BUILT_SOURCES ="
echo "SUFFIXES ="
fi
&& 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
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 \\"
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
echo "pkgdata_DATA ="
fi
echo "EXTRA_DIST ="
+ echo "EXTRA_HEADERS ="
echo "BUILT_SOURCES ="
echo "SUFFIXES ="
echo "MOSTLYCLEANFILES = core *.stackdump"
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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.
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
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