From f857a986a184beb40d71d0543eefffdcd98e806a Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 6 May 2001 05:26:59 +0000 Subject: [PATCH] * automake.texi (Future): Removed. (Depth): Removed. (Hello): Don't mention `deep'. (Top level): Likewise. --- ChangeLog | 5 ++++ automake.texi | 83 ++++++--------------------------------------------- stamp-vti | 4 +-- version.texi | 4 +-- 4 files changed, 18 insertions(+), 78 deletions(-) diff --git a/ChangeLog b/ChangeLog index d19496ca..714f7c32 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2001-05-05 Tom Tromey + * automake.texi (Future): Removed. + (Depth): Removed. + (Hello): Don't mention `deep'. + (Top level): Likewise. + * automake.in (conditional_true_when): Use a hash, not index(). Also, a TRUE component always results in a true return. Fixes test cond10.test. For PR automake/164. diff --git a/automake.texi b/automake.texi index 6f21e909..825e97c2 100644 --- a/automake.texi +++ b/automake.texi @@ -131,7 +131,6 @@ This edition documents version @value{VERSION}. * Cygnus:: The effect of @code{--cygnus} * Extending:: Extending Automake * Distributing:: Distributing the Makefile.in -* Future:: Some ideas for the future * Macro and Variable Index:: * General Index:: @end menu @@ -196,14 +195,13 @@ understand how Automake works. @menu * General Operation:: General operation of Automake -* Depth:: The kinds of packages * Strictness:: Standards conformance checking * Uniform:: The Uniform Naming Scheme * Canonicalization:: How derived variables are named @end menu -@node General Operation, Depth, Generalities, Generalities +@node General Operation, Strictness, Generalities, Generalities @section General Operation Automake works by reading a @file{Makefile.am} and generating a @@ -290,41 +288,7 @@ It is customary to make the first line of @file{Makefile.am} read: @c FIXME document customary ordering of Makefile.am here! -@node Depth, Strictness, General Operation, Generalities -@section Depth - -@cindex Flat package -@cindex Package, Flat -@cindex Shallow package -@cindex Package, shallow -@cindex Deep package -@cindex Package, deep - -@code{automake} supports three kinds of directory hierarchy: -@samp{flat}, @samp{shallow}, and @samp{deep}. - -A @dfn{flat} package is one in which all the files are in a single -directory. The @file{Makefile.am} for such a package by definition -lacks a @code{SUBDIRS} macro. An example of such a package is -@code{termutils}. -@vindex SUBDIRS - -@cindex SUBDIRS, deep package - -A @dfn{deep} package is one in which all the source lies in -subdirectories; the top level directory contains mainly configuration -information. GNU @code{cpio} is a good example of such a package, as is -GNU @code{tar}. The top level @file{Makefile.am} for a deep package -will contain a @code{SUBDIRS} macro, but no other macros to define -objects which are built. - -A @dfn{shallow} package is one in which the primary source resides in -the top-level directory, while various parts (typically libraries) -reside in subdirectories. Automake is one such package (as is GNU -@code{make}, which does not currently use @code{automake}). - - -@node Strictness, Uniform, Depth, Generalities +@node Strictness, Uniform, General Operation, Generalities @section Strictness @cindex Non-GNU packages @@ -365,7 +329,7 @@ Automake will check for compliance to the as-yet-unwritten @dfn{Gnits standards}. These are based on the GNU standards, but are even more detailed. Unless you are a Gnits standards contributor, it is recommended that you avoid this option until such time as the Gnits -standard is actually published. +standard is actually published (which may never happen). @end table For more information on the precise implications of the strictness @@ -596,7 +560,7 @@ maintainer-only code stripped out, as well as all copyright comments. Of course, GNU Hello is somewhat more featureful than your traditional two-liner. GNU Hello is internationalized, does option processing, and -has a manual and a test suite. GNU Hello is a deep package. +has a manual and a test suite. @cindex configure.in, from GNU Hello @cindex GNU Hello, configure.in @@ -1377,9 +1341,9 @@ mentioned in @code{SUBDIRS} must be direct children of the current directory. For instance, you cannot put @samp{src/subdir} into @code{SUBDIRS}. -In a deep package, the top-level @file{Makefile.am} is often very short. -For instance, here is the @file{Makefile.am} from the GNU Hello -distribution: +In packages that use subdirectories, the top-level @file{Makefile.am} is +often very short. For instance, here is the @file{Makefile.am} from the +GNU Hello distribution: @example EXTRA_DIST = BUGS ChangeLog.O README-alpha @@ -3600,7 +3564,7 @@ install-exec-hook: @c rules -@node Distributing, Future, Extending, Top +@node Distributing, Macro and Variable Index, Extending, Top @chapter Distributing @file{Makefile.in}s Automake places no restrictions on the distribution of the resulting @@ -3613,37 +3577,8 @@ Some of the files that can be automatically installed via the to see. -@node Future, Macro and Variable Index, Distributing, Top -@chapter Some ideas for the future - -@cindex Future directions - -Here are some things that might happen in the future: - -@itemize @bullet -@item -HTML support. - -@item -The output will be cleaned up. For instance, only variables which are -actually used will appear in the generated @file{Makefile.in}. - -@item -There will be support for automatically recoding a distribution. The -intent is to allow a maintainer to use whatever character set is most -convenient locally, but for all distributions to be Unicode or -@w{ISO 10646} with the UTF-8 encoding. - -@cindex Guile rewrite - -@item -Rewrite in Guile. This won't happen in the near future, but it will -eventually happen. -@end itemize - - @page -@node Macro and Variable Index, General Index, Future, Top +@node Macro and Variable Index, General Index, Distributing, Top @unnumbered Macro and Variable Index @printindex vr diff --git a/stamp-vti b/stamp-vti index 4014e5e9..610f6167 100644 --- a/stamp-vti +++ b/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 23 March 2001 -@set UPDATED-MONTH March 2001 +@set UPDATED 5 May 2001 +@set UPDATED-MONTH May 2001 @set EDITION 1.4e @set VERSION 1.4e diff --git a/version.texi b/version.texi index 4014e5e9..610f6167 100644 --- a/version.texi +++ b/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 23 March 2001 -@set UPDATED-MONTH March 2001 +@set UPDATED 5 May 2001 +@set UPDATED-MONTH May 2001 @set EDITION 1.4e @set VERSION 1.4e -- 2.43.5