Changeset 883

Timestamp:

07/15/08 11:55:18 (7 weeks ago)

Author:

michael

Message:

'autoreconf -f -i' run & config.rpath added

Location:

trunk

Files:

• INSTALL (modified) (7 diffs)
• config.guess (modified) (11 diffs)
• config.rpath (added)
• config.sub (modified) (18 diffs)
• depcomp (modified) (6 diffs)
• install-sh (modified) (2 diffs)
• missing (modified) (16 diffs)
• mkinstalldirs (modified) (1 diff)

trunk/INSTALL

@@ -1 @@
-$Id$
-$URL$
-
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007 Free Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
 
 Basic Installation
 ==================
 
-   These are generic installation instructions.
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
 
    The `configure' shell script attempts to guess correct values for
@@ -13 +21 @@
 It may also create one or more `.h' files containing system-dependent
 definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
 
    If you need to do unusual things to compile the package, please try
 to figure out how `configure' could check whether to do them, and mail
 diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
-
-   The file `configure.in' is used to create `configure' by a program
-called `autoconf'.  You only need `configure.in' if you want to change
-it or regenerate `configure' using a newer version of `autoconf'.
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
 
 The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
+     `./configure' to configure the package for your system.
+
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
 
   2. Type `make' to compile the package.
@@ -56 +68 @@
      with the distribution.
 
+  6. Often, you can also type `make uninstall' to remove the installed
+     files again.
+
 Compilers and Options
 =====================
 
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  You can give `configure'
-initial values for variables by setting them in the environment.  Using
-a Bourne-compatible shell, you can do that on the command line like
-this:
-     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
-
-Or on systems that have the `env' program, you can do it like this:
-     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about.  Run `./configure --help' for
+details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
 
 Compiling For Multiple Architectures
 ====================================
 
-   You can compile the package for more than one kind of computer at the
+You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
 source code in the directory that `configure' is in and in `..'.
 
-   If you have to use a `make' that does not supports the `VPATH'
-variable, you have to compile the package for one architecture at a time
-in the source code directory.  After you have installed the package for
-one architecture, use `make distclean' before reconfiguring for another
-architecture.
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
 
 Installation Names
 ==================
 
-   By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
 
    In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
+options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
 you can set and what kinds of files go in them.
@@ -112 +127 @@
 =================
 
-   Some packages pay attention to `--enable-FEATURE' options to
+Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
@@ -127 +142 @@
 ==========================
 
-   There may be some features `configure' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
      CPU-COMPANY-SYSTEM
 
-See the file `config.sub' for the possible values of each field.  If
+where SYSTEM can have one of these forms:
+
+     OS KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
-
-   If you are building compiler tools for cross-compiling, you can also
-use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
 
 Sharing Defaults
 ================
 
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
 `configure' looks for `PREFIX/share/config.site' if it exists, then
 `PREFIX/etc/config.site' if it exists.  Or, you can set the
@@ -155 +180 @@
 A warning: not all `configure' scripts look for a site script.
 
-Operation Controls
+Defining Variables
 ==================
 
-   `configure' recognizes the following options to control how it
-operates.
+Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
+
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+`configure' recognizes the following options to control how it operates.
+
+`--help'
+`-h'
+     Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
 
 `--cache-file=FILE'
-     Use and save the results of the tests in FILE instead of
-     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
-     debugging `configure'.
-
-`--help'
-     Print a summary of the options to `configure', and exit.
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
 
 `--quiet'
@@ -180 +233 @@
      `configure' can determine that directory automatically.
 
-`--version'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`configure' also accepts some other, not widely useful, options.
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
+

trunk/config.guess

@@ -2 +2 @@
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
-
-timestamp='2006-07-02'
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
+
+timestamp='2008-01-23'
 
 # This file is free software; you can redistribute it and/or modify it
@@ -57 +57 @@
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -162 +162 @@
       sh3el) machine=shl-unknown ;;
       sh3eb) machine=sh-unknown ;;
+      sh5el) machine=sh5le-unknown ;;
       *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
   esac
@@ -330 +331 @@
   echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
   exit ;;
-    i86pc:SunOS:5.*:*)
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
   echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
   exit ;;
@@ -532 +533 @@
   fi
   exit ;;
-    *:AIX:*:[45])
+    *:AIX:*:[456])
   IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
   if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
@@ -781 +782 @@
   echo ${UNAME_MACHINE}-pc-cygwin
   exit ;;
-    i*:MINGW*:*)
+    *:MINGW*:*)
   echo ${UNAME_MACHINE}-pc-mingw32
   exit ;;
@@ -791 +792 @@
   echo ${UNAME_MACHINE}-pc-pw32
   exit ;;
-    x86:Interix*:[3456]*)
-  echo i586-pc-interix${UNAME_RELEASE}
-  exit ;;
-    EM64T:Interix*:[3456]*)
-  echo x86_64-unknown-interix${UNAME_RELEASE}
-  exit ;;
+    *:Interix*:[3456]*)
+      case ${UNAME_MACHINE} in
+      x86)
+    echo i586-pc-interix${UNAME_RELEASE}
+    exit ;;
+      EM64T | authenticamd)
+    echo x86_64-unknown-interix${UNAME_RELEASE}
+    exit ;;
+      IA64)
+    echo ia64-unknown-interix${UNAME_RELEASE}
+    exit ;;
+  esac ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
   echo i${UNAME_MACHINE}-pc-mks
@@ -830 +837 @@
   exit ;;
     arm*:Linux:*:*)
-  echo ${UNAME_MACHINE}-unknown-linux-gnu
+  eval $set_cc_for_build
+  if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+      | grep -q __ARM_EABI__
+  then
+      echo ${UNAME_MACHINE}-unknown-linux-gnu
+  else
+      echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+  fi
   exit ;;
     avr32*:Linux:*:*)
@@ -950 +964 @@
     x86_64:Linux:*:*)
   echo x86_64-unknown-linux-gnu
+  exit ;;
+    xtensa*:Linux:*:*)
+      echo ${UNAME_MACHINE}-unknown-linux-gnu
   exit ;;
     i*86:Linux:*:*)
@@ -1209 +1226 @@
   echo sx6-nec-superux${UNAME_RELEASE}
   exit ;;
+    SX-7:SUPER-UX:*:*)
+  echo sx7-nec-superux${UNAME_RELEASE}
+  exit ;;
+    SX-8:SUPER-UX:*:*)
+  echo sx8-nec-superux${UNAME_RELEASE}
+  exit ;;
+    SX-8R:SUPER-UX:*:*)
+  echo sx8r-nec-superux${UNAME_RELEASE}
+  exit ;;
     Power*:Rhapsody:*:*)
   echo powerpc-apple-rhapsody${UNAME_RELEASE}
@@ -1459 +1485 @@
 download the most up to date version of the config scripts from
 
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 and
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 
 If the version you run ($0) is already up to date, please

trunk/config.sub

@@ -2 +2 @@
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
-
-timestamp='2006-07-02'
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
+
+timestamp='2008-01-16'
 
 # This file is (in principle) common to ALL GNU software.
@@ -73 +73 @@
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -246 +246 @@
   | c4x | clipper \
   | d10v | d30v | dlx | dsp16xx \
-  | fr30 | frv \
+  | fido | fr30 | frv \
   | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
   | i370 | i860 | i960 | ia64 \
   | ip2k | iq2000 \
   | m32c | m32r | m32rle | m68000 | m68k | m88k \
-  | maxq | mb | microblaze | mcore \
+  | maxq | mb | microblaze | mcore | mep \
   | mips | mipsbe | mipseb | mipsel | mipsle \
   | mips16 \
@@ -277 +277 @@
   | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
   | pyramid \
+  | score \
   | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
   | sh64 | sh64le \
@@ -285 +286 @@
   | v850 | v850e \
   | we32k \
-  | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+  | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
   | z8k)
     basic_machine=$basic_machine-unknown
@@ -324 +325 @@
   | d10v-* | d30v-* | dlx-* \
   | elxsi-* \
-  | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+  | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
   | h8300-* | h8500-* \
   | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
@@ -368 +369 @@
   | v850-* | v850e-* | vax-* \
   | we32k-* \
-  | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-  | xstormy16-* | xtensa-* \
+  | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+  | xstormy16-* | xtensa*-* \
   | ymp-* \
   | z8k-*)
+    ;;
+  # Recognize the basic CPU types without company name, with glob match.
+  xtensa*)
+    basic_machine=$basic_machine-unknown
     ;;
   # Recognize the various machine names and aliases which stand
@@ -443 +448 @@
     os=-dynix
     ;;
+  blackfin)
+    basic_machine=bfin-unknown
+    os=-linux
+    ;;
+  blackfin-*)
+    basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+    os=-linux
+    ;;
   c90)
     basic_machine=c90-cray
@@ -475 +488 @@
     os=-unicosmp
     ;;
-  cr16c)
-    basic_machine=cr16c-unknown
+  cr16)
+    basic_machine=cr16-unknown
     os=-elf
     ;;
@@ -668 +681 @@
     os=-sysv
     ;;
+  m68knommu)
+    basic_machine=m68k-unknown
+    os=-linux
+    ;;
+  m68knommu-*)
+    basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+    os=-linux
+    ;;
   m88k-omron*)
     basic_machine=m88k-omron
@@ -682 +703 @@
     basic_machine=i386-pc
     os=-mingw32
+    ;;
+  mingw32ce)
+    basic_machine=arm-unknown
+    os=-mingw32ce
     ;;
   miniframe)
@@ -809 +834 @@
     os=-osf
     ;;
+  parisc)
+    basic_machine=hppa-unknown
+    os=-linux
+    ;;
+  parisc-*)
+    basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+    os=-linux
+    ;;
   pbd)
     basic_machine=sparc-tti
@@ -910 +943 @@
     basic_machine=mipsisa64sb1el-unknown
     ;;
+  sde)
+    basic_machine=mipsisa32-sde
+    os=-elf
+    ;;
   sei)
     basic_machine=mips-sei
@@ -921 +958 @@
     os=-hms
     ;;
+  sh5el)
+    basic_machine=sh5le-unknown
+    ;;
   sh64)
     basic_machine=sh64-unknown
@@ -1009 +1049 @@
     basic_machine=tic6x-unknown
     os=-coff
+    ;;
+  tile*)
+    basic_machine=tile-unknown
+    os=-linux-gnu
     ;;
   tx39)
@@ -1215 +1259 @@
         | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
         | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-        | -skyos* | -haiku* | -rdos* | -toppers*)
+        | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
   # Remember, each alternative MUST END IN *, to match a version number.
     ;;
@@ -1367 +1411 @@
 
 case $basic_machine in
+        score-*)
+    os=-elf
+    ;;
         spu-*)
     os=-elf
@@ -1406 +1453 @@
   m68*-cisco)
     os=-aout
+    ;;
+        mep-*)
+    os=-elf
     ;;
   mips*-cisco)

trunk/depcomp

@@ -2 +2 @@
 # 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.
+scriptversion=2007-03-29.01
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
+# Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -92 +93 @@
 ## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
 ## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am.  Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+  for arg
+  do
+    case $arg in
+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+    *)  set fnord "$@" "$arg" ;;
+    esac
+    shift # fnord
+    shift # $arg
+  done
+  "$@"
   stat=$?
   if test $stat -eq 0; then :
@@ -202 +216 @@
   # 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"
+  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.u
+    tmpdepfile2=$base.u
+    tmpdepfile3=$dir.libs/$base.u
     "$@" -Wc,-M
   else
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$dir$base.u
+    tmpdepfile3=$dir$base.u
     "$@" -M
   fi
   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"
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
     exit $stat
   fi