From 85b1e2e3eaac648b040afa9910bfcc3ee2a23fe0 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Thu, 25 Feb 2010 15:49:12 -0700 Subject: [PATCH] Update file flow diagram to mention Automake. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 --- ChangeLog | 6 ++++++ doc/autoconf.texi | 25 +++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f0be2df..90befe8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2010-02-25 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. + Document how to safely override CFLAGS default. * doc/autoconf.texi (C Compiler) : Document a way to change the default CFLAGS. diff --git a/doc/autoconf.texi b/doc/autoconf.texi index 86d434c..3bb2e42 100644 --- a/doc/autoconf.texi +++ b/doc/autoconf.texi @@ -1009,7 +1009,8 @@ Making configure Scripts 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 @@ Making configure Scripts [acsite.m4] ---' @end group -Makefile.in -------------------------------> Makefile.in +Makefile.in address@hidden example + address@hidden +Additionally, if you use Automake, the following additional productions +come into play: + address@hidden address@hidden +[acinclude.m4] --. + | +[local macros] --+--> aclocal* --> aclocal.m4 + | +configure.ac ----' address@hidden group + address@hidden +configure.ac --. + +--> automake* --> Makefile.in +Makefile.am ---' address@hidden group @end example @noindent -- 1.6.6.1