diff options
author | Tar Committer <tar@ocjtech.us> | 2004-06-06 04:12:54 +0000 |
---|---|---|
committer | Tar Committer <tar@ocjtech.us> | 2004-06-06 04:12:54 +0000 |
commit | 654a4573f8fd2b1109e0ded8d9ce061dd3a2093f (patch) | |
tree | e1d9f6fdea04a52f7cfcdc1b3ddf9d49046d20df /depcomp | |
parent | 381d322caf5928732f3d478d80e70acfccd67f99 (diff) | |
download | rancid-654a4573f8fd2b1109e0ded8d9ce061dd3a2093f.tar.gz rancid-654a4573f8fd2b1109e0ded8d9ce061dd3a2093f.tar.xz rancid-654a4573f8fd2b1109e0ded8d9ce061dd3a2093f.zip |
Imported from rancid-2.3.1.tar.gz.rancid-2.3.1
Diffstat (limited to 'depcomp')
-rwxr-xr-x | depcomp | 16 |
1 files changed, 11 insertions, 5 deletions
@@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2003-11-08.23 +scriptversion=2004-04-25.13 -# 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 @@ -294,26 +294,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" |