--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,104 @@
+2006-08-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Avoid the need for AC_LIBSOURCES in m4 macros.
+	* modules/acl (EXTRA_DIST): Add acl.h.
+	* modules/argmatch (Files): Add m4/argmatch.m4.
+	(configure.ac): Add gl_ARGMATCH.
+	(EXTRA_DIST): Renamed from lib_SOURCES, for
+	consistency with the other modules.  Remove argmatch.c.
+	* modules/backupfile (EXTRA_DIST): Add backupfile.h.
+	* modules/c-strtod (EXTRA_DIST): Add c-strtod.h.
+	* modules/c-strtold (EXTRA_DIST): Add c-strtod.c, c-strtod.h.
+	* modules/canonhost (EXTRA_DIST): Add c-canonhost.h.
+	* modules/canonicalize (EXTRA_DIST): Add canonicalize.h.
+	* modules/chdir-long (EXTRA_DIST): Add chdir-long.h.
+	* modules/chdir-safer (EXTRA_DIST): Add chdir-safer.h.
+	* modules/cloexec (EXTRA_DIST): Add cloexec.h.
+	* modules/close-stream (EXTRA_DIST): Add close-stream.h.
+	* modules/closeout (EXTRA_DIST): Add closeout.h.
+	* modules/cycle-check (EXTRA_DIST): Add cycle-check.h.
+	* modules/dev-ino (EXTRA_DIST): Add dev-ino.h.
+	* modules/dirfd (EXTRA_DIST): Add dirfd.h.
+	* modules/dirname (EXTRA_DIST): Renamed from lib_SOURCES.  Add
+	dirname.h; remove basename.c and stripslash.c.
+	* modules/exclude (EXTRA_DIST): Add exclude.h.
+	* modules/exitfail (EXTRA_DIST): Add exitfail.h.
+	* modules/fcntl-safer (EXTRA_DIST): Add fcntl-safer.h fcntl--.h.
+	* modules/file-type (EXTRA_DIST): Add file-type.h.
+	* modules/filemode (EXTRA_DIST): Add filemode.h.
+	* modules/filenamecat (EXTRA_DIST): Add filenamecat.h.
+	* modules/fopen-safer (EXTRA_DIST): Add stdio-safer.h stdio--.h.
+	* modules/fpending (EXTRA_DIST): Add __fpending.h.
+	* modules/fprintftime (EXTRA_DIST): Add fprintftime.h.
+	* modules/fsusage (EXTRA_DIST): Add fsusage.h.
+	* modules/fts (EXTRA_DIST): Add fts_.h fts-cycle.c.
+	* modules/getcwd (EXTRA_DIST): Add getcwd.h.
+	* modules/getdate (EXTRA_DIST): Add getdate.c.
+	* modules/gethrxtime (EXTRA_DIST): Add gethrxtime.h xtime.h.
+	* modules/getpagesize (EXTRA_DIST): Add getpagesize.h.
+	* modules/getpass (EXTRA_DIST): Add getpass.h.
+	* modules/glob (EXTRA_DIST): Add glob_.h glob-libc.h.
+	* modules/group-member (EXTRA_DIST): Add group-member.h.
+	* modules/hard-locale (EXTRA_DIST): Add hard-locale.h.
+	* modules/hash (EXTRA_DIST): Add hash.h.
+	* modules/human (EXTRA_DIST): Add human.h.
+	* modules/inttypes (EXTRA_DIST): Add inttypes.h.
+	* modules/lchmod (EXTRA_DIST): Add lchmod.h.
+	* modules/lchown (EXTRA_DIST): Add lchown.h.
+	* modules/long-options (EXTRA_DIST): Add long-options.h.
+	* modules/lstat (EXTRA_DIST): Add lstat.h.
+	* modules/md5 (EXTRA_DIST): Add memcasecmp.h.
+	* modules/memcoll (EXTRA_DIST): Add memcoll.h.
+	* modules/mempcpy (EXTRA_DIST): Add mempcpy.h.
+	* modules/memrchr (EXTRA_DIST): Add memrchr.h.
+	* modules/memxor (EXTRA_DIST): Add memxor.h.
+	* modules/mkancesdirs (EXTRA_DIST): Add mkancesdirs.h.
+	* modules/mkdir-p (EXTRA_DIST): Add modechange.h.
+	* modules/mountlist (EXTRA_DIST): Add mountlist.h.
+	* modules/openat (EXTRA_DIST): Add at-func.c openat.h openat-priv.h.
+	* modules/pathmax (EXTRA_DIST): Add pathmax.h.
+	* modules/physmem (EXTRA_DIST): Add physmem.h.
+	* modules/posixtm (EXTRA_DIST): Add posixtm.h.
+	* modules/posixver (EXTRA_DIST): Add posixver.h.
+	* modules/quote (EXTRA_DIST): Add quote.h.
+	* modules/quotearg (EXTRA_DIST): Add quotearg.h.
+	* modules/readtokens (EXTRA_DIST): Add readtokens.h.
+	* modules/readutmp (EXTRA_DIST): Add readutmp.h.
+	* modules/regex (EXTRA_DIST): Add regcomp.c regex.h regex_internal.c regex_internal.h regexec.c.
+	* modules/safe-read (EXTRA_DIST): Add safe-read.h.
+	* modules/safe-write (EXTRA_DIST): Add safe-write.h.
+	* modules/same (EXTRA_DIST): Add same.h.
+	* modules/same-inode (EXTRA_DIST): Add same-inode.h.
+	* modules/save-cwd (EXTRA_DIST): Add save-cwd.h.
+	* modules/savedir (EXTRA_DIST): Add savedir.h.
+	* modules/sha1 (EXTRA_DIST): Add sha1.h.
+	* modules/sig2str (EXTRA_DIST): Add sig2str.h.
+	* modules/stat-macros (EXTRA_DIST): Add stat-macros.h.
+	* modules/stat-time (EXTRA_DIST): Add stat-time.h.
+	* modules/stdlib-safer (EXTRA_DIST): Add stdlib-safer.h stdlib--.h.
+	* modules/strdup (EXTRA_DIST): Add strdup.h.
+	* modules/strftime (EXTRA_DIST): Add strftime.h.
+	* modules/strndup (EXTRA_DIST): Add strndup.h.
+	* modules/strnlen (EXTRA_DIST): Add strnlen.h.
+	* modules/strverscmp (EXTRA_DIST): Add strverscmp.h.
+	* modules/time_r (EXTRA_DIST): Add time_r.h.
+	* modules/timespec (EXTRA_DIST): Add timespec.h.
+	* modules/tmpfile-safer (EXTRA_DIST): Add stdio-safer.h stdio--.h.
+	* modules/unistd-safer (EXTRA_DIST): Add unistd-safer.h unistd--.h.
+	* modules/unlinkdir (EXTRA_DIST): Add unlinkdir.h.
+	* modules/unlocked-io (EXTRA_DIST): Add unlocked-io.h.
+	* modules/userspec (EXTRA_DIST): Add userspec.h.
+	* modules/utimecmp (EXTRA_DIST): Add utimecmp.h.
+	* modules/utimens (EXTRA_DIST): Add utimens.h.
+	* modules/xalloc (EXTRA_DIST): Add xalloc.h.
+	* modules/xgetcwd (EXTRA_DIST): Add xgetcwd.h.
+	* modules/xnanosleep (EXTRA_DIST): Add xnanosleep.h.
+	* modules/xreadlink (EXTRA_DIST): Add xreadlink.h.
+	* modules/xstrtod (EXTRA_DIST): Add xstrtod.h.
+	* modules/xstrtol (EXTRA_DIST): Add xstrtol.h.
+	* modules/xstrtold (EXTRA_DIST): Add xstrtod.c xstrtod.h.
+	* modules/yesno (EXTRA_DIST): Add yesno.h.
+
 2006-08-21  Bruno Haible <bruno@clisp.org>
 
 	* gnulib-tool (func_emit_lib_Makefile_am): If the snippets already

--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,101 @@
+2006-08-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* argmatch.m4: New file, from coreutils with AC_LIBSOURCES removed.
+	* dev-ino.m4, same-inode.m4: Remove.
+
+	* _inttypes_h.m4 (gl_INTTYPES_H):
+	* acl.m4 (AC_FUNC_ACL):
+	* backupfile.m4 (gl_BACKUPFILE):
+	* c-strtod.m4 (gl_C99_STRTOLD):
+	* canon-host.m4 (gl_CANON_HOST):
+	* canonicalize.m4 (AC_FUNC_CANONICALIZE_FILE_NAME):
+	* chdir-long.m4 (gl_FUNC_CHDIR_LONG):
+	* chdir-safer.m4 (gl_CHDIR_SAFER):
+	* cloexec.m4 (gl_CLOEXEC):
+	* close-stream.m4 (gl_CLOSE_STREAM):
+	* closeout.m4 (gl_CLOSEOUT):
+	* dirfd.m4 (gl_FUNC_DIRFD):
+	* dirname.m4 (gl_DIRNAME):
+	* exclude.m4 (gl_EXCLUDE):
+	* exitfail.m4 (gl_EXITFAIL):
+	* fcntl-safer.m4 (gl_FCNTL_SAFER):
+	* file-type.m4 (gl_FILE_TYPE):
+	* filemode.m4 (gl_FILEMODE):
+	* filenamecat.m4 (gl_FILE_NAME_CONCAT):
+	* fpending.m4 (gl_FUNC_FPENDING):
+	* fprintftime.m4 (gl_FPRINTFTIME):
+	* fts.m4 (gl_FUNC_FTS):
+	* getcwd.m4 (gl_FUNC_GETCWD_NULL):
+	* getdate.m4 (gl_GETDATE):
+	* gethrxtime.m4 (gl_GETHRXTIME):
+	* getpagesize.m4 (gl_GETPAGESIZE):
+	* getpass.m4 (gl_FUNC_GETPASS):
+	* gettime.m4 (gl_GETTIME):
+	* getugroups.m4 (gl_GETUGROUPS):
+	* glob.m4 (gl_GLOB_SUBSTITUTE):
+	* group-member.m4 (gl_FUNC_GROUP_MEMBER):
+	* hard-locale.m4 (gl_HARD_LOCALE):
+	* hash.m4 (gl_HASH):
+	* idcache.m4 (gl_IDCACHE):
+	* lchmod.m4 (gl_FUNC_LCHMOD):
+	* lchown.m4 (gl_FUNC_LCHOWN):
+	* long-options.m4 (gl_LONG_OPTIONS):
+	* lstat.m4 (gl_FUNC_LSTAT):
+	* md5.m4 (gl_MD5):
+	* memcasecmp.m4 (gl_MEMCASECMP):
+	* memcoll.m4 (gl_MEMCOLL):
+	* mempcpy.m4 (gl_FUNC_MEMPCPY):
+	* memrchr.m4 (gl_FUNC_MEMRCHR):
+	* memxor.m4 (gl_MEMXOR):
+	* mkancesdirs.m4 (gl_MKANCESDIRS):
+	* mkdir-p.m4 (gl_MKDIR_PARENTS):
+	* modechange.m4 (gl_MODECHANGE):
+	* mountlist.m4 (gl_MOUNTLIST):
+	* nanosleep.m4 (gl_FUNC_NANOSLEEP):
+	* openat.m4 (gl_FUNC_OPENAT):
+	* pathmax.m4 (gl_PATHMAX):
+	* physmem.m4 (gl_PHYSMEM):
+	* posixtm.m4 (gl_POSIXTM):
+	* posixver.m4 (gl_POSIXVER):
+	* quote.m4 (gl_QUOTE):
+	* quotearg.m4 (gl_QUOTEARG):
+	* readtokens.m4 (gl_READTOKENS):
+	* readutmp.m4 (gl_READUTMP):
+	* regex.m4 (gl_REGEX):
+	* safe-read.m4 (gl_SAFE_READ):
+	* safe-write.m4 (gl_SAFE_WRITE):
+	* same.m4 (gl_SAME):
+	* save-cwd.m4 (gl_SAVE_CWD):
+	* savedir.m4 (gl_SAVEDIR):
+	* settime.m4 (gl_SETTIME):
+	* sha1.m4 (gl_SHA1):
+	* sig2str.m4 (gl_FUNC_SIG2STR):
+	* stat-macros.m4 (gl_STAT_MACROS):
+	* stat-time.m4 (gl_STAT_TIME):
+	* stdio-safer.m4 (gl_FOPEN_SAFER):
+	* stdlib-safer.m4 (gl_STDLIB_SAFER):
+	* strdup.m4 (gl_FUNC_STRDUP):
+	* strftime.m4 (gl_FUNC_GNU_STRFTIME):
+	* strndup.m4 (gl_FUNC_STRNDUP):
+	* strnlen.m4 (gl_FUNC_STRNLEN):
+	* strverscmp.m4 (gl_FUNC_STRVERSCMP):
+	* time_r.m4 (gl_TIME_R):
+	* timespec.m4 (gl_TIMESPEC):
+	* unistd-safer.m4 (gl_UNISTD_SAFER):
+	* unlinkdir.m4 (gl_UNLINKDIR):
+	* unlocked-io.m4 (gl_FUNC_GLIBC_UNLOCKED_IO):
+	* userspec.m4 (gl_USERSPEC):
+	* utimecmp.m4 (gl_UTIMECMP):
+	* utimens.m4 (gl_UTIMENS):
+	* xalloc.m4 (gl_XALLOC):
+	* xgetcwd.m4 (gl_XGETCWD):
+	* xnanosleep.m4 (gl_XNANOSLEEP):
+	* xreadlink.m4 (gl_XREADLINK):
+	* xstrtod.m4 (gl_XSTRTOD):
+	* yesno.m4 (gl_YESNO):
+	Don't use AC_LIBSOURCES; instead, rely on the files in ../modules/
+	to get the necessary .h files and whatnot.
+
 2006-08-19  Bruno Haible  <bruno@clisp.org>
 
 	BeOS portability.

--- a/m4/_inttypes_h.m4
+++ b/m4/_inttypes_h.m4
@@ -1,4 +1,4 @@
-# _inttypes_h.m4 serial 4
+# _inttypes_h.m4 serial 5
 dnl Copyright (C) 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -8,7 +8,6 @@
 
 AC_DEFUN([gl_INTTYPES_H],
 [AC_REQUIRE([gl_INCLUDE_NEXT])dnl
-AC_LIBSOURCES([inttypes.h])
 if test $gl_cv_have_include_next = no; then
   gl_ABSOLUTE_HEADER([inttypes.h])
 fi

--- a/m4/acl.m4
+++ b/m4/acl.m4
@@ -1,6 +1,6 @@
 # acl.m4 - check for access control list (ACL) primitives
 
-# Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -9,7 +9,6 @@
 
 AC_DEFUN([AC_FUNC_ACL],
 [
-  AC_LIBSOURCES([acl.c, acl.h])
   AC_LIBOBJ([acl])
 
   dnl Prerequisites of lib/acl.c.

new file mode 100644
--- /dev/null
+++ b/m4/argmatch.m4
@@ -0,0 +1,10 @@
+#serial 3
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_ARGMATCH],
+[
+  AC_LIBOBJ([argmatch])
+])

--- a/m4/backupfile.m4
+++ b/m4/backupfile.m4
@@ -1,4 +1,4 @@
-# backupfile.m4 serial 11
+# backupfile.m4 serial 12
 dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,7 +6,6 @@
 
 AC_DEFUN([gl_BACKUPFILE],
 [
-  AC_LIBSOURCES([backupfile.c, backupfile.h])
   AC_LIBOBJ([backupfile])
 
   dnl Prerequisites of lib/backupfile.c.

--- a/m4/c-strtod.m4
+++ b/m4/c-strtod.m4
@@ -1,4 +1,4 @@
-# c-strtod.m4 serial 8
+# c-strtod.m4 serial 9
 
 # Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -35,7 +35,6 @@
 
 AC_DEFUN([gl_C_STRTOD],
 [
-  AC_LIBSOURCES([c-strtod.c, c-strtod.h])
   AC_LIBOBJ([c-strtod])
 
   dnl Prerequisites of lib/c-strtod.c.
@@ -45,7 +44,6 @@
 
 AC_DEFUN([gl_C_STRTOLD],
 [
-  AC_LIBSOURCES([c-strtod.c, c-strtold.c, c-strtod.h])
   AC_LIBOBJ([c-strtold])
 
   dnl Prerequisites of lib/c-strtold.c.

--- a/m4/canon-host.m4
+++ b/m4/canon-host.m4
@@ -1,12 +1,11 @@
-# canon-host.m4 serial 7
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# canon-host.m4 serial 8
+dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_CANON_HOST],
 [
-  AC_LIBSOURCES([canon-host.c, canon-host.h])
   AC_LIBOBJ([canon-host])
   gl_PREREQ_CANON_HOST
 ])

--- a/m4/canonicalize.m4
+++ b/m4/canonicalize.m4
@@ -1,4 +1,4 @@
-#serial 9
+#serial 10
 
 # Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -9,7 +9,6 @@
 
 AC_DEFUN([AC_FUNC_CANONICALIZE_FILE_NAME],
   [
-    AC_LIBSOURCES([canonicalize.c, canonicalize.h])
     AC_LIBOBJ([canonicalize])
 
     AC_CHECK_HEADERS(sys/param.h)

--- a/m4/chdir-long.m4
+++ b/m4/chdir-long.m4
@@ -1,4 +1,4 @@
-#serial 7
+#serial 8
 
 # Use Gnulib's robust chdir function.
 # It can handle arbitrarily long directory names, which means
@@ -6,7 +6,7 @@
 # never fails with ENAMETOOLONG.
 # Arrange to compile chdir-long.c only on systems that define PATH_MAX.
 
-dnl Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+dnl Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -15,7 +15,6 @@
 
 AC_DEFUN([gl_FUNC_CHDIR_LONG],
 [
-  AC_LIBSOURCES([chdir-long.c, chdir-long.h])
   AC_CACHE_CHECK([whether this system has an arbitrary file name length limit],
     gl_have_arbitrary_file_name_length_limit,
     [AC_EGREP_CPP([have_arbitrary_file_name_length_limit],

--- a/m4/chdir-safer.m4
+++ b/m4/chdir-safer.m4
@@ -1,4 +1,4 @@
-#serial 2
+#serial 3
 dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,6 +6,5 @@
 
 AC_DEFUN([gl_CHDIR_SAFER],
 [
-  AC_LIBSOURCES([chdir-safer.c, chdir-safer.h, same-inode.h])
   AC_LIBOBJ([chdir-safer])
 ])

--- a/m4/cloexec.m4
+++ b/m4/cloexec.m4
@@ -1,11 +1,10 @@
-#serial 5
-dnl Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+#serial 6
+dnl Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_CLOEXEC],
 [
-  AC_LIBSOURCES([cloexec.c, cloexec.h])
   AC_LIBOBJ([cloexec])
 ])

--- a/m4/close-stream.m4
+++ b/m4/close-stream.m4
@@ -5,7 +5,6 @@
 
 AC_DEFUN([gl_CLOSE_STREAM],
 [
-  AC_LIBSOURCES([close-stream.c, close-stream.h])
   AC_LIBOBJ([close-stream])
 
   dnl Prerequisites of lib/close-stream.c.

--- a/m4/closeout.m4
+++ b/m4/closeout.m4
@@ -1,12 +1,11 @@
-# closeout.m4 serial 4
-dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# closeout.m4 serial 5
+dnl Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_CLOSEOUT],
 [
-  AC_LIBSOURCES([closeout.c, closeout.h])
   AC_LIBOBJ([closeout])
 
   dnl Prerequisites of lib/closeout.c.

deleted file mode 100644
--- a/m4/dev-ino.m4
+++ /dev/null
@@ -1,10 +0,0 @@
-#serial 1
-dnl Copyright (C) 2006 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_STRUCT_DEV_INO],
-[
-  AC_LIBSOURCES([dev-ino.h])
-])

--- a/m4/dirfd.m4
+++ b/m4/dirfd.m4
@@ -1,4 +1,4 @@
-#serial 13   -*- Autoconf -*-
+#serial 14   -*- Autoconf -*-
 
 dnl Find out how to get the file descriptor associated with an open DIR*.
 
@@ -12,8 +12,6 @@
 
 AC_DEFUN([gl_FUNC_DIRFD],
 [
-  AC_LIBSOURCES([dirfd.c, dirfd.h])
-
   dnl Work around a bug of AC_EGREP_CPP in autoconf-2.57.
   AC_REQUIRE([AC_PROG_CPP])
   AC_REQUIRE([AC_PROG_EGREP])

--- a/m4/dirname.m4
+++ b/m4/dirname.m4
@@ -1,4 +1,4 @@
-#serial 6   -*- autoconf -*-
+#serial 7   -*- autoconf -*-
 dnl Copyright (C) 2002-2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,8 +6,9 @@
 
 AC_DEFUN([gl_DIRNAME],
 [
-  AC_LIBSOURCES([dirname.c, dirname.h])
+  AC_LIBOBJ([basename])
   AC_LIBOBJ([dirname])
+  AC_LIBOBJ([stripslash])
 
   dnl Prerequisites of lib/dirname.h.
   AC_REQUIRE([gl_AC_DOS])

--- a/m4/exclude.m4
+++ b/m4/exclude.m4
@@ -1,4 +1,4 @@
-# exclude.m4 serial 6
+# exclude.m4 serial 7
 dnl Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,6 +6,5 @@
 
 AC_DEFUN([gl_EXCLUDE],
 [
-  AC_LIBSOURCES([exclude.c, exclude.h])
   AC_LIBOBJ([exclude])
 ])

--- a/m4/exitfail.m4
+++ b/m4/exitfail.m4
@@ -1,12 +1,11 @@
-# exitfail.m4 serial 5
-dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# exitfail.m4 serial 6
+dnl Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_EXITFAIL],
 [
-  AC_LIBSOURCES([exitfail.c, exitfail.h])
   AC_LIBOBJ([exitfail])
 
   dnl No prerequisites of lib/exitfail.c.

--- a/m4/fcntl-safer.m4
+++ b/m4/fcntl-safer.m4
@@ -1,12 +1,11 @@
-#serial 2
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+#serial 3
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FCNTL_SAFER],
 [
-  AC_LIBSOURCES([creat-safer.c, fcntl-safer.h, open-safer.c, fcntl--.h])
   AC_LIBOBJ([open-safer])
   AC_LIBOBJ([creat-safer])
 ])

--- a/m4/file-type.m4
+++ b/m4/file-type.m4
@@ -1,11 +1,10 @@
-# file-type.m4 serial 5
-dnl Copyright (C) 2002, 2005 Free Software Foundation, Inc.
+# file-type.m4 serial 6
+dnl Copyright (C) 2002, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FILE_TYPE],
 [
-  AC_LIBSOURCES([file-type.c, file-type.h])
   AC_LIBOBJ([file-type])
 ])

--- a/m4/filemode.m4
+++ b/m4/filemode.m4
@@ -1,4 +1,4 @@
-# filemode.m4 serial 6
+# filemode.m4 serial 7
 dnl Copyright (C) 2002, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -7,7 +7,6 @@
 AC_DEFUN([gl_FILEMODE],
 [
   AC_REQUIRE([AC_STRUCT_ST_DM_MODE])
-  AC_LIBSOURCES([filemode.c, filemode.h])
   AC_LIBOBJ([filemode])
   AC_CHECK_DECLS_ONCE([strmode])
 ])

--- a/m4/filenamecat.m4
+++ b/m4/filenamecat.m4
@@ -1,12 +1,11 @@
-# filenamecat.m4 serial 7
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# filenamecat.m4 serial 8
+dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FILE_NAME_CONCAT],
 [
-  AC_LIBSOURCES([filenamecat.c, filenamecat.h])
   AC_LIBOBJ([filenamecat])
 
   dnl Prerequisites of lib/filenamecat.c.

--- a/m4/fpending.m4
+++ b/m4/fpending.m4
@@ -1,4 +1,4 @@
-#serial 8
+#serial 9
 
 # Copyright (C) 2000, 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -15,8 +15,6 @@
 
 AC_DEFUN([gl_FUNC_FPENDING],
 [
-  AC_LIBSOURCES([__fpending.c, __fpending.h])
-
   AC_CHECK_HEADERS(stdio_ext.h)
   AC_REPLACE_FUNCS([__fpending])
   fp_headers='

--- a/m4/fprintftime.m4
+++ b/m4/fprintftime.m4
@@ -1,11 +1,10 @@
-#serial 1
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+#serial 2
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FPRINTFTIME],
 [
-  AC_LIBSOURCES([fprintftime.c, fprintftime.h])
   AC_LIBOBJ([fprintftime])
 ])

--- a/m4/fts.m4
+++ b/m4/fts.m4
@@ -1,4 +1,4 @@
-#serial 10
+#serial 11
 dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -7,7 +7,6 @@
 AC_DEFUN([gl_FUNC_FTS],
 [
   AC_REQUIRE([gl_FUNC_FTS_CORE])
-  AC_LIBSOURCES([fts-cycle.c])
 ])
 
 AC_DEFUN([gl_FUNC_FTS_LGPL],
@@ -20,8 +19,6 @@
 
 AC_DEFUN([gl_FUNC_FTS_CORE],
 [
-  AC_LIBSOURCES([fts.c, fts_.h])
-
   dnl Use this version of fts unconditionally, since the GNU libc and
   dnl NetBSD versions have bugs and/or unnecessary limitations.
   AC_LIBOBJ([fts])

--- a/m4/getcwd.m4
+++ b/m4/getcwd.m4
@@ -9,8 +9,6 @@
 
 AC_DEFUN([gl_FUNC_GETCWD_NULL],
   [
-   AC_LIBSOURCES([getcwd.c, getcwd.h])
-
    AC_CACHE_CHECK([whether getcwd (NULL, 0) allocates memory for result],
      [gl_cv_func_getcwd_null],
      [AC_TRY_RUN(

--- a/m4/getdate.m4
+++ b/m4/getdate.m4
@@ -1,4 +1,4 @@
-# getdate.m4 serial 9
+# getdate.m4 serial 10
 dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -19,7 +19,6 @@
 
 AC_DEFUN([gl_GETDATE],
 [
-  AC_LIBSOURCES([getdate.h, getdate.y])
   AC_LIBOBJ([getdate])
 
   dnl Prerequisites of lib/getdate.h.

--- a/m4/gethrxtime.m4
+++ b/m4/gethrxtime.m4
@@ -1,4 +1,4 @@
-# gethrxtime.m4 serial 5
+# gethrxtime.m4 serial 6
 dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -8,7 +8,6 @@
 
 AC_DEFUN([gl_GETHRXTIME],
 [
-  AC_LIBSOURCES([gethrxtime.c, gethrxtime.h, xtime.h])
   AC_REQUIRE([gl_ARITHMETIC_HRTIME_T])
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
   AC_REQUIRE([gl_XTIME])

--- a/m4/getpagesize.m4
+++ b/m4/getpagesize.m4
@@ -1,4 +1,4 @@
-# getpagesize.m4 serial 5
+# getpagesize.m4 serial 6
 dnl Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,8 +6,6 @@
 
 AC_DEFUN([gl_GETPAGESIZE],
 [
-  AC_LIBSOURCES([getpagesize.h])
-
   dnl Prerequisites of lib/getpagesize.h.
   AC_CHECK_HEADERS_ONCE(sys/param.h)
   AC_CHECK_HEADERS(OS.h)

--- a/m4/getpass.m4
+++ b/m4/getpass.m4
@@ -1,4 +1,4 @@
-# getpass.m4 serial 8
+# getpass.m4 serial 9
 dnl Copyright (C) 2002-2003, 2005-2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -7,8 +7,6 @@
 # Provide a getpass() function if the system doesn't have it.
 AC_DEFUN([gl_FUNC_GETPASS],
 [
-  AC_LIBSOURCES([getpass.c, getpass.h])
-
   AC_REPLACE_FUNCS(getpass)
   AC_CHECK_DECLS_ONCE(getpass)
   if test $ac_cv_func_getpass = no; then
@@ -20,8 +18,6 @@
 # arbitrary length (not just 8 bytes as on HP-UX).
 AC_DEFUN([gl_FUNC_GETPASS_GNU],
 [
-  AC_LIBSOURCES([getpass.c, getpass.h])
-
   AC_CHECK_DECLS_ONCE(getpass)
   dnl TODO: Detect when GNU getpass() is already found in glibc.
   AC_LIBOBJ(getpass)

--- a/m4/gettime.m4
+++ b/m4/gettime.m4
@@ -1,12 +1,11 @@
-# gettime.m4 serial 5
-dnl Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
+# gettime.m4 serial 6
+dnl Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_GETTIME],
 [
-  AC_LIBSOURCES([gettime.c])
   AC_LIBOBJ([gettime])
 
   dnl Prerequisites of lib/gettime.c.

--- a/m4/getugroups.m4
+++ b/m4/getugroups.m4
@@ -1,12 +1,11 @@
-# getugroups.m4 serial 5
-dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# getugroups.m4 serial 6
+dnl Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_GETUGROUPS],
 [
-  AC_LIBSOURCES([getugroups.c])
   AC_LIBOBJ([getugroups])
 
   dnl Prerequisites of lib/getugroups.c.

--- a/m4/glob.m4
+++ b/m4/glob.m4
@@ -1,4 +1,4 @@
-# glob.m4 serial 6
+# glob.m4 serial 7
 dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -13,7 +13,6 @@
   gl_PREREQ_GLOB
 
   GLOB_H=glob.h
-  AC_LIBSOURCES([glob.c, glob_.h, glob-libc.h])
   AC_LIBOBJ([glob])
   AC_SUBST([GLOB_H])
 ])

--- a/m4/group-member.m4
+++ b/m4/group-member.m4
@@ -1,6 +1,8 @@
-#serial 9
+#serial 10
 
-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2006 Free Software
+# Foundation, Inc.
+
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -9,8 +11,6 @@
 
 AC_DEFUN([gl_FUNC_GROUP_MEMBER],
 [
-  AC_LIBSOURCES([group-member.c, group-member.h])
-
   dnl Persuade glibc <unistd.h> to declare group_member().
   AC_REQUIRE([AC_GNU_SOURCE])
 

--- a/m4/hard-locale.m4
+++ b/m4/hard-locale.m4
@@ -1,5 +1,5 @@
-# hard-locale.m4 serial 6
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# hard-locale.m4 serial 7
+dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,6 +7,5 @@
 dnl No prerequisites of lib/hard-locale.c.
 AC_DEFUN([gl_HARD_LOCALE],
 [
-  AC_LIBSOURCES([hard-locale.c, hard-locale.h])
   AC_LIBOBJ([hard-locale])
 ])

--- a/m4/hash.m4
+++ b/m4/hash.m4
@@ -1,12 +1,11 @@
-# hash.m4 serial 5
-dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# hash.m4 serial 6
+dnl Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_HASH],
 [
-  AC_LIBSOURCES([hash.c, hash.h])
   AC_LIBOBJ([hash])
 
   dnl Prerequisites of lib/hash.c.

--- a/m4/idcache.m4
+++ b/m4/idcache.m4
@@ -1,11 +1,10 @@
-# idcache.m4 serial 5
-dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# idcache.m4 serial 6
+dnl Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_IDCACHE],
 [
-  AC_LIBSOURCES([idcache.c])
   AC_LIBOBJ([idcache])
 ])

--- a/m4/lchmod.m4
+++ b/m4/lchmod.m4
@@ -1,6 +1,6 @@
-#serial 1
+#serial 2
 
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -10,6 +10,5 @@
 
 AC_DEFUN([gl_FUNC_LCHMOD],
 [
-  AC_LIBSOURCES([lchmod.h])
   AC_CHECK_FUNCS_ONCE([lchmod])
 ])

--- a/m4/lchown.m4
+++ b/m4/lchown.m4
@@ -1,6 +1,8 @@
-#serial 8
+#serial 9
 
-dnl Copyright (C) 1998, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+dnl Copyright (C) 1998, 2001, 2003, 2004, 2005, 2006 Free Software
+dnl Foundation, Inc.
+
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -10,7 +12,6 @@
 
 AC_DEFUN([gl_FUNC_LCHOWN],
 [
-  AC_LIBSOURCES([lchown.c, lchown.h])
   AC_REQUIRE([AC_TYPE_UID_T])
   AC_REQUIRE([gl_FUNC_CHOWN])
   AC_REQUIRE([gl_STAT_MACROS])

--- a/m4/long-options.m4
+++ b/m4/long-options.m4
@@ -1,12 +1,11 @@
-# long-options.m4 serial 4
-dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# long-options.m4 serial 5
+dnl Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_LONG_OPTIONS],
 [
-  AC_LIBSOURCES([long-options.c, long-options.h])
   AC_LIBOBJ([long-options])
 
   dnl Prerequisites of lib/long-options.c.

--- a/m4/lstat.m4
+++ b/m4/lstat.m4
@@ -1,7 +1,7 @@
-#serial 14
+#serial 15
 
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 Free Software
-# Foundation, Inc.
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006
+# Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -11,8 +11,6 @@
 
 AC_DEFUN([gl_FUNC_LSTAT],
 [
-  AC_LIBSOURCES([lstat.c, lstat.h])
-
   AC_REQUIRE([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
   dnl Note: AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK does AC_LIBOBJ(lstat).
   :

--- a/m4/md5.m4
+++ b/m4/md5.m4
@@ -1,12 +1,11 @@
-# md5.m4 serial 8
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# md5.m4 serial 9
+dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_MD5],
 [
-  AC_LIBSOURCES([md5.c, md5.h])
   AC_LIBOBJ([md5])
 
   dnl Prerequisites of lib/md5.c.

--- a/m4/memcasecmp.m4
+++ b/m4/memcasecmp.m4
@@ -1,4 +1,4 @@
-#serial 4
+#serial 5
 dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,6 +6,5 @@
 
 AC_DEFUN([gl_MEMCASECMP],
 [
-  AC_LIBSOURCES([memcasecmp.c, memcasecmp.h])
   AC_LIBOBJ([memcasecmp])
 ])

--- a/m4/memcoll.m4
+++ b/m4/memcoll.m4
@@ -1,4 +1,4 @@
-# memcoll.m4 serial 6
+# memcoll.m4 serial 7
 dnl Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,7 +6,6 @@
 
 AC_DEFUN([gl_MEMCOLL],
 [
-  AC_LIBSOURCES([memcoll.c, memcoll.h])
   AC_LIBOBJ([memcoll])
 
   dnl Prerequisites of lib/memcoll.c.

--- a/m4/mempcpy.m4
+++ b/m4/mempcpy.m4
@@ -1,12 +1,11 @@
-# mempcpy.m4 serial 3
-dnl Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# mempcpy.m4 serial 4
+dnl Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_MEMPCPY],
 [
-  AC_LIBSOURCES([mempcpy.c, mempcpy.h])
 
   dnl Persuade glibc <string.h> to declare mempcpy().
   AC_REQUIRE([AC_GNU_SOURCE])

--- a/m4/memrchr.m4
+++ b/m4/memrchr.m4
@@ -1,13 +1,11 @@
-# memrchr.m4 serial 4
-dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# memrchr.m4 serial 5
+dnl Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_MEMRCHR],
 [
-  AC_LIBSOURCES([memrchr.c, memrchr.h])
-
   dnl Persuade glibc <string.h> to declare memrchr().
   AC_REQUIRE([AC_GNU_SOURCE])
 

--- a/m4/memxor.m4
+++ b/m4/memxor.m4
@@ -1,4 +1,4 @@
-# memxor.m4 serial 2
+# memxor.m4 serial 3
 dnl Copyright (C) 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,7 +6,6 @@
 
 AC_DEFUN([gl_MEMXOR],
 [
-  AC_LIBSOURCES([memxor.h, memxor.c])
   AC_LIBOBJ([memxor])
   AC_REQUIRE([AC_C_RESTRICT])
 ])

--- a/m4/mkancesdirs.m4
+++ b/m4/mkancesdirs.m4
@@ -6,6 +6,5 @@
 
 AC_DEFUN([gl_MKANCESDIRS],
 [
-  AC_LIBSOURCES([mkancesdirs.c, mkancesdirs.h])
   AC_LIBOBJ([mkancesdirs])
 ])

--- a/m4/mkdir-p.m4
+++ b/m4/mkdir-p.m4
@@ -1,4 +1,4 @@
-# mkdir-p.m4 serial 11
+# mkdir-p.m4 serial 12
 dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,7 +6,6 @@
 
 AC_DEFUN([gl_MKDIR_PARENTS],
 [
-  AC_LIBSOURCES([dirchownmod.c, dirchownmod.h, mkdir-p.c, mkdir-p.h])
   AC_LIBOBJ([dirchownmod])
   AC_LIBOBJ([mkdir-p])
 

--- a/m4/modechange.m4
+++ b/m4/modechange.m4
@@ -1,11 +1,10 @@
-# modechange.m4 serial 5
-dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# modechange.m4 serial 6
+dnl Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_MODECHANGE],
 [
-  AC_LIBSOURCES([modechange.c, modechange.h])
   AC_LIBOBJ([modechange])
 ])

--- a/m4/mountlist.m4
+++ b/m4/mountlist.m4
@@ -1,13 +1,11 @@
-#serial 8
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#serial 9
+dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_MOUNTLIST],
 [
-  AC_LIBSOURCES([mountlist.c, mountlist.h])
-
   gl_LIST_MOUNTED_FILE_SYSTEMS([gl_cv_list_mounted_fs=yes],
 			       [gl_cv_list_mounted_fs=no])
   if test $gl_cv_list_mounted_fs = yes; then

--- a/m4/nanosleep.m4
+++ b/m4/nanosleep.m4
@@ -1,4 +1,4 @@
-#serial 17
+#serial 18
 
 dnl From Jim Meyering.
 dnl Check for the nanosleep function.
@@ -14,8 +14,6 @@
 
 AC_DEFUN([gl_FUNC_NANOSLEEP],
 [
- AC_LIBSOURCES([nanosleep.c])
-
  dnl Persuade glibc and Solaris <time.h> to declare nanosleep.
  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 

--- a/m4/openat.m4
+++ b/m4/openat.m4
@@ -1,4 +1,4 @@
-#serial 9
+#serial 10
 # See if we need to use our replacement for Solaris' openat et al functions.
 
 dnl Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -10,11 +10,6 @@
 
 AC_DEFUN([gl_FUNC_OPENAT],
 [
-  AC_LIBSOURCES([openat.c, openat.h, openat-priv.h, openat-die.c, at-func.c])
-  AC_LIBSOURCES([intprops.h])
-  AC_LIBSOURCES([mkdirat.c])
-  AC_LIBSOURCES([fchmodat.c])
-
   # No system provides these functions; compile them unconditionally.
   AC_LIBOBJ([mkdirat])
   AC_LIBOBJ([fchmodat])

--- a/m4/pathmax.m4
+++ b/m4/pathmax.m4
@@ -1,13 +1,11 @@
-# pathmax.m4 serial 5
-dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# pathmax.m4 serial 6
+dnl Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_PATHMAX],
 [
-  AC_LIBSOURCES([pathmax.h])
-
   dnl Prerequisites of lib/pathmax.h.
   AC_CHECK_HEADERS_ONCE(sys/param.h)
 ])

--- a/m4/physmem.m4
+++ b/m4/physmem.m4
@@ -1,5 +1,5 @@
-# physmem.m4 serial 5
-dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# physmem.m4 serial 6
+dnl Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -26,7 +26,6 @@
 
 AC_DEFUN([gl_PHYSMEM],
 [
-  AC_LIBSOURCES([physmem.c, physmem.h])
   AC_LIBOBJ([physmem])
 
   # Prerequisites of lib/physmem.c.

--- a/m4/posixtm.m4
+++ b/m4/posixtm.m4
@@ -1,12 +1,11 @@
-# posixtm.m4 serial 4
-dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# posixtm.m4 serial 5
+dnl Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_POSIXTM],
 [
-  AC_LIBSOURCES([posixtm.c, posixtm.h])
   AC_LIBOBJ(posixtm)
 
   dnl Prerequisites of lib/posixtm.c.

--- a/m4/posixver.m4
+++ b/m4/posixver.m4
@@ -1,4 +1,4 @@
-# posixver.m4 serial 8
+# posixver.m4 serial 9
 dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,7 +6,6 @@
 
 AC_DEFUN([gl_POSIXVER],
 [
-  AC_LIBSOURCES([posixver.c, posixver.h])
   AC_LIBOBJ([posixver])
 
   AC_REQUIRE([gl_DEFAULT_POSIX2_VERSION])

--- a/m4/quote.m4
+++ b/m4/quote.m4
@@ -1,12 +1,11 @@
-# quote.m4 serial 4
-dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# quote.m4 serial 5
+dnl Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_QUOTE],
 [
-  AC_LIBSOURCES([quote.c, quote.h])
   AC_LIBOBJ([quote])
 
   dnl Prerequisites of lib/quote.c.

--- a/m4/quotearg.m4
+++ b/m4/quotearg.m4
@@ -1,12 +1,11 @@
-# quotearg.m4 serial 4
-dnl Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
+# quotearg.m4 serial 5
+dnl Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_QUOTEARG],
 [
-  AC_LIBSOURCES([quotearg.c, quotearg.h])
   AC_LIBOBJ([quotearg])
 
   dnl Prerequisites of lib/quotearg.c.

--- a/m4/readtokens.m4
+++ b/m4/readtokens.m4
@@ -1,12 +1,11 @@
-# readtokens.m4 serial 4
-dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# readtokens.m4 serial 5
+dnl Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_READTOKENS],
 [
-  AC_LIBSOURCES([readtokens.c, readtokens.h])
   AC_LIBOBJ([readtokens])
 
   dnl Prerequisites of lib/readtokens.c.

--- a/m4/readutmp.m4
+++ b/m4/readutmp.m4
@@ -1,12 +1,11 @@
-# readutmp.m4 serial 9
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# readutmp.m4 serial 10
+dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_READUTMP],
 [
-  AC_LIBSOURCES([readutmp.c, readutmp.h])
   AC_LIBOBJ([readutmp])
 
   dnl Prerequisites of lib/readutmp.h and lib/readutmp.c.

--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -1,4 +1,4 @@
-#serial 38
+#serial 39
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
 # 2006 Free Software Foundation, Inc.
@@ -14,10 +14,6 @@
 
 AC_DEFUN([gl_REGEX],
 [
-  AC_LIBSOURCES(
-    [regcomp.c, regex.c, regex.h,
-     regex_internal.c, regex_internal.h, regexec.c])
-
   AC_ARG_WITH([included-regex],
     [AC_HELP_STRING([--without-included-regex],
 		    [don't compile regex; this is the default on

--- a/m4/safe-read.m4
+++ b/m4/safe-read.m4
@@ -1,12 +1,11 @@
-# safe-read.m4 serial 4
-dnl Copyright (C) 2002-2003, 2005 Free Software Foundation, Inc.
+# safe-read.m4 serial 5
+dnl Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_SAFE_READ],
 [
-  AC_LIBSOURCES([safe-read.c, safe-read.h])
   AC_LIBOBJ([safe-read])
 
   gl_PREREQ_SAFE_READ

--- a/m4/safe-write.m4
+++ b/m4/safe-write.m4
@@ -1,12 +1,11 @@
-# safe-write.m4 serial 2
-dnl Copyright (C) 2002, 2005 Free Software Foundation, Inc.
+# safe-write.m4 serial 3
+dnl Copyright (C) 2002, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_SAFE_WRITE],
 [
-  AC_LIBSOURCES([safe-write.c, safe-write.h])
   AC_LIBOBJ([safe-write])
 
   gl_PREREQ_SAFE_WRITE

deleted file mode 100644
--- a/m4/same-inode.m4
+++ /dev/null
@@ -1,10 +0,0 @@
-#serial 1
-dnl Copyright (C) 2006 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_SAME_INODE],
-[
-  AC_LIBSOURCES([same-inode.h])
-])

--- a/m4/same.m4
+++ b/m4/same.m4
@@ -1,4 +1,4 @@
-#serial 7
+#serial 8
 dnl Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,7 +6,6 @@
 
 AC_DEFUN([gl_SAME],
 [
-  AC_LIBSOURCES([same.c, same.h, same-inode.h])
   AC_LIBOBJ([same])
 
   dnl Prerequisites of lib/same.c.

--- a/m4/save-cwd.m4
+++ b/m4/save-cwd.m4
@@ -1,12 +1,11 @@
-#serial 7
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#serial 8
+dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_SAVE_CWD],
 [
-  AC_LIBSOURCES([save-cwd.c, save-cwd.h])
   AC_LIBOBJ([save-cwd])
   dnl Prerequisites for lib/save-cwd.c.
   AC_CHECK_FUNCS_ONCE(fchdir)

--- a/m4/savedir.m4
+++ b/m4/savedir.m4
@@ -1,4 +1,4 @@
-# savedir.m4 serial 8
+# savedir.m4 serial 9
 dnl Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,6 +6,5 @@
 
 AC_DEFUN([gl_SAVEDIR],
 [
-  AC_LIBSOURCES([savedir.c, savedir.h])
   AC_LIBOBJ([savedir])
 ])

--- a/m4/settime.m4
+++ b/m4/settime.m4
@@ -1,12 +1,11 @@
-# settime.m4 serial 4
-dnl Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
+# settime.m4 serial 5
+dnl Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_SETTIME],
 [
-  AC_LIBSOURCES([settime.c])
   AC_LIBOBJ([settime])
 
   dnl Prerequisites of lib/settime.c.

--- a/m4/sha1.m4
+++ b/m4/sha1.m4
@@ -1,12 +1,11 @@
-# sha1.m4 serial 6
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# sha1.m4 serial 7
+dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_SHA1],
 [
-  AC_LIBSOURCES([sha1.c, sha1.h])
   AC_LIBOBJ([sha1])
 
   dnl Prerequisites of lib/sha1.c.

--- a/m4/sig2str.m4
+++ b/m4/sig2str.m4
@@ -1,12 +1,11 @@
-#serial 4
-dnl Copyright (C) 2002, 2005 Free Software Foundation, Inc.
+#serial 5
+dnl Copyright (C) 2002, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_SIG2STR],
 [
-  AC_LIBSOURCES([sig2str.c, sig2str.h, intprops.h])
 
   AC_REPLACE_FUNCS(sig2str)
   if test $ac_cv_func_sig2str = no; then

--- a/m4/stat-macros.m4
+++ b/m4/stat-macros.m4
@@ -1,6 +1,6 @@
-#serial 2
+#serial 3
 
-# Copyright (C) 2005 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -8,7 +8,5 @@
 
 AC_DEFUN([gl_STAT_MACROS],
 [
-  AC_LIBSOURCES([stat-macros.h])
-
   AC_REQUIRE([AC_HEADER_STAT])
 ])

--- a/m4/stat-time.m4
+++ b/m4/stat-time.m4
@@ -1,6 +1,8 @@
 # Checks for stat-related time functions.
 
-# Copyright (C) 1998, 1999, 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999, 2001, 2003, 2005, 2006 Free Software
+# Foundation, Inc.
+
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +17,6 @@
 
 AC_DEFUN([gl_STAT_TIME],
 [
-  AC_LIBSOURCES([stat-time.h])
-
   AC_REQUIRE([AC_C_INLINE])
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 

--- a/m4/stdio-safer.m4
+++ b/m4/stdio-safer.m4
@@ -1,4 +1,4 @@
-#serial 7
+#serial 8
 dnl Copyright (C) 2002, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,12 +6,10 @@
 
 AC_DEFUN([gl_FOPEN_SAFER],
 [
-  AC_LIBSOURCES([fopen-safer.c, stdio-safer.h, stdio--.h])
   AC_LIBOBJ([fopen-safer])
 ])
 
 AC_DEFUN([gl_TMPFILE_SAFER],
 [
-  AC_LIBSOURCES([tmpfile-safer.c, stdio-safer.h, stdio--.h])
   AC_LIBOBJ([tmpfile-safer])
 ])

--- a/m4/stdlib-safer.m4
+++ b/m4/stdlib-safer.m4
@@ -1,11 +1,10 @@
-# stdlib-safer.m4 serial 1
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+# stdlib-safer.m4 serial 2
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_STDLIB_SAFER],
 [
-  AC_LIBSOURCES([mkstemp-safer.c, stdlib-safer.h, stdlib--.h])
   AC_LIBOBJ([mkstemp-safer])
 ])

--- a/m4/strdup.m4
+++ b/m4/strdup.m4
@@ -1,13 +1,11 @@
-# strdup.m4 serial 6
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# strdup.m4 serial 7
+dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_STRDUP],
 [
-  AC_LIBSOURCES([strdup.c, strdup.h])
-
   AC_REPLACE_FUNCS(strdup)
   AC_CHECK_DECLS_ONCE(strdup)
   gl_PREREQ_STRDUP

--- a/m4/strftime.m4
+++ b/m4/strftime.m4
@@ -1,4 +1,4 @@
-#serial 27
+#serial 28
 
 # Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 # Free Software Foundation, Inc.
@@ -16,7 +16,6 @@
 # These are the prerequisite macros for GNU's strftime.c replacement.
 AC_DEFUN([gl_FUNC_STRFTIME],
 [
- AC_LIBSOURCES([strftime.c, strftime.h])
  AC_LIBOBJ([strftime])
 
  # This defines (or not) HAVE_TZNAME and HAVE_TM_ZONE.

--- a/m4/strndup.m4
+++ b/m4/strndup.m4
@@ -1,4 +1,4 @@
-# strndup.m4 serial 7
+# strndup.m4 serial 8
 dnl Copyright (C) 2002-2003, 2005-2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,8 +6,6 @@
 
 AC_DEFUN([gl_FUNC_STRNDUP],
 [
-  AC_LIBSOURCES([strndup.c, strndup.h])
-
   dnl Persuade glibc <string.h> to declare strndup().
   AC_REQUIRE([AC_GNU_SOURCE])
 

--- a/m4/strnlen.m4
+++ b/m4/strnlen.m4
@@ -1,13 +1,11 @@
-# strnlen.m4 serial 5
-dnl Copyright (C) 2002-2003, 2005 Free Software Foundation, Inc.
+# strnlen.m4 serial 6
+dnl Copyright (C) 2002-2003, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_STRNLEN],
 [
-  AC_LIBSOURCES([strnlen.c, strnlen.h])
-
   dnl Persuade glibc <string.h> to declare strnlen().
   AC_REQUIRE([AC_GNU_SOURCE])
 

--- a/m4/strverscmp.m4
+++ b/m4/strverscmp.m4
@@ -1,13 +1,11 @@
-# strverscmp.m4 serial 3
-dnl Copyright (C) 2002, 2005 Free Software Foundation, Inc.
+# strverscmp.m4 serial 4
+dnl Copyright (C) 2002, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_STRVERSCMP],
 [
-  AC_LIBSOURCES([strverscmp.c, strverscmp.h])
-
   dnl Persuade glibc <string.h> to declare strverscmp().
   AC_REQUIRE([AC_GNU_SOURCE])
 

--- a/m4/time_r.m4
+++ b/m4/time_r.m4
@@ -9,7 +9,6 @@
 
 AC_DEFUN([gl_TIME_R],
 [
-  AC_LIBSOURCES([time_r.c, time_r.h])
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
   AC_REQUIRE([AC_C_RESTRICT])
 

--- a/m4/timespec.m4
+++ b/m4/timespec.m4
@@ -11,8 +11,6 @@
 
 AC_DEFUN([gl_TIMESPEC],
 [
-  AC_LIBSOURCES([timespec.h])
-
   dnl Prerequisites of lib/timespec.h.
   AC_REQUIRE([AC_C_INLINE])
   AC_REQUIRE([AC_HEADER_TIME])

--- a/m4/unistd-safer.m4
+++ b/m4/unistd-safer.m4
@@ -7,7 +7,6 @@
 AC_DEFUN([gl_UNISTD_SAFER],
 [
   AC_CHECK_FUNCS_ONCE([pipe])
-  AC_LIBSOURCES([dup-safer.c, fd-safer.c, pipe-safer.c, unistd-safer.h, unistd--.h])
   AC_LIBOBJ([dup-safer])
   AC_LIBOBJ([fd-safer])
   AC_LIBOBJ([pipe-safer])

--- a/m4/unlinkdir.m4
+++ b/m4/unlinkdir.m4
@@ -1,6 +1,6 @@
-#serial 3
+#serial 4
 
-# Copyright (C) 2005 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -13,7 +13,6 @@
   AC_REQUIRE([AC_CANONICAL_HOST])
   AC_CHECK_HEADERS_ONCE(priv.h)
 
-  AC_LIBSOURCES([unlinkdir.c, unlinkdir.h])
   AC_LIBOBJ([unlinkdir])
 
   # The Hurd, the Linux kernel, the FreeBSD kernel version 2.2 and later,

--- a/m4/unlocked-io.m4
+++ b/m4/unlocked-io.m4
@@ -1,4 +1,4 @@
-# unlocked-io.m4 serial 13
+# unlocked-io.m4 serial 14
 
 # Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 # Free Software Foundation, Inc.
@@ -17,8 +17,6 @@
 
 AC_DEFUN([gl_FUNC_GLIBC_UNLOCKED_IO],
 [
-  AC_LIBSOURCES([unlocked-io.h])
-
   AC_DEFINE([USE_UNLOCKED_IO], 1,
     [Define to 1 if you want getc etc. to use unlocked I/O if available.
      Unlocked I/O can improve performance in unithreaded apps,

--- a/m4/userspec.m4
+++ b/m4/userspec.m4
@@ -1,12 +1,11 @@
-#serial 8
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#serial 9
+dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_USERSPEC],
 [
-  AC_LIBSOURCES([userspec.c, userspec.h, intprops.h])
   AC_LIBOBJ([userspec])
 
   dnl Prerequisites of lib/userspec.c.

--- a/m4/utimecmp.m4
+++ b/m4/utimecmp.m4
@@ -1,12 +1,11 @@
-#serial 1
-dnl Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+#serial 2
+dnl Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_UTIMECMP],
 [
-  AC_LIBSOURCES([utimecmp.c, utimecmp.h, intprops.h])
   AC_LIBOBJ([utimecmp])
 
   dnl Prerequisites of lib/utimecmp.c.

--- a/m4/utimens.m4
+++ b/m4/utimens.m4
@@ -1,11 +1,10 @@
-dnl Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_UTIMENS],
 [
-  AC_LIBSOURCES([utimens.c, utimens.h])
   AC_LIBOBJ([utimens])
 
   dnl Prerequisites of lib/utimens.c.

--- a/m4/xalloc.m4
+++ b/m4/xalloc.m4
@@ -1,12 +1,11 @@
-# xalloc.m4 serial 12
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# xalloc.m4 serial 13
+dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_XALLOC],
 [
-  AC_LIBSOURCES([xmalloc.c, xalloc.h])
   AC_LIBOBJ([xmalloc])
 
   gl_PREREQ_XALLOC

--- a/m4/xgetcwd.m4
+++ b/m4/xgetcwd.m4
@@ -1,12 +1,11 @@
-#serial 5
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#serial 6
+dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_XGETCWD],
 [
-  AC_LIBSOURCES([xgetcwd.c, xgetcwd.h])
   AC_LIBOBJ([xgetcwd])
 
   AC_REQUIRE([gl_FUNC_GETCWD])

--- a/m4/xnanosleep.m4
+++ b/m4/xnanosleep.m4
@@ -1,5 +1,5 @@
-#serial 3
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+#serial 4
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -8,6 +8,5 @@
 
 AC_DEFUN([gl_XNANOSLEEP],
 [
-  AC_LIBSOURCES([xnanosleep.c, xnanosleep.h, intprops.h])
   AC_LIBOBJ([xnanosleep])
 ])

--- a/m4/xreadlink.m4
+++ b/m4/xreadlink.m4
@@ -1,12 +1,11 @@
-#serial 7
-dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+#serial 8
+dnl Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_XREADLINK],
 [
-  AC_LIBSOURCES([xreadlink.c, xreadlink.h])
   AC_LIBOBJ([xreadlink])
 
   dnl Prerequisites of lib/xreadlink.c.

--- a/m4/xstrtod.m4
+++ b/m4/xstrtod.m4
@@ -1,4 +1,4 @@
-#serial 5
+#serial 6
 dnl Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -7,13 +7,11 @@
 # Prerequisites of lib/xstrtod.c.
 AC_DEFUN([gl_XSTRTOD],
 [
-  AC_LIBSOURCES([xstrtod.c, xstrtod.h])
   AC_LIBOBJ([xstrtod])
 ])
 
 # Prerequisites of lib/xstrtold.c.
 AC_DEFUN([gl_XSTRTOLD],
 [
-  AC_LIBSOURCES([xstrtold.c, xstrtod.c, xstrtod.h])
   AC_LIBOBJ([xstrtold])
 ])

--- a/m4/yesno.m4
+++ b/m4/yesno.m4
@@ -1,12 +1,11 @@
-# yesno.m4 serial 4
-dnl Copyright (C) 2002-2003, 2005 Free Software Foundation, Inc.
+# yesno.m4 serial 5
+dnl Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_YESNO],
 [
-  AC_LIBSOURCES([yesno.c, yesno.h])
   AC_LIBOBJ([yesno])
 
   dnl No prerequisites of lib/yesno.c.

--- a/modules/acl
+++ b/modules/acl
@@ -14,6 +14,7 @@
 AC_FUNC_ACL
 
 Makefile.am:
+EXTRA_DIST += acl.h
 
 Include:
 "acl.h"

--- a/modules/argmatch
+++ b/modules/argmatch
@@ -4,6 +4,7 @@
 Files:
 lib/argmatch.h
 lib/argmatch.c
+m4/argmatch.m4
 
 Depends-on:
 gettext-h
@@ -16,9 +17,10 @@
 stdbool
 
 configure.ac:
+gl_ARGMATCH
 
 Makefile.am:
-lib_SOURCES += argmatch.h argmatch.c
+EXTRA_DIST += argmatch.h
 
 Include:
 "argmatch.h"

--- a/modules/backupfile
+++ b/modules/backupfile
@@ -18,6 +18,7 @@
 gl_BACKUPFILE
 
 Makefile.am:
+EXTRA_DIST += backupfile.h
 
 Include:
 "backupfile.h"

--- a/modules/c-strtod
+++ b/modules/c-strtod
@@ -14,6 +14,7 @@
 gl_C_STRTOD
 
 Makefile.am:
+EXTRA_DIST += c-strtod.h
 
 Include:
 "c-strtod.h"

--- a/modules/c-strtold
+++ b/modules/c-strtold
@@ -15,6 +15,7 @@
 gl_C_STRTOLD
 
 Makefile.am:
+EXTRA_DIST += c-strtod.c c-strtod.h
 
 Include:
 "c-strtod.h"

--- a/modules/canon-host
+++ b/modules/canon-host
@@ -15,6 +15,7 @@
 gl_CANON_HOST
 
 Makefile.am:
+EXTRA_DIST += canon-host.h
 
 Include:
 #include "canon-host.h"

--- a/modules/canonicalize
+++ b/modules/canonicalize
@@ -19,6 +19,7 @@
 AC_FUNC_CANONICALIZE_FILE_NAME
 
 Makefile.am:
+EXTRA_DIST += canonicalize.h
 
 Include:
 "canonicalize.h"

--- a/modules/chdir-long
+++ b/modules/chdir-long
@@ -16,6 +16,7 @@
 gl_FUNC_CHDIR_LONG
 
 Makefile.am:
+EXTRA_DIST += chdir-long.h
 
 Include:
 "chdir-long.h"

--- a/modules/chdir-safer
+++ b/modules/chdir-safer
@@ -14,6 +14,7 @@
 gl_CHDIR_SAFER
 
 Makefile.am:
+EXTRA_DIST += chdir-safer.h
 
 Include:
 "chdir-safer.h"

--- a/modules/cloexec
+++ b/modules/cloexec
@@ -13,6 +13,7 @@
 gl_CLOEXEC
 
 Makefile.am:
+EXTRA_DIST += cloexec.h
 
 Include:
 "cloexec.h"

--- a/modules/close-stream
+++ b/modules/close-stream
@@ -14,6 +14,7 @@
 gl_CLOSE_STREAM
 
 Makefile.am:
+EXTRA_DIST += close-stream.h
 
 Include:
 "close-stream.h"

--- a/modules/closeout
+++ b/modules/closeout
@@ -17,6 +17,7 @@
 gl_CLOSEOUT
 
 Makefile.am:
+EXTRA_DIST += closeout.h
 
 Include:
 "closeout.h"

--- a/modules/cycle-check
+++ b/modules/cycle-check
@@ -16,7 +16,7 @@
 gl_CYCLE_CHECK
 
 Makefile.am:
-lib_SOURCES += cycle-check.h
+EXTRA_DIST += cycle-check.h
 
 Include:
 "cycle-check.h"

--- a/modules/dev-ino
+++ b/modules/dev-ino
@@ -3,14 +3,13 @@
 
 Files:
 lib/dev-ino.h
-m4/dev-ino.m4
 
 Depends-on:
 
 configure.ac:
-gl_STRUCT_DEV_INO
 
 Makefile.am:
+EXTRA_DIST += dev-ino.h
 
 Include:
 "dev-ino.h"

--- a/modules/dirfd
+++ b/modules/dirfd
@@ -12,6 +12,7 @@
 gl_FUNC_DIRFD
 
 Makefile.am:
+EXTRA_DIST += dirfd.h
 
 Include:
 "dirfd.h"

--- a/modules/dirname
+++ b/modules/dirname
@@ -19,7 +19,7 @@
 gl_DIRNAME
 
 Makefile.am:
-lib_SOURCES += basename.c stripslash.c
+EXTRA_DIST += dirname.h
 
 Include:
 "dirname.h"

--- a/modules/exclude
+++ b/modules/exclude
@@ -17,6 +17,7 @@
 gl_EXCLUDE
 
 Makefile.am:
+EXTRA_DIST += exclude.h
 
 Include:
 "exclude.h"

--- a/modules/exitfail
+++ b/modules/exitfail
@@ -13,6 +13,7 @@
 gl_EXITFAIL
 
 Makefile.am:
+EXTRA_DIST += exitfail.h
 
 Include:
 "exitfail.h"

--- a/modules/fcntl-safer
+++ b/modules/fcntl-safer
@@ -15,6 +15,7 @@
 gl_FCNTL_SAFER
 
 Makefile.am:
+EXTRA_DIST += fcntl-safer.h fcntl--.h
 
 Include:
 "fcntl-safer.h"

--- a/modules/file-type
+++ b/modules/file-type
@@ -14,6 +14,7 @@
 gl_FILE_TYPE
 
 Makefile.am:
+EXTRA_DIST += file-type.h
 
 Include:
 "file-type.h"

--- a/modules/filemode
+++ b/modules/filemode
@@ -15,6 +15,7 @@
 gl_FILEMODE
 
 Makefile.am:
+EXTRA_DIST += filemode.h
 
 Include:
 "filemode.h"

--- a/modules/filenamecat
+++ b/modules/filenamecat
@@ -15,6 +15,7 @@
 gl_FILE_NAME_CONCAT
 
 Makefile.am:
+EXTRA_DIST += filenamecat.h
 
 Include:
 "filenamecat.h"

--- a/modules/fopen-safer
+++ b/modules/fopen-safer
@@ -14,6 +14,7 @@
 gl_FOPEN_SAFER
 
 Makefile.am:
+EXTRA_DIST += stdio-safer.h stdio--.h
 
 Include:
 "stdio-safer.h"

--- a/modules/fpending
+++ b/modules/fpending
@@ -12,6 +12,7 @@
 gl_FUNC_FPENDING
 
 Makefile.am:
+EXTRA_DIST += __fpending.h
 
 Include:
 "__fpending.h"

--- a/modules/fprintftime
+++ b/modules/fprintftime
@@ -13,6 +13,7 @@
 gl_FPRINTFTIME
 
 Makefile.am:
+EXTRA_DIST += fprintftime.h
 
 Include:
 "fprintftime.h"

--- a/modules/fsusage
+++ b/modules/fsusage
@@ -15,7 +15,7 @@
 gl_FSUSAGE
 
 Makefile.am:
-lib_SOURCES += fsusage.h
+EXTRA_DIST += fsusage.h
 
 Include:
 "fsusage.h"

--- a/modules/fts
+++ b/modules/fts
@@ -21,6 +21,7 @@
 gl_FUNC_FTS
 
 Makefile.am:
+EXTRA_DIST += fts_.h fts-cycle.c
 
 Include:
 "fts_.h"

--- a/modules/getcwd
+++ b/modules/getcwd
@@ -18,6 +18,7 @@
 gl_FUNC_GETCWD
 
 Makefile.am:
+EXTRA_DIST += getcwd.h
 
 Include:
 "getcwd.h"

--- a/modules/getdate
+++ b/modules/getdate
@@ -21,9 +21,10 @@
 gl_GETDATE
 
 Makefile.am:
+lib_SOURCES += getdate.y
 BUILT_SOURCES += getdate.c
 MAINTAINERCLEANFILES += getdate.c
-EXTRA_DIST += getdate.c
+EXTRA_DIST += getdate.c getdate.h
 
 Include:
 "getdate.h"

--- a/modules/gethrxtime
+++ b/modules/gethrxtime
@@ -17,6 +17,7 @@
 gl_GETHRXTIME
 
 Makefile.am:
+EXTRA_DIST += gethrxtime.h xtime.h
 
 Include:
 #include "xtime.h"

--- a/modules/getpagesize
+++ b/modules/getpagesize
@@ -11,6 +11,7 @@
 gl_GETPAGESIZE
 
 Makefile.am:
+EXTRA_DIST += getpagesize.h
 
 Include:
 "getpagesize.h"

--- a/modules/getpass
+++ b/modules/getpass
@@ -14,6 +14,7 @@
 gl_FUNC_GETPASS
 
 Makefile.am:
+EXTRA_DIST += getpass.h
 
 Include:
 "getpass.h"

--- a/modules/glob
+++ b/modules/glob
@@ -25,6 +25,7 @@
 
 Makefile.am:
 BUILT_SOURCES += $(GLOB_H)
+EXTRA_DIST += glob_.h glob-libc.h
 
 # We need the following in order to create <glob.h> when the system
 # doesn't have one that works with the given compiler.

--- a/modules/group-member
+++ b/modules/group-member
@@ -14,6 +14,7 @@
 gl_FUNC_GROUP_MEMBER
 
 Makefile.am:
+EXTRA_DIST += group-member.h
 
 Include:
 "group-member.h"

--- a/modules/hard-locale
+++ b/modules/hard-locale
@@ -14,6 +14,7 @@
 gl_HARD_LOCALE
 
 Makefile.am:
+EXTRA_DIST += hard-locale.h
 
 Include:
 "hard-locale.h"

--- a/modules/hash
+++ b/modules/hash
@@ -14,6 +14,7 @@
 gl_HASH
 
 Makefile.am:
+EXTRA_DIST += hash.h
 
 Include:
 "hash.h"

--- a/modules/human
+++ b/modules/human
@@ -20,7 +20,7 @@
 gl_HUMAN
 
 Makefile.am:
-lib_SOURCES += human.h
+EXTRA_DIST += human.h
 
 Include:
 "human.h"

--- a/modules/inttypes
+++ b/modules/inttypes
@@ -15,6 +15,7 @@
 gl_INTTYPES_H
 
 Makefile.am:
+EXTRA_DIST += inttypes.h
 
 Include:
 #include <inttypes.h>

--- a/modules/lchmod
+++ b/modules/lchmod
@@ -11,6 +11,7 @@
 gl_FUNC_LCHMOD
 
 Makefile.am:
+EXTRA_DIST += lchmod.h
 
 Include:
 "lchown.h"

--- a/modules/lchown
+++ b/modules/lchown
@@ -14,6 +14,7 @@
 gl_FUNC_LCHOWN
 
 Makefile.am:
+EXTRA_DIST += lchown.h
 
 Include:
 "lchown.h"

--- a/modules/long-options
+++ b/modules/long-options
@@ -13,6 +13,7 @@
 gl_LONG_OPTIONS
 
 Makefile.am:
+EXTRA_DIST += long-options.h
 
 Include:
 "long-options.h"

--- a/modules/lstat
+++ b/modules/lstat
@@ -13,6 +13,7 @@
 gl_FUNC_LSTAT
 
 Makefile.am:
+EXTRA_DIST += lstat.h
 
 Include:
 "lstat.h"

--- a/modules/md5
+++ b/modules/md5
@@ -13,6 +13,7 @@
 gl_MD5
 
 Makefile.am:
+lib_SOURCES += md5.h
 
 Include:
 "md5.h"

--- a/modules/memcasecmp
+++ b/modules/memcasecmp
@@ -12,6 +12,7 @@
 gl_MEMCASECMP
 
 Makefile.am:
+EXTRA_DIST += memcasecmp.h
 
 Include:
 "memcasecmp.h"

--- a/modules/memcoll
+++ b/modules/memcoll
@@ -12,6 +12,7 @@
 gl_MEMCOLL
 
 Makefile.am:
+EXTRA_DIST += memcoll.h
 
 Include:
 "memcoll.h"

--- a/modules/mempcpy
+++ b/modules/mempcpy
@@ -12,6 +12,7 @@
 gl_FUNC_MEMPCPY
 
 Makefile.am:
+EXTRA_DIST += mempcpy.h
 
 Include:
 "mempcpy.h"

--- a/modules/memrchr
+++ b/modules/memrchr
@@ -12,6 +12,7 @@
 gl_FUNC_MEMRCHR
 
 Makefile.am:
+EXTRA_DIST += memrchr.h
 
 Include:
 "memrchr.h"

--- a/modules/memxor
+++ b/modules/memxor
@@ -12,6 +12,7 @@
 gl_MEMXOR
 
 Makefile.am:
+EXTRA_DIST += memxor.h
 
 Include:
 "memxor.h"

--- a/modules/mkancesdirs
+++ b/modules/mkancesdirs
@@ -14,6 +14,7 @@
 gl_MKANCESDIRS
 
 Makefile.am:
+EXTRA_DIST += mkancesdirs.h
 
 Include:
 "mkancesdirs.h"

--- a/modules/mkdir-p
+++ b/modules/mkdir-p
@@ -22,6 +22,7 @@
 gl_MKDIR_PARENTS
 
 Makefile.am:
+lib+SOURCES += dirchownmod.h mkdir-p.h
 
 Include:
 "mkdir-p.h"

--- a/modules/modechange
+++ b/modules/modechange
@@ -15,6 +15,7 @@
 gl_MODECHANGE
 
 Makefile.am:
+EXTRA_DIST += modechange.h
 
 Include:
 "modechange.h"

--- a/modules/mountlist
+++ b/modules/mountlist
@@ -16,6 +16,7 @@
 gl_MOUNTLIST
 
 Makefile.am:
+EXTRA_DIST += mountlist.h
 
 Include:
 "mountlist.h"

--- a/modules/openat
+++ b/modules/openat
@@ -23,6 +23,7 @@
 gl_FUNC_OPENAT
 
 Makefile.am:
+EXTRA_DIST += at-func.c openat.h openat-priv.h
 
 Include:
 "openat.h"

--- a/modules/pathmax
+++ b/modules/pathmax
@@ -11,6 +11,7 @@
 gl_PATHMAX
 
 Makefile.am:
+EXTRA_DIST += pathmax.h
 
 Include:
 "pathmax.h"

--- a/modules/physmem
+++ b/modules/physmem
@@ -12,6 +12,7 @@
 gl_PHYSMEM
 
 Makefile.am:
+EXTRA_DIST += physmem.h
 
 Include:
 "physmem.h"

--- a/modules/posixtm
+++ b/modules/posixtm
@@ -14,6 +14,7 @@
 gl_POSIXTM
 
 Makefile.am:
+EXTRA_DIST += posixtm.h
 
 Include:
 "posixtm.h"

--- a/modules/posixver
+++ b/modules/posixver
@@ -13,6 +13,7 @@
 gl_POSIXVER
 
 Makefile.am:
+EXTRA_DIST += posixver.h
 
 Include:
 "posixver.h"

--- a/modules/quote
+++ b/modules/quote
@@ -13,6 +13,7 @@
 gl_QUOTE
 
 Makefile.am:
+EXTRA_DIST += quote.h
 
 Include:
 "quote.h"

--- a/modules/quotearg
+++ b/modules/quotearg
@@ -17,6 +17,7 @@
 gl_QUOTEARG
 
 Makefile.am:
+EXTRA_DIST += quotearg.h
 
 Include:
 "quotearg.h"

--- a/modules/readtokens
+++ b/modules/readtokens
@@ -14,6 +14,7 @@
 gl_READTOKENS
 
 Makefile.am:
+EXTRA_DIST += readtokens.h
 
 Include:
 "readtokens.h"

--- a/modules/readutmp
+++ b/modules/readutmp
@@ -15,6 +15,7 @@
 gl_READUTMP
 
 Makefile.am:
+EXTRA_DIST += readutmp.h
 
 Include:
 "readutmp.h"

--- a/modules/regex
+++ b/modules/regex
@@ -24,6 +24,7 @@
 gl_REGEX
 
 Makefile.am:
+EXTRA_DIST += regcomp.c regex.h regex_internal.c regex_internal.h regexec.c
 
 Include:
 "regex.h"

--- a/modules/safe-read
+++ b/modules/safe-read
@@ -13,6 +13,7 @@
 gl_SAFE_READ
 
 Makefile.am:
+EXTRA_DIST += safe-read.h
 
 Include:
 "safe-read.h"

--- a/modules/safe-write
+++ b/modules/safe-write
@@ -13,6 +13,7 @@
 gl_SAFE_WRITE
 
 Makefile.am:
+EXTRA_DIST += safe-write.h
 
 Include:
 "safe-write.h"

--- a/modules/same
+++ b/modules/same
@@ -18,6 +18,7 @@
 gl_SAME
 
 Makefile.am:
+EXTRA_DIST += same.h
 
 Include:
 "same.h"

--- a/modules/same-inode
+++ b/modules/same-inode
@@ -3,14 +3,13 @@
 
 Files:
 lib/same-inode.h
-m4/same-inode.m4
 
 Depends-on:
 
 configure.ac:
-gl_SAME_INODE
 
 Makefile.am:
+EXTRA_DIST += same-inode.h
 
 Include:
 "same-inode.h"

--- a/modules/save-cwd
+++ b/modules/save-cwd
@@ -16,6 +16,7 @@
 gl_SAVE_CWD
 
 Makefile.am:
+EXTRA_DIST += save-cwd.h
 
 Include:
 "save-cwd.h"

--- a/modules/savedir
+++ b/modules/savedir
@@ -14,6 +14,7 @@
 gl_SAVEDIR
 
 Makefile.am:
+EXTRA_DIST += savedir.h
 
 Include:
 "savedir.h"

--- a/modules/sha1
+++ b/modules/sha1
@@ -13,6 +13,7 @@
 gl_SHA1
 
 Makefile.am:
+EXTRA_DIST += sha1.h
 
 Include:
 "sha1.h"

--- a/modules/sig2str
+++ b/modules/sig2str
@@ -13,6 +13,7 @@
 gl_FUNC_SIG2STR
 
 Makefile.am:
+EXTRA_DIST += sig2str.h
 
 Include:
 "sig2str.h"

--- a/modules/stat-macros
+++ b/modules/stat-macros
@@ -11,6 +11,7 @@
 gl_STAT_MACROS
 
 Makefile.am:
+EXTRA_DIST += stat-macros.h
 
 Include:
 "stat-macros.h"

--- a/modules/stat-time
+++ b/modules/stat-time
@@ -12,6 +12,7 @@
 gl_STAT_TIME
 
 Makefile.am:
+EXTRA_DIST += stat-time.h
 
 Include:
 "stat-time.h"

--- a/modules/stdlib-safer
+++ b/modules/stdlib-safer
@@ -15,6 +15,7 @@
 gl_STDLIB_SAFER
 
 Makefile.am:
+EXTRA_DIST += stdlib-safer.h stdlib--.h
 
 Include:
 "stdlib-safer.h"

--- a/modules/strdup
+++ b/modules/strdup
@@ -12,6 +12,7 @@
 gl_FUNC_STRDUP
 
 Makefile.am:
+EXTRA_DIST += strdup.h
 
 Include:
 "strdup.h"

--- a/modules/strftime
+++ b/modules/strftime
@@ -16,6 +16,7 @@
 gl_FUNC_GNU_STRFTIME
 
 Makefile.am:
+EXTRA_DIST += strftime.h
 
 Include:
 "strftime.h"

--- a/modules/strndup
+++ b/modules/strndup
@@ -13,6 +13,7 @@
 gl_FUNC_STRNDUP
 
 Makefile.am:
+EXTRA_DIST += strndup.h
 
 Include:
 "strndup.h"

--- a/modules/strnlen
+++ b/modules/strnlen
@@ -12,6 +12,7 @@
 gl_FUNC_STRNLEN
 
 Makefile.am:
+EXTRA_DIST += strnlen.h
 
 Include:
 "strnlen.h"

--- a/modules/strverscmp
+++ b/modules/strverscmp
@@ -12,6 +12,7 @@
 gl_FUNC_STRVERSCMP
 
 Makefile.am:
+EXTRA_DIST += strverscmp.h
 
 Include:
 "strverscmp.h"

--- a/modules/time_r
+++ b/modules/time_r
@@ -13,6 +13,7 @@
 gl_TIME_R
 
 Makefile.am:
+EXTRA_DIST += time_r.h
 
 Include:
 "time_r.h"

--- a/modules/timespec
+++ b/modules/timespec
@@ -12,6 +12,7 @@
 gl_TIMESPEC
 
 Makefile.am:
+EXTRA_DIST += timespec.h
 
 Include:
 "timespec.h"

--- a/modules/tmpfile-safer
+++ b/modules/tmpfile-safer
@@ -15,6 +15,7 @@
 gl_TMPFILE_SAFER
 
 Makefile.am:
+EXTRA_DIST += stdio-safer.h stdio--.h
 
 Include:
 "stdio-safer.h"

--- a/modules/unistd-safer
+++ b/modules/unistd-safer
@@ -15,6 +15,7 @@
 gl_UNISTD_SAFER
 
 Makefile.am:
+EXTRA_DIST += unistd-safer.h unistd--.h
 
 Include:
 "unistd-safer.h"

--- a/modules/unlinkdir
+++ b/modules/unlinkdir
@@ -13,6 +13,7 @@
 gl_UNLINKDIR
 
 Makefile.am:
+EXTRA_DIST += unlinkdir.h
 
 Include:
 "unlinkdir.h"

--- a/modules/unlocked-io
+++ b/modules/unlocked-io
@@ -12,6 +12,7 @@
 gl_FUNC_GLIBC_UNLOCKED_IO
 
 Makefile.am:
+EXTRA_DIST += unlocked-io.h
 
 Include:
 "unlocked-io.h"

--- a/modules/userspec
+++ b/modules/userspec
@@ -20,6 +20,7 @@
 gl_USERSPEC
 
 Makefile.am:
+EXTRA_DIST += userspec.h
 
 Include:
 "userspec.h"

--- a/modules/utimecmp
+++ b/modules/utimecmp
@@ -21,6 +21,7 @@
 gl_UTIMECMP
 
 Makefile.am:
+EXTRA_DIST += utimecmp.h
 
 Include:
 "utimecmp.h"

--- a/modules/utimens
+++ b/modules/utimens
@@ -15,6 +15,7 @@
 gl_UTIMENS
 
 Makefile.am:
+EXTRA_DIST += utimens.h
 
 Include:
 "utimens.h"

--- a/modules/xalloc
+++ b/modules/xalloc
@@ -13,6 +13,7 @@
 gl_XALLOC
 
 Makefile.am:
+EXTRA_DIST += xalloc.h
 
 Include:
 "xalloc.h"

--- a/modules/xgetcwd
+++ b/modules/xgetcwd
@@ -15,6 +15,7 @@
 gl_XGETCWD
 
 Makefile.am:
+EXTRA_DIST += xgetcwd.h
 
 Include:
 "xgetcwd.h"

--- a/modules/xnanosleep
+++ b/modules/xnanosleep
@@ -16,6 +16,7 @@
 gl_XNANOSLEEP
 
 Makefile.am:
+EXTRA_DIST += xnanosleep.h
 
 Include:
 "xnanosleep.h"

--- a/modules/xreadlink
+++ b/modules/xreadlink
@@ -15,6 +15,7 @@
 gl_XREADLINK
 
 Makefile.am:
+EXTRA_DIST += xreadlink.h
 
 Include:
 "xreadlink.h"

--- a/modules/xstrtod
+++ b/modules/xstrtod
@@ -13,6 +13,7 @@
 gl_XSTRTOD
 
 Makefile.am:
+EXTRA_DIST += xstrtod.h
 
 Include:
 "xstrtod.h"

--- a/modules/xstrtol
+++ b/modules/xstrtol
@@ -17,7 +17,7 @@
 gl_XSTRTOL
 
 Makefile.am:
-lib_SOURCES += xstrtol.h
+EXTRA_DIST += xstrtol.h
 
 Include:
 "xstrtol.h"

--- a/modules/xstrtold
+++ b/modules/xstrtold
@@ -14,6 +14,7 @@
 gl_XSTRTOLD
 
 Makefile.am:
+EXTRA_DIST += xstrtod.c xstrtod.h
 
 Include:
 "xstrtod.h"

--- a/modules/yesno
+++ b/modules/yesno
@@ -16,6 +16,7 @@
 gl_YESNO
 
 Makefile.am:
+EXTRA_DIST += yesno.h
 
 Include:
 "yesno.h"