From 007a7b810d59ed85ce24f6081ad1848806380ba6 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Sat, 24 Apr 2004 09:21:11 +0000 Subject: [PATCH] * 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. --- ChangeLog | 7 +++++++ THANKS | 1 + lib/depcomp | 16 +++++++++++----- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index a078439b..61c52995 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-04-24 Alexandre Duret-Lutz + + * 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 For PR automake/414: diff --git a/THANKS b/THANKS index 73cc5a9b..a6c02c1e 100644 --- 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 9beba448..7434cd8e 100755 --- 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" -- 2.43.5