[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.13.1-143-g664a045

[Stefano Lattarini]

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=664a0456a36de893747ae577963129a205328161

The branch, master has been updated
       via  664a0456a36de893747ae577963129a205328161 (commit)
       via  c3db23860e9e7f1171a5b3d2098f6079799befd4 (commit)
       via  fd273c14023361a71160e17b7c267099c139a509 (commit)
       via  b6197589c37bed3edfa37706269e066bc841206b (commit)
       via  13f1d58ada3fb9709ec144954ae38254d9624f8c (commit)
       via  a8f36147417116ab0af6977b5688e2fd94f28600 (commit)
       via  e5932416dc8832616a57807ea3efd5aeeeed3ad8 (commit)
       via  6b8f20088def2f54c8d62e8a0baaa249511ed0f2 (commit)
       via  7d0372aceb50e1bd0938eab2eb3a5f289e731daa (commit)
       via  ae34038674ae31fb9783264fc116075c511a1bcf (commit)
       via  9d1002e0772e2fb6e9f9a3832a0f9c6486cd438a (commit)
      from  2c72b157e7c37964f6854d7b5c29c97957b02e36 (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 664a0456a36de893747ae577963129a205328161
Merge: 2c72b15 c3db238
Author: Stefano Lattarini <address@hidden>
Date:   Tue Jan 22 13:49:02 2013 +0100

    Merge branch 'maint'
    
    * maint:
      docs: '.txi' and '.texinfo' extensions are deprecated
      NEWS: document recent documentation improvements
      docs: more precise cross reference
      docs: 'dist-shar' and 'dist-tarZ' are obsolescent today
      docs: improve documentation of 'dist-*' targets slightly
      docs: make even clearer 'dist-gzip' is the default.
      docs: document 'dist-xz' together with the other 'dist-*' options
      docs: 'no-define' option and AM_INIT_AUTOMAKE three-args usage: fixlets
      warn: correct broken hyperlink in warning message

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

Summary of changes:
 NEWS              |    8 +++++-
 automake.in       |    2 +-
 doc/automake.texi |   68 ++++++++++++++++++++++++++++++++---------------------
 3 files changed, 49 insertions(+), 29 deletions(-)

diff --git a/NEWS b/NEWS
index b06c01c..7a25b80 100644
--- a/NEWS
+++ b/NEWS
@@ -168,6 +168,13 @@ New in 1.13.2:
   - The parallel testsuite is no longer reported as "experimental"; it
     is well tested, ans should be stable now.
 
+  - The 'shar' and 'tarZ' distribution formats and the 'dist-shar' and
+    'dist-tarZ' options are obsolescent, and their use is deprecated
+    in the documentation.
+
+  - Other minor miscellaneous fixes and improvements; in particular,
+    some improvements in cross-references.
+
 * Obsolescent features:
 
   - Use of suffix-less info files (that can be specified through the
@@ -187,7 +194,6 @@ New in 1.13.2:
     category.  You are advised to simply use the '.texi' extension
     instead.
 
-
 * Bugs fixed:
 
   - The obsolete macros AM_CONFIG_HEADER or AM_PROG_CC_STDC work once
diff --git a/automake.in b/automake.in
index 0473af4..4776581 100644
--- a/automake.in
+++ b/automake.in
@@ -5359,7 +5359,7 @@ sub scan_autoconf_traces ($)
            {
               msg 'obsolete', $where, <<'EOF';
 AM_INIT_AUTOMAKE: two- and three-arguments forms are deprecated.  For more 
info, see:
-http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation
+http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_005fINIT_005fAUTOMAKE-invocation
 EOF
              $package_version = $args[2];
              $package_version_location = $where;
diff --git a/doc/automake.texi b/doc/automake.texi
index 2488aeb..263e0cc 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -3944,9 +3944,9 @@ explicitly).
 @opindex no-define
 By default this macro @code{AC_DEFINE}'s @code{PACKAGE} and
 @code{VERSION}.  This can be avoided by passing the @option{no-define}
-option:
+option (@pxref{List of Automake options}):
 @example
-AM_INIT_AUTOMAKE([gnits 1.5 no-define dist-bzip2])
+AM_INIT_AUTOMAKE([no-define ...])
 @end example
 
 @item AM_PATH_LISPDIR
@@ -7809,9 +7809,9 @@ Currently Automake provides support for Texinfo and man 
pages.
 If the current directory contains Texinfo source, you must declare it
 with the @code{TEXINFOS} primary.  Generally Texinfo files are converted
 into info, and thus the @code{info_TEXINFOS} variable is most commonly used
-here.  Any Texinfo source file must end in the @file{.texi},
address@hidden, or @file{.texinfo} extension.  We recommend @file{.texi}
-for new manuals.
+here.  Any Texinfo source file should have the @file{.texi} extension.
+Automake also accepts @file{.txi} or @file{.texinfo} extensions, but their
+use is discouraged now, and will elicit runtime warnings.
 
 Automake generates rules to build @file{.info}, @file{.dvi},
 @file{.ps}, @file{.pdf} and @file{.html} files from your Texinfo
@@ -8649,28 +8649,25 @@ Automake generates rules to provide archives of the 
project for
 distributions in various formats.  Their targets are:
 
 @table @asis
address@hidden @code{dist-gzip}
+Generate a @samp{gzip} tar archive of the distribution.  This is the
+only format enabled by default.
address@hidden dist-gzip
+
 @vindex BZIP2
 @item @code{dist-bzip2}
-Generate a bzip2 tar archive of the distribution.  bzip2 archives are
-frequently smaller than gzipped archives.
+Generate a @samp{bzip2} tar archive of the distribution.  bzip2 archives
+are frequently smaller than gzipped archives.
 By default, this rule makes @samp{bzip2} use a compression option of 
@option{-9}.
 To make it use a different one, set the @env{BZIP2} environment variable.
 For example, @samp{make dist-bzip2 BZIP2=-7}.
 @trindex dist-bzip2
 
address@hidden @code{dist-gzip}
-Generate a gzip tar archive of the distribution.
address@hidden dist-gzip
-
 @item @code{dist-lzip}
 Generate an @samp{lzip} tar archive of the distribution.  @command{lzip}
 archives are frequently smaller than @command{bzip2}-compressed archives.
 @trindex dist-lzip
 
address@hidden @code{dist-shar}
-Generate a shar archive of the distribution.
address@hidden dist-shar
-
 @vindex XZ_OPT
 @item @code{dist-xz}
 Generate an @samp{xz} tar archive of the distribution.  @command{xz}
@@ -8683,18 +8680,26 @@ default compression ratio, but with a progress 
indicator:
 @trindex dist-xz
 
 @item @code{dist-zip}
-Generate a zip archive of the distribution.
+Generate a @samp{zip} archive of the distribution.
 @trindex dist-zip
 
 @item @code{dist-tarZ}
-Generate a compressed tar archive of
-the distribution.
+Generate a tar archive of the distribution, compressed with the
+historical (obsolescent) program @command{compress}.  Use of this
+option is discouraged.
 @trindex dist-tarZ
+
address@hidden @code{dist-shar}
+Generate a @samp{shar} archive of the distribution.  This format archive
+is obsolescent, and use of this option is discouraged.
address@hidden dist-shar
+
 @end table
 
-The rule @code{dist} (and its historical synonym @code{dist-all}) will
-create archives in all the enabled formats, @ref{Options}.  By
-default, only the @code{dist-gzip} target is hooked to @code{dist}.
+The rule @code{dist} (and its historical synonym @code{dist-all})
+will create archives in all the enabled formats (@pxref{List of
+Automake options} for how to change this list).  By default, only
+the @code{dist-gzip} target is hooked to @code{dist}.
 
 
 @node Tests
@@ -10060,11 +10065,11 @@ Hook @code{dist-bzip2} to @code{dist}.
 Hook @code{dist-lzip} to @code{dist}.
 @trindex dist-lzip
 
address@hidden @option{dist-shar}
address@hidden Option, @option{dist-shar}
address@hidden dist-shar
-Hook @code{dist-shar} to @code{dist}.
address@hidden dist-shar
address@hidden @option{dist-xz}
address@hidden Option, @option{dist-xz}
address@hidden dist-xz
+Hook @code{dist-xz} to @code{dist}.
address@hidden dist-xz
 
 @item @option{dist-zip}
 @cindex Option, @option{dist-zip}
@@ -10072,10 +10077,19 @@ Hook @code{dist-shar} to @code{dist}.
 Hook @code{dist-zip} to @code{dist}.
 @trindex dist-zip
 
address@hidden @option{dist-shar}
address@hidden Option, @option{dist-shar}
address@hidden dist-shar
+Hook @code{dist-shar} to @code{dist}.  Use of this option
+is discouraged, as the @samp{shar} format is obsolescent and
+problematic.
address@hidden dist-shar
+
 @item @option{dist-tarZ}
 @cindex Option, @option{dist-tarZ}
 @opindex dist-tarZ
-Hook @code{dist-tarZ} to @code{dist}.
+Hook @code{dist-tarZ} to @code{dist}.  Use of this option
+is discouraged, as the @samp{compress} program is obsolete.
 @trindex dist-tarZ
 
 @item @option{filename-length-max=99}


hooks/post-receive
-- 
GNU Automake