* automake.in (handle_languages, define_compiler_variable): Output

Libtool's --tag= option before --mode=compile, because depcomp use
--mode=compile as end marker for libtool arguments.
(define_linker_variable): Likewise before --mode=link, for
uniformity.
* tests/pr307.test: Make sure dependency files are updated.  That
was not the case because depcomp thought `--tag=CC' was the
compiler to get dependencies from.
Report from Пухальский Юрий Андреевич.

4 files changed, 48 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index d5c769ede..4e9cd903a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2004-09-28  Alexandre Duret-Lutz  <adl@gnu.org>
+
+	* automake.in (handle_languages, define_compiler_variable): Output
+	Libtool's --tag= option before --mode=compile, because depcomp use
+	--mode=compile as end marker for libtool arguments.
+	(define_linker_variable): Likewise before --mode=link, for
+	uniformity.
+	* tests/pr307.test: Make sure dependency files are updated.  That
+	was not the case because depcomp thought `--tag=CC' was the
+	compiler to get dependencies from.
+	Report from Пухальский Юрий Андреевич.
+
 2004-09-25  Alexandre Duret-Lutz  <adl@gnu.org>
 
 	* doc/automake.texi (Clean): Document -local targets.
@@ -1138,7 +1150,7 @@
 
 	* tests/txinfo24.test, tests/txinfo25.test, tests/txinfo28.test:
 	Require texi2dvi-o.
-	Report from V�clav Haisman.
+	Report from Václav Haisman.
 
 2003-12-10  Alexandre Duret-Lutz  <adl@gnu.org>
 
@@ -2999,9 +3011,9 @@
 
 2003-05-22  Alexandre Duret-Lutz  <adl@gnu.org>
 
-	* automake.texi (maintainer-mode): s/Fran�ois/Fran@,{c}ois/.
+	* automake.texi (maintainer-mode): s/François/Fran@,{c}ois/.
 
-	* lib/elisp-comp: s/Fran�ois/Franc,ois/.
+	* lib/elisp-comp: s/François/Franc,ois/.
 	Suggested by Paul Eggert.
 
 	* automake.in: Move the "main" code at the end.
@@ -4054,3 +4066,7 @@ You should have received a copy of the GNU General Public License
 along with autoconf; see the file COPYING.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.
+
+;; Local Variables:
+;; coding: utf-8
+;; End:
diff --git a/THANKS b/THANKS
index 6ace6a7a9..8f2a2cbe6 100644
--- a/THANKS
+++ b/THANKS
@@ -70,7 +70,7 @@ Erik Lindahl		E.Lindahl@chem.rug.nl
 Esben Haabendal Soerensen bart@kom.aau.dk
 Ezra Peisach		epeisach@MED-XTAL.BU.EDU
 Flavien Astraud		flav42@yahoo.fr
-Fran�ois Pinard		pinard@iro.umontreal.ca
+François Pinard		pinard@iro.umontreal.ca
 Fred Fish		fnf@ninemoons.com
 Ganesan Rajagopal	rganesan@novell.com
 Garrett D'Amore		garrett@qualcomm.com
@@ -104,7 +104,7 @@ Jeff Bailey		Jbailey@phn.ca
 Jeff Garzik		jgarzik@pobox.com
 Jeff Squyres		jsquyres@lam-mpi.org
 Jens Elkner		elkner@imsgroup.de
-Jens Kr�ger		jens_krueger@physik.tu-muenchen.de
+Jens Krüger		jens_krueger@physik.tu-muenchen.de
 Jens Petersen		petersen@redhat.com
 Jeremy Nimmer		jwnimmer@alum.mit.edu
 Jerome Lovy		jlovy@multimania.com
@@ -205,13 +205,14 @@ Phil Edwards		phil@jaj.com
 Phil Nelson		phil@cs.wwu.edu
 Philip Fong		pwlfong@users.sourceforge.net
 Philip S Tellis		philip@ncst.ernet.in
+Пухальский Юрий Андреевич pooh@cryptopro.ru
 Rainer Orth		ro@techfak.uni-bielefeld.de
 Rafael Laboissiere	laboissiere@psy.mpg.de
 Raja R Harinath		harinath@cs.umn.edu
 Ralf Corsepius		corsepiu@faw.uni-ulm.de
 Ralf Wildenhues		Ralf.Wildenhues@gmx.de
 Ralph Schleicher	rs@purple.UL.BaWue.DE
-Ram�n Garc�a Fern�ndez	ramon@jl1.quim.ucm.es
+Ramón García Fernández	ramon@jl1.quim.ucm.es
 Rich Wales		richw@webcom.com
 Richard Boulton		richard@tartarus.org
 Richard Dawe		rich@phekda.freeserve.co.uk
@@ -253,10 +254,15 @@ Tim Van Holder		tim.van.holder@pandora.be
 Tom Epperly		tepperly@llnl.gov
 Ulrich Drepper		drepper@gnu.ai.mit.edu
 Ulrich Eckhardt		eckhardt@satorlaser.com
-V�clav Haisman		V.Haisman@sh.cvut.cz
+Václav Haisman		V.Haisman@sh.cvut.cz
 Vadim Zeitlin		Vadim.zeitlin@dptmaths.ens-cachan.fr
 Volker Boerchers	vboerchers@tecon.de
 Werner John		john@oswf.de
 Werner Koch		wk@isil.d.shuttle.de
 William S Fulton	wsf@fultondesigns.co.uk
 Yann Droneaud		ydroneaud@meuh.eu.org
+
+;; Local Variables:
+;; mode: text
+;; coding: utf-8
+;; End:
diff --git a/automake.in b/automake.in
index a6f34f278..12f57565c 100755
--- a/automake.in
+++ b/automake.in
@@ -1223,7 +1223,7 @@ sub handle_languages
 	      }
 
 	    my $obj_ltcompile =
-	      '$(LIBTOOL) --mode=compile ' . $libtool_tag . $obj_compile;
+	      "\$(LIBTOOL) $libtool_tag--mode=compile $obj_compile";
 
 	    # We _need_ `-o' for per object rules.
 	    my $output_flag = $lang->output_flag || '-o';
@@ -5689,7 +5689,7 @@ sub define_compiler_variable ($)
       if $lang->libtool_tag && exists $libtool_tags{$lang->libtool_tag};
     &define_variable ($var, $value, INTERNAL);
     &define_variable ("LT$var",
-		      "\$(LIBTOOL) --mode=compile $libtool_tag$value",
+		      "\$(LIBTOOL) $libtool_tag--mode=compile $value",
 		      INTERNAL)
       if var ('LIBTOOL');
 }
@@ -5711,7 +5711,7 @@ sub define_linker_variable ($)
     # CCLINK = $(CCLD) blah blah...
     &define_variable ($lang->linker,
 		      ((var ('LIBTOOL') ?
-			'$(LIBTOOL) --mode=link ' . $libtool_tag  : '')
+			"\$(LIBTOOL) $libtool_tag--mode=link " : '')
 		       . $lang->link),
 		      INTERNAL);
 }
diff --git a/tests/pr307.test b/tests/pr307.test
index fa6c71f1d..2d3adead6 100755
--- a/tests/pr307.test
+++ b/tests/pr307.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -34,10 +34,23 @@ END
 cat > Makefile.am << 'END'
 check_LTLIBRARIES = librace.la
 librace_la_SOURCES = a.c b.c c.c d.c e.c f.c g.c h.c
+
+# Make sure the dependencies are updated.
+check-local:
+	for i in $(librace_la_SOURCES:.c=.Plo); do \
+	  echo checking ./$(DEPDIR)/$$i; \
+	  grep foo.h ./$(DEPDIR)/$$i >tst || exit 1; \
+	  test `wc -l <tst` -eq 2 || exit 1; \
+	done
 END
 
+: >foo.h
+
 for i in a b c d e f g h; do
-  echo "int $i() { return 0; }" > $i.c
+  cat >$i.c <<EOF
+#include "foo.h"
+int $i() { return 0; }
+EOF
 done
 
 set -e
@@ -65,3 +78,4 @@ $MAKE check
 # (This may happen on `f' or on some other files.)
 
 test -f librace.la
+test -f tst # a proof that check-local was run