bug-coreutils
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Makefile.maint: spring cleaning


From: Jim Meyering
Subject: Makefile.maint: spring cleaning
Date: Sat, 14 Oct 2006 11:52:57 +0200

FYI, I've removed some obsolete rules from Makefile.maint:

[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.

Index: Makefile.cfg
===================================================================
RCS file: /fetish/cu/Makefile.cfg,v
retrieving revision 1.27
diff -u -r1.27 Makefile.cfg
--- Makefile.cfg        18 Jun 2006 22:06:42 -0000      1.27
+++ Makefile.cfg        14 Oct 2006 09:46:21 -0000
@@ -26,27 +26,6 @@
 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

Index: Makefile.maint
===================================================================
RCS file: /fetish/cu/Makefile.maint,v
retrieving revision 1.254
diff -u -r1.254 Makefile.maint
--- Makefile.maint      14 Oct 2006 09:39:34 -0000      1.254
+++ Makefile.maint      14 Oct 2006 09:47:39 -0000
@@ -31,7 +31,6 @@

 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 @@
 # 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:address@hidden:/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 =====================================
Index: build-aux/vc-list-files
===================================================================
RCS file: /fetish/cu/build-aux/vc-list-files,v
retrieving revision 1.5
diff -u -r1.5 vc-list-files
--- build-aux/vc-list-files     14 Oct 2006 09:31:27 -0000      1.5
+++ build-aux/vc-list-files     14 Oct 2006 09:47:52 -0000
@@ -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




reply via email to

[Prev in Thread] Current Thread [Next in Thread]