1 --- automake-1.13.1/doc/automake.texi.orig 2013-01-01 12:50:13.000000000 +0100
2 +++ automake-1.13.1/doc/automake.texi 2013-01-02 17:52:44.118274937 +0100
7 -@dircategory Software development
8 +@dircategory Programming tools:
10 -* Automake: (automake). Making GNU standards-compliant Makefiles.
13 -@dircategory Individual utilities
15 -* aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4.
16 -* automake-invocation: (automake)automake Invocation. Generating Makefile.in.
17 +* Automake: (automake). Making GNU standards-compliant Makefiles
18 +* aclocal-invocation: (automake)aclocal. Generating aclocal.m4
19 +* automake-invocation: (automake)automake. Generating Makefile.in
24 * Autotools Introduction:: An Introduction to the Autotools
25 * Generalities:: General ideas
26 * Examples:: Some example packages
27 -* automake Invocation:: Creating a Makefile.in
28 +* automake:: Creating a Makefile.in
29 * configure:: Scanning configure.ac, using aclocal
30 * Directories:: Declaring subdirectories
31 * Programs:: Building programs and libraries
34 * Requirements:: Configuration requirements
35 * Optional:: Other things Automake recognizes
36 -* aclocal Invocation:: Auto-generating aclocal.m4
37 +* aclocal:: Auto-generating aclocal.m4
38 * Macros:: Autoconf macros supplied with Automake
40 Auto-generating aclocal.m4
42 When starting a new project, we suggest you start with such a simple
43 @file{configure.ac}, and gradually add the other tests it requires.
44 The command @command{autoscan} can also suggest a few of the tests
45 -your package may need (@pxref{autoscan Invocation, , Using
46 +your package may need (@pxref{autoscan, , Using
47 @command{autoscan} to Create @file{configure.ac}, autoconf, The
51 would be chosen by automake; they would be @file{false-true.o} and
52 @file{true-true.o}. (The name of the object files rarely matters.)
54 -@node automake Invocation
56 @chapter Creating a @file{Makefile.in}
57 @c This node used to be named "Invoking automake". This @anchor
58 @c allows old links to still work.
61 * Requirements:: Configuration requirements
62 * Optional:: Other things Automake recognizes
63 -* aclocal Invocation:: Auto-generating aclocal.m4
64 +* aclocal:: Auto-generating aclocal.m4
65 * Macros:: Autoconf macros supplied with Automake
68 @@ -3119,11 +3115,11 @@
69 @code{m4_include} is seldom used by @file{configure.ac} authors, but
70 can appear in @file{aclocal.m4} when @command{aclocal} detects that
71 some required macros come from files local to your package (as opposed to
72 -macros installed in a system-wide directory, @pxref{aclocal Invocation}).
73 +macros installed in a system-wide directory, @pxref{aclocal}).
77 -@node aclocal Invocation
79 @section Auto-generating aclocal.m4
80 @c This node used to be named "Invoking automake". This @anchor
81 @c allows old links to still work.
85 The environment variable @env{WARNINGS} is honored in the same
86 -way as it is for @command{automake} (@pxref{automake Invocation}).
87 +way as it is for @command{automake} (@pxref{automake}).
92 releases, you should not use any of them in new code. @emph{All
93 these macros will be removed in the next major Automake version};
94 if you are still using them, running @command{autoupdate} should
95 -adjust your @file{configure.ac} automatically (@pxref{autoupdate
96 -Invocation, , Using @command{autoupdate} to Modernize
97 +adjust your @file{configure.ac} automatically (@pxref{autoupdate,
98 +, Using @command{autoupdate} to Modernize
99 @file{configure.ac}, autoconf, The Autoconf Manual}).
102 @@ -5453,7 +5449,7 @@
103 passed to the tool invoked by @command{libtool} (hence the use of
104 @samp{@var{library}_LDFLAGS} for libtool linking flags). Generic
105 options include @option{--tag=@var{tag}} and @option{--silent}
106 -(@pxref{Invoking libtool, , Invoking @command{libtool}, libtool, The
107 +(@pxref{libtool, , Invoking @command{libtool}, libtool, The
108 Libtool Manual} for more options) should appear before the mode
109 selection on the command line; in @file{Makefile.am}s they should
110 be listed in the @samp{@var{library}_LIBTOOLFLAGS} variable.
111 @@ -5526,7 +5522,7 @@
112 Since Automake 1.6, it has been decided that running
113 @command{libtoolize} was none of Automake's business. Instead, that
114 functionality has been moved into the @command{autoreconf} command
115 -(@pxref{autoreconf Invocation, , Using @command{autoreconf}, autoconf,
116 +(@pxref{autoreconf, , Using @command{autoreconf}, autoconf,
117 The Autoconf Manual}). If you do not want to remember what to run and
118 when, just learn the @command{autoreconf} command. Hopefully,
119 replacing existing @file{bootstrap.sh} or @file{autogen.sh} scripts by
120 @@ -10278,7 +10274,7 @@
121 @cindex Option, @option{-W@var{category}}
122 @cindex Option, @option{--warnings=@var{category}}
123 These options behave exactly like their command-line counterpart
124 -(@pxref{automake Invocation}). This allows you to enable or disable some
125 +(@pxref{automake}). This allows you to enable or disable some
126 warning categories on a per-file basis. You can also setup some warnings
127 for your entire project; for instance, try @samp{AM_INIT_AUTOMAKE([-Wall])}
128 in your @file{configure.ac}.
129 @@ -11051,7 +11047,7 @@
130 settings of Automake, or replace some of its rules. Overriding
131 Automake rules is often inadvisable, particularly in the topmost
132 directory of a package with subdirectories. The @option{-Woverride}
133 -option (@pxref{automake Invocation}) comes in handy to catch overridden
134 +option (@pxref{automake}) comes in handy to catch overridden
137 Note that Automake does not make any distinction between rules with
138 @@ -11499,7 +11495,7 @@
141 The use of @option{--force-missing} ensures that auxiliary tools will be
142 -overridden by new versions (@pxref{automake Invocation}).
143 +overridden by new versions (@pxref{automake}).
145 It is important to regenerate all of these files each time Automake is
146 upgraded, even between bug fixes releases. For instance, it is not