--- automake-1.10/doc/automake.texi.orig 2006-10-15 19:41:24.000000000 +0200 +++ automake-1.10/doc/automake.texi 2006-10-26 23:02:36.354332500 +0200 @@ -38,15 +38,11 @@ @c info Automake points to the Automake package's documentation @c info automake points to the automake script's documentation @c (Autoconf has a similar setup.) -@dircategory Software development +@dircategory Programming tools: @direntry -* Automake: (automake). Making GNU standards-compliant Makefiles. -@end direntry - -@dircategory Individual utilities -@direntry -* aclocal: (automake)Invoking aclocal. Generating aclocal.m4. -* automake: (automake)Invoking Automake. Generating Makefile.in. +* Automake: (automake). Making GNU standards-compliant Makefiles +* aclocal: (automake)aclocal. Generating aclocal.m4 +* automake: (automake)automake. Generating Makefile.in @end direntry @titlepage @@ -97,7 +93,7 @@ * Autotools Introduction:: An Introduction to the Autotools * Generalities:: General ideas * Examples:: Some example packages -* Invoking Automake:: Creating a Makefile.in +* automake:: Creating a Makefile.in * configure:: Scanning configure.ac or configure.in * Directories:: Declaring subdirectories * Programs:: Building programs and libraries @@ -174,7 +170,7 @@ * Requirements:: Configuration requirements * Optional:: Other things Automake recognizes -* Invoking aclocal:: Auto-generating aclocal.m4 +* aclocal:: Auto-generating aclocal.m4 * Macros:: Autoconf macros supplied with Automake Auto-generating aclocal.m4 @@ -2418,7 +2414,7 @@ (The name of the object files rarely matters.) -@node Invoking Automake +@node automake @chapter Creating a @file{Makefile.in} @cindex Multiple @file{configure.ac} files @@ -2652,7 +2648,7 @@ @menu * Requirements:: Configuration requirements * Optional:: Other things Automake recognizes -* Invoking aclocal:: Auto-generating aclocal.m4 +* aclocal:: Auto-generating aclocal.m4 * Macros:: Autoconf macros supplied with Automake @end menu @@ -3020,13 +3016,12 @@ @code{m4_include} is seldom used by @file{configure.ac} authors, but can appear in @file{aclocal.m4} when @command{aclocal} detects that some required macros come from files local to your package (as opposed -to macros installed in a system-wide directory, @pxref{Invoking -aclocal}). +to macros installed in a system-wide directory, @pxref{aclocal}). @end ftable -@node Invoking aclocal +@node aclocal @section Auto-generating aclocal.m4 @cindex Invoking @command{aclocal} @@ -3194,7 +3189,7 @@ @vindex WARNINGS The environment variable @env{WARNINGS} is honored in the same -way as it is for @command{automake} (@pxref{Invoking Automake}). +way as it is for @command{automake} (@pxref{automake}). @end table @@ -3468,12 +3463,12 @@ @code{ACLOCAL_AMFLAGS} contains options to pass to @command{aclocal} when @file{aclocal.m4} is to be rebuilt by @command{make}. This line is -also used by @command{autoreconf} (@pxref{autoreconf Invocation, , +also used by @command{autoreconf} (@pxref{autoreconf, , Using @command{autoreconf} to Update @file{configure} Scripts, autoconf, The Autoconf Manual}) to run @command{aclocal} with suitable -options, or by @command{autopoint} (@pxref{autopoint Invocation, , +options, or by @command{autopoint} (@pxref{autopoint, , Invoking the @command{autopoint} Program, gettext, GNU gettext tools}) -and @command{gettextize} (@pxref{gettextize Invocation, , Invoking the +and @command{gettextize} (@pxref{gettextize, , Invoking the @command{gettextize} Program, gettext, GNU gettext tools}) to locate the place where Gettext's macros should be installed. So even if you do not really care about the rebuild rules, you should define @@ -5314,7 +5309,7 @@ passed to the tool invoked by @command{libtool} (hence the use of @samp{@var{library}_LDFLAGS} for libtool linking flags). Generic options include @option{--tag=@var{TAG}} and @option{--silent} -(@pxref{Invoking libtool, , Invoking @command{libtool}, libtool, The +(@pxref{libtool, , Invoking @command{libtool}, libtool, The Libtool Manual} for more options) should appear before the mode selection on the command line; in @file{Makefile.am}s they should be listed in the @samp{@var{library}_LIBTOOLFLAGS} variable. @@ -9151,7 +9146,7 @@ @command{make} implementations that do not support it. The @option{silent-rules} option turns off warnings about recursive variable expansion, which are in turn enabled by @option{-Wportability} -(@pxref{Invoking Automake}). +(@pxref{automake}). @vindex @code{AM_V_GEN} @vindex @code{AM_V_at} @@ -9292,7 +9287,7 @@ @cindex Option, @option{-W@var{category}} @cindex Option, @option{--warnings=@var{category}} These options behave exactly like their command-line counterpart -(@pxref{Invoking Automake}). This allows you to enable or disable some +(@pxref{automake}). This allows you to enable or disable some warning categories on a per-file basis. You can also setup some warnings for your entire project; for instance, try @samp{AM_INIT_AUTOMAKE([-Wall])} in your @file{configure.ac}. @@ -9840,7 +9835,7 @@ settings of Automake, or replace some of its rules. Overriding Automake rules is often inadvisable, particularly in the topmost directory of a package with subdirectories. The @option{-Woverride} -option (@pxref{Invoking Automake}) comes in handy to catch overridden +option (@pxref{automake}) comes in handy to catch overridden definitions. Note that Automake does not make any distinction between rules with @@ -10283,7 +10278,7 @@ @end example The use of @option{--force-missing} ensures that auxiliary tools will be -overridden by new versions (@pxref{Invoking Automake}). +overridden by new versions (@pxref{automake}). It is important to regenerate all these files each time Automake is upgraded, even between bug fixes releases. For instance, it is not