Merge branch 'parallel-dist'

* parallel-dist:
  dist: allow running several compressors in parallel.

diff --cc ChangeLog
index 717578e34d8c7cd6237df78046ab519a0069c00e,e925df0cd747def69ad05e6cedb1e9c516511c34..763c5738b403b522a635e5247e41e57b0cb4a667
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,20 -1,19 +1,34 @@@
  2009-10-17  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
  
+       dist: allow running several compressors in parallel.
+       * lib/am/distdir.am (am__post_remove_distdir): New internal
+       variable.
+       (DIST_TARGETS): New variable, set to list of chosen distribution
+       formats.  Order formats by expected duration, slowest first, for
+       better parallelism.
+       (dist-gzip, dist-bzip2, dist-lzma, dist-xz, dist-tarZ)
+       (dist-shar, dist-zip): Use $(am__post_remove_distdir).
+       (dist, dist-all): Do not depend on distdir.  Instead of
+       replicating each compression command, use a recursive invocation
+       to allow running all $(DIST_TARGETS) in parallel.
+       * NEWS: Update.
+       Report by Peter Breitenlohner.
+ 
 +      Fix license headers of cscope tests to be GPLv2+.
 +      * tests/cscope.test: Revert to GPL version 2.
 +      * tests/cscope2.test: Likewise.
 +      * tests/cscope3.test: Likewise.
 +
 +      Sync auxiliary files from upstream.
 +      * INSTALL, lib/INSTALL, lib/config.guess, lib/config.sub,
 +      lib/texinfo.tex: Sync from upstream.
 +
 +      Doc and comment typos.
 +      * automake.in (handle_ltlibraries): Fix typo in comment.
 +      * tests/distcom7.test: Likewise.
 +      * tests/lisp5.test: Likewise.
 +      * doc/automake.texi (Usage of Conditionals): Fix typo.
 +
  2009-10-11  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
  
        Fix race condition in werror2.test due to sanity sleep change.

diff --cc Makefile.in
Simple merge

diff --cc NEWS
index ef46ee7863e365643595d6e6d02d17719ed855b7,5ccb59efa1abc33c2bdee85cd925a672b2bcd87d..0851e63fa0f726accb06acd25c7be8d430682a14
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,14 -1,10 +1,18 @@@
 -New in 1.11.0a:
 +New in 1.11a:
 +
 +* Changes to automake:
 +
 +  - automake now generates silenced rules for texinfo outputs.
 +
 +* New targets:
 +
 +  - New `cscope' target to build a cscope database for the source tree.
  
 -Bugs fixed in 1.11.0a:
+ * Miscellaneous changes:
+ 
+   - The `dist' and `dist-all' targets now can run compressors in parallel.
+ 
 +Bugs fixed in 1.11a:
  
  * Bugs introduced by 1.11: