Re: automake 1.8.3: Tru64: fix for depcomp

[Alexandre Duret-Lutz]

>>> "Burgers" == Burgers A R <address@hidden> writes:

 Burgers> In order to get the dependencies for a LTLIBRARY right for Tru64's
 Burgers> native cc C-compiler, I had to apply the following patch to
 Burgers> automake's depcomp script. cc -MD outputs the dependencies in the
 Burgers> .o.d file, not in the .lo.d file.

 Burgers> I am using automake 1.8.3, autoconf 2.59,
 Burgers> libtool (ltmain.sh (GNU libtool) 1.5 (1.1220 2003/04/05 19:32:58))

Thanks, I'm installing the following patch on HEAD and
branch-1-8.  It would be nice to know the difference between
your setup and Nicolas's.

2004-04-24  Alexandre Duret-Lutz  <address@hidden>

        * 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.

Index: NEWS
===================================================================
RCS file: /cvs/automake/automake/NEWS,v
retrieving revision 1.256.2.42
diff -u -r1.256.2.42 NEWS
--- NEWS        18 Apr 2004 12:30:20 -0000      1.256.2.42
+++ NEWS        24 Apr 2004 09:12:46 -0000
@@ -28,6 +28,8 @@
 
   - Fix install-sh so it can install the `mv' binary... using `mv'.
 
+  - Fix tru64 dependency tracking for libtool objects.
+
 * Bugs introduced by 1.8:
 
   - Fix an "internal error" when @LIBOBJS@ is used in a variable that is
Index: THANKS
===================================================================
RCS file: /cvs/automake/automake/THANKS,v
retrieving revision 1.230.2.17
diff -u -r1.230.2.17 THANKS
--- THANKS      12 Apr 2004 16:59:25 -0000      1.230.2.17
+++ THANKS      24 Apr 2004 09:12:46 -0000
@@ -235,6 +235,7 @@
 Sven Verdoolaege       address@hidden
 Tamara L. Dahlgren     address@hidden
 Tatu Ylonen            address@hidden
+Teun Burgers           address@hidden
 The Crimson Binome     address@hidden
 Thien-Thi Nguyen       address@hidden
 Thomas Gagne           address@hidden
Index: lib/depcomp
===================================================================
RCS file: /cvs/automake/automake/lib/depcomp,v
retrieving revision 1.47
diff -u -r1.47 depcomp
--- lib/depcomp 9 Nov 2003 00:10:50 -0000       1.47
+++ lib/depcomp 24 Apr 2004 09:12:47 -0000
@@ -1,9 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2003-11-08.23
+scriptversion=2004-04-24.11
 
-# 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 @@
    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"

-- 
Alexandre Duret-Lutz