* automake.texi (Top level): Don't recommend substing SUBDIRS.

Doc update from Erez.

diff --git a/ChangeLog b/ChangeLog
index 5d48301ecddfbe7b643a7123c7f5cba755bae15a..4dfa30c71551b59e00db167b3df3894b606931a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1999-04-20  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.texi (Top level): Don't recommend substing SUBDIRS.
+
 1999-04-20  Brian Ford <ford@vss.fsi.com>
 
        * scripts.am: Change else if's to elif.

diff --git a/automake.texi b/automake.texi
index 3252376fa43e87fa0b496905ccdf8432f8e4ea66..3c8ba6711e59975ad3cafe89b2abab87a4ad0085 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -1450,16 +1450,20 @@ case of GNU @code{Inetutils}, you want to only build a subset of the
 entire package.  In your @file{Makefile.am} include:
 
 @example
-SUBDIRS = @@SUBDIRS@@
+SUBDIRS = @@MY_SUBDIRS@@
 @end example
 
 Then in your @file{configure.in} you can specify:
 
 @example
-SUBDIRS = "src doc lib po"
-AC_SUBST(SUBDIRS)
+MY_SUBDIRS = "src doc lib po"
+AC_SUBST(MY_SUBDIRS)
 @end example
 
+(Note that we don't use the variable name @code{SUBDIRS} in our
+@file{configure.in}; that would cause Automake to believe that every
+@file{Makefile.in} should recurse into the listed subdirectories.)
+
 The upshot of this is that Automake is tricked into building the package
 to take the subdirs, but doesn't actually bind that list until
 @code{configure} is run.
@@ -1695,6 +1699,10 @@ determined by @code{configure}.  Again from @code{cpio}:
 libcpio_a_LIBADD = @@LIBOBJS@@ @@ALLOCA@@
 @end example
 
+In addition, sources for extra objects that will not exist until
+configure-time must be added to the @code{BUILT_SOURCES} variable
+(@pxref{Sources}).
+
 
 @node LIBOBJS, A Shared Library, A Library, Programs
 @section Special handling for LIBOBJS and ALLOCA