depcomp update from automake

diff --git a/config/ChangeLog b/config/ChangeLog
index 6f3aab9b1c12b167bc6cb7c2663da6155f3df50d..dee2221fe17ff62826a03aa03bed4b6a4497cf07 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2003-12-31  Karl Berry  <karl@gnu.org>
+
+       * depcomp: update from automake.
+
 2003-11-21  Karl Berry  <karl@gnu.org>
 
        * config.{sub,guess}: update from config.

diff --git a/config/depcomp b/config/depcomp
index 9e5522d045f5e086ce88cf287a5db1e9f7bafb71..9beba448a31276e74a2f53444dd3608d0626014b 100644 (file)
--- a/config/depcomp
+++ b/config/depcomp
@@ -1,7 +1,7 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2003-11-08.23
+scriptversion=2003-12-28.12
 
 # Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
 
@@ -43,6 +43,7 @@ Environment variables:
   depmode     Dependency tracking mode.
   source      Source file read by `PROGRAMS ARGS'.
   object      Object file output by `PROGRAMS ARGS'.
+  DEPDIR      directory where to store dependencies.
   depfile     Dependency file to output.
   tmpdepfile  Temporary file to use when outputing dependencies.
   libtool     Whether libtool is used (yes/no).
@@ -61,18 +62,10 @@ if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
   exit 1
 fi
-# `libtool' can also be set to `yes' or `no'.
-
-if test -z "$depfile"; then
-   base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
-   dir=`echo "$object" | sed 's,/.*$,/,'`
-   if test "$dir" = "$object"; then
-      dir=
-   fi
-   # FIXME: should be _deps on DOS.
-   depfile="$dir.deps/$base"
-fi
 
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
 tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
 
 rm -f "$tmpdepfile"