* Makefile.maint: Formatting changes.

(do-po-update, po-update, cvs-update, update): New targets.
(AMTAR): Remove.

diff --git a/ChangeLog b/ChangeLog
index 08511edacdeec237077c4ff3ccb1e3b25bc37c13..e6892b9c7c845fcb63376b060c129748651c414f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-27  Akim Demaille  <akim@epita.fr>
+
+       * Makefile.maint: Formatting changes.
+       (do-po-update, po-update, cvs-update, update): New targets.
+       (AMTAR): Remove.
+
 2001-08-27  Akim Demaille  <akim@epita.fr>
 
        * lib/autotest/general.m4 (AT_INIT) <at_cmd_line>: Remove.
@@ -26,7 +32,7 @@
        (--clean, -c): New option.
        * tests/Makefile.am: Use this option.
 
-       
+
 2001-08-27  Akim Demaille  <akim@epita.fr>
 
        * lib/autoconf/status.m4 (_AC_SRCPATHS): Rename `ac_dots' as
@@ -126,7 +132,7 @@
        * tests/Makefile.am (testsuite): Remove -I top_srcdir, unneeded.
        * tests/suite.at: Require 2.52c.
 
-       
+
 2001-08-27  Akim Demaille  <akim@epita.fr>
 
        testsuite.log should include config.log.

diff --git a/Makefile.am b/Makefile.am
index 8a271cdf414dff7b37e47a69ddfe2f4230c03786..2b97d7eee498d37a3ff742c20d3366a4dc2d404b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -67,6 +67,7 @@ maintainer-check-tests:
 ## ---------------------------- ##
 
 prev_version_file = $(srcdir)/config/prev-version.txt
+move_if_change = $(srcdir)/config/move-if-change
 release_archive_dir = releases
 
 # Uploading betas.

diff --git a/Makefile.in b/Makefile.in
index 9d5c1c60fbf683d13234ec3baaf72eda69858467..bb5b658838a7410f83ee078b9e799d8e9f29d85c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -82,6 +82,7 @@ pkgdata_DATA = INSTALL
 MAKEINFO = @MAKEINFO@ --no-headers --no-validate --no-split
 
 prev_version_file = $(srcdir)/config/prev-version.txt
+move_if_change = $(srcdir)/config/move-if-change
 release_archive_dir = releases
 
 # Uploading betas.

diff --git a/Makefile.maint b/Makefile.maint
index b3b289a6a6a6f75e94f38aecc043203351715a3b..d3a34e02e49d5b1e75927e80c0209b6c6b24747a 100644 (file)
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -22,9 +22,6 @@
 # Do not save the original name or timestamp in the .tar.gz file.
 GZIP_ENV = '--no-name --best'
 
-# Automake 1.4 does not define AMTAR.
-AMTAR ?= $(TAR)
-
 CVS = cvs
 
 prev_version_file ?= .prev-version
@@ -46,6 +43,91 @@ release_archive_dir ?= ../release
 
 
 
+## ---------------- ##
+## Updating files.  ##
+## ---------------- ##
+
+WGET = wget
+ftp-gnu = ftp://ftp.gnu.org/gnu
+
+# Use mv, if you don't have/want move-if-change.
+move_if_change ?= move-if-change
+
+# ------------------- #
+# Updating PO files.  #
+# ------------------- #
+
+po_repo = http://www.iro.umontreal.ca/contrib/po/maint/$(PACKAGE)
+.PHONY: do-po-update po-update
+do-po-update:
+       cd $(srcdir)/po && wget -r -l1 -nd --no-parent -A '*.po' $(po_repo)
+       rm $(srcdir)/po/index.html
+       cd po && $(MAKE) update-po
+       $(MAKE) po-check
+
+po-update:
+       if test -d "po"; then \
+         $(MAKE) do-po-update; \
+       fi
+
+# -------------------------- #
+# 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)/config.guess $(srcdir)/config.sub \
+              $(srcdir)/src/ansi2knr.c \
+             $(srcdir)/doc/texinfo.tex
+wget-targets = $(patsubst %, get-%, $(wget_files))
+
+config.guess-url_prefix = $(ftp-gnu)/config/
+config.sub-url_prefix = $(ftp-gnu)/config/
+
+ansi2knr.c-url_prefix = ftp://ftp.cs.wisc.edu/ghost/
+
+texinfo.tex-url_prefix = $(ftp-gnu)/texinfo/
+
+standards.texi-url_prefix = $(ftp-gnu)/GNUinfo/
+make-stds.texi-url_prefix = $(ftp-gnu)/GNUinfo/
+
+target = $(patsubst get-%, %, $@)
+url = $($(notdir $(target))-url_prefix)$(notdir $(target))
+
+.PHONY: $(wget-targets)
+$(wget-targets):
+       $(WGET) $(url) -O $(target).t \
+         && $(move_if_change) $(target).t $(target)
+
+.PHONY: wget-update
+wget-update: $(wget-targets)
+
+
+# Updating tools via CVS.
+cvs_files ?= depcomp missing
+cvs-targets = $(patsubst %, get-%, $(cvs_files))
+
+automake_repo = :pserver:anoncvs@anoncvs.cygnus.com:/cvs/automake
+.PHONY: $(cvs-targets)
+$(cvs-targets):
+       $(CVS) -d $(automake_repo) co -p automake/lib/$(notdir $(target)) \
+         >$(target).t \
+           && $(move_if_change) $(target).t $(target);
+
+.PHONY: cvs-update
+cvs-update: $(cvs-targets)
+
+
+# --------------------- #
+# Updating everything.  #
+# --------------------- #
+
+.PHONY: update
+update: wget-update cvs-update po-update
+
+
+
 ## --------------- ##
 ## Sanity checks.  ##
 ## --------------- ##
@@ -119,6 +201,12 @@ maintainer-distcheck: changelog-check
        $(MAKE) my-distcheck
 
 
+
+## -------------- ##
+## Making dists.  ##
+## -------------- ##
+
+
 # Tag before making distribution.  Also, don't make a distribution if
 # checks fail.  Also, make sure the NEWS file is up-to-date.
 # FIXME: use dist-hook/my-dist like distcheck-hook/my-distcheck.
@@ -230,48 +318,6 @@ announcement: NEWS ChangeLog $(rel-files)
              -e 'print "\n"."*"x70 ."\n"; s///; print; print "*"x70 ."\n"'; \
        )
 
-WGET = wget
-ftp-gnu = ftp://ftp.gnu.org/gnu
-
-# Use mv, if you don't have/want move-if-change.
-move_if_change ?= move-if-change
-
-# 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)/config.guess $(srcdir)/config.sub \
-              $(srcdir)/src/ansi2knr.c \
-             $(srcdir)/doc/texinfo.tex
-get-targets = $(patsubst %, get-%, $(wget_files))
-
-config.guess-url_prefix = $(ftp-gnu)/config/
-config.sub-url_prefix = $(ftp-gnu)/config/
-
-ansi2knr.c-url_prefix = ftp://ftp.cs.wisc.edu/ghost/
-
-texinfo.tex-url_prefix = $(ftp-gnu)/texinfo/
-
-standards.texi-url_prefix = $(ftp-gnu)/GNUinfo/
-make-stds.texi-url_prefix = $(ftp-gnu)/GNUinfo/
-
-target = $(patsubst get-%, %, $@)
-url = $($(notdir $(target))-url_prefix)$(notdir $(target))
-
-.PHONY: $(get-targets)
-$(get-targets):
-       $(WGET) $(url) -O $(target).t \
-         && $(move_if_change) $(target).t $(target)
-
-automake_repo=:pserver:anoncvs@anoncvs.cygnus.com:/cvs/automake
-.PHONY: wget-update
-wget-update: $(get-targets)
-       for f in depcomp missing; do                                    \
-         test -f $$f || continue;                                      \
-         echo checking out $$f...;                                     \
-         $(CVS) -d $(automake_repo) co -p automake/lib/$$f > $$f.t     \
-           && $(move_if_change) $$f.t $$f;                             \
-       done
-
 define emit-rsync-commands
        echo =====================================
        echo =====================================