From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Thu, 18 Oct 2012 15:14:15 +0000 (+0200)
Subject: depcomp: remove last relics of libtool 1.4 support
X-Git-Tag: v1.12b~13^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4f855e0d1078bb7c1d869d3929259c525f4c5fff;p=platform%2Fupstream%2Fautomake.git

depcomp: remove last relics of libtool 1.4 support

* lib/depcomp (tru64): Here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

diff --git a/lib/depcomp b/lib/depcomp
index cfe0542..7b78133 100755
--- a/lib/depcomp
+++ b/lib/depcomp
@@ -500,39 +500,31 @@ tru64)
   set_base_from "$object"
 
   if test "$libtool" = yes; then
-    # With Tru64 cc, shared objects can also be used to make a
-    # static library.  This mechanism is used in libtool 1.4 series to
-    # handle both shared and static libraries in a single compilation.
-    # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-    #
-    # With libtool 1.5 this exception was removed, and libtool now
-    # generates 2 separate objects for the 2 libraries.  These two
-    # compilations output dependencies in $dir.libs/$base.o.d and
+    # Libtool generates 2 separate objects for the 2 libraries.  These
+    # two compilations output dependencies in $dir.libs/$base.o.d and
     # in $dir$base.o.d.  We have to check for both files, because
     # one of the two compilations can be disabled.  We should prefer
     # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
     # automatically cleaned when .libs/ is deleted, while ignoring
     # the former would cause a distcleancheck panic.
-    tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-    tmpdepfile2=$dir$base.o.d          # libtool 1.5
-    tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-    tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
+    tmpdepfile1=$dir$base.o.d          # libtool 1.5
+    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
+    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
     "$@" -Wc,-MD
   else
-    tmpdepfile1=$dir$base.o.d
+    tmpdepfile1=$dir$base.d
     tmpdepfile2=$dir$base.d
     tmpdepfile3=$dir$base.d
-    tmpdepfile4=$dir$base.d
     "$@" -MD
   fi
 
   stat=$?
   if test $stat -ne 0; then
-    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
     exit $stat
   fi
 
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
   do
     test -f "$tmpdepfile" && break
   done