From: Eric Blake Date: Thu, 25 Feb 2010 22:49:12 +0000 (-0700) Subject: Update file flow diagram to mention Automake. X-Git-Tag: v2.66~79 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=346e5876eb709debf019e063bc3393278f834dd2;p=thirdparty%2Fautoconf.git 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 --- diff --git a/ChangeLog b/ChangeLog index 98e0b314..523628e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2010-03-01 Eric Blake + + 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 Optimize AC_REPLACE_FUNCS. diff --git a/doc/autoconf.texi b/doc/autoconf.texi index 3dfeda24..191a3979 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