From 65fb2841a1e3abd56335bab127d281028f0f1f8c Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Thu, 27 Sep 2001 08:37:54 +0000 Subject: [PATCH] * lib/am/distdir.am (dist): Rename as... (dist-gzip): this. (dist): Additional name for dist-all. * automake.texi (Options, Dist): Adjust. --- ChangeLog | 7 +++++++ NEWS | 2 ++ automake.texi | 44 +++++++++++++++++++++----------------------- lib/am/distdir.am | 8 ++++---- stamp-vti | 2 +- version.texi | 2 +- 6 files changed, 36 insertions(+), 29 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6ec9f613..62e7a1e1e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-09-27 Akim Demaille + + * lib/am/distdir.am (dist): Rename as... + (dist-gzip): this. + (dist): Additional name for dist-all. + * automake.texi (Options, Dist): Adjust. + 2001-09-25 Alexandre Duret-Lutz * aclocal.in (obsolete_macros): Update AM_EXEEXT message. diff --git a/NEWS b/NEWS index 26525ffa8..5689aa77c 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,7 @@ New in 1.5a: * Autoconf 2.52 is required. +* `dist' generates all the archive flavors, as did `dist-all'. +* `dist-gzip' generates the Gzip tar file only. New in 1.5: * Support for `configure.ac'. diff --git a/automake.texi b/automake.texi index 0efb4fde5..cd7cd31a8 100644 --- a/automake.texi +++ b/automake.texi @@ -3590,7 +3590,7 @@ As the GNU Standards aren't always explicit as to which files should be removed by which target, we've adopted a heuristic which we believe was first formulated by Fran@,{c}ois Pinard: -@itemize @bullet +@itemize @bullet @item If @code{make} built it, and it is commonly something that one would want to rebuild (for instance, a @file{.o} file), then @@ -3620,9 +3620,10 @@ We recommend that you follow this same set of heuristics in your @cindex make distcheck The @code{dist} target in the generated @file{Makefile.in} can be used -to generate a gzip'd @code{tar} file for distribution. The tar file is -named based on the @samp{PACKAGE} and @samp{VERSION} variables; more -precisely it is named @samp{@var{package}-@var{version}.tar.gz}. +to generate a gzip'd @code{tar} file and other flavors of archive for +distribution. The files is named based on the @samp{PACKAGE} and +@samp{VERSION} variables; more precisely the gzip'd @code{tar} file is +named @samp{@var{package}-@var{version}.tar.gz}. @cvindex PACKAGE @cvindex VERSION @trindex dist @@ -3726,13 +3727,10 @@ standard mechanism. @section The types of distributions -By default Automake generates a @samp{.tar.gz} file when asked to create -a distribution. However, some projects prefer different packaging -formats. Automake accomodates most of these using options; -@ref{Options}. - -Automake also generates a @code{dist-all} target which can be used to -make all the requested packaged distributions at once. +@trindex dist-gzip +Automake generates a @samp{.tar.gz} file when asked to create a +distribution and other archives formats, @ref{Options}. The target +@code{dist-gzip} generates the @samp{.tar.gz} file only. @node Tests, Options, Dist, Top @@ -3861,30 +3859,30 @@ Cause @code{dejagnu}-specific rules to be generated. @xref{Tests}. @item @code{dist-bzip2} @cindex Option, dist-bzip2 -Generate a @code{dist-bzip2} target as well as the ordinary @code{dist} -target. This new target will create a bzip2 tar archive of the -distribution. bzip2 archives are frequently smaller than even gzipped -archives. +Generate a @code{dist-bzip2} target, creating a bzip2 tar archive of the +distribution. @code{dist} will create it in addition to the other +formats. bzip2 archives are frequently smaller than gzipped archives. @trindex dist-bzip2 @item @code{dist-shar} @cindex Option, dist-shar -Generate a @code{dist-shar} target as well as the ordinary @code{dist} -target. This new target will create a shar archive of the -distribution. +Generate a @code{dist-shar} target, creating a shar archive of the +distribution. @code{dist} will create it in addition to the other +formats. @trindex dist-shar @item @code{dist-zip} @cindex Option, dist-zip -Generate a @code{dist-zip} target as well as the ordinary @code{dist} -target. This new target will create a zip archive of the distribution. +Generate a @code{dist-zip} target, creating a zip archive of the +distribution. @code{dist} will create it in addition to the other +formats. @trindex dist-zip @item @code{dist-tarZ} @cindex Option, dist-tarZ -Generate a @code{dist-tarZ} target as well as the ordinary @code{dist} -target. This new target will create a compressed tar archive of the -distribution. +Generate a @code{dist-tarZ} target, creating a compressed tar archive of +the distribution. @code{dist} will create it in addition to the other +formats. @trindex dist-tarZ @item @code{no-dependencies} diff --git a/lib/am/distdir.am b/lib/am/distdir.am index e808966a0..d847b467b 100644 --- a/lib/am/distdir.am +++ b/lib/am/distdir.am @@ -165,8 +165,8 @@ endif %?TOPDIR_P% if %?TOPDIR_P% GZIP_ENV = --best -.PHONY: dist -dist: distdir +.PHONY: dist-gzip +dist-gzip: distdir $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) @@ -215,8 +215,8 @@ endif %?TOPDIR_P% if %?TOPDIR_P% -.PHONY: dist-all -dist-all: distdir +.PHONY: dist dist-all +dist dist-all: distdir $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ?BZIP2? $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2 ?COMPRESS? $(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z diff --git a/stamp-vti b/stamp-vti index 30485bbcd..1932f7323 100644 --- a/stamp-vti +++ b/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 3 September 2001 +@set UPDATED 27 September 2001 @set UPDATED-MONTH September 2001 @set EDITION 1.5a @set VERSION 1.5a diff --git a/version.texi b/version.texi index 30485bbcd..1932f7323 100644 --- a/version.texi +++ b/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 3 September 2001 +@set UPDATED 27 September 2001 @set UPDATED-MONTH September 2001 @set EDITION 1.5a @set VERSION 1.5a -- 2.47.2