Re: depcomp (tru64 mode) + libtool problems

[Nicolas Joly]

On Wed, Jun 12, 2002 at 02:34:24PM +0200, Alexandre Duret-Lutz wrote:
> >>> "Nicolas" == Nicolas Joly <address@hidden> writes:
> 
>  Nicolas> I just noticed that tru64 depcomp mode is broken if
>  Nicolas> used for building libraries with libtool.
> 
>  Nicolas> File dependancies are expected in either `$base.o.d'
>  Nicolas> or `$base.d'; but in that case, the generated file is
>  Nicolas> named `$base.lo.d'.
> 
>  Nicolas> A second problem is that the dependancy file is
>  Nicolas> generated in `.libs' directory, where the object is
>  Nicolas> build.
> 
> Thanks.  Could you try this patch?

This works; except a small typo (see below).

> 2002-06-12  Alexandre Duret-Lutz  <address@hidden>
> 
>       * lib/depcomp (tru64): Expect dependency files in .libs/, maybe as
>       $base.lo.d, when libtool is used.
>       Reported by Nicolas Joly.
> 
> Index: lib/depcomp
> ===================================================================
> RCS file: /cvs/automake/automake/lib/depcomp,v
> retrieving revision 1.32.2.1
> diff -u -r1.32.2.1 depcomp
> --- lib/depcomp       25 Apr 2002 07:55:51 -0000      1.32.2.1
> +++ lib/depcomp       12 Jun 2002 12:30:08 -0000
> @@ -212,13 +212,17 @@
>     # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
>     # dependencies in `foo.d' instead, so we check for that too.
>     # Subdirectories are respected.
> +   dir=`$echo "$object" | sed -e 's|/[^/]*$|/|'`
           ^^^^^
           echo

> +   test "x$dir" = "x$object" && dir=
> +   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
>  
> -   base=`echo "$object" | sed -e 's/\.o$//' -e 's/\.lo$//'`
> -   tmpdepfile1="$base.o.d"
> -   tmpdepfile2="$base.d"
>     if test "$libtool" = yes; then
> +      tmpdepfile1="$dir.libs/$base.lo.d"
> +      tmpdepfile2="$dir.libs/$base.d"
>        "$@" -Wc,-MD
>     else
> +      tmpdepfile1="$dir$base.o.d"
> +      tmpdepfile2="$dir$base.d"
>        "$@" -MD
>     fi

-- 
Nicolas Joly

Biological Software and Databanks.
Pasteur Institute, Paris.