[SCM] GNU Autoconf source repository branch, master, updated. v2.65-42-g346e587

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 Autoconf source repository".

http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=346e5876eb709debf019e063bc3393278f834dd2

The branch, master has been updated
       via  346e5876eb709debf019e063bc3393278f834dd2 (commit)
      from  b4d3a51a96f83c2f5f6eefc34ec87a2eddfb5f45 (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 346e5876eb709debf019e063bc3393278f834dd2
Author: Eric Blake <[email protected]>
Date:   Thu Feb 25 15:49:12 2010 -0700

    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 <[email protected]>

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

Summary of changes:
 ChangeLog         |    8 ++++++++
 doc/autoconf.texi |   25 +++++++++++++++++++++++--
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 98e0b31..523628e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-03-01  Eric Blake  <[email protected]>
+
+	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  <[email protected]>
 
 	Optimize AC_REPLACE_FUNCS.
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 3dfeda2..191a397 100644
--- 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


hooks/post-receive
-- 
GNU Autoconf source repository