Update file flow diagram to mention Automake.

* doc/autoconf.texi (Making configure Scripts): Avoid confusion
with listing Makefile.in twice on one line.  Add a diagram showing
how automake fits into the picture.
Reported by santilín.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index 98e0b314f6bbeb91119de73fdff65f8731b0288f..523628e8f28f2ec07ec9a97755854aabbfe5ae97 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-03-01  Eric Blake  <eblake@redhat.com>
+
+       Update file flow diagram to mention Automake.
+       * doc/autoconf.texi (Making configure Scripts): Avoid confusion
+       with listing Makefile.in twice on one line.  Add a diagram showing
+       how automake fits into the picture.
+       Reported by santilín.
+
 2010-02-26  Eric Blake  <eblake@redhat.com>
 
        Optimize AC_REPLACE_FUNCS.

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 3dfeda2486d85c51a4c3cbe2f5a1cb07a8f51917..191a3979b950dddfc44fb01909ec4fc94b6cb422 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -1009,7 +1009,8 @@ configuration are produced.  Programs that are executed are suffixed by
 macro files (by reading @file{autoconf.m4}).
 
 @noindent
-Files used in preparing a software package for distribution:
+Files used in preparing a software package for distribution, when using
+just Autoconf:
 @example
 your source files --> [autoscan*] --> [configure.scan] --> configure.ac
 
@@ -1021,7 +1022,27 @@ configure.ac --.
 [acsite.m4] ---'
 @end group
 
-Makefile.in -------------------------------> Makefile.in
+Makefile.in
+@end example
+
+@noindent
+Additionally, if you use Automake, the following additional productions
+come into play:
+
+@example
+@group
+[acinclude.m4] --.
+                 |
+[local macros] --+--> aclocal* --> aclocal.m4
+                 |
+configure.ac ----'
+@end group
+
+@group
+configure.ac --.
+               +--> automake* --> Makefile.in
+Makefile.am ---'
+@end group
 @end example
 
 @noindent