From e6dc3d8a2540b80c5675f41491f4f6cbd362a913 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Tue, 12 Oct 2004 07:02:42 +0000 Subject: [PATCH] * lib/compile: Handle output.obj in addition to output.o. * tests/compile.test: Check for this. --- ChangeLog | 5 +++++ lib/compile | 4 +++- tests/compile.test | 5 +++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6a62a75f..b00ac8f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-10-12 Alexandre Duret-Lutz + + * lib/compile: Handle output.obj in addition to output.o. + * tests/compile.test: Check for this. + 2004-10-11 Alexandre Duret-Lutz * doc/automake.texi (Sources): Typo, reported by Karl Berry. diff --git a/lib/compile b/lib/compile index 80b645b0..3d217032 100755 --- 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 . @@ -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 a0ca397a..f9851d48 100755 --- 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 -- 2.43.5