---- automake-1.4-p4/automake.texi.orig Wed Jan 6 14:01:26 1999
-+++ automake-1.4-p4/automake.texi Wed Jul 11 02:48:08 2001
-@@ -7,14 +7,10 @@
+--- automake-1.9.6/doc/automake.texi.orig 2005-07-09 11:28:44.000000000 +0200
++++ automake-1.9.6/doc/automake.texi 2005-07-16 15:22:23.458288944 +0200
+@@ -32,14 +32,10 @@
+ @end quotation
+ @end copying
- @include version.texi
-
--@dircategory GNU admin
+-@dircategory Software development
+@dircategory Programming tools:
@direntry
--* automake: (automake). Making Makefile.in's
+-* automake: (automake). Making Makefile.in's.
-@end direntry
-
-@dircategory Individual utilities
-@direntry
--* aclocal: (automake)Invoking aclocal. Generating aclocal.m4
+-* aclocal: (automake)Invoking aclocal. Generating aclocal.m4.
+* automake: (automake). Making Makefile.in's
+* aclocal: (automake)aclocal. Generating aclocal.m4
@end direntry
- @ifinfo
-@@ -111,7 +107,7 @@
- * Introduction:: Automake's purpose
- * Generalities:: General ideas
- * Examples:: Some example packages
--* Invoking Automake:: Creating a Makefile.in
-+* Automake:: Creating a Makefile.in
- * configure:: Scanning configure.in
- * Top level:: The top-level Makefile.am
- * Programs:: Building programs and libraries
-@@ -503,7 +499,7 @@
- @code{sniff_glue_SOURCES}, not @code{sniff-glue_SOURCES}.
-
-
--@node Examples, Invoking Automake, Generalities, Top
-+@node Examples, Automake, Generalities, Top
- @chapter Some example packages
-
- @menu
-@@ -743,11 +739,11 @@
- @end example
-
+ @titlepage
+@@ -130,7 +126,7 @@
--@node Invoking Automake, configure, Examples, Top
-+@node Automake, configure, Examples, Top
- @chapter Creating a @file{Makefile.in}
-
- @cindex Multiple configure.in files
--@cindex Invoking Automake
-+@cindex Automake
- @cindex Automake, invoking
-
- To create all the @file{Makefile.in}s for a package, run the
-@@ -890,7 +886,7 @@
- @end table
-
-
--@node configure, Top level, Invoking Automake, Top
-+@node configure, Top level, Automake, Top
- @chapter Scanning @file{configure.in}
-
- @cindex configure.in, scanning
-@@ -909,7 +905,7 @@
+ * Requirements:: Configuration requirements
+ * Optional:: Other things Automake recognizes
+-* Invoking aclocal:: Auto-generating aclocal.m4
++* aclocal:: Auto-generating aclocal.m4
+ * aclocal options:: aclocal command line arguments
+ * Macro search path:: Modifying aclocal's search path
+ * Macros:: Autoconf macros supplied with Automake
+@@ -1286,7 +1282,7 @@
@menu
* Requirements:: Configuration requirements
* Optional:: Other things Automake recognizes
-* Invoking aclocal:: Auto-generating aclocal.m4
+* aclocal:: Auto-generating aclocal.m4
+ * aclocal options:: aclocal command line arguments
+ * Macro search path:: Modifying aclocal's search path
* Macros:: Autoconf macros supplied with Automake
- * Extending aclocal:: Writing your own aclocal macros
- @end menu
-@@ -995,7 +991,7 @@
- @end table
-
-
--@node Optional, Invoking aclocal, Requirements, configure
-+@node Optional, aclocal, Requirements, configure
- @section Other things Automake recognizes
+@@ -1490,13 +1486,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}).
- @cindex Macros Automake recognizes
-@@ -1185,11 +1181,11 @@
- @end table
+ @end ftable
--@node Invoking aclocal, Macros, Optional, configure
-+@node aclocal, Macros, Optional, configure
+-@node Invoking aclocal
++@node aclocal
@section Auto-generating aclocal.m4
--@cindex Invoking aclocal
--@cindex aclocal, Invoking
-+@cindex aclocal
-+@cindex aclocal
-
- Automake includes a number of Autoconf macros which can be used in your
- package; some of them are actually required by Automake in certain
-@@ -1249,7 +1245,7 @@
- @end table
-
-
--@node Macros, Extending aclocal, Invoking aclocal, configure
-+@node Macros, Extending aclocal, aclocal, configure
- @section Autoconf macros supplied with Automake
-
- @c consider generating this node automatically from m4 files.
-@@ -2294,7 +2290,7 @@
-
- When you decide to make a distribution, the @code{dist} target will
- re-run @code{automake} with @samp{--include-deps} and other options.
--@xref{Invoking Automake}, and @ref{Options}. This will cause the
-+@xref{Automake}, and @ref{Options}. This will cause the
- previously generated dependencies to be inserted into the generated
- @file{Makefile.in}, and thus into the distribution. This step also
- turns off inclusion of the dependency generation code, so that those who
+ @cindex Invoking @command{aclocal}
+@@ -2120,12 +2115,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
projects / packages / automake.git / blobdiff