maint.mk: remove more coreutils-specific targets; XZ_OPT=-9ev

* top/maint.mk (cvs-check): Remove target; it was just an alias
to the better-named vc-diff-check.
(maintainer-distcheck): Remove rule.  It was used only from
the (alpha/beta/major) target, and all of its commands but one
were coreutils-specific.
(vc-dist): Remove rule.
(alpha beta major): Run "$(MAKE) distcheck" explicitly.
Run vc-diff-check, not vc-dist.
Run $(MAKE) dist with XZ_OPT=-9ev.  Note spelling, with "-".

diff --git a/ChangeLog b/ChangeLog
index 0a1297d36a45835fe4f2f7eb7225f0f3dc58ce9d..50ac840389f3c8d0b8f3c5b0dc7adb187e8e5557 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2009-08-29  Jim Meyering  <meyering@redhat.com>
+
+       maint.mk: remove more coreutils-specific targets; XZ_OPT=-9ev
+       * top/maint.mk (cvs-check): Remove target; it was just an alias
+       to the better-named vc-diff-check.
+       (maintainer-distcheck): Remove rule.  It was used only from
+       the (alpha/beta/major) target, and all of its commands but one
+       were coreutils-specific.
+       (vc-dist): Remove rule.
+       (alpha beta major): Run "$(MAKE) distcheck" explicitly.
+       Run vc-diff-check, not vc-dist.
+       Run $(MAKE) dist with XZ_OPT=-9ev.  Note spelling, with "-".
+
 2009-08-27  Bruno Haible  <bruno@clisp.org>
 
        * tests/test-bitrotate.c (main): Remove test that uses a shift count

diff --git a/top/maint.mk b/top/maint.mk
index 21782e5162b81bf4e3c343e38e7e9ad8313ab479..39bbc7698e472053b8715e97181c45013cc23e76 100644 (file)
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -618,21 +618,6 @@ vc-diff-check:
          rm vc-diffs;                                          \
        fi
 
-cvs-check: vc-diff-check
-
-ALL_RECURSIVE_TARGETS += maintainer-distcheck
-maintainer-distcheck:
-       $(MAKE) distcheck
-       $(MAKE) taint-distcheck
-       $(MAKE) my-distcheck
-
-
-# Don't make a distribution if checks fail.
-# Also, make sure the NEWS file is up-to-date.
-ALL_RECURSIVE_TARGETS += vc-dist
-vc-dist: $(local-check) cvs-check maintainer-distcheck
-       XZ_OPT=9ev $(MAKE) dist
-
 # Use this to make sure we don't run these programs when building
 # from a virgin tgz file, below.
 null_AM_MAKEFLAGS = \
@@ -708,8 +693,10 @@ alpha beta major: $(local-check) writable-files no-submodule-changes
          && { echo $(VERSION) | grep -E '^[0-9]+(\.[0-9]+)+$$' \
               || { echo "invalid version string: $(VERSION)" 1>&2; exit 1;};}\
          || :
-       $(MAKE) vc-dist
+       $(MAKE) vc-diff-check
        $(MAKE) news-date-check
+       $(MAKE) distcheck
+       $(MAKE) dist XZ_OPT=-9ev
        $(MAKE) -s announcement RELEASE_TYPE=$@ > /tmp/announce-$(my_distdir)
        if test -d $(release_archive_dir); then                 \
          ln $(rel-files) $(release_archive_dir);               \