VCG no longer supports long_straight_phase.

[bison.git] / config / depcomp

diff --git a/config/depcomp b/config/depcomp
index 6ee57a62415e75bb030d58e51939210afcb3d95a..86f7f1539cffa1f9f39d2e058f94170bf82c9f1b 100755 (executable)
--- a/config/depcomp
+++ b/config/depcomp
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # depcomp - compile a program generating dependencies as side-effects
 #! /bin/sh
 
 # depcomp - compile a program generating dependencies as side-effects

-# Copyright 1999, 2000, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003 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
 
 # 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


@@ -172,19 +172,25 @@ sgi)
 
 aix)
   # The C for AIX Compiler uses -M and outputs the dependencies
 
 aix)
   # The C for AIX Compiler uses -M and outputs the dependencies

-  # in a .u file.  This file always lives in the current directory.
-  # Also, the AIX compiler puts `$object:' at the start of each line;
-  # $object doesn't have directory information.
-  stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
+  # in a .u file.  In older versions, this file always lives in the
+  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # start of each line; $object doesn't have directory information.
+  # Version 6 uses the directory in both cases.
+  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`

   tmpdepfile="$stripped.u"
   tmpdepfile="$stripped.u"

-  outname="$stripped.o"

   if test "$libtool" = yes; then
     "$@" -Wc,-M
   else
     "$@" -M
   fi
   if test "$libtool" = yes; then
     "$@" -Wc,-M
   else
     "$@" -M
   fi

-

   stat=$?
   stat=$?

+
+  if test -f "$tmpdepfile"; then :
+  else
+    stripped=`echo "$stripped" | sed 's,^.*/,,'`
+    tmpdepfile="$stripped.u"
+  fi
+

   if test $stat -eq 0; then :
   else
     rm -f "$tmpdepfile"
   if test $stat -eq 0; then :
   else
     rm -f "$tmpdepfile"


@@ -192,6 +198,7 @@ aix)
   fi
 
   if test -f "$tmpdepfile"; then
   fi
 
   if test -f "$tmpdepfile"; then

+    outname="$stripped.o"

     # Each line is of the form `foo.o: dependent.h'.
     # Do two passes, one to just change these to
     # `$object: dependent.h' and one to simply `dependent.h:'.
     # Each line is of the form `foo.o: dependent.h'.
     # Do two passes, one to just change these to
     # `$object: dependent.h' and one to simply `dependent.h:'.


@@ -207,11 +214,9 @@ aix)
   ;;
 
 icc)
   ;;
 
 icc)

-  # Must come before tru64.
-
-  # Intel's C compiler understands `-MD -MF file'.  However
+  # Intel's C compiler understands `-MD -MF file'.  However on

   #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
   #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c

-  # will fill foo.d with something like
+  # ICC 7.0 will fill foo.d with something like

   #    foo.o: sub/foo.c
   #    foo.o: sub/foo.h
   # which is wrong.  We want:
   #    foo.o: sub/foo.c
   #    foo.o: sub/foo.h
   # which is wrong.  We want:


@@ -219,6 +224,12 @@ icc)
   #    sub/foo.o: sub/foo.h
   #    sub/foo.c:
   #    sub/foo.h:
   #    sub/foo.o: sub/foo.h
   #    sub/foo.c:
   #    sub/foo.h:

+  # ICC 7.1 will output
+  #    foo.o: sub/foo.c sub/foo.h
+  # and will wrap long lines using \ :
+  #    foo.o: sub/foo.c ... \
+  #     sub/foo.h ... \
+  #     ...

 
   "$@" -MD -MF "$tmpdepfile"
   stat=$?
 
   "$@" -MD -MF "$tmpdepfile"
   stat=$?


@@ -228,11 +239,15 @@ icc)
     exit $stat
   fi
   rm -f "$depfile"
     exit $stat
   fi
   rm -f "$depfile"

-  # Each line is of the form `foo.o: dependent.h'.
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.

   # Do two passes, one to just change these to
   # `$object: dependent.h' and one to simply `dependent.h:'.
   # Do two passes, one to just change these to
   # `$object: dependent.h' and one to simply `dependent.h:'.

-  sed -e "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  sed -e "s,^[^:]*: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
+    sed -e 's/$/ :/' >> "$depfile"

   rm -f "$tmpdepfile"
   ;;
 
   rm -f "$tmpdepfile"
   ;;
 


@@ -270,7 +285,7 @@ tru64)
    fi
    if test -f "$tmpdepfile"; then
       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
    fi
    if test -f "$tmpdepfile"; then
       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"

-      # That's a space and a tab in the [].
+      # That's a tab and a space in the [].

       sed -e 's,^.*\.[a-z]*:[   ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
    else
       echo "#dummy" > "$depfile"
       sed -e 's,^.*\.[a-z]*:[   ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
    else
       echo "#dummy" > "$depfile"