diff options
| author | Jim Meyering <jim@meyering.net> | 2004-04-26 13:59:35 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2004-04-26 13:59:35 +0000 |
| commit | 431d6618636655ba3fc33072cbf03e38b79bbf67 (patch) | |
| tree | 7e137f2252c35ea8a2a8c05717807dbc5e865c30 /config/depcomp | |
| parent | 48d44f43013741400944633fddcbe3d144a3fafe (diff) | |
| download | coreutils-431d6618636655ba3fc33072cbf03e38b79bbf67.tar.xz | |
update from master
Diffstat (limited to 'config/depcomp')
| -rw-r--r-- | config/depcomp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/config/depcomp b/config/depcomp index 9beba448a..b966ddd8c 100644 --- a/config/depcomp +++ b/config/depcomp @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2003-12-28.12 +scriptversion=2004-04-25.14 -# 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 are output in .lo.d with libtool 1.4. + # They are output in .o.d with libtool 1.5. 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" |