(EXTRA_DIST): Add isc-posix.m4.

[bison.git] / config / depcomp

diff --git a/config/depcomp b/config/depcomp
index 807b991f4a895431dfc232112e77b0ae7e3d5017..51606f8c4632e402516abd7afb1071a2c3b18a99 100755 (executable)
--- a/config/depcomp
+++ b/config/depcomp
@@ -206,6 +206,36 @@ aix)
   rm -f "$tmpdepfile"
   ;;
 
   rm -f "$tmpdepfile"
   ;;
 

+icc)
+  # Must come before tru64.
+
+  # Intel's C compiler understands `-MD -MF file'.  However
+  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+  # will fill foo.d with something like
+  #    foo.o: sub/foo.c
+  #    foo.o: sub/foo.h
+  # which is wrong.  We want:
+  #    sub/foo.o: sub/foo.c
+  #    sub/foo.o: sub/foo.h
+  #    sub/foo.c:
+  #    sub/foo.h:
+
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # 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:'.
+  sed -e "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  sed -e "s,^[^:]*: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+

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


@@ -265,9 +295,7 @@ dashmstdout)
     shift
   fi
 
     shift
   fi
 

-  # Remove `-o $object'.  We will use -o /dev/null later,
-  # however we can't do the remplacement now because
-  # `-o $object' might simply not be used
+  # Remove `-o $object'.

   IFS=" "
   for arg
   do
   IFS=" "
   for arg
   do


@@ -287,7 +315,11 @@ dashmstdout)
   done
 
   test -z "$dashmflag" && dashmflag=-M
   done
 
   test -z "$dashmflag" && dashmflag=-M

-  "$@" -o /dev/null $dashmflag | sed 's:^[^:]*\:[      ]*:'"$object"'\: :' > "$tmpdepfile"
+  # Require at least two characters before searching for `:'
+  # in the target name.  This is to cope with DOS-style filenames:
+  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+  "$@" $dashmflag |
+    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"

   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
   tr ' ' '
   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
   tr ' ' '


@@ -306,6 +338,13 @@ dashXmstdout)
 
 makedepend)
   "$@" || exit $?
 
 makedepend)
   "$@" || exit $?

+  # Remove any Libtool call
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi

   # X makedepend
   shift
   cleared=no
   # X makedepend
   shift
   cleared=no


@@ -318,7 +357,9 @@ makedepend)
     case "$arg" in
     -D*|-I*)
       set fnord "$@" "$arg"; shift ;;
     case "$arg" in
     -D*|-I*)
       set fnord "$@" "$arg"; shift ;;

-    -*)
+    # Strip any option that makedepend may not understand.  Remove
+    # the object too, otherwise makedepend will parse it as a source file.
+    -*|$object)

       ;;
     *)
       set fnord "$@" "$arg"; shift ;;
       ;;
     *)
       set fnord "$@" "$arg"; shift ;;