Commit 5eeec029 authored by Bruno Haible's avatar Bruno Haible

gnulib-tool now synthesizes the EXTRA_DIST line.

parent 3ed9cf9b
2006-10-12 Bruno Haible <bruno@clisp.org>
* gnulib-tool (func_get_automake_snippet): Append an automatically
computed EXTRA_DIST augmentation.
* modules/acl (Makefile.am): Remove EXTRA_DIST augmentation.
* modules/alloca-opt (Makefile.am): Likewise.
* modules/allocsa (Makefile.am): Likewise.
* modules/arcfour (Makefile.am): Likewise.
* modules/arctwo (Makefile.am): Likewise.
* modules/argmatch (Makefile.am): Likewise.
* modules/argz (Makefile.am): Likewise.
* modules/atexit (Makefile.am): Likewise.
* modules/backupfile (Makefile.am): Likewise.
* modules/byteswap (Makefile.am): Likewise.
* modules/c-strtod (Makefile.am): Likewise.
* modules/c-strtold (Makefile.am): Likewise.
* modules/calloc (Makefile.am): Likewise.
* modules/canon-host (Makefile.am): Likewise.
* modules/canonicalize (Makefile.am): Likewise.
* modules/chdir-long (Makefile.am): Likewise.
* modules/chdir-safer (Makefile.am): Likewise.
* modules/check-version (Makefile.am): Likewise.
* modules/chown (Makefile.am): Likewise.
* modules/cloexec (Makefile.am): Likewise.
* modules/close-stream (Makefile.am): Likewise.
* modules/closeout (Makefile.am): Likewise.
* modules/crc (Makefile.am): Likewise.
* modules/csharpexec (Makefile.am): Likewise.
* modules/cycle-check (Makefile.am): Likewise.
* modules/des (Makefile.am): Likewise.
* modules/dev-ino (Makefile.am): Likewise.
* modules/dirfd (Makefile.am): Likewise.
* modules/dirname (Makefile.am): Likewise.
* modules/dup2 (Makefile.am): Likewise.
* modules/eealloc (Makefile.am): Likewise.
* modules/error (Makefile.am): Likewise.
* modules/euidaccess (Makefile.am): Likewise.
* modules/exclude (Makefile.am): Likewise.
* modules/exitfail (Makefile.am): Likewise.
* modules/fcntl-safer (Makefile.am): Likewise.
* modules/fcntl (Makefile.am): Likewise.
* modules/file-type (Makefile.am): Likewise.
* modules/fileblocks (Makefile.am): Likewise.
* modules/filemode (Makefile.am): Likewise.
* modules/filenamecat (Makefile.am): Likewise.
* modules/fnmatch (Makefile.am): Likewise.
* modules/fopen-safer (Makefile.am): Likewise.
* modules/fpending (Makefile.am): Likewise.
* modules/fprintftime (Makefile.am): Likewise.
* modules/free (Makefile.am): Likewise.
* modules/fsusage (Makefile.am): Likewise.
* modules/ftruncate (Makefile.am): Likewise.
* modules/fts (Makefile.am): Likewise.
* modules/gc-arcfour (Makefile.am): Likewise.
* modules/gc-des (Makefile.am): Likewise.
* modules/gc-hmac-md5 (Makefile.am): Likewise.
* modules/gc-hmac-sha1 (Makefile.am): Likewise.
* modules/gc-md4 (Makefile.am): Likewise.
* modules/gc-pbkdf2-sha1 (Makefile.am): Likewise.
* modules/gc-sha1 (Makefile.am): Likewise.
* modules/gc (Makefile.am): Likewise.
* modules/getaddrinfo (Makefile.am): Likewise.
* modules/getcwd (Makefile.am): Likewise.
* modules/getdelim (Makefile.am): Likewise.
* modules/getdomainname (Makefile.am): Likewise.
* modules/getgroups (Makefile.am): Likewise.
* modules/gethostname (Makefile.am): Likewise.
* modules/gethrxtime (Makefile.am): Likewise.
* modules/getline (Makefile.am): Likewise.
* modules/getloadavg (Makefile.am): Likewise.
* modules/getlogin_r (Makefile.am): Likewise.
* modules/getndelim2 (Makefile.am): Likewise.
* modules/getopt (Makefile.am): Likewise.
* modules/getpagesize (Makefile.am): Likewise.
* modules/getpass-gnu (Makefile.am): Likewise.
* modules/getpass (Makefile.am): Likewise.
* modules/getsubopt (Makefile.am): Likewise.
* modules/gettime (Makefile.am): Likewise.
* modules/gettimeofday (Makefile.am): Likewise.
* modules/getugroups (Makefile.am): Likewise.
* modules/getusershell (Makefile.am): Likewise.
* modules/glob (Makefile.am): Likewise.
* modules/group-member (Makefile.am): Likewise.
* modules/hard-locale (Makefile.am): Likewise.
* modules/hash (Makefile.am): Likewise.
* modules/hmac-md5 (Makefile.am): Likewise.
* modules/hmac-sha1 (Makefile.am): Likewise.
* modules/human (Makefile.am): Likewise.
* modules/idcache (Makefile.am): Likewise.
* modules/imaxabs (Makefile.am): Likewise.
* modules/imaxdiv (Makefile.am): Likewise.
* modules/inet_ntop (Makefile.am): Likewise.
* modules/inet_pton (Makefile.am): Likewise.
* modules/intprops (Makefile.am): Likewise.
* modules/inttostr (Makefile.am): Likewise.
* modules/inttypes (Makefile.am): Likewise.
* modules/isapipe (Makefile.am): Likewise.
* modules/javaversion (Makefile.am): Likewise.
* modules/lchmod (Makefile.am): Likewise.
* modules/lchown (Makefile.am): Likewise.
* modules/localcharset (Makefile.am): Likewise.
* modules/long-options (Makefile.am): Likewise.
* modules/lstat (Makefile.am): Likewise.
* modules/malloc (Makefile.am): Likewise.
* modules/mathl (Makefile.am): Likewise.
* modules/mbchar (Makefile.am): Likewise.
* modules/md2 (Makefile.am): Likewise.
* modules/md4 (Makefile.am): Likewise.
* modules/md5 (Makefile.am): Likewise.
* modules/memcasecmp (Makefile.am): Likewise.
* modules/memchr (Makefile.am): Likewise.
* modules/memcmp (Makefile.am): Likewise.
* modules/memcoll (Makefile.am): Likewise.
* modules/memcpy (Makefile.am): Likewise.
* modules/memmem (Makefile.am): Likewise.
* modules/memmove (Makefile.am): Likewise.
* modules/mempcpy (Makefile.am): Likewise.
* modules/memrchr (Makefile.am): Likewise.
* modules/memset (Makefile.am): Likewise.
* modules/memxor (Makefile.am): Likewise.
* modules/mkancesdirs (Makefile.am): Likewise.
* modules/mkdir-p (Makefile.am): Likewise.
* modules/mkdir (Makefile.am): Likewise.
* modules/mkdtemp (Makefile.am): Likewise.
* modules/mkstemp (Makefile.am): Likewise.
* modules/mktime (Makefile.am): Likewise.
* modules/modechange (Makefile.am): Likewise.
* modules/mountlist (Makefile.am): Likewise.
* modules/nanosleep (Makefile.am): Likewise.
* modules/obstack (Makefile.am): Likewise.
* modules/openat (Makefile.am): Likewise.
* modules/pagealign_alloc (Makefile.am): Likewise.
* modules/pathmax (Makefile.am): Likewise.
* modules/physmem (Makefile.am): Likewise.
* modules/poll (Makefile.am): Likewise.
* modules/posixtm (Makefile.am): Likewise.
* modules/posixver (Makefile.am): Likewise.
* modules/putenv (Makefile.am): Likewise.
* modules/quote (Makefile.am): Likewise.
* modules/quotearg (Makefile.am): Likewise.
* modules/raise (Makefile.am): Likewise.
* modules/read-file (Makefile.am): Likewise.
* modules/readline (Makefile.am): Likewise.
* modules/readlink (Makefile.am): Likewise.
* modules/readtokens (Makefile.am): Likewise.
* modules/readutmp (Makefile.am): Likewise.
* modules/realloc (Makefile.am): Likewise.
* modules/regex (Makefile.am): Likewise.
* modules/rename-dest-slash (Makefile.am): Likewise.
* modules/rename (Makefile.am): Likewise.
* modules/rijndael (Makefile.am): Likewise.
* modules/rmdir (Makefile.am): Likewise.
* modules/rpmatch (Makefile.am): Likewise.
* modules/safe-read (Makefile.am): Likewise.
* modules/safe-write (Makefile.am): Likewise.
* modules/same-inode (Makefile.am): Likewise.
* modules/same (Makefile.am): Likewise.
* modules/save-cwd (Makefile.am): Likewise.
* modules/savedir (Makefile.am): Likewise.
* modules/setenv (Makefile.am): Likewise.
* modules/settime (Makefile.am): Likewise.
* modules/sha1 (Makefile.am): Likewise.
* modules/sig2str (Makefile.am): Likewise.
* modules/snprintf (Makefile.am): Likewise.
* modules/stat-macros (Makefile.am): Likewise.
* modules/stat-time (Makefile.am): Likewise.
* modules/stdbool (Makefile.am): Likewise.
* modules/stdint (Makefile.am): Likewise.
* modules/stdlib-safer (Makefile.am): Likewise.
* modules/stpcpy (Makefile.am): Likewise.
* modules/stpncpy (Makefile.am): Likewise.
* modules/strcase (Makefile.am): Likewise.
* modules/strcasestr (Makefile.am): Likewise.
* modules/strchrnul (Makefile.am): Likewise.
* modules/strcspn (Makefile.am): Likewise.
* modules/strdup (Makefile.am): Likewise.
* modules/strerror (Makefile.am): Likewise.
* modules/strftime (Makefile.am): Likewise.
* modules/strndup (Makefile.am): Likewise.
* modules/strnlen (Makefile.am): Likewise.
* modules/strpbrk (Makefile.am): Likewise.
* modules/strsep (Makefile.am): Likewise.
* modules/strstr (Makefile.am): Likewise.
* modules/strtod (Makefile.am): Likewise.
* modules/strtoimax (Makefile.am): Likewise.
* modules/strtok_r (Makefile.am): Likewise.
* modules/strtol (Makefile.am): Likewise.
* modules/strtoll (Makefile.am): Likewise.
* modules/strtoul (Makefile.am): Likewise.
* modules/strtoull (Makefile.am): Likewise.
* modules/strtoumax (Makefile.am): Likewise.
* modules/strverscmp (Makefile.am): Likewise.
* modules/sys_socket (Makefile.am): Likewise.
* modules/sys_stat (Makefile.am): Likewise.
* modules/sysexits (Makefile.am): Likewise.
* modules/time_r (Makefile.am): Likewise.
* modules/timegm (Makefile.am): Likewise.
* modules/timespec (Makefile.am): Likewise.
* modules/tmpfile-safer (Makefile.am): Likewise.
* modules/trim (Makefile.am): Likewise.
* modules/unistd-safer (Makefile.am): Likewise.
* modules/unlinkdir (Makefile.am): Likewise.
* modules/unlocked-io (Makefile.am): Likewise.
* modules/userspec (Makefile.am): Likewise.
* modules/utime (Makefile.am): Likewise.
* modules/utimecmp (Makefile.am): Likewise.
* modules/utimens (Makefile.am): Likewise.
* modules/vasnprintf (Makefile.am): Likewise.
* modules/vasprintf (Makefile.am): Likewise.
* modules/vsnprintf (Makefile.am): Likewise.
* modules/xalloc (Makefile.am): Likewise.
* modules/xgetcwd (Makefile.am): Likewise.
* modules/xnanosleep (Makefile.am): Likewise.
* modules/xreadlink (Makefile.am): Likewise.
* modules/xstrtod (Makefile.am): Likewise.
* modules/xstrtol (Makefile.am): Likewise.
* modules/xstrtold (Makefile.am): Likewise.
* modules/yesno (Makefile.am): Likewise.
* modules/getdate (Makefile.am): Don't add getdate.h to EXTRA_DIST.
2006-10-12 Paul Eggert <eggert@cs.ucla.edu>
* modules/error (Makefile.am): Distribute files through
......
......@@ -22,7 +22,7 @@
progname=$0
package=gnulib
cvsdatestamp='$Date: 2006-10-12 12:33:50 $'
cvsdatestamp='$Date: 2006-10-13 12:40:22 $'
last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
nl='
......@@ -907,6 +907,41 @@ func_get_automake_snippet ()
{
func_lookup_file "modules/$1"
sed -n -e "/^Makefile\.am$sed_extract_prog" < "$lookedup_file"
case "$1" in
*-tests)
# *-tests module live in tests/, not lib/.
;;
*)
# Synthesize an EXTRA_DIST augmentation.
sed_combine_lines='/\\$/{
:a
N
s/\\\
//
s/\\$/\\/
ta
}'
sed_extract_mentioned_files='s/^lib_SOURCES[ ]*+=[ ]*//p'
already_mentioned_files=` \
sed -n -e "/^Makefile\.am$sed_extract_prog" < "$lookedup_file" \
| sed -e "$sed_combine_lines" \
| sed -n -e "$sed_extract_mentioned_files" | sed -e 's/#.*//'`
all_files=`func_get_filelist $1`
lib_files=`for f in $all_files; do \
case $f in \
lib/*) echo $f ;; \
esac; \
done | sed -e 's,^lib/,,'`
# Remove $already_mentioned_files from $lib_files.
echo "$lib_files" | LC_ALL=C sort -u > "$tmp"/lib-files
extra_files=`for f in $already_mentioned_files; do echo $f; done \
| LC_ALL=C sort -u | LC_ALL=C join -v 2 - "$tmp"/lib-files`
if test -n "$extra_files"; then
echo "EXTRA_DIST +=" $extra_files
echo
fi
;;
esac
}
# func_get_include_directive module
......
......@@ -14,7 +14,6 @@ configure.ac:
AC_FUNC_ACL
Makefile.am:
EXTRA_DIST += acl.h acl.c
Include:
"acl.h"
......
......@@ -14,7 +14,6 @@ gl_FUNC_ALLOCA
Makefile.am:
BUILT_SOURCES += $(ALLOCA_H)
EXTRA_DIST += alloca_.h
# We need the following in order to create <alloca.h> when the system
# doesn't have one that works with the given compiler.
......
......@@ -18,7 +18,6 @@ gl_ALLOCSA
Makefile.am:
lib_SOURCES += allocsa.h allocsa.c
EXTRA_DIST += allocsa.valgrind
Include:
#include "allocsa.h"
......
......@@ -13,7 +13,6 @@ configure.ac:
gl_ARCFOUR
Makefile.am:
EXTRA_DIST += arcfour.h arcfour.c
Include:
"arcfour.h"
......
......@@ -13,7 +13,6 @@ configure.ac:
gl_ARCTWO
Makefile.am:
EXTRA_DIST += arctwo.h arctwo.c
Include:
"arctwo.h"
......
......@@ -20,7 +20,6 @@ configure.ac:
gl_ARGMATCH
Makefile.am:
EXTRA_DIST += argmatch.h argmatch.c
Include:
"argmatch.h"
......
......@@ -13,7 +13,6 @@ gl_FUNC_ARGZ
Makefile.am:
BUILT_SOURCES += $(ARGZ_H)
EXTRA_DIST += argz_.h argz.c
# We need the following in order to create <argz.h> when the system
# doesn't have one that works with the given compiler.
......
......@@ -11,7 +11,6 @@ configure.ac:
gl_FUNC_ATEXIT
Makefile.am:
EXTRA_DIST += atexit.c
Include:
<stdlib.h>
......
......@@ -18,7 +18,6 @@ configure.ac:
gl_BACKUPFILE
Makefile.am:
EXTRA_DIST += backupfile.h backupfile.c
Include:
"backupfile.h"
......
......@@ -12,7 +12,6 @@ gl_BYTESWAP
Makefile.am:
BUILT_SOURCES += $(BYTESWAP_H)
EXTRA_DIST += byteswap_.h
# We need the following in order to create <byteswap.h> when the system
# doesn't have one.
......
......@@ -14,7 +14,6 @@ configure.ac:
gl_C_STRTOD
Makefile.am:
EXTRA_DIST += c-strtod.h c-strtod.c
Include:
"c-strtod.h"
......
......@@ -15,7 +15,6 @@ configure.ac:
gl_C_STRTOLD
Makefile.am:
EXTRA_DIST += c-strtod.h c-strtod.c c-strtold.c
Include:
"c-strtod.h"
......
......@@ -11,7 +11,6 @@ configure.ac:
AC_FUNC_CALLOC
Makefile.am:
EXTRA_DIST += calloc.c
Include:
<stdlib.h>
......
......@@ -15,7 +15,6 @@ configure.ac:
gl_CANON_HOST
Makefile.am:
EXTRA_DIST += canon-host.h canon-host.c
Include:
#include "canon-host.h"
......
......@@ -19,7 +19,6 @@ configure.ac:
AC_FUNC_CANONICALIZE_FILE_NAME
Makefile.am:
EXTRA_DIST += canonicalize.h canonicalize.c pathmax.h
Include:
"canonicalize.h"
......
......@@ -17,7 +17,6 @@ configure.ac:
gl_FUNC_CHDIR_LONG
Makefile.am:
EXTRA_DIST += chdir-long.h chdir-long.c
Include:
"chdir-long.h"
......
......@@ -15,7 +15,6 @@ configure.ac:
gl_CHDIR_SAFER
Makefile.am:
EXTRA_DIST += chdir-safer.h chdir-safer.c
Include:
"chdir-safer.h"
......
......@@ -13,7 +13,6 @@ configure.ac:
gl_CHECK_VERSION
Makefile.am:
EXTRA_DIST += check-version.h check-version.c
Include:
"check-version.h"
......
......@@ -13,7 +13,6 @@ configure.ac:
gl_FUNC_CHOWN
Makefile.am:
EXTRA_DIST += chown.c fchown-stub.c
Include:
<unistd.h>
......
......@@ -13,7 +13,6 @@ configure.ac:
gl_CLOEXEC
Makefile.am:
EXTRA_DIST += cloexec.h cloexec.c
Include:
"cloexec.h"
......
......@@ -14,7 +14,6 @@ configure.ac:
gl_CLOSE_STREAM
Makefile.am:
EXTRA_DIST += close-stream.h close-stream.c
Include:
"close-stream.h"
......
......@@ -17,7 +17,6 @@ configure.ac:
gl_CLOSEOUT
Makefile.am:
EXTRA_DIST += closeout.h closeout.c
Include:
"closeout.h"
......
......@@ -13,7 +13,6 @@ configure.ac:
gl_CRC
Makefile.am:
EXTRA_DIST += crc.h crc.c
Include:
"crc.h"
......
......@@ -27,7 +27,6 @@ AC_CONFIG_FILES([csharpexec.sh:build-aux/csharpexec.sh.in])
Makefile.am:
DEFS += -DEXEEXT=\"$(EXEEXT)\"
lib_SOURCES += csharpexec.h csharpexec.c
EXTRA_DIST += classpath.h classpath.c
Include:
"csharpexec.h"
......
......@@ -16,7 +16,6 @@ configure.ac:
gl_CYCLE_CHECK
Makefile.am:
EXTRA_DIST += cycle-check.h cycle-check.c
Include:
"cycle-check.h"
......
......@@ -14,7 +14,6 @@ configure.ac:
gl_DES
Makefile.am:
EXTRA_DIST += des.h des.c
Include:
"des.h"
......
......@@ -9,7 +9,6 @@ Depends-on:
configure.ac:
Makefile.am:
EXTRA_DIST += dev-ino.h
Include:
"dev-ino.h"
......
......@@ -12,7 +12,6 @@ configure.ac:
gl_FUNC_DIRFD
Makefile.am:
EXTRA_DIST += dirfd.h dirfd.c
Include:
"dirfd.h"
......
......@@ -19,7 +19,6 @@ configure.ac:
gl_DIRNAME
Makefile.am:
EXTRA_DIST += dirname.h dirname.c basename.c stripslash.c
Include:
"dirname.h"
......
......@@ -11,7 +11,6 @@ configure.ac:
gl_FUNC_DUP2
Makefile.am:
EXTRA_DIST += dup2.c
Include:
<unistd.h>
......
......@@ -11,7 +11,6 @@ configure.ac:
gl_EEALLOC
Makefile.am:
EXTRA_DIST += eealloc.h
Include:
#include <eealloc.h>
......
......@@ -12,7 +12,6 @@ configure.ac:
gl_ERROR
Makefile.am:
EXTRA_DIST += error.h error.c
Include:
"error.h"
......
......@@ -14,7 +14,6 @@ configure.ac:
gl_FUNC_EUIDACCESS
Makefile.am:
EXTRA_DIST += euidaccess.h euidaccess.c
Include:
"euidaccess.h"
......
......@@ -17,7 +17,6 @@ configure.ac:
gl_EXCLUDE
Makefile.am:
EXTRA_DIST += exclude.h exclude.c
Include:
"exclude.h"
......
......@@ -13,7 +13,6 @@ configure.ac:
gl_EXITFAIL
Makefile.am:
EXTRA_DIST += exitfail.h exitfail.c
Include:
"exitfail.h"
......
......@@ -14,7 +14,6 @@ gl_FCNTL_H
Makefile.am:
BUILT_SOURCES += $(FCNTL_H)
EXTRA_DIST += fcntl_.h
# We need the following in order to create <fcntl.h> when the system
# doesn't have one that works with the given compiler.
......
......@@ -15,7 +15,6 @@ configure.ac:
gl_FCNTL_SAFER
Makefile.am:
EXTRA_DIST += fcntl--.h creat-safer.c fcntl-safer.h open-safer.c
Include:
"fcntl-safer.h"
......
......@@ -14,7 +14,6 @@ configure.ac:
gl_FILE_TYPE
Makefile.am:
EXTRA_DIST += file-type.h file-type.c
Include:
"file-type.h"
......
......@@ -11,7 +11,6 @@ configure.ac:
gl_FILEBLOCKS
Makefile.am:
EXTRA_DIST += fileblocks.c
Include:
......
......@@ -15,7 +15,6 @@ configure.ac:
gl_FILEMODE
Makefile.am:
EXTRA_DIST += filemode.h filemode.c
Include:
"filemode.h"
......
......@@ -15,7 +15,6 @@ configure.ac:
gl_FILE_NAME_CONCAT
Makefile.am:
EXTRA_DIST += filenamecat.h filenamecat.c
Include:
"filenamecat.h"
......
......@@ -17,7 +17,6 @@ configure.ac:
Makefile.am:
BUILT_SOURCES += $(FNMATCH_H)
EXTRA_DIST += fnmatch_.h fnmatch.c fnmatch_loop.c
# We need the following in order to create <fnmatch.h> when the system
# doesn't have one that supports the required API.
......
......@@ -14,7 +14,6 @@ configure.ac:
gl_FOPEN_SAFER
Makefile.am:
EXTRA_DIST += stdio--.h stdio-safer.h fopen-safer.c
Include:
"stdio-safer.h"
......
......@@ -12,7 +12,6 @@ configure.ac:
gl_FUNC_FPENDING
Makefile.am:
EXTRA_DIST += __fpending.h __fpending.c
Include:
"__fpending.h"
......
......@@ -13,7 +13,6 @@ configure.ac:
gl_FPRINTFTIME
Makefile.am:
EXTRA_DIST += fprintftime.h fprintftime.c
Include:
"fprintftime.h"
......
......@@ -11,7 +11,6 @@ configure.ac:
gl_FUNC_FREE
Makefile.am:
EXTRA_DIST += free.c
Include:
<stdlib.h>
......
......@@ -15,7 +15,6 @@ configure.ac:
gl_FSUSAGE
Makefile.am:
EXTRA_DIST += fsusage.h fsusage.c
Include:
"fsusage.h"
......
......@@ -11,7 +11,6 @@ configure.ac:
gl_FUNC_FTRUNCATE
Makefile.am:
EXTRA_DIST += ftruncate.c
Include:
<unistd.h>
......
......@@ -23,7 +23,6 @@ configure.ac:
gl_FUNC_FTS
Makefile.am:
EXTRA_DIST += fts_.h fts.c fts-cycle.c
Include: