[SCM] GNU Automake branch, branch-1-10, updated. Release-1-10-67-gdc23571

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=dc235715128b04ac2e2e3bda5845a6013e60e9f5

The branch, branch-1-10 has been updated
       via  dc235715128b04ac2e2e3bda5845a6013e60e9f5 (commit)
       via  254c19ac1b385c93bdbd13742432810317abaa12 (commit)
      from  95beb49e9111842b1da6c16a195ac041b63a41a2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit dc235715128b04ac2e2e3bda5845a6013e60e9f5
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Jan 19 10:14:18 2008 +0100

    Regenerate.

commit 254c19ac1b385c93bdbd13742432810317abaa12
Author: Jim Meyering <address@hidden>
Date:   Tue Oct 9 14:52:20 2007 +0000

    Add lzma compression support.
    
    * NEWS: Mention it.
    * automake.in (handle_dist): Recognize dist-lzma.
    (make_paragraphs): Map LZMA to dist-lzma.
    * doc/automake.texi (Dist): Add dist-lzma.
    (Options): Likewise.
    * lib/Automake/Options.pm (_process_option_list):
    * lib/am/distdir.am (dist-lzma): New rule.
    (dist dist-all): Add command to create an lzma-compressed tarball.
    (distcheck): Handle lzma-compressed tarballs just like the others.
    * tests/defs.in: Test for lzma, too.
    * tests/lzma.test: New file, based on nogzip.test.
    * tests/Makefile.am (TESTS): Add lzma.test.
    * tests/Makefile.in: Regenerate.
    Suggestion from Karl Berry.
    
    Author: Jim Meyering <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                        |   18 ++++++++++++++++++
 Makefile.in                      |   14 ++++++++++----
 NEWS                             |    2 ++
 automake.in                      |    3 ++-
 doc/automake.texi                |   15 +++++++++++++--
 lib/Automake/Options.pm          |    3 ++-
 lib/am/distdir.am                |    9 +++++++++
 tests/Makefile.am                |    1 +
 tests/Makefile.in                |    1 +
 tests/{nogzip.test => lzma.test} |   12 ++++++------
 10 files changed, 64 insertions(+), 14 deletions(-)
 copy tests/{nogzip.test => lzma.test} (81%)

diff --git a/ChangeLog b/ChangeLog
index 7480120..2d6c666 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2008-01-19  Jim Meyering  <address@hidden>
+
+       Add lzma compression support.
+       * NEWS: Mention it.
+       * automake.in (handle_dist): Recognize dist-lzma.
+       (make_paragraphs): Map LZMA to dist-lzma.
+       * doc/automake.texi (Dist): Add dist-lzma.
+       (Options): Likewise.
+       * lib/Automake/Options.pm (_process_option_list):
+       * lib/am/distdir.am (dist-lzma): New rule.
+       (dist dist-all): Add command to create an lzma-compressed tarball.
+       (distcheck): Handle lzma-compressed tarballs just like the others.
+       * tests/defs.in: Test for lzma, too.
+       * tests/lzma.test: New file, based on nogzip.test.
+       * tests/Makefile.am (TESTS): Add lzma.test.
+       * tests/Makefile.in: Regenerate.
+       Suggestion from Karl Berry.
+
 2008-01-19  Ralf Wildenhues  <address@hidden>
 
        Backport from master branch:
diff --git a/Makefile.in b/Makefile.in
index e3ead86..be2c272 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -449,6 +449,10 @@ dist-bzip2: distdir
        tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
        $(am__remove_distdir)
 
+dist-lzma: distdir
+       tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+       $(am__remove_distdir)
+
 dist-tarZ: distdir
        tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
        $(am__remove_distdir)
@@ -476,6 +480,8 @@ distcheck: dist
          GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
        *.tar.bz2*) \
          bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+       *.tar.lzma*) \
+         unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
        *.tar.Z*) \
          uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
        *.shar.gz*) \
@@ -634,10 +640,10 @@ uninstall-am: uninstall-binSCRIPTS
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
        all all-am am--refresh check check-am clean clean-generic \
        ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-       dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
-       distclean-generic distclean-tags distcleancheck distdir \
-       distuninstallcheck dvi dvi-am html html-am info info-am \
-       install install-am install-binSCRIPTS install-data \
+       dist-hook dist-lzma dist-shar dist-tarZ dist-zip distcheck \
+       distclean distclean-generic distclean-tags distcleancheck \
+       distdir distuninstallcheck dvi dvi-am html html-am info \
+       info-am install install-am install-binSCRIPTS install-data \
        install-data-am install-dvi install-dvi-am install-exec \
        install-exec-am install-exec-hook install-html install-html-am \
        install-info install-info-am install-man install-pdf \
diff --git a/NEWS b/NEWS
index c017d13..400a8de 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,8 @@ New in 1.10.0a:
       cvs -d :pserver:address@hidden:/automake.git \
           checkout -d automake HEAD
 
+  - "make dist" can now create lzma-compressed tarballs.
+
   - Automake is licensed under GPLv3+.  `automake --add-missing' will
     by default install the GPLv3 file as COPYING if it is missing.
     Note that Automake will never overwrite an existing COPYING file,
diff --git a/automake.in b/automake.in
index e708809..5c61b2c 100755
--- a/automake.in
+++ b/automake.in
@@ -3606,7 +3606,7 @@ sub handle_dist ()
     {
       my $archive_defined = option 'no-dist-gzip' ? 0 : 1;
       $archive_defined ||=
-       grep { option "dist-$_" } ('shar', 'zip', 'tarZ', 'bzip2');
+       grep { option "dist-$_" } qw(shar zip tarZ bzip2 lzma);
       error (option 'no-dist-gzip',
             "no-dist-gzip specified but no dist-* specified, "
             . "at least one archive format must be enabled")
@@ -6431,6 +6431,7 @@ sub make_paragraphs ($%)
                 'MAINTAINER-MODE'
                 => $seen_maint_mode ? subst ('MAINTAINER_MODE_TRUE') : '',
 
+                'LZMA'        => !! option 'dist-lzma',
                 'BZIP2'       => !! option 'dist-bzip2',
                 'COMPRESS'    => !! option 'dist-tarZ',
                 'GZIP'        =>  ! option 'no-dist-gzip',
diff --git a/doc/automake.texi b/doc/automake.texi
index c00a002..992ec66 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -8075,6 +8075,11 @@ frequently smaller than gzipped archives.
 Generate a gzip tar archive of the distribution.
 @trindex dist-gzip
 
address@hidden @code{dist-lzma}
+Generate a lzma tar archive of the distribution.  lzma archives are
+frequently smaller than @command{bzip2}-compressed archives.
address@hidden dist-lzma
+
 @item @code{dist-shar}
 Generate a shar archive of the distribution.
 @trindex dist-shar
@@ -8362,6 +8367,12 @@ Cause @command{dejagnu}-specific rules to be generated.  
@xref{Tests}.
 Hook @code{dist-bzip2} to @code{dist}.
 @trindex dist-bzip2
 
address@hidden @option{dist-lzma}
address@hidden Option, @option{dist-lzma}
address@hidden dist-lzma
+Hook @code{dist-lzma} to @code{dist}.
address@hidden dist-lzma
+
 @item @option{dist-shar}
 @cindex Option, @option{dist-shar}
 @opindex dist-shar
@@ -8533,7 +8544,7 @@ In order to use this option with C sources, you should add
 These three mutually exclusive options select the tar format to use
 when generating tarballs with @samp{make dist}.  (The tar file created
 is then compressed according to the set of @option{no-dist-gzip},
address@hidden and @option{dist-tarZ} options in use.)
address@hidden, @option{dist-lzma} and @option{dist-tarZ} options in use.)
 
 These options must be passed as argument to @code{AM_INIT_AUTOMAKE}
 (@pxref{Macros}) because they can require additional configure checks.
@@ -12071,4 +12082,4 @@ The number of test cases in the test suite.
 @c  LocalWords:  LTALLOCA MALLOC malloc memcmp strdup alloca libcompat xyz DFOO
 @c  LocalWords:  unprefixed buildable preprocessed DBAZ DDATADIR WARNINGCFLAGS
 @c  LocalWords:  LIBFOOCFLAGS LIBFOOLDFLAGS ftable testSubDir obj LIBTOOLFLAGS
address@hidden  LocalWords:  barexec Pinard's automatize initialize
address@hidden  LocalWords:  barexec Pinard's automatize initialize lzma
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index c4c8775..a63f97a 100644
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003, 2004, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2006, 2007  Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -261,6 +261,7 @@ sub _process_option_list (\%$@)
       elsif ($_ eq 'no-installman' || $_ eq 'no-installinfo'
             || $_ eq 'dist-shar' || $_ eq 'dist-zip'
             || $_ eq 'dist-tarZ' || $_ eq 'dist-bzip2'
+            || $_ eq 'dist-lzma'
             || $_ eq 'no-dist-gzip' || $_ eq 'no-dist'
             || $_ eq 'dejagnu' || $_ eq 'no-texinfo.tex'
             || $_ eq 'readme-alpha' || $_ eq 'check-news'
diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index c62ef53..ce547fd 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -259,6 +259,12 @@ dist-bzip2: distdir
        tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
        $(am__remove_distdir)
 
+?LZMA?DIST_ARCHIVES += $(distdir).tar.lzma
+.PHONY: dist-lzma
+dist-lzma: distdir
+       tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+       $(am__remove_distdir)
+
 ?COMPRESS?DIST_ARCHIVES += $(distdir).tar.Z
 .PHONY: dist-tarZ
 dist-tarZ: distdir
@@ -295,6 +301,7 @@ if %?TOPDIR_P%
 dist dist-all: distdir
 ?GZIP? tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c 
>$(distdir).tar.gz
 ?BZIP2?        tardir=$(distdir) && $(am__tar) | bzip2 -9 -c 
>$(distdir).tar.bz2
+?LZMA? tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
 ?COMPRESS?     tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 ?SHAR? shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
 ?ZIP?  -rm -f $(distdir).zip
@@ -320,6 +327,8 @@ distcheck: dist
          GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
        *.tar.bz2*) \
          bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+       *.tar.lzma*) \
+         unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
        *.tar.Z*) \
          uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
        *.shar.gz*) \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2813f1b..f7fd00c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -354,6 +354,7 @@ ltconv.test \
 ltdeps.test \
 ltlibobjs.test \
 ltlibsrc.test \
+lzma.test \
 maintclean.test \
 make.test \
 makej.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 473d4ac..e51c138 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -486,6 +486,7 @@ ltconv.test \
 ltdeps.test \
 ltlibobjs.test \
 ltlibsrc.test \
+lzma.test \
 maintclean.test \
 make.test \
 makej.test \
diff --git a/tests/nogzip.test b/tests/lzma.test
similarity index 81%
copy from tests/nogzip.test
copy to tests/lzma.test
index f954575..bbfc6c2 100755
--- a/tests/nogzip.test
+++ b/tests/lzma.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2007  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -18,23 +18,23 @@
 # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 
-# Check support for no-dist-gzip
+# Check support for no-dist-gzip with lzma
 
-required=bzip2
+required=lzma
 . ./defs || exit 1
 
 set -e
 
 cat > configure.in << 'END'
-AC_INIT([nogzip], [1.0])
-AM_INIT_AUTOMAKE([no-dist-gzip dist-bzip2])
+AC_INIT([lzma], [1.0])
+AM_INIT_AUTOMAKE([no-dist-gzip dist-lzma])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
 END
 
 cat > Makefile.am << 'END'
 test: distcheck
-       test $(DIST_ARCHIVES) = nogzip-1.0.tar.bz2
+       test $(DIST_ARCHIVES) = lzma-1.0.tar.lzma
        test -f $(DIST_ARCHIVES)
 END
 


hooks/post-receive
--
GNU Automake