* automake.texi (Program and Library Variables): Document _LINK.

diff --git a/ChangeLog b/ChangeLog
index d09b5aa4a6cd58e08f7476ec59f03c1350fc9a06..e17fa6886188edc2b8b1e3ff3a69558a4bbbb001 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-16  Tom Tromey  <tromey@redhat.com>
+
+       * automake.texi (Program and Library Variables): Document _LINK.
+
 2001-07-16  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
        * automake.in (handle_libraries): Allow libraries to lie in

diff --git a/automake.texi b/automake.texi
index f44f0005dcfdc515c9095a0378885c4991fa5a42..c96e3e1fe7c2e96bf90712575165e22d352bf935 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -1982,6 +1982,19 @@ Use the @samp{_LDFLAGS} variable for this purpose.
 This variable is used to pass extra flags to the link step of a program
 or a shared library.
 
+@item maude_LINK
+You can override the linker on a per-program basis.  By default the
+linker is chosen according to the languages used by the program.  For
+instance, a program that includes C++ source code would use the C++
+compiler to link.  The @samp{_LINK} variable must hold the name of a
+command which can be passed all the @file{.o} file names as arguments.
+Note that the name of the underlying program is @emph{not} passed to
+@samp{_LINK}; typically one uses @samp{$@@}:
+
+@example
+maude_LINK = $(CCLD) -magic -o $@
+@end example
+
 @item maude_CFLAGS
 Automake allows you to set compilation flags on a per-program (or
 per-library) basis.  A single source file can be included in several
@@ -1999,10 +2012,9 @@ object file will be named, for instance, @file{maude-sample.o}.
 
 In compilations with per-program flags, the ordinary @samp{AM_} form of
 the flags variable is @emph{not} automatically included in the
-compilation (however, the user form of the variable @emph{is}
-included).  So for instance, if you want the hypothetical @file{maude}
-compilation to also use the value of @samp{AM_CFLAGS}, you would need to
-write:
+compilation (however, the user form of the variable @emph{is} included).
+So for instance, if you want the hypothetical @file{maude} compilations
+to also use the value of @samp{AM_CFLAGS}, you would need to write:
 
 @example
 maude_CFLAGS = ... your flags ... $(AM_CFLAGS)

diff --git a/stamp-vti b/stamp-vti
index 7f5d863f30dd5c953ff233875312558f34f1fa8a..4699f00c218369a4826eed40b284baaf9a193eaf 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 3 July 2001
+@set UPDATED 16 July 2001
 @set UPDATED-MONTH July 2001
 @set EDITION 1.4i
 @set VERSION 1.4i

diff --git a/version.texi b/version.texi
index 7f5d863f30dd5c953ff233875312558f34f1fa8a..4699f00c218369a4826eed40b284baaf9a193eaf 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 3 July 2001
+@set UPDATED 16 July 2001
 @set UPDATED-MONTH July 2001
 @set EDITION 1.4i
 @set VERSION 1.4i