texinfo update (Sun Jan 8 09:52:01 EST 2006)

[Karl Berry]

Index: depcomp
===================================================================
RCS file: /sources/texinfo/texinfo/depcomp,v
retrieving revision 1.14
retrieving revision 1.15
diff -c -r1.14 -r1.15
*** depcomp     10 Jul 2005 12:41:26 -0000      1.14
--- depcomp     8 Jan 2006 14:35:04 -0000       1.15
***************
*** 1,9 ****
  #! /bin/sh
  # depcomp - compile a program generating dependencies as side-effects
  
! scriptversion=2005-07-09.11
  
! # Copyright (C) 1999, 2000, 2003, 2004, 2005 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
--- 1,10 ----
  #! /bin/sh
  # depcomp - compile a program generating dependencies as side-effects
  
! scriptversion=2006-01-05.21
  
! # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 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
***************
*** 276,281 ****
--- 277,322 ----
    rm -f "$tmpdepfile"
    ;;
  
+ ia64hp)
+   # The "hp" stanza above does not work with HP's ia64 compilers,
+   # which have integrated preprocessors.  The correct option to use
+   # with these is +Maked; it writes dependencies to a file named
+   # 'foo.d', which lands next to the object file, wherever that
+   # happens to be.
+   # Much of this is similar to the tru64 case; see comments there.
+   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+   test "x$dir" = "x$object" && dir=
+   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+   if test "$libtool" = yes; then
+     tmpdepfile1=$dir$base.d
+     tmpdepfile2=$dir.libs/$base.d
+     "$@" -Wc,+Maked
+   else
+     tmpdepfile1=$dir$base.d
+     tmpdepfile2=$dir$base.d
+     "$@" +Maked
+   fi
+   stat=$?
+   if test $stat -eq 0; then :
+   else
+      rm -f "$tmpdepfile1" "$tmpdepfile2"
+      exit $stat
+   fi
+ 
+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+   do
+     test -f "$tmpdepfile" && break
+   done
+   if test -f "$tmpdepfile"; then
+     sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+     # Add `dependent.h:' lines.
+     sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> 
"$depfile"
+   else
+     echo "#dummy" > "$depfile"
+   fi
+   rm -f "$tmpdepfile" "$tmpdepfile2"
+   ;;
+ 
  tru64)
     # The Tru64 compiler uses -MD to generate dependencies as a side
     # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
***************
*** 288,294 ****
  
     if test "$libtool" = yes; then
        # With Tru64 cc, shared objects can also be used to make a
!       # static library.  This mecanism 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.
        #
--- 329,335 ----
  
     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.
        #
P depcomp