* lib/compile: Handle output.obj in addition to output.o.

* tests/compile.test: Check for this.

diff --git a/ChangeLog b/ChangeLog
index 6a62a75f986445b500e94fcecd531fbfe5187bfd..b00ac8f5ca8bb7ecf91d31d274bce220751c4d4d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-12  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * lib/compile: Handle output.obj in addition to output.o.
+       * tests/compile.test: Check for this.
+
 2004-10-11  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * doc/automake.texi (Sources): Typo, reported by Karl Berry.

diff --git a/lib/compile b/lib/compile
index 80b645b015f3cbee717fd38ca22e857c8cd70830..3d2170320efc07c320445d98bb4bfad1393a4e8d 100755 (executable)
--- a/lib/compile
+++ b/lib/compile
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand `-c -o'.
 
-scriptversion=2004-09-10.20
+scriptversion=2004-10-12.08
 
 # Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
@@ -125,6 +125,8 @@ ret=$?
 
 if test -f "$cofile"; then
   mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  mv "${cofile}bj" "$ofile"
 fi
 
 rmdir "$lockdir"

diff --git a/tests/compile.test b/tests/compile.test
index a0ca397abeb665709fc420d6e509f8387dd4e5a7..f9851d48436b65f06057f0935b5fa85338c2e41d 100755 (executable)
--- a/tests/compile.test
+++ b/tests/compile.test
@@ -41,3 +41,8 @@ test -f 'a  c.o'
 test ! -f ./-o
 test ! -f a.o
 test -f a.c
+
+# Make sure `compile' works for .obj too.
+./compile touch a.obj -- -o ac.obj a.c
+test ! -f a.obj
+test ac.obj