* lib/depcomp (tru64) [libtool]: Nicolas Joly reported on

2002-06-12 that dependencies were output in $dir.libs/$base.lo.d.
Teun Burgers reported on 2004-03-30 they were in
$dir.libs/$base.o.d.  Try both.

diff --git a/ChangeLog b/ChangeLog
index a078439b701553003b27bb6767a0c0ac4e7b99f9..61c52995a116ebd117e4f172993d278a5921a841 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-04-24  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * lib/depcomp (tru64) [libtool]: Nicolas Joly reported on
+       2002-06-12 that dependencies were output in $dir.libs/$base.lo.d.
+       Teun Burgers reported on 2004-03-30 they were in
+       $dir.libs/$base.o.d.  Try both.
+
 2004-04-23  Alexandre Duret-Lutz  <adl@gnu.org>
 
        For PR automake/414:

diff --git a/THANKS b/THANKS
index 73cc5a9bc31dd6bc61ef46acf4d015b114723432..a6c02c1e62726f3c6cfb899079cb001ec1bb1787 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -236,6 +236,7 @@ Steve M. Robbins    steve@nyongwa.montreal.qc.ca
 Sven Verdoolaege       skimo@kotnet.org
 Tamara L. Dahlgren     dahlgren1@llnl.gov
 Tatu Ylonen            ylo@ssh.fi
+Teun Burgers           burgers@ecn.nl
 The Crimson Binome     steve@nyongwa.montreal.qc.ca
 Thien-Thi Nguyen       ttn@glug.org
 Thomas Fitzsimmons     fitzsim@redhat.com

diff --git a/lib/depcomp b/lib/depcomp
index 9beba448a31276e74a2f53444dd3608d0626014b..7434cd8e6dca50fa634ba8864714774dcd191a03 100755 (executable)
--- a/lib/depcomp
+++ b/lib/depcomp
@@ -1,9 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2003-12-28.12
+scriptversion=2004-04-24.12
 
-# Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -287,26 +287,32 @@ tru64)
    base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
 
    if test "$libtool" = yes; then
+      # Dependencies have been reported to be
+      # output in either .lo.d or .o.d.
       tmpdepfile1="$dir.libs/$base.lo.d"
-      tmpdepfile2="$dir.libs/$base.d"
+      tmpdepfile2="$dir.libs/$base.o.d"
+      tmpdepfile3="$dir.libs/$base.d"
       "$@" -Wc,-MD
    else
       tmpdepfile1="$dir$base.o.d"
       tmpdepfile2="$dir$base.d"
+      tmpdepfile3="$dir$base.d"
       "$@" -MD
    fi
 
    stat=$?
    if test $stat -eq 0; then :
    else
-      rm -f "$tmpdepfile1" "$tmpdepfile2"
+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
       exit $stat
    fi
 
    if test -f "$tmpdepfile1"; then
       tmpdepfile="$tmpdepfile1"
-   else
+   elif test -f "$tmpdepfile2"; then
       tmpdepfile="$tmpdepfile2"
+   else
+      tmpdepfile="$tmpdepfile3"
    fi
    if test -f "$tmpdepfile"; then
       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"