[ChangeLog]

* Makefile.cfg: Remove cruft that's now handled via bootstrap.
* Makefile.maint: Likewise, remove these targets/rules/variables:
(local_updates, update, cvs-update, wget_files, get-targets): Remove.
(cvs_files, wget-update, automake_repo): Likewise.
Move the comment about cvsu to build-aux/vc-list-files,
where cvsu is actually used.
[build-aux/ChangeLog]
* vc-list-files: Add a comment about cvsu.

5 files changed, 9 insertions, 90 deletions

diff --git a/ChangeLog b/ChangeLog
index 82c94fab5..03c59d377 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2006-10-14  Jim Meyering  <jim@meyering.net>
 
+	* Makefile.cfg: Remove cruft that's now handled via bootstrap.
+	* Makefile.maint: Likewise, remove these targets/rules/variables:
+	(local_updates, update, cvs-update, wget_files, get-targets): Remove.
+	(cvs_files, wget-update, automake_repo): Likewise.
+	Move the comment about cvsu to build-aux/vc-list-files,
+	where cvsu is actually used.
+
 	* Makefile.maint (cvs-update): Use $(CVS), not "cvs".
 
 	Work also when the working directory (with e.g. coreutils sources)
diff --git a/Makefile.cfg b/Makefile.cfg
index 7a5a90457..0c43c21d4 100644
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -26,27 +26,6 @@ gnu_rel_host = $(gnu_ftp_host-$(RELEASE_TYPE))
 url_dir_list = \
   ftp://$(gnu_rel_host)/gnu/coreutils
 
-# Files to update automatically.
-wget_files = \
-  $(srcdir)/build-aux/config.guess \
-  $(srcdir)/build-aux/config.sub \
-  $(srcdir)/build-aux/texinfo.tex
-# Of the above, texinfo.tex is out of date,
-# and the other two are not available.
-wget_files =
-
-cvs_files = \
-  $(srcdir)/build-aux/elisp-comp \
-  $(srcdir)/build-aux/depcomp \
-  $(srcdir)/build-aux/mdate-sh \
-  $(srcdir)/build-aux/missing \
-  $(srcdir)/build-aux/install-sh \
-  $(srcdir)/build-aux/mkinstalldirs
-
-#  $(srcdir)/src/ansi2knr.c
-
-local_updates = wget-update cvs-update
-
 # The GnuPG ID of the key used to sign the tarballs.
 gpg_key_ID = D333CBA1
 
diff --git a/Makefile.maint b/Makefile.maint
index 692919208..8d12b9eee 100644
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -31,7 +31,6 @@ GZIP_ENV = '--no-name --best $(gzip_rsyncable)'
 
 CVS = cvs
 
-# cvsu is part of the cvsutils package: http://www.red-bean.com/cvsutils/
 CVS_LIST = build-aux/vc-list-files
 
 CVS_LIST_EXCEPT = \
@@ -522,74 +521,6 @@ www-gnu = http://www.gnu.org
 # Use mv, if you don't have/want move-if-change.
 move_if_change ?= move-if-change
 
-
-# --------------------- #
-# Updating everything.  #
-# --------------------- #
-
-.PHONY: update
-local_updates ?= wget-update cvs-update
-update: $(local_updates)
-
-
-# -------------------------- #
-# Updating GNU build tools.  #
-# -------------------------- #
-
-# The following pseudo table associates a local directory and a URL
-# with each of the files that belongs to some other package and is
-# regularly updated from the specified URL.
-wget_files ?= \
-  $(srcdir)/build-aux/config.guess \
-  $(srcdir)/build-aux/config.sub \
-  $(srcdir)/build-aux/texinfo.tex \
-  $(srcdir)/src/ansi2knr.c
-
-get-targets = $(patsubst %, get-%, $(wget_files))
-
-config.guess-url_prefix = $(ftp-gnu)/build-aux/
-config.sub-url_prefix = $(ftp-gnu)/build-aux/
-
-ansi2knr.c-url_prefix = ftp://ftp.cs.wisc.edu/ghost/
-
-texinfo.tex-url_prefix = $(ftp-gnu)/texinfo/
-
-standards.texi-url_prefix = $(www-gnu)/prep/
-make-stds.texi-url_prefix = $(standards.texi-url_prefix)
-
-target = $(patsubst get-%, %, $@)
-url = $($(notdir $(target))-url_prefix)$(notdir $(target))
-
-.PHONY: $(get-targets)
-$(get-targets):
-	$(WGET) $(WGETFLAGS) $(url) -O $(target).t \
-	  && $(move_if_change) $(target).t $(target)
-
-cvs_files ?= \
-  $(srcdir)/build-aux/depcomp \
-  $(srcdir)/build-aux/install-sh \
-  $(srcdir)/build-aux/missing \
-  $(srcdir)/build-aux/mkinstalldirs \
-  $(srcdir)/src/ansi2knr.c
-automake_repo=:pserver:anoncvs:anoncvs@sources.redhat.com:/cvs/automake
-.PHONY: wget-update
-wget-update: $(get-targets)
-
-.PHONY: cvs-update
-cvs-update:
-	fail=;								\
-	for f in $(cvs_files); do					\
-	  test -f $$f || { echo "*** skipping $$f" 1>&2; continue; };	\
-	  $(CVS) diff $$f > /dev/null					\
-	    || { echo "*** $$f is locally modified; skipping it" 1>&2;	\
-		 fail=yes; continue; };					\
-	  file=$$(basename $$f);					\
-	  echo checking out $$file...;					\
-	  $(CVS) -d $(automake_repo) co -p automake/lib/$$file> $$f.t	\
-	    && $(move_if_change) $$f.t $$f;				\
-	done;								\
-	test "$$fail" && exit 1
-
 emit_upload_commands:
 	@echo =====================================
 	@echo =====================================
diff --git a/build-aux/ChangeLog b/build-aux/ChangeLog
index 4bef6ae42..164624767 100644
--- a/build-aux/ChangeLog
+++ b/build-aux/ChangeLog
@@ -1,6 +1,7 @@
 2006-10-14  Jim Meyering  <jim@meyering.net>
 
 	* vc-list-files: Don't filter git-ls-files output through cut.
+	Add a comment about cvsu.
 
 2006-08-22  Paul Eggert  <eggert@cs.ucla.edu>
 
diff --git a/build-aux/vc-list-files b/build-aux/vc-list-files
index b873fbce5..992048751 100755
--- a/build-aux/vc-list-files
+++ b/build-aux/vc-list-files
@@ -26,6 +26,7 @@
 # with no trailing slashes.  In mercurial mode, it's used as part of a
 # "grep" pattern (prepend "^", append "/"), and in cvs mode, it's simply
 # used as an argument to the cvsu script.
+# cvsu is part of the cvsutils package: http://www.red-bean.com/cvsutils/
 
 include_prefix=
 case $# in