]>
Commit | Line | Data |
---|---|---|
849f5418 JB |
1 | --- automake-1.16.5/doc/automake.texi.orig 2021-10-01 21:30:59.000000000 +0200 |
2 | +++ automake-1.16.5/doc/automake.texi 2021-11-30 22:10:34.118232059 +0100 | |
3 | @@ -38,15 +38,11 @@ section entitled ``GNU Free Documentatio | |
efa0465c JB |
4 | @end quotation |
5 | @end copying | |
6 | ||
90b9a4ac | 7 | -@dircategory Software development |
02574d4c | 8 | +@dircategory Programming tools: |
9 | @direntry | |
7fc67891 | 10 | -* Automake: (automake). Making GNU standards-compliant Makefiles. |
02574d4c | 11 | -@end direntry |
12 | - | |
13 | -@dircategory Individual utilities | |
14 | -@direntry | |
efa0465c JB |
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 | |
02574d4c | 20 | @end direntry |
21 | ||
1e718d93 | 22 | @titlepage |
849f5418 | 23 | @@ -102,7 +98,7 @@ section entitled ``GNU Free Documentatio |
7fc67891 JB |
24 | * Autotools Introduction:: An Introduction to the Autotools |
25 | * Generalities:: General ideas | |
26 | * Examples:: Some example packages | |
efa0465c | 27 | -* automake Invocation:: Creating a Makefile.in |
7fc67891 | 28 | +* automake:: Creating a Makefile.in |
09dffca2 | 29 | * configure:: Scanning configure.ac, using aclocal |
7fc67891 JB |
30 | * Directories:: Declaring subdirectories |
31 | * Programs:: Building programs and libraries | |
849f5418 | 32 | @@ -178,7 +174,7 @@ Scanning @file{configure.ac}, using @com |
63096833 JB |
33 | |
34 | * Requirements:: Configuration requirements | |
35 | * Optional:: Other things Automake recognizes | |
efa0465c | 36 | -* aclocal Invocation:: Auto-generating aclocal.m4 |
63096833 | 37 | +* aclocal:: Auto-generating aclocal.m4 |
63096833 | 38 | * Macros:: Autoconf macros supplied with Automake |
7fc67891 JB |
39 | |
40 | Auto-generating aclocal.m4 | |
849f5418 | 41 | @@ -1696,7 +1692,7 @@ registered with @code{AC_CONFIG_HEADERS} |
efa0465c JB |
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 | |
48 | Autoconf Manual}). | |
49 | ||
849f5418 | 50 | @@ -2583,7 +2579,7 @@ with different flags. In this instance, |
efa0465c | 51 | would be chosen by automake; they would be @file{false-true.o} and |
09dffca2 | 52 | @file{true-true.o}. (The name of the object files rarely matters.) |
7fc67891 | 53 | |
efa0465c | 54 | -@node automake Invocation |
7fc67891 JB |
55 | +@node automake |
56 | @chapter Creating a @file{Makefile.in} | |
efa0465c JB |
57 | @c This node used to be named "Invoking automake". This @anchor |
58 | @c allows old links to still work. | |
849f5418 | 59 | @@ -2851,7 +2847,7 @@ easier. These macros can automatically |
02574d4c | 60 | @menu |
61 | * Requirements:: Configuration requirements | |
62 | * Optional:: Other things Automake recognizes | |
efa0465c | 63 | -* aclocal Invocation:: Auto-generating aclocal.m4 |
02574d4c | 64 | +* aclocal:: Auto-generating aclocal.m4 |
65 | * Macros:: Autoconf macros supplied with Automake | |
7fc67891 JB |
66 | @end menu |
67 | ||
849f5418 | 68 | @@ -3241,11 +3237,11 @@ appear as dependencies in @file{Makefile |
a810cf6e | 69 | @code{m4_include} is seldom used by @file{configure.ac} authors, but |
1e718d93 | 70 | can appear in @file{aclocal.m4} when @command{aclocal} detects that |
efa0465c | 71 | some required macros come from files local to your package (as opposed to |
780166fe AM |
72 | -macros installed in a system-wide directory; @pxref{aclocal Invocation}). |
73 | +macros installed in a system-wide directory; @pxref{aclocal}). | |
02574d4c | 74 | |
a810cf6e | 75 | @end ftable |
02574d4c | 76 | |
efa0465c | 77 | -@node aclocal Invocation |
1e718d93 | 78 | +@node aclocal |
02574d4c | 79 | @section Auto-generating aclocal.m4 |
efa0465c JB |
80 | @c This node used to be named "Invoking automake". This @anchor |
81 | @c allows old links to still work. | |
849f5418 | 82 | @@ -3435,7 +3431,7 @@ All warnings are output by default. |
7fc67891 JB |
83 | |
84 | @vindex WARNINGS | |
85 | The environment variable @env{WARNINGS} is honored in the same | |
efa0465c | 86 | -way as it is for @command{automake} (@pxref{automake Invocation}). |
7fc67891 JB |
87 | +way as it is for @command{automake} (@pxref{automake}). |
88 | ||
89 | @end table | |
90 | ||
849f5418 | 91 | @@ -4191,8 +4187,8 @@ Although using some of the following mac |
0ed98c47 JB |
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}). | |
100 | @emph{Do it NOW!} | |
101 | ||
849f5418 | 102 | @@ -5585,7 +5581,7 @@ aforementioned linking flags should be l |
7fc67891 JB |
103 | passed to the tool invoked by @command{libtool} (hence the use of |
104 | @samp{@var{library}_LDFLAGS} for libtool linking flags). Generic | |
09dffca2 | 105 | options include @option{--tag=@var{tag}} and @option{--silent} |
7fc67891 JB |
106 | -(@pxref{Invoking libtool, , Invoking @command{libtool}, libtool, The |
107 | +(@pxref{libtool, , Invoking @command{libtool}, libtool, The | |
780166fe | 108 | Libtool Manual} for more options). They should appear before the mode |
7fc67891 JB |
109 | selection on the command line; in @file{Makefile.am}s they should |
110 | be listed in the @samp{@var{library}_LIBTOOLFLAGS} variable. | |
849f5418 | 111 | @@ -5658,7 +5654,7 @@ this issue because older Automake versio |
efa0465c JB |
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, | |
849f5418 JB |
119 | replacing existing @file{bootstrap} or @file{autogen.sh} scripts by |
120 | @@ -10712,7 +10708,7 @@ will be suppressed. | |
7fc67891 JB |
121 | @cindex Option, @option{-W@var{category}} |
122 | @cindex Option, @option{--warnings=@var{category}} | |
123 | These options behave exactly like their command-line counterpart | |
efa0465c | 124 | -(@pxref{automake Invocation}). This allows you to enable or disable some |
7fc67891 JB |
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}. | |
849f5418 | 129 | @@ -11439,7 +11435,7 @@ These overriding semantics make it possi |
7fc67891 JB |
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} | |
efa0465c | 133 | -option (@pxref{automake Invocation}) comes in handy to catch overridden |
b46b2103 | 134 | +option (@pxref{automake}) comes in handy to catch overridden |
7fc67891 JB |
135 | definitions. |
136 | ||
b46b2103 | 137 | Note that Automake does not make any distinction between rules with |
849f5418 | 138 | @@ -11896,7 +11892,7 @@ autoreconf -vfi |
7fc67891 JB |
139 | @end example |
140 | ||
141 | The use of @option{--force-missing} ensures that auxiliary tools will be | |
efa0465c | 142 | -overridden by new versions (@pxref{automake Invocation}). |
7fc67891 JB |
143 | +overridden by new versions (@pxref{automake}). |
144 | ||
70921c59 | 145 | It is important to regenerate all of these files each time Automake is |
849f5418 | 146 | upgraded, even between bug fix releases. For instance, it is not |
41bc3074 JB |
147 | --- automake-1.16.3/doc/automake-history.texi.orig 2020-11-19 02:21:03.000000000 +0100 |
148 | +++ automake-1.16.3/doc/automake-history.texi 2021-01-10 12:24:21.033358854 +0100 | |
149 | @@ -23,9 +23,9 @@ | |
150 | @end quotation | |
151 | @end copying | |
152 | ||
153 | -@dircategory Software development | |
154 | +@dircategory Programming tools: | |
155 | @direntry | |
156 | -* Automake-history: (automake-history). History of Automake development. | |
157 | +* Automake-history: (automake-history). History of Automake development | |
158 | @end direntry | |
159 | ||
160 | @titlepage |