PR c/10175

[pf3gnuchains/gcc-fork.git] / Makefile.in
diff --git a/Makefile.in b/Makefile.in

index 1e8925c..f70250d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,7 +3,7 @@
  #
  # Makefile for directory with subdirs to build.
  #   Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-#   1999, 2000, 2001, 2002 Free Software Foundation
+#   1999, 2000, 2001, 2002, 2003 Free Software Foundation
  #
  # This file is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
@@ -20,14 +20,10 @@
  # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  #
  
-# Tell GNU make 3.79 not to run the top level in parallel.  This 
-# prevents contention for $builddir/$target/config.cache, as well
-# as minimizing scatter in file system caches.
-NOTPARALLEL = .NOTPARALLEL
-$(NOTPARALLEL):
-
+# -------------------------------
+# Standard Autoconf-set variables
+# -------------------------------
  VPATH=@srcdir@
-links=@configlinks@
  
  build_alias=@build_alias@
  build_cpu=@build_cpu@
@@ -45,18 +41,13 @@ target_vendor=@target_vendor@
  target_os=@target_os@
  target_canonical=@target_cpu@-@target_vendor@-@target_os@
  
-enable_shared = @enable_shared@
-enable_threads = @enable_threads@
-enable_version_specific_runtime_libs = @enable_version_specific_runtime_libs@
-# The file containing GCC's version number.
-gcc_version_trigger = @gcc_version_trigger@
-gcc_version = @gcc_version@
-
-srcdir = @srcdir@
+program_transform_name = @program_transform_name@
  
  prefix = @prefix@
  exec_prefix = @exec_prefix@
  
+srcdir = @srcdir@
+
  bindir = @bindir@
  sbindir = @sbindir@
  libexecdir = @libexecdir@
@@ -69,14 +60,6 @@ includedir = @includedir@
  oldincludedir = @oldincludedir@
  infodir = @infodir@
  mandir = @mandir@
-gxx_include_dir = @gxx_include_dir@
-libstdcxx_incdir = @libstdcxx_incdir@
-
-tooldir = @tooldir@
-build_tooldir = @build_tooldir@
-
-program_transform_name = @program_transform_name@
-
  man1dir = $(mandir)/man1
  man2dir = $(mandir)/man2
  man3dir = $(mandir)/man3
@@ -86,17 +69,6 @@ man6dir = $(mandir)/man6
  man7dir = $(mandir)/man7
  man8dir = $(mandir)/man8
  man9dir = $(mandir)/man9
-# Directory in which the compiler finds executables, libraries, etc.
-libsubdir = $(libdir)/gcc-lib/$(target_alias)/$(gcc_version)
-GDB_NLM_DEPS = 
-
-SHELL = @config_shell@
-
-# pwd command to use.  Allow user to override default by setting PWDCMD in
-# the environment to account for automounters.  The make variable must not
-# be called PWDCMD, otherwise the value set here is passed to make
-# subprocesses and overrides the setting from the user's environment.
-PWD = $${PWDCMD-pwd}
  
  # INSTALL_PROGRAM_ARGS is changed by configure.in to use -x for a
  # cygwin host.
@@ -107,51 +79,89 @@ INSTALL_PROGRAM = $(INSTALL) $(INSTALL_PROGRAM_ARGS)
  INSTALL_SCRIPT = $(INSTALL)
  INSTALL_DATA = $(INSTALL) -m 644
  
-AS = @AS@
-AR = @AR@
-AR_FLAGS = rc
-CC = @CC@
+# -------------------------------------------------
+# Miscellaneous non-standard autoconf-set variables
+# -------------------------------------------------
  
-# Special variables passed down in EXTRA_GCC_FLAGS.  They are defined
-# here so that they can be overridden by Makefile fragments.
-BUILD_CC = $(CC_FOR_BUILD)
-BUILD_PREFIX = @BUILD_PREFIX@
-BUILD_PREFIX_1 = @BUILD_PREFIX_1@
+links=@configlinks@
+# The file containing GCC's version number.
+gcc_version_trigger = @gcc_version_trigger@
+gcc_version = @gcc_version@
  
-CFLAGS = @CFLAGS@
-CXXFLAGS = @CXXFLAGS@
+# The gcc driver likes to know the arguments it was configured with.
+TOPLEVEL_CONFIGURE_ARGUMENTS=@TOPLEVEL_CONFIGURE_ARGUMENTS@
  
-LDFLAGS = 
-LIBCFLAGS = $(CFLAGS)
-CFLAGS_FOR_BUILD = $(CFLAGS)
-# During gcc bootstrap, if we use some random cc for stage1 then
-# CFLAGS will be just -g.  We want to ensure that TARGET libraries
-# (which we know are built with gcc) are built with optimizations so
-# prepend -O2 when setting CFLAGS_FOR_TARGET.
-CFLAGS_FOR_TARGET = -O2 $(CFLAGS)
-LDFLAGS_FOR_TARGET = 
-LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
-PICFLAG = 
-PICFLAG_FOR_TARGET = 
+gxx_include_dir = @gxx_include_dir@
+libstdcxx_incdir = @libstdcxx_incdir@
  
-CXX = @CXX@
+tooldir = @tooldir@
+build_tooldir = @build_tooldir@
  
-# Use -O2 to stress test the compiler.
-LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
-CXXFLAGS_FOR_TARGET = $(CXXFLAGS)
-LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
+# Directory in which the compiler finds executables, libraries, etc.
+libsubdir = $(libdir)/gcc-lib/$(target_alias)/$(gcc_version)
+GDB_NLM_DEPS = 
  
-DLLTOOL = @DLLTOOL@
-WINDRES = @WINDRES@
+# This is the name of the environment variable used for the path to
+# the libraries.
+RPATH_ENVVAR = @RPATH_ENVVAR@
  
-NM = @NM@
+# This is set by configure to REALLY_SET_LIB_PATH if --enable-shared
+# was used.
+SET_LIB_PATH = @SET_LIB_PATH@
  
-LD = @LD@
+# configure.in sets SET_LIB_PATH to this if --enable-shared was used.
+# Some platforms don't like blank entries, so we remove duplicate,
+# leading and trailing colons.
+REALLY_SET_LIB_PATH = \
+  $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH):$(TARGET_LIB_PATH):$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
  
-# These values are substituted by configure.
-DEFAULT_YACC = @DEFAULT_YACC@
-DEFAULT_LEX = @DEFAULT_LEX@
-DEFAULT_M4 = @DEFAULT_M4@
+# This is the list of directories to be built for the build system.
+BUILD_CONFIGDIRS = libiberty
+# Build programs are put under this directory.
+BUILD_SUBDIR = @build_subdir@
+# This is set by the configure script to the arguments to use when configuring
+# directories built for the build system.
+BUILD_CONFIGARGS = @build_configargs@
+
+# This is the list of directories to built for the host system.
+SUBDIRS = @configdirs@
+# This is set by the configure script to the arguments to use when configuring
+# directories built for the host system.
+HOST_CONFIGARGS = @host_configargs@
+
+# This is set by the configure script to the list of directories which
+# should be built using the target tools.
+TARGET_CONFIGDIRS = @target_configdirs@
+# Target libraries are put under this directory:
+TARGET_SUBDIR = @target_subdir@
+# This is set by the configure script to the arguments to use when configuring
+# directories built for the target.
+TARGET_CONFIGARGS = @target_configargs@
+
+# ----------------------------------------------
+# Programs producing files for the BUILD machine
+# ----------------------------------------------
+
+SHELL = @config_shell@
+
+# pwd command to use.  Allow user to override default by setting PWDCMD in
+# the environment to account for automounters.  The make variable must not
+# be called PWDCMD, otherwise the value set here is passed to make
+# subprocesses and overrides the setting from the user's environment.
+PWD = $${PWDCMD-pwd}
+
+# compilers to use to create programs which must be run in the build
+# environment.
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS_FOR_BUILD = $(CFLAGS)
+
+CXX_FOR_BUILD = $(CXX)
+
+# Special variables passed down in EXTRA_GCC_FLAGS.  They are defined
+# here so that they can be overridden by Makefile fragments.
+BUILD_CC = $(CC_FOR_BUILD)
+BUILD_PREFIX = @BUILD_PREFIX@
+BUILD_PREFIX_1 = @BUILD_PREFIX_1@
  
  BISON=@BISON@
  USUAL_BISON = `if [ -f $$r/bison/bison ] ; then \
@@ -160,6 +170,7 @@ USUAL_BISON = `if [ -f $$r/bison/bison ] ; then \
             echo bison ; \
          fi`
  
+DEFAULT_YACC = @DEFAULT_YACC@
  YACC=@YACC@
  USUAL_YACC = `if [ -f $$r/bison/bison ] ; then \
             echo $$r/bison/bison -y -L $$s/bison/ ; \
@@ -169,11 +180,13 @@ USUAL_YACC = `if [ -f $$r/bison/bison ] ; then \
             echo ${DEFAULT_YACC} ; \
         fi`
  
+DEFAULT_LEX = @DEFAULT_LEX@
  LEX=@LEX@
  USUAL_LEX = `if [ -f $$r/flex/flex ] ; \
         then echo $$r/flex/flex ; \
         else echo ${DEFAULT_LEX} ; fi`
  
+DEFAULT_M4 = @DEFAULT_M4@
  M4 = `if [ -f $$r/m4/m4 ] ; \
         then echo $$r/m4/m4 ; \
         else echo ${DEFAULT_M4} ; fi`
@@ -200,74 +213,61 @@ RUNTEST = `if [ -f $$s/dejagnu/runtest ] ; \
         then echo $$s/dejagnu/runtest ; \
         else echo runtest ; fi`
  
+# ---------------------------------------------
+# Programs producing files for the HOST machine
+# ---------------------------------------------
  
-# compilers to use to create programs which must be run in the build
-# environment.
-CC_FOR_BUILD = @CC_FOR_BUILD@
-CXX_FOR_BUILD = $(CXX)
+# This is the list of directories that may be needed in RPATH_ENVVAR
+# so that programs built for the host machine work.
+HOST_LIB_PATH = $$r/bfd:$$r/opcodes
  
-SUBDIRS = @configdirs@
+AS = @AS@
  
-# This is set by the configure script to the list of directories which
-# should be built using the target tools.
-TARGET_CONFIGDIRS = @target_configdirs@
+AR = @AR@
+AR_FLAGS = rc
  
-# Target libraries are put under this directory:
-# Changed by configure to $(target_alias) if cross.
-TARGET_SUBDIR = @target_subdir@
+CC = @CC@
+CFLAGS = @CFLAGS@
+LIBCFLAGS = $(CFLAGS)
  
-BUILD_CONFIGDIRS = libiberty
-BUILD_SUBDIR = @build_subdir@
+CXX = @CXX@
+CXXFLAGS = @CXXFLAGS@
+LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
  
-# This is set by the configure script to the arguments to use when configuring
-# directories built for the build system.
-BUILD_CONFIGARGS = @build_configargs@
+DLLTOOL = @DLLTOOL@
  
-# This is set by the configure script to the arguments to use when configuring
-# directories built for the host system.
-HOST_CONFIGARGS = @host_configargs@
+NM = @NM@
  
-# This is set by the configure script to the arguments to use when configuring
-# directories built for the target.
-TARGET_CONFIGARGS = @target_configargs@
+LD = @LD@
+LDFLAGS = 
  
-# This is set by configure to REALLY_SET_LIB_PATH if --enable-shared
-# was used.
-SET_LIB_PATH = @SET_LIB_PATH@
+RANLIB = @RANLIB@
  
-# This is the name of the environment variable used for the path to
-# the libraries.  This may be changed by configure.in.
-RPATH_ENVVAR = @RPATH_ENVVAR@
+WINDRES = @WINDRES@
  
-# This is the list of directories that may be needed in RPATH_ENVVAR
-# so that programs built for the host machine work.
-HOST_LIB_PATH = $$r/bfd:$$r/opcodes
+PICFLAG = 
+
+# -----------------------------------------------
+# Programs producing files for the TARGET machine
+# -----------------------------------------------
  
  # This is the list of directories that may be needed in RPATH_ENVVAR
  # so that prorgams built for the target machine work.
  TARGET_LIB_PATH = $$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs:
  
-# configure.in sets SET_LIB_PATH to this if --enable-shared was used.
-# Some platforms don't like blank entries, so we remove duplicate,
-# leading and trailing colons.
-REALLY_SET_LIB_PATH = \
-  $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH):$(TARGET_LIB_PATH):$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
-
-# Should be substed by configure.in
  FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
-CC_FOR_TARGET = @CC_FOR_TARGET@
-CXX_FOR_TARGET = @CXX_FOR_TARGET@
-RAW_CXX_FOR_TARGET = @RAW_CXX_FOR_TARGET@
-CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@
-RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@
-GCJ_FOR_TARGET = @GCJ_FOR_TARGET@
  
-# If GCC_FOR_TARGET is not overriden on the command line, then this
-# variable is passed down to the gcc Makefile, where it is used to
-# build libgcc2.a.  We define it here so that it can itself be
-# overridden on the command line.
-GCC_FOR_TARGET=@GCC_FOR_TARGET@
-USUAL_GCC_FOR_TARGET = $(STAGE_CC_WRAPPER) $$r/gcc/xgcc -B$$r/gcc/ $(FLAGS_FOR_TARGET)
+AR_FOR_TARGET=@AR_FOR_TARGET@
+USUAL_AR_FOR_TARGET = ` \
+  if [ -f $$r/binutils/ar ] ; then \
+    echo $$r/binutils/ar ; \
+  else \
+    if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
+      echo $(AR); \
+    else \
+       echo ar | sed '$(program_transform_name)' ; \
+    fi; \
+  fi`
  
  AS_FOR_TARGET=@AS_FOR_TARGET@
  USUAL_AS_FOR_TARGET = ` \
@@ -279,23 +279,30 @@ USUAL_AS_FOR_TARGET = ` \
      if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
        echo $(AS); \
      else \
-       t='$(program_transform_name)'; echo as | sed -e $$t ; \
+       echo as | sed '$(program_transform_name)' ; \
      fi; \
    fi`
  
-LD_FOR_TARGET=@LD_FOR_TARGET@
-USUAL_LD_FOR_TARGET = ` \
-  if [ -f $$r/ld/ld-new ] ; then \
-    echo $$r/ld/ld-new ; \
-  elif [ -f $$r/gcc/xgcc ]; then \
-    $(CC_FOR_TARGET) -print-prog-name=ld ; \
-  else \
-    if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
-      echo $(LD); \
-    else \
-       t='$(program_transform_name)'; echo ld | sed -e $$t ; \
-    fi; \
-  fi`
+CC_FOR_TARGET = @CC_FOR_TARGET@
+# During gcc bootstrap, if we use some random cc for stage1 then
+# CFLAGS will be just -g.  We want to ensure that TARGET libraries
+# (which we know are built with gcc) are built with optimizations so
+# prepend -O2 when setting CFLAGS_FOR_TARGET.
+CFLAGS_FOR_TARGET = -O2 $(CFLAGS)
+# If GCC_FOR_TARGET is not overriden on the command line, then this
+# variable is passed down to the gcc Makefile, where it is used to
+# build libgcc2.a.  We define it here so that it can itself be
+# overridden on the command line.
+GCC_FOR_TARGET=@GCC_FOR_TARGET@
+USUAL_GCC_FOR_TARGET = $(STAGE_CC_WRAPPER) $$r/gcc/xgcc -B$$r/gcc/ $(FLAGS_FOR_TARGET)
+LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
+
+CXX_FOR_TARGET = @CXX_FOR_TARGET@
+RAW_CXX_FOR_TARGET = @RAW_CXX_FOR_TARGET@
+CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@
+RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@
+CXXFLAGS_FOR_TARGET = $(CXXFLAGS)
+LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
  
  DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
  USUAL_DLLTOOL_FOR_TARGET = ` \
@@ -305,31 +312,39 @@ USUAL_DLLTOOL_FOR_TARGET = ` \
      if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
        echo $(DLLTOOL); \
      else \
-       t='$(program_transform_name)'; echo dlltool | sed -e $$t ; \
+       echo dlltool | sed '$(program_transform_name)' ; \
      fi; \
    fi`
  
-WINDRES_FOR_TARGET=@WINDRES_FOR_TARGET@
-USUAL_WINDRES_FOR_TARGET = ` \
-  if [ -f $$r/binutils/windres ] ; then \
-    echo $$r/binutils/windres ; \
+GCJ_FOR_TARGET = @GCJ_FOR_TARGET@
+
+LD_FOR_TARGET=@LD_FOR_TARGET@
+USUAL_LD_FOR_TARGET = ` \
+  if [ -f $$r/ld/ld-new ] ; then \
+    echo $$r/ld/ld-new ; \
+  elif [ -f $$r/gcc/xgcc ]; then \
+    $(CC_FOR_TARGET) -print-prog-name=ld ; \
    else \
      if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
-      echo $(WINDRES); \
+      echo $(LD); \
      else \
-       t='$(program_transform_name)'; echo windres | sed -e $$t ; \
+       echo ld | sed '$(program_transform_name)' ; \
      fi; \
    fi`
  
-AR_FOR_TARGET=@AR_FOR_TARGET@
-USUAL_AR_FOR_TARGET = ` \
-  if [ -f $$r/binutils/ar ] ; then \
-    echo $$r/binutils/ar ; \
+LDFLAGS_FOR_TARGET = 
+
+NM_FOR_TARGET=@NM_FOR_TARGET@
+USUAL_NM_FOR_TARGET = ` \
+  if [ -f $$r/binutils/nm-new ] ; then \
+    echo $$r/binutils/nm-new ; \
+  elif [ -f $$r/gcc/xgcc ]; then \
+    $(CC_FOR_TARGET) -print-prog-name=nm ; \
    else \
      if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
-      echo $(AR); \
+      echo $(NM); \
      else \
-       t='$(program_transform_name)'; echo ar | sed -e $$t ; \
+       echo nm | sed '$(program_transform_name)' ; \
      fi; \
    fi`
  
@@ -345,24 +360,28 @@ USUAL_RANLIB_FOR_TARGET = ` \
           echo ranlib; \
        fi; \
      else \
-       t='$(program_transform_name)'; echo ranlib | sed -e $$t ; \
+       echo ranlib | sed '$(program_transform_name)' ; \
      fi; \
    fi`
  
-NM_FOR_TARGET=@NM_FOR_TARGET@
-USUAL_NM_FOR_TARGET = ` \
-  if [ -f $$r/binutils/nm-new ] ; then \
-    echo $$r/binutils/nm-new ; \
-  elif [ -f $$r/gcc/xgcc ]; then \
-    $(CC_FOR_TARGET) -print-prog-name=nm ; \
+WINDRES_FOR_TARGET=@WINDRES_FOR_TARGET@
+USUAL_WINDRES_FOR_TARGET = ` \
+  if [ -f $$r/binutils/windres ] ; then \
+    echo $$r/binutils/windres ; \
    else \
      if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
-      echo $(NM); \
+      echo $(WINDRES); \
      else \
-       t='$(program_transform_name)'; echo nm | sed -e $$t ; \
+       echo windres | sed '$(program_transform_name)' ; \
      fi; \
    fi`
  
+PICFLAG_FOR_TARGET = 
+
+# ------------------------------------
+# Miscellaneous targets and flag lists
+# ------------------------------------
+
  # The first rule in the file had better be this one.  Don't put any above it.
  # This lives here to allow makefile fragments to contain dependencies.
  all: all.normal
@@ -391,6 +410,7 @@ BASE_FLAGS_TO_PASS = \
         "CXXFLAGS=$(CXXFLAGS)" \
         "CXXFLAGS_FOR_TARGET=$(CXXFLAGS_FOR_TARGET)" \
         "CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \
+       "DESTDIR=$(DESTDIR)" \
         "DLLTOOL_FOR_TARGET=$(DLLTOOL_FOR_TARGET)" \
         "INSTALL=$(INSTALL)" \
         "INSTALL_DATA=$(INSTALL_DATA)" \
@@ -460,7 +480,7 @@ EXTRA_HOST_FLAGS = \
         'DLLTOOL=$(DLLTOOL)' \
         'LD=$(LD)' \
         'NM=$(NM)' \
-       "`echo 'RANLIB=$(RANLIB)' | sed -e s/.*=$$/XFOO=/`" \
+       'RANLIB=$(RANLIB)' \
         'WINDRES=$(WINDRES)'
  
  FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)
@@ -514,7 +534,7 @@ EXTRA_GCC_FLAGS = \
         'BUILD_PREFIX=$(BUILD_PREFIX)' \
         'BUILD_PREFIX_1=$(BUILD_PREFIX_1)' \
         'NM=$(NM)' \
-       "`echo 'RANLIB=$(RANLIB)' | sed -e s/.*=$$/XFOO=/`" \
+       'RANLIB=$(RANLIB)' \
         'WINDRES=$$(WINDRES_FOR_TARGET)' \
         "GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \
         "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
@@ -545,7 +565,6 @@ CLEAN_MODULES = \
         clean-bison \
         clean-byacc \
         clean-bzip2 \
-       clean-db \
         clean-dejagnu \
         clean-diff \
         clean-dosutils \
@@ -560,7 +579,6 @@ CLEAN_MODULES = \
         clean-gettext \
         clean-gnuserv \
         clean-gprof \
-       clean-grep \
         clean-gzip \
         clean-hello \
         clean-indent \
@@ -586,7 +604,6 @@ CLEAN_MODULES = \
         clean-shellutils \
         clean-sid \
         clean-sim \
-       clean-snavigator \
         clean-tar \
         clean-texinfo \
         clean-textutils \
@@ -663,7 +680,7 @@ do-clean:
             (cd ./$$i && \
                 $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                         "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                       "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
+                       "RANLIB=$${RANLIB}" \
                         "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
                         clean) \
             || exit 1; \
@@ -681,7 +698,7 @@ do-clean:
             (cd $(TARGET_SUBDIR)/$$i && \
                 $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                         "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                       "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
+                       "RANLIB=$${RANLIB}" \
                         "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
                         clean) \
             || exit 1; \
@@ -710,7 +727,7 @@ do-distclean:
             (cd ./$$i && \
                 $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                         "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                       "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
+                       "RANLIB=$${RANLIB}" \
                         "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
                         distclean) \
             || exit 1; \
@@ -728,7 +745,7 @@ do-distclean:
             (cd $(TARGET_SUBDIR)/$$i && \
                 $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                         "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                       "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
+                       "RANLIB=$${RANLIB}" \
                         "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
                         distclean) \
             || exit 1; \
@@ -757,7 +774,7 @@ do-dvi:
             (cd ./$$i && \
                 $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                         "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                       "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
+                       "RANLIB=$${RANLIB}" \
                         "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
                         dvi) \
             || exit 1; \
@@ -775,7 +792,7 @@ do-dvi:
             (cd $(TARGET_SUBDIR)/$$i && \
                 $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                         "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                       "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
+                       "RANLIB=$${RANLIB}" \
                         "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
                         dvi) \
             || exit 1; \
@@ -804,7 +821,7 @@ do-info:
             (cd ./$$i && \
                 $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                         "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                       "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
+                       "RANLIB=$${RANLIB}" \
                         "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
                         info) \
             || exit 1; \
@@ -822,7 +839,7 @@ do-info:
             (cd $(TARGET_SUBDIR)/$$i && \
                 $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                         "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                       "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
+                       "RANLIB=$${RANLIB}" \
                         "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
                         info) \
             || exit 1; \
@@ -851,7 +868,7 @@ do-install-info:
             (cd ./$$i && \
                 $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                         "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                       "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
+                       "RANLIB=$${RANLIB}" \
                         "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
                         install-info) \
             || exit 1; \
@@ -869,7 +886,7 @@ do-install-info:
             (cd $(TARGET_SUBDIR)/$$i && \
                 $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                         "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                       "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
+                       "RANLIB=$${RANLIB}" \
                         "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
                         install-info) \
             || exit 1; \
@@ -898,7 +915,7 @@ do-installcheck:
             (cd ./$$i && \
                 $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                         "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                       "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
+                       "RANLIB=$${RANLIB}" \
                         "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
                         installcheck) \
             || exit 1; \
@@ -916,7 +933,7 @@ do-installcheck:
             (cd $(TARGET_SUBDIR)/$$i && \
                 $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                         "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                       "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
+                       "RANLIB=$${RANLIB}" \
                         "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
                         installcheck) \
             || exit 1; \
@@ -945,7 +962,7 @@ do-mostlyclean:
             (cd ./$$i && \
                 $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                         "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                       "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
+                       "RANLIB=$${RANLIB}" \
                         "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
                         mostlyclean) \
             || exit 1; \
@@ -963,7 +980,7 @@ do-mostlyclean:
             (cd $(TARGET_SUBDIR)/$$i && \
                 $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                         "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                       "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
+                       "RANLIB=$${RANLIB}" \
                         "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
                         mostlyclean) \
             || exit 1; \
@@ -992,7 +1009,7 @@ do-maintainer-clean:
             (cd ./$$i && \
                 $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                         "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                       "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
+                       "RANLIB=$${RANLIB}" \
                         "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
                         maintainer-clean) \
             || exit 1; \
@@ -1010,7 +1027,7 @@ do-maintainer-clean:
             (cd $(TARGET_SUBDIR)/$$i && \
                 $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                         "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                       "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
+                       "RANLIB=$${RANLIB}" \
                         "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
                         maintainer-clean) \
             || exit 1; \
@@ -1039,7 +1056,7 @@ do-TAGS:
             (cd ./$$i && \
                 $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                         "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                       "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
+                       "RANLIB=$${RANLIB}" \
                         "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
                         TAGS) \
             || exit 1; \
@@ -1057,7 +1074,7 @@ do-TAGS:
             (cd $(TARGET_SUBDIR)/$$i && \
                 $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                         "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                       "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
+                       "RANLIB=$${RANLIB}" \
                         "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
                         TAGS) \
             || exit 1; \
@@ -1082,7 +1099,7 @@ do-info: maybe-all-texinfo
  install-info: do-install-info dir.info
         s=`cd $(srcdir); ${PWD}`; export s; \
         if [ -f dir.info ] ; then \
-         $(INSTALL_DATA) dir.info $(infodir)/dir.info ; \
+         $(INSTALL_DATA) dir.info $(DESTDIR)$(infodir)/dir.info ; \
         else true ; fi
  
  local-clean:
@@ -1090,7 +1107,7 @@ local-clean:
  
  local-distclean:
         -rm -f Makefile config.status config.cache mh-frag mt-frag
-       -rm -f multilib.out multilib.ts multilib.tmp maybedep.tmp serdep.tmp
+       -rm -f multilib.out multilib.tmp maybedep.tmp serdep.tmp
         -if [ "$(TARGET_SUBDIR)" != "." ]; then \
           rm -rf $(TARGET_SUBDIR); \
         else true; fi
@@ -1213,7 +1230,7 @@ installdirs: mkinstalldirs
  
  dir.info: do-install-info
         if [ -f $(srcdir)/texinfo/gen-info-dir ] ; then \
-         $(srcdir)/texinfo/gen-info-dir $(infodir) $(srcdir)/texinfo/dir.info-template > dir.info.new ; \
+         $(srcdir)/texinfo/gen-info-dir $(DESTDIR)$(infodir) $(srcdir)/texinfo/dir.info-template > dir.info.new ; \
           mv -f dir.info.new dir.info ; \
         else true ; \
         fi
@@ -1238,71 +1255,72 @@ TAGS: do-TAGS
  
  .PHONY: configure-build-libiberty maybe-configure-build-libiberty
  maybe-configure-build-libiberty:
-configure-build-libiberty: $(BUILD_SUBDIR)/libiberty/Makefile
-$(BUILD_SUBDIR)/libiberty/Makefile: config.status
-       @[ -d $(BUILD_SUBDIR)/libiberty ] || mkdir $(BUILD_SUBDIR)/libiberty;\
-           r=`${PWD}`; export r; \
-           s=`cd $(srcdir); ${PWD}`; export s; \
-           AR="$(AR_FOR_BUILD)"; export AR; \
-           AS="$(AS_FOR_BUILD)"; export AS; \
-           CC="$(CC_FOR_BUILD)"; export CC; \
-           CFLAGS="$(CFLAGS_FOR_BUILD)"; export CFLAGS; \
-           CXX="$(CXX_FOR_BUILD)"; export CXX; \
-           CXXFLAGS="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS; \
-           GCJ="$(GCJ_FOR_BUILD)"; export GCJ; \
-           DLLTOOL="$(DLLTOOL_FOR_BUILD)"; export DLLTOOL; \
-           LD="$(LD_FOR_BUILD)"; export LD; \
-            LDFLAGS="$(LDFLAGS_FOR_BUILD)"; export LDFLAGS; \
-           NM="$(NM_FOR_BUILD)"; export NM; \
-           RANLIB="$(RANLIB_FOR_BUILD)"; export RANLIB; \
-           WINDRES="$(WINDRES_FOR_BUILD)"; export WINDRES; \
-           echo Configuring in $(BUILD_SUBDIR)/libiberty; \
-           cd "$(BUILD_SUBDIR)/libiberty" || exit 1; \
-           case $(srcdir) in \
-           /* | [A-Za-z]:[\\/]*) \
-             topdir=$(srcdir) ;; \
-           *) \
-             case "$(BUILD_SUBDIR)" in \
+configure-build-libiberty:
+       @test ! -f $(BUILD_SUBDIR)/libiberty/Makefile || exit 0; \
+       [ -d $(BUILD_SUBDIR)/libiberty ] || \
+         mkdir $(BUILD_SUBDIR)/libiberty;\
+       r=`${PWD}`; export r; \
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       AR="$(AR_FOR_BUILD)"; export AR; \
+       AS="$(AS_FOR_BUILD)"; export AS; \
+       CC="$(CC_FOR_BUILD)"; export CC; \
+       CFLAGS="$(CFLAGS_FOR_BUILD)"; export CFLAGS; \
+       CXX="$(CXX_FOR_BUILD)"; export CXX; \
+       CXXFLAGS="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS; \
+       GCJ="$(GCJ_FOR_BUILD)"; export GCJ; \
+       DLLTOOL="$(DLLTOOL_FOR_BUILD)"; export DLLTOOL; \
+       LD="$(LD_FOR_BUILD)"; export LD; \
+       LDFLAGS="$(LDFLAGS_FOR_BUILD)"; export LDFLAGS; \
+       NM="$(NM_FOR_BUILD)"; export NM; \
+       RANLIB="$(RANLIB_FOR_BUILD)"; export RANLIB; \
+       WINDRES="$(WINDRES_FOR_BUILD)"; export WINDRES; \
+       echo Configuring in $(BUILD_SUBDIR)/libiberty; \
+       cd "$(BUILD_SUBDIR)/libiberty" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) \
+           topdir=$(srcdir) ;; \
+         *) \
+           case "$(BUILD_SUBDIR)" in \
               .) topdir="../$(srcdir)" ;; \
               *) topdir="../../$(srcdir)" ;; \
-             esac ;; \
-           esac; \
-           if [ "$(srcdir)" = "." ] ; then \
-             if [ "$(BUILD_SUBDIR)" != "." ] ; then \
-               if $(SHELL) $$s/symlink-tree $${topdir}/libiberty "no-such-file" ; then \
-                 if [ -f Makefile ]; then \
-                   if $(MAKE) distclean; then \
-                     true; \
-                   else \
-                     exit 1; \
-                   fi; \
-                 else \
-                   true; \
-                 fi; \
-               else \
-                 exit 1; \
-               fi; \
+           esac ;; \
+       esac; \
+       if [ "$(srcdir)" = "." ] ; then \
+         if [ "$(BUILD_SUBDIR)" != "." ] ; then \
+           if $(SHELL) $$s/symlink-tree $${topdir}/libiberty "no-such-file" ; then \
+             if [ -f Makefile ]; then \
+               if $(MAKE) distclean; then \
+                 true; \
+               else \
+                 exit 1; \
+               fi; \
               else \
-               true; \
+               true; \
               fi; \
-             srcdiroption="--srcdir=."; \
-             libsrcdir="."; \
             else \
-             srcdiroption="--srcdir=$${topdir}/libiberty"; \
-             libsrcdir="$$s/libiberty"; \
+             exit 1; \
             fi; \
-           rm -f no-such-file || : ; \
-           CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-             $(BUILD_CONFIGARGS) $${srcdiroption} \
-             --with-build-subdir="$(BUILD_SUBDIR)" \
-             || exit 1
+         else \
+           true; \
+         fi; \
+         srcdiroption="--srcdir=."; \
+         libsrcdir="."; \
+       else \
+         srcdiroption="--srcdir=$${topdir}/libiberty"; \
+         libsrcdir="$$s/libiberty"; \
+       fi; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(BUILD_CONFIGARGS) $${srcdiroption} \
+         --with-build-subdir="$(BUILD_SUBDIR)" \
+         || exit 1
  
  .PHONY: all-build-libiberty maybe-all-build-libiberty
  maybe-all-build-libiberty:
  all-build-libiberty: configure-build-libiberty
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         (cd $(BUILD_SUBDIR)/libiberty && $(MAKE) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       (cd $(BUILD_SUBDIR)/libiberty && $(MAKE) all)
  
  
  # --------------------------------------
@@ -1311,10 +1329,9 @@ all-build-libiberty: configure-build-libiberty
  
  .PHONY: configure-ash maybe-configure-ash
  maybe-configure-ash:
-configure-ash: ash/Makefile
-
-ash/Makefile: config.status
-       @[ -d ash ] || mkdir ash; \
+configure-ash:
+       @test ! -f ash/Makefile || exit 0; \
+       [ -d ash ] || mkdir ash; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -1354,17 +1371,17 @@ ash/Makefile: config.status
  maybe-all-ash:
  all-ash: configure-ash
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd ash && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd ash && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-ash
  check-ash:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd ash && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd ash && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -1372,17 +1389,16 @@ check-ash:
  maybe-install-ash:
  install-ash: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd ash && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd ash && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-autoconf maybe-configure-autoconf
  maybe-configure-autoconf:
-configure-autoconf: autoconf/Makefile
-
-autoconf/Makefile: config.status
-       @[ -d autoconf ] || mkdir autoconf; \
+configure-autoconf:
+       @test ! -f autoconf/Makefile || exit 0; \
+       [ -d autoconf ] || mkdir autoconf; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -1422,17 +1438,17 @@ autoconf/Makefile: config.status
  maybe-all-autoconf:
  all-autoconf: configure-autoconf
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd autoconf && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd autoconf && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-autoconf
  check-autoconf:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd autoconf && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd autoconf && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -1440,17 +1456,16 @@ check-autoconf:
  maybe-install-autoconf:
  install-autoconf: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd autoconf && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd autoconf && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-automake maybe-configure-automake
  maybe-configure-automake:
-configure-automake: automake/Makefile
-
-automake/Makefile: config.status
-       @[ -d automake ] || mkdir automake; \
+configure-automake:
+       @test ! -f automake/Makefile || exit 0; \
+       [ -d automake ] || mkdir automake; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -1490,17 +1505,17 @@ automake/Makefile: config.status
  maybe-all-automake:
  all-automake: configure-automake
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd automake && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd automake && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-automake
  check-automake:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd automake && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd automake && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -1508,17 +1523,16 @@ check-automake:
  maybe-install-automake:
  install-automake: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd automake && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd automake && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-bash maybe-configure-bash
  maybe-configure-bash:
-configure-bash: bash/Makefile
-
-bash/Makefile: config.status
-       @[ -d bash ] || mkdir bash; \
+configure-bash:
+       @test ! -f bash/Makefile || exit 0; \
+       [ -d bash ] || mkdir bash; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -1558,17 +1572,17 @@ bash/Makefile: config.status
  maybe-all-bash:
  all-bash: configure-bash
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd bash && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd bash && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-bash
  check-bash:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd bash && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd bash && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -1576,17 +1590,16 @@ check-bash:
  maybe-install-bash:
  install-bash: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd bash && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd bash && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-bfd maybe-configure-bfd
  maybe-configure-bfd:
-configure-bfd: bfd/Makefile
-
-bfd/Makefile: config.status
-       @[ -d bfd ] || mkdir bfd; \
+configure-bfd:
+       @test ! -f bfd/Makefile || exit 0; \
+       [ -d bfd ] || mkdir bfd; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -1626,17 +1639,17 @@ bfd/Makefile: config.status
  maybe-all-bfd:
  all-bfd: configure-bfd
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd bfd && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd bfd && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-bfd
  check-bfd:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd bfd && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd bfd && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -1644,17 +1657,16 @@ check-bfd:
  maybe-install-bfd:
  install-bfd: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd bfd && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd bfd && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-opcodes maybe-configure-opcodes
  maybe-configure-opcodes:
-configure-opcodes: opcodes/Makefile
-
-opcodes/Makefile: config.status
-       @[ -d opcodes ] || mkdir opcodes; \
+configure-opcodes:
+       @test ! -f opcodes/Makefile || exit 0; \
+       [ -d opcodes ] || mkdir opcodes; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -1694,17 +1706,17 @@ opcodes/Makefile: config.status
  maybe-all-opcodes:
  all-opcodes: configure-opcodes
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd opcodes && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd opcodes && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-opcodes
  check-opcodes:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd opcodes && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd opcodes && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -1712,17 +1724,16 @@ check-opcodes:
  maybe-install-opcodes:
  install-opcodes: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd opcodes && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd opcodes && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-binutils maybe-configure-binutils
  maybe-configure-binutils:
-configure-binutils: binutils/Makefile
-
-binutils/Makefile: config.status
-       @[ -d binutils ] || mkdir binutils; \
+configure-binutils:
+       @test ! -f binutils/Makefile || exit 0; \
+       [ -d binutils ] || mkdir binutils; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -1762,17 +1773,17 @@ binutils/Makefile: config.status
  maybe-all-binutils:
  all-binutils: configure-binutils
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd binutils && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd binutils && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-binutils
  check-binutils:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd binutils && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd binutils && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -1780,17 +1791,16 @@ check-binutils:
  maybe-install-binutils:
  install-binutils: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd binutils && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd binutils && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-bison maybe-configure-bison
  maybe-configure-bison:
-configure-bison: bison/Makefile
-
-bison/Makefile: config.status
-       @[ -d bison ] || mkdir bison; \
+configure-bison:
+       @test ! -f bison/Makefile || exit 0; \
+       [ -d bison ] || mkdir bison; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -1830,19 +1840,19 @@ bison/Makefile: config.status
  maybe-all-bison:
  all-bison: configure-bison
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd bison && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd bison && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-bison
  # This module is only tested in a native toolchain.
  check-bison:
         @if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
-           r=`${PWD}`; export r; \
-           s=`cd $(srcdir); ${PWD}`; export s; \
-           $(SET_LIB_PATH) \
-           (cd bison && $(MAKE) $(FLAGS_TO_PASS) check); \
+         r=`${PWD}`; export r; \
+         s=`cd $(srcdir); ${PWD}`; export s; \
+         $(SET_LIB_PATH) \
+         (cd bison && $(MAKE) $(FLAGS_TO_PASS) check); \
         fi
  
  
@@ -1851,17 +1861,16 @@ check-bison:
  maybe-install-bison:
  install-bison: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd bison && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd bison && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-byacc maybe-configure-byacc
  maybe-configure-byacc:
-configure-byacc: byacc/Makefile
-
-byacc/Makefile: config.status
-       @[ -d byacc ] || mkdir byacc; \
+configure-byacc:
+       @test ! -f byacc/Makefile || exit 0; \
+       [ -d byacc ] || mkdir byacc; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -1901,19 +1910,19 @@ byacc/Makefile: config.status
  maybe-all-byacc:
  all-byacc: configure-byacc
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd byacc && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd byacc && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-byacc
  # This module is only tested in a native toolchain.
  check-byacc:
         @if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
-           r=`${PWD}`; export r; \
-           s=`cd $(srcdir); ${PWD}`; export s; \
-           $(SET_LIB_PATH) \
-           (cd byacc && $(MAKE) $(FLAGS_TO_PASS) check); \
+         r=`${PWD}`; export r; \
+         s=`cd $(srcdir); ${PWD}`; export s; \
+         $(SET_LIB_PATH) \
+         (cd byacc && $(MAKE) $(FLAGS_TO_PASS) check); \
         fi
  
  
@@ -1922,17 +1931,16 @@ check-byacc:
  maybe-install-byacc:
  install-byacc: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd byacc && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd byacc && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-bzip2 maybe-configure-bzip2
  maybe-configure-bzip2:
-configure-bzip2: bzip2/Makefile
-
-bzip2/Makefile: config.status
-       @[ -d bzip2 ] || mkdir bzip2; \
+configure-bzip2:
+       @test ! -f bzip2/Makefile || exit 0; \
+       [ -d bzip2 ] || mkdir bzip2; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -1972,17 +1980,17 @@ bzip2/Makefile: config.status
  maybe-all-bzip2:
  all-bzip2: configure-bzip2
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd bzip2 && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd bzip2 && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-bzip2
  check-bzip2:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd bzip2 && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd bzip2 && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -1990,85 +1998,16 @@ check-bzip2:
  maybe-install-bzip2:
  install-bzip2: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd bzip2 && $(MAKE) $(FLAGS_TO_PASS) install)
-
-
-.PHONY: configure-db maybe-configure-db
-maybe-configure-db:
-configure-db: db/Makefile
-
-db/Makefile: config.status
-       @[ -d db ] || mkdir db; \
-       r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       if [ z$(build_canonical) !=  z$(host_canoncial) ] ; then \
-         AR="$(AR)"; export AR; \
-         AS="$(AS)"; export AS; \
-         CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
-         DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
-         LD="$(LD)"; export LD; \
-         NM="$(NM)"; export NM; \
-         RANLIB="$(RANLIB)"; export RANLIB; \
-         WINDRES="$(WINDRES)"; export WINDRES; \
-         OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-         OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       fi; \
-       echo Configuring in db; \
-       cd db || exit 1; \
-       case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/db"; \
-           libsrcdir="$$s/db";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/db"; \
-           libsrcdir="$$s/db";; \
-       esac; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         || exit 1
-
-.PHONY: all-db maybe-all-db
-maybe-all-db:
-all-db: configure-db
-       @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd db && $(MAKE) $(FLAGS_TO_PASS) all)
-
-
-.PHONY: check-db
-check-db:
-       @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd db && $(MAKE) $(FLAGS_TO_PASS) check)
-
-
-
-.PHONY: install-db maybe-install-db
-maybe-install-db:
-install-db: installdirs
-       @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd db && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(SET_LIB_PATH) \
+       (cd bzip2 && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-dejagnu maybe-configure-dejagnu
  maybe-configure-dejagnu:
-configure-dejagnu: dejagnu/Makefile
-
-dejagnu/Makefile: config.status
-       @[ -d dejagnu ] || mkdir dejagnu; \
+configure-dejagnu:
+       @test ! -f dejagnu/Makefile || exit 0; \
+       [ -d dejagnu ] || mkdir dejagnu; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -2108,17 +2047,17 @@ dejagnu/Makefile: config.status
  maybe-all-dejagnu:
  all-dejagnu: configure-dejagnu
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd dejagnu && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd dejagnu && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-dejagnu
  check-dejagnu:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd dejagnu && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd dejagnu && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -2126,17 +2065,16 @@ check-dejagnu:
  maybe-install-dejagnu:
  install-dejagnu: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd dejagnu && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd dejagnu && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-diff maybe-configure-diff
  maybe-configure-diff:
-configure-diff: diff/Makefile
-
-diff/Makefile: config.status
-       @[ -d diff ] || mkdir diff; \
+configure-diff:
+       @test ! -f diff/Makefile || exit 0; \
+       [ -d diff ] || mkdir diff; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -2176,17 +2114,17 @@ diff/Makefile: config.status
  maybe-all-diff:
  all-diff: configure-diff
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd diff && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd diff && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-diff
  check-diff:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd diff && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd diff && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -2194,17 +2132,16 @@ check-diff:
  maybe-install-diff:
  install-diff: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd diff && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd diff && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-dosutils maybe-configure-dosutils
  maybe-configure-dosutils:
-configure-dosutils: dosutils/Makefile
-
-dosutils/Makefile: config.status
-       @[ -d dosutils ] || mkdir dosutils; \
+configure-dosutils:
+       @test ! -f dosutils/Makefile || exit 0; \
+       [ -d dosutils ] || mkdir dosutils; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -2244,9 +2181,9 @@ dosutils/Makefile: config.status
  maybe-all-dosutils:
  all-dosutils: configure-dosutils
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd dosutils && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd dosutils && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-dosutils
@@ -2258,17 +2195,16 @@ check-dosutils:
  maybe-install-dosutils:
  install-dosutils: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd dosutils && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd dosutils && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-etc maybe-configure-etc
  maybe-configure-etc:
-configure-etc: etc/Makefile
-
-etc/Makefile: config.status
-       @[ -d etc ] || mkdir etc; \
+configure-etc:
+       @test ! -f etc/Makefile || exit 0; \
+       [ -d etc ] || mkdir etc; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -2308,17 +2244,17 @@ etc/Makefile: config.status
  maybe-all-etc:
  all-etc: configure-etc
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd etc && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd etc && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-etc
  check-etc:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd etc && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd etc && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -2326,17 +2262,16 @@ check-etc:
  maybe-install-etc:
  install-etc: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd etc && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd etc && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-fastjar maybe-configure-fastjar
  maybe-configure-fastjar:
-configure-fastjar: fastjar/Makefile
-
-fastjar/Makefile: config.status
-       @[ -d fastjar ] || mkdir fastjar; \
+configure-fastjar:
+       @test ! -f fastjar/Makefile || exit 0; \
+       [ -d fastjar ] || mkdir fastjar; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -2376,19 +2311,19 @@ fastjar/Makefile: config.status
  maybe-all-fastjar:
  all-fastjar: configure-fastjar
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd fastjar && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd fastjar && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-fastjar
  # This module is only tested in a native toolchain.
  check-fastjar:
         @if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
-           r=`${PWD}`; export r; \
-           s=`cd $(srcdir); ${PWD}`; export s; \
-           $(SET_LIB_PATH) \
-           (cd fastjar && $(MAKE) $(FLAGS_TO_PASS) check); \
+         r=`${PWD}`; export r; \
+         s=`cd $(srcdir); ${PWD}`; export s; \
+         $(SET_LIB_PATH) \
+         (cd fastjar && $(MAKE) $(FLAGS_TO_PASS) check); \
         fi
  
  
@@ -2397,17 +2332,16 @@ check-fastjar:
  maybe-install-fastjar:
  install-fastjar: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd fastjar && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd fastjar && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-fileutils maybe-configure-fileutils
  maybe-configure-fileutils:
-configure-fileutils: fileutils/Makefile
-
-fileutils/Makefile: config.status
-       @[ -d fileutils ] || mkdir fileutils; \
+configure-fileutils:
+       @test ! -f fileutils/Makefile || exit 0; \
+       [ -d fileutils ] || mkdir fileutils; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -2447,17 +2381,17 @@ fileutils/Makefile: config.status
  maybe-all-fileutils:
  all-fileutils: configure-fileutils
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd fileutils && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd fileutils && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-fileutils
  check-fileutils:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd fileutils && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd fileutils && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -2465,17 +2399,16 @@ check-fileutils:
  maybe-install-fileutils:
  install-fileutils: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd fileutils && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd fileutils && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-findutils maybe-configure-findutils
  maybe-configure-findutils:
-configure-findutils: findutils/Makefile
-
-findutils/Makefile: config.status
-       @[ -d findutils ] || mkdir findutils; \
+configure-findutils:
+       @test ! -f findutils/Makefile || exit 0; \
+       [ -d findutils ] || mkdir findutils; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -2515,17 +2448,17 @@ findutils/Makefile: config.status
  maybe-all-findutils:
  all-findutils: configure-findutils
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd findutils && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd findutils && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-findutils
  check-findutils:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd findutils && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd findutils && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -2533,17 +2466,16 @@ check-findutils:
  maybe-install-findutils:
  install-findutils: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd findutils && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd findutils && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-find maybe-configure-find
  maybe-configure-find:
-configure-find: find/Makefile
-
-find/Makefile: config.status
-       @[ -d find ] || mkdir find; \
+configure-find:
+       @test ! -f find/Makefile || exit 0; \
+       [ -d find ] || mkdir find; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -2583,17 +2515,17 @@ find/Makefile: config.status
  maybe-all-find:
  all-find: configure-find
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd find && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd find && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-find
  check-find:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd find && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd find && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -2601,17 +2533,16 @@ check-find:
  maybe-install-find:
  install-find: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd find && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd find && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-flex maybe-configure-flex
  maybe-configure-flex:
-configure-flex: flex/Makefile
-
-flex/Makefile: config.status
-       @[ -d flex ] || mkdir flex; \
+configure-flex:
+       @test ! -f flex/Makefile || exit 0; \
+       [ -d flex ] || mkdir flex; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -2651,19 +2582,19 @@ flex/Makefile: config.status
  maybe-all-flex:
  all-flex: configure-flex
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd flex && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd flex && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-flex
  # This module is only tested in a native toolchain.
  check-flex:
         @if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
-           r=`${PWD}`; export r; \
-           s=`cd $(srcdir); ${PWD}`; export s; \
-           $(SET_LIB_PATH) \
-           (cd flex && $(MAKE) $(FLAGS_TO_PASS) check); \
+         r=`${PWD}`; export r; \
+         s=`cd $(srcdir); ${PWD}`; export s; \
+         $(SET_LIB_PATH) \
+         (cd flex && $(MAKE) $(FLAGS_TO_PASS) check); \
         fi
  
  
@@ -2672,17 +2603,16 @@ check-flex:
  maybe-install-flex:
  install-flex: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd flex && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd flex && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-gas maybe-configure-gas
  maybe-configure-gas:
-configure-gas: gas/Makefile
-
-gas/Makefile: config.status
-       @[ -d gas ] || mkdir gas; \
+configure-gas:
+       @test ! -f gas/Makefile || exit 0; \
+       [ -d gas ] || mkdir gas; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -2722,17 +2652,17 @@ gas/Makefile: config.status
  maybe-all-gas:
  all-gas: configure-gas
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd gas && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd gas && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-gas
  check-gas:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd gas && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd gas && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -2740,17 +2670,16 @@ check-gas:
  maybe-install-gas:
  install-gas: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd gas && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd gas && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-gawk maybe-configure-gawk
  maybe-configure-gawk:
-configure-gawk: gawk/Makefile
-
-gawk/Makefile: config.status
-       @[ -d gawk ] || mkdir gawk; \
+configure-gawk:
+       @test ! -f gawk/Makefile || exit 0; \
+       [ -d gawk ] || mkdir gawk; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -2790,17 +2719,17 @@ gawk/Makefile: config.status
  maybe-all-gawk:
  all-gawk: configure-gawk
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd gawk && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd gawk && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-gawk
  check-gawk:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd gawk && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd gawk && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -2808,17 +2737,16 @@ check-gawk:
  maybe-install-gawk:
  install-gawk: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd gawk && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd gawk && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-gettext maybe-configure-gettext
  maybe-configure-gettext:
-configure-gettext: gettext/Makefile
-
-gettext/Makefile: config.status
-       @[ -d gettext ] || mkdir gettext; \
+configure-gettext:
+       @test ! -f gettext/Makefile || exit 0; \
+       [ -d gettext ] || mkdir gettext; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -2858,17 +2786,17 @@ gettext/Makefile: config.status
  maybe-all-gettext:
  all-gettext: configure-gettext
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd gettext && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd gettext && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-gettext
  check-gettext:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd gettext && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd gettext && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -2876,17 +2804,16 @@ check-gettext:
  maybe-install-gettext:
  install-gettext: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd gettext && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd gettext && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-gnuserv maybe-configure-gnuserv
  maybe-configure-gnuserv:
-configure-gnuserv: gnuserv/Makefile
-
-gnuserv/Makefile: config.status
-       @[ -d gnuserv ] || mkdir gnuserv; \
+configure-gnuserv:
+       @test ! -f gnuserv/Makefile || exit 0; \
+       [ -d gnuserv ] || mkdir gnuserv; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -2926,17 +2853,17 @@ gnuserv/Makefile: config.status
  maybe-all-gnuserv:
  all-gnuserv: configure-gnuserv
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-gnuserv
  check-gnuserv:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -2944,17 +2871,16 @@ check-gnuserv:
  maybe-install-gnuserv:
  install-gnuserv: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-gprof maybe-configure-gprof
  maybe-configure-gprof:
-configure-gprof: gprof/Makefile
-
-gprof/Makefile: config.status
-       @[ -d gprof ] || mkdir gprof; \
+configure-gprof:
+       @test ! -f gprof/Makefile || exit 0; \
+       [ -d gprof ] || mkdir gprof; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -2994,17 +2920,17 @@ gprof/Makefile: config.status
  maybe-all-gprof:
  all-gprof: configure-gprof
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd gprof && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd gprof && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-gprof
  check-gprof:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd gprof && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd gprof && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -3012,85 +2938,16 @@ check-gprof:
  maybe-install-gprof:
  install-gprof: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd gprof && $(MAKE) $(FLAGS_TO_PASS) install)
-
-
-.PHONY: configure-grep maybe-configure-grep
-maybe-configure-grep:
-configure-grep: grep/Makefile
-
-grep/Makefile: config.status
-       @[ -d grep ] || mkdir grep; \
-       r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       if [ z$(build_canonical) !=  z$(host_canoncial) ] ; then \
-         AR="$(AR)"; export AR; \
-         AS="$(AS)"; export AS; \
-         CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
-         DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
-         LD="$(LD)"; export LD; \
-         NM="$(NM)"; export NM; \
-         RANLIB="$(RANLIB)"; export RANLIB; \
-         WINDRES="$(WINDRES)"; export WINDRES; \
-         OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-         OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       fi; \
-       echo Configuring in grep; \
-       cd grep || exit 1; \
-       case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/grep"; \
-           libsrcdir="$$s/grep";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/grep"; \
-           libsrcdir="$$s/grep";; \
-       esac; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         || exit 1
-
-.PHONY: all-grep maybe-all-grep
-maybe-all-grep:
-all-grep: configure-grep
-       @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd grep && $(MAKE) $(FLAGS_TO_PASS) all)
-
-
-.PHONY: check-grep
-check-grep:
-       @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd grep && $(MAKE) $(FLAGS_TO_PASS) check)
-
-
-
-.PHONY: install-grep maybe-install-grep
-maybe-install-grep:
-install-grep: installdirs
-       @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd grep && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(SET_LIB_PATH) \
+       (cd gprof && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-gzip maybe-configure-gzip
  maybe-configure-gzip:
-configure-gzip: gzip/Makefile
-
-gzip/Makefile: config.status
-       @[ -d gzip ] || mkdir gzip; \
+configure-gzip:
+       @test ! -f gzip/Makefile || exit 0; \
+       [ -d gzip ] || mkdir gzip; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -3130,17 +2987,17 @@ gzip/Makefile: config.status
  maybe-all-gzip:
  all-gzip: configure-gzip
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd gzip && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd gzip && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-gzip
  check-gzip:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd gzip && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd gzip && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -3148,17 +3005,16 @@ check-gzip:
  maybe-install-gzip:
  install-gzip: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd gzip && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd gzip && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-hello maybe-configure-hello
  maybe-configure-hello:
-configure-hello: hello/Makefile
-
-hello/Makefile: config.status
-       @[ -d hello ] || mkdir hello; \
+configure-hello:
+       @test ! -f hello/Makefile || exit 0; \
+       [ -d hello ] || mkdir hello; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -3198,17 +3054,17 @@ hello/Makefile: config.status
  maybe-all-hello:
  all-hello: configure-hello
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd hello && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd hello && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-hello
  check-hello:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd hello && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd hello && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -3216,17 +3072,16 @@ check-hello:
  maybe-install-hello:
  install-hello: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd hello && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd hello && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-indent maybe-configure-indent
  maybe-configure-indent:
-configure-indent: indent/Makefile
-
-indent/Makefile: config.status
-       @[ -d indent ] || mkdir indent; \
+configure-indent:
+       @test ! -f indent/Makefile || exit 0; \
+       [ -d indent ] || mkdir indent; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -3266,17 +3121,17 @@ indent/Makefile: config.status
  maybe-all-indent:
  all-indent: configure-indent
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd indent && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd indent && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-indent
  check-indent:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd indent && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd indent && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -3284,17 +3139,16 @@ check-indent:
  maybe-install-indent:
  install-indent: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd indent && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd indent && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-intl maybe-configure-intl
  maybe-configure-intl:
-configure-intl: intl/Makefile
-
-intl/Makefile: config.status
-       @[ -d intl ] || mkdir intl; \
+configure-intl:
+       @test ! -f intl/Makefile || exit 0; \
+       [ -d intl ] || mkdir intl; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -3334,17 +3188,17 @@ intl/Makefile: config.status
  maybe-all-intl:
  all-intl: configure-intl
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd intl && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd intl && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-intl
  check-intl:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd intl && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd intl && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -3352,17 +3206,16 @@ check-intl:
  maybe-install-intl:
  install-intl: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd intl && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd intl && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-tcl maybe-configure-tcl
  maybe-configure-tcl:
-configure-tcl: tcl/Makefile
-
-tcl/Makefile: config.status
-       @[ -d tcl ] || mkdir tcl; \
+configure-tcl:
+       @test ! -f tcl/Makefile || exit 0; \
+       [ -d tcl ] || mkdir tcl; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -3402,17 +3255,17 @@ tcl/Makefile: config.status
  maybe-all-tcl:
  all-tcl: configure-tcl
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd tcl && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd tcl && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-tcl
  check-tcl:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd tcl && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd tcl && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -3420,17 +3273,16 @@ check-tcl:
  maybe-install-tcl:
  install-tcl: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd tcl && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd tcl && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-itcl maybe-configure-itcl
  maybe-configure-itcl:
-configure-itcl: itcl/Makefile
-
-itcl/Makefile: config.status
-       @[ -d itcl ] || mkdir itcl; \
+configure-itcl:
+       @test ! -f itcl/Makefile || exit 0; \
+       [ -d itcl ] || mkdir itcl; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -3470,17 +3322,17 @@ itcl/Makefile: config.status
  maybe-all-itcl:
  all-itcl: configure-itcl
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd itcl && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd itcl && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-itcl
  check-itcl:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd itcl && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd itcl && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -3488,17 +3340,16 @@ check-itcl:
  maybe-install-itcl:
  install-itcl: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd itcl && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd itcl && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-ld maybe-configure-ld
  maybe-configure-ld:
-configure-ld: ld/Makefile
-
-ld/Makefile: config.status
-       @[ -d ld ] || mkdir ld; \
+configure-ld:
+       @test ! -f ld/Makefile || exit 0; \
+       [ -d ld ] || mkdir ld; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -3538,17 +3389,17 @@ ld/Makefile: config.status
  maybe-all-ld:
  all-ld: configure-ld
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd ld && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd ld && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-ld
  check-ld:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd ld && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd ld && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -3556,17 +3407,16 @@ check-ld:
  maybe-install-ld:
  install-ld: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd ld && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd ld && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-libgui maybe-configure-libgui
  maybe-configure-libgui:
-configure-libgui: libgui/Makefile
-
-libgui/Makefile: config.status
-       @[ -d libgui ] || mkdir libgui; \
+configure-libgui:
+       @test ! -f libgui/Makefile || exit 0; \
+       [ -d libgui ] || mkdir libgui; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -3606,17 +3456,17 @@ libgui/Makefile: config.status
  maybe-all-libgui:
  all-libgui: configure-libgui
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd libgui && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd libgui && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-libgui
  check-libgui:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd libgui && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd libgui && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -3624,17 +3474,16 @@ check-libgui:
  maybe-install-libgui:
  install-libgui: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd libgui && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd libgui && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-libiberty maybe-configure-libiberty
  maybe-configure-libiberty:
-configure-libiberty: libiberty/Makefile
-
-libiberty/Makefile: config.status
-       @[ -d libiberty ] || mkdir libiberty; \
+configure-libiberty:
+       @test ! -f libiberty/Makefile || exit 0; \
+       [ -d libiberty ] || mkdir libiberty; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -3674,17 +3523,17 @@ libiberty/Makefile: config.status
  maybe-all-libiberty:
  all-libiberty: configure-libiberty
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd libiberty && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd libiberty && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-libiberty
  check-libiberty:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd libiberty && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd libiberty && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -3692,17 +3541,16 @@ check-libiberty:
  maybe-install-libiberty:
  install-libiberty: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd libiberty && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd libiberty && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-libtool maybe-configure-libtool
  maybe-configure-libtool:
-configure-libtool: libtool/Makefile
-
-libtool/Makefile: config.status
-       @[ -d libtool ] || mkdir libtool; \
+configure-libtool:
+       @test ! -f libtool/Makefile || exit 0; \
+       [ -d libtool ] || mkdir libtool; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -3742,17 +3590,17 @@ libtool/Makefile: config.status
  maybe-all-libtool:
  all-libtool: configure-libtool
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd libtool && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd libtool && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-libtool
  check-libtool:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd libtool && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd libtool && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -3760,17 +3608,16 @@ check-libtool:
  maybe-install-libtool:
  install-libtool: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd libtool && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd libtool && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-m4 maybe-configure-m4
  maybe-configure-m4:
-configure-m4: m4/Makefile
-
-m4/Makefile: config.status
-       @[ -d m4 ] || mkdir m4; \
+configure-m4:
+       @test ! -f m4/Makefile || exit 0; \
+       [ -d m4 ] || mkdir m4; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -3810,17 +3657,17 @@ m4/Makefile: config.status
  maybe-all-m4:
  all-m4: configure-m4
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd m4 && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd m4 && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-m4
  check-m4:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd m4 && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd m4 && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -3828,17 +3675,16 @@ check-m4:
  maybe-install-m4:
  install-m4: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd m4 && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd m4 && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-make maybe-configure-make
  maybe-configure-make:
-configure-make: make/Makefile
-
-make/Makefile: config.status
-       @[ -d make ] || mkdir make; \
+configure-make:
+       @test ! -f make/Makefile || exit 0; \
+       [ -d make ] || mkdir make; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -3878,17 +3724,17 @@ make/Makefile: config.status
  maybe-all-make:
  all-make: configure-make
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd make && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd make && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-make
  check-make:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd make && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd make && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -3896,17 +3742,16 @@ check-make:
  maybe-install-make:
  install-make: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd make && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd make && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-mmalloc maybe-configure-mmalloc
  maybe-configure-mmalloc:
-configure-mmalloc: mmalloc/Makefile
-
-mmalloc/Makefile: config.status
-       @[ -d mmalloc ] || mkdir mmalloc; \
+configure-mmalloc:
+       @test ! -f mmalloc/Makefile || exit 0; \
+       [ -d mmalloc ] || mkdir mmalloc; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -3946,9 +3791,9 @@ mmalloc/Makefile: config.status
  maybe-all-mmalloc:
  all-mmalloc: configure-mmalloc
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd mmalloc && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd mmalloc && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-mmalloc
@@ -3960,17 +3805,16 @@ check-mmalloc:
  maybe-install-mmalloc:
  install-mmalloc: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd mmalloc && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd mmalloc && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-patch maybe-configure-patch
  maybe-configure-patch:
-configure-patch: patch/Makefile
-
-patch/Makefile: config.status
-       @[ -d patch ] || mkdir patch; \
+configure-patch:
+       @test ! -f patch/Makefile || exit 0; \
+       [ -d patch ] || mkdir patch; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -4010,17 +3854,17 @@ patch/Makefile: config.status
  maybe-all-patch:
  all-patch: configure-patch
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd patch && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd patch && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-patch
  check-patch:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd patch && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd patch && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -4028,17 +3872,16 @@ check-patch:
  maybe-install-patch:
  install-patch: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd patch && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd patch && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-perl maybe-configure-perl
  maybe-configure-perl:
-configure-perl: perl/Makefile
-
-perl/Makefile: config.status
-       @[ -d perl ] || mkdir perl; \
+configure-perl:
+       @test ! -f perl/Makefile || exit 0; \
+       [ -d perl ] || mkdir perl; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -4078,17 +3921,17 @@ perl/Makefile: config.status
  maybe-all-perl:
  all-perl: configure-perl
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd perl && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd perl && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-perl
  check-perl:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd perl && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd perl && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -4096,17 +3939,16 @@ check-perl:
  maybe-install-perl:
  install-perl: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd perl && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd perl && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-prms maybe-configure-prms
  maybe-configure-prms:
-configure-prms: prms/Makefile
-
-prms/Makefile: config.status
-       @[ -d prms ] || mkdir prms; \
+configure-prms:
+       @test ! -f prms/Makefile || exit 0; \
+       [ -d prms ] || mkdir prms; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -4146,17 +3988,17 @@ prms/Makefile: config.status
  maybe-all-prms:
  all-prms: configure-prms
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd prms && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd prms && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-prms
  check-prms:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd prms && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd prms && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -4164,17 +4006,16 @@ check-prms:
  maybe-install-prms:
  install-prms: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd prms && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd prms && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-rcs maybe-configure-rcs
  maybe-configure-rcs:
-configure-rcs: rcs/Makefile
-
-rcs/Makefile: config.status
-       @[ -d rcs ] || mkdir rcs; \
+configure-rcs:
+       @test ! -f rcs/Makefile || exit 0; \
+       [ -d rcs ] || mkdir rcs; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -4214,17 +4055,17 @@ rcs/Makefile: config.status
  maybe-all-rcs:
  all-rcs: configure-rcs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd rcs && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd rcs && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-rcs
  check-rcs:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd rcs && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd rcs && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -4232,17 +4073,16 @@ check-rcs:
  maybe-install-rcs:
  install-rcs: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd rcs && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd rcs && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-readline maybe-configure-readline
  maybe-configure-readline:
-configure-readline: readline/Makefile
-
-readline/Makefile: config.status
-       @[ -d readline ] || mkdir readline; \
+configure-readline:
+       @test ! -f readline/Makefile || exit 0; \
+       [ -d readline ] || mkdir readline; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -4282,17 +4122,17 @@ readline/Makefile: config.status
  maybe-all-readline:
  all-readline: configure-readline
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd readline && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd readline && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-readline
  check-readline:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd readline && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd readline && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -4300,17 +4140,16 @@ check-readline:
  maybe-install-readline:
  install-readline: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd readline && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd readline && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-release maybe-configure-release
  maybe-configure-release:
-configure-release: release/Makefile
-
-release/Makefile: config.status
-       @[ -d release ] || mkdir release; \
+configure-release:
+       @test ! -f release/Makefile || exit 0; \
+       [ -d release ] || mkdir release; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -4350,9 +4189,9 @@ release/Makefile: config.status
  maybe-all-release:
  all-release: configure-release
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd release && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd release && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-release
@@ -4367,10 +4206,9 @@ install-release:
  
  .PHONY: configure-recode maybe-configure-recode
  maybe-configure-recode:
-configure-recode: recode/Makefile
-
-recode/Makefile: config.status
-       @[ -d recode ] || mkdir recode; \
+configure-recode:
+       @test ! -f recode/Makefile || exit 0; \
+       [ -d recode ] || mkdir recode; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -4410,17 +4248,17 @@ recode/Makefile: config.status
  maybe-all-recode:
  all-recode: configure-recode
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd recode && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd recode && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-recode
  check-recode:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd recode && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd recode && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -4428,17 +4266,16 @@ check-recode:
  maybe-install-recode:
  install-recode: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd recode && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd recode && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-sed maybe-configure-sed
  maybe-configure-sed:
-configure-sed: sed/Makefile
-
-sed/Makefile: config.status
-       @[ -d sed ] || mkdir sed; \
+configure-sed:
+       @test ! -f sed/Makefile || exit 0; \
+       [ -d sed ] || mkdir sed; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -4478,17 +4315,17 @@ sed/Makefile: config.status
  maybe-all-sed:
  all-sed: configure-sed
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd sed && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd sed && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-sed
  check-sed:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd sed && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd sed && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -4496,17 +4333,16 @@ check-sed:
  maybe-install-sed:
  install-sed: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd sed && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd sed && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-send-pr maybe-configure-send-pr
  maybe-configure-send-pr:
-configure-send-pr: send-pr/Makefile
-
-send-pr/Makefile: config.status
-       @[ -d send-pr ] || mkdir send-pr; \
+configure-send-pr:
+       @test ! -f send-pr/Makefile || exit 0; \
+       [ -d send-pr ] || mkdir send-pr; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -4546,17 +4382,17 @@ send-pr/Makefile: config.status
  maybe-all-send-pr:
  all-send-pr: configure-send-pr
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd send-pr && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd send-pr && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-send-pr
  check-send-pr:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd send-pr && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd send-pr && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -4564,17 +4400,16 @@ check-send-pr:
  maybe-install-send-pr:
  install-send-pr: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd send-pr && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd send-pr && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-shellutils maybe-configure-shellutils
  maybe-configure-shellutils:
-configure-shellutils: shellutils/Makefile
-
-shellutils/Makefile: config.status
-       @[ -d shellutils ] || mkdir shellutils; \
+configure-shellutils:
+       @test ! -f shellutils/Makefile || exit 0; \
+       [ -d shellutils ] || mkdir shellutils; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -4614,17 +4449,17 @@ shellutils/Makefile: config.status
  maybe-all-shellutils:
  all-shellutils: configure-shellutils
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd shellutils && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd shellutils && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-shellutils
  check-shellutils:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd shellutils && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd shellutils && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -4632,17 +4467,16 @@ check-shellutils:
  maybe-install-shellutils:
  install-shellutils: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd shellutils && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd shellutils && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-sid maybe-configure-sid
  maybe-configure-sid:
-configure-sid: sid/Makefile
-
-sid/Makefile: config.status
-       @[ -d sid ] || mkdir sid; \
+configure-sid:
+       @test ! -f sid/Makefile || exit 0; \
+       [ -d sid ] || mkdir sid; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -4682,17 +4516,17 @@ sid/Makefile: config.status
  maybe-all-sid:
  all-sid: configure-sid
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd sid && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd sid && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-sid
  check-sid:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd sid && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd sid && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -4700,17 +4534,16 @@ check-sid:
  maybe-install-sid:
  install-sid: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd sid && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd sid && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-sim maybe-configure-sim
  maybe-configure-sim:
-configure-sim: sim/Makefile
-
-sim/Makefile: config.status
-       @[ -d sim ] || mkdir sim; \
+configure-sim:
+       @test ! -f sim/Makefile || exit 0; \
+       [ -d sim ] || mkdir sim; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -4750,17 +4583,17 @@ sim/Makefile: config.status
  maybe-all-sim:
  all-sim: configure-sim
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd sim && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd sim && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-sim
  check-sim:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd sim && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd sim && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -4768,85 +4601,16 @@ check-sim:
  maybe-install-sim:
  install-sim: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd sim && $(MAKE) $(FLAGS_TO_PASS) install)
-
-
-.PHONY: configure-snavigator maybe-configure-snavigator
-maybe-configure-snavigator:
-configure-snavigator: snavigator/Makefile
-
-snavigator/Makefile: config.status
-       @[ -d snavigator ] || mkdir snavigator; \
-       r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       if [ z$(build_canonical) !=  z$(host_canoncial) ] ; then \
-         AR="$(AR)"; export AR; \
-         AS="$(AS)"; export AS; \
-         CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
-         DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
-         LD="$(LD)"; export LD; \
-         NM="$(NM)"; export NM; \
-         RANLIB="$(RANLIB)"; export RANLIB; \
-         WINDRES="$(WINDRES)"; export WINDRES; \
-         OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-         OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       fi; \
-       echo Configuring in snavigator; \
-       cd snavigator || exit 1; \
-       case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/snavigator"; \
-           libsrcdir="$$s/snavigator";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/snavigator"; \
-           libsrcdir="$$s/snavigator";; \
-       esac; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         || exit 1
-
-.PHONY: all-snavigator maybe-all-snavigator
-maybe-all-snavigator:
-all-snavigator: configure-snavigator
-       @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd snavigator && $(MAKE) $(FLAGS_TO_PASS) all)
-
-
-.PHONY: check-snavigator
-check-snavigator:
-       @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd snavigator && $(MAKE) $(FLAGS_TO_PASS) check)
-
-
-
-.PHONY: install-snavigator maybe-install-snavigator
-maybe-install-snavigator:
-install-snavigator: installdirs
-       @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd snavigator && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(SET_LIB_PATH) \
+       (cd sim && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-tar maybe-configure-tar
  maybe-configure-tar:
-configure-tar: tar/Makefile
-
-tar/Makefile: config.status
-       @[ -d tar ] || mkdir tar; \
+configure-tar:
+       @test ! -f tar/Makefile || exit 0; \
+       [ -d tar ] || mkdir tar; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -4886,17 +4650,17 @@ tar/Makefile: config.status
  maybe-all-tar:
  all-tar: configure-tar
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd tar && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd tar && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-tar
  check-tar:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd tar && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd tar && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -4904,17 +4668,16 @@ check-tar:
  maybe-install-tar:
  install-tar: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd tar && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd tar && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-texinfo maybe-configure-texinfo
  maybe-configure-texinfo:
-configure-texinfo: texinfo/Makefile
-
-texinfo/Makefile: config.status
-       @[ -d texinfo ] || mkdir texinfo; \
+configure-texinfo:
+       @test ! -f texinfo/Makefile || exit 0; \
+       [ -d texinfo ] || mkdir texinfo; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -4954,17 +4717,17 @@ texinfo/Makefile: config.status
  maybe-all-texinfo:
  all-texinfo: configure-texinfo
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd texinfo && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd texinfo && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-texinfo
  check-texinfo:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd texinfo && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd texinfo && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -4975,10 +4738,9 @@ install-texinfo:
  
  .PHONY: configure-textutils maybe-configure-textutils
  maybe-configure-textutils:
-configure-textutils: textutils/Makefile
-
-textutils/Makefile: config.status
-       @[ -d textutils ] || mkdir textutils; \
+configure-textutils:
+       @test ! -f textutils/Makefile || exit 0; \
+       [ -d textutils ] || mkdir textutils; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -5018,17 +4780,17 @@ textutils/Makefile: config.status
  maybe-all-textutils:
  all-textutils: configure-textutils
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd textutils && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd textutils && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-textutils
  check-textutils:
-       @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd textutils && $(MAKE) $(FLAGS_TO_PASS) check)
+       @r=`${PWD}`; export r; \
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd textutils && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -5036,17 +4798,16 @@ check-textutils:
  maybe-install-textutils:
  install-textutils: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd textutils && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd textutils && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-time maybe-configure-time
  maybe-configure-time:
-configure-time: time/Makefile
-
-time/Makefile: config.status
-       @[ -d time ] || mkdir time; \
+configure-time:
+       @test ! -f time/Makefile || exit 0; \
+       [ -d time ] || mkdir time; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -5086,17 +4847,17 @@ time/Makefile: config.status
  maybe-all-time:
  all-time: configure-time
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd time && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd time && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-time
  check-time:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd time && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd time && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -5104,17 +4865,16 @@ check-time:
  maybe-install-time:
  install-time: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd time && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd time && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-uudecode maybe-configure-uudecode
  maybe-configure-uudecode:
-configure-uudecode: uudecode/Makefile
-
-uudecode/Makefile: config.status
-       @[ -d uudecode ] || mkdir uudecode; \
+configure-uudecode:
+       @test ! -f uudecode/Makefile || exit 0; \
+       [ -d uudecode ] || mkdir uudecode; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -5154,17 +4914,17 @@ uudecode/Makefile: config.status
  maybe-all-uudecode:
  all-uudecode: configure-uudecode
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd uudecode && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd uudecode && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-uudecode
  check-uudecode:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd uudecode && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd uudecode && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -5172,17 +4932,16 @@ check-uudecode:
  maybe-install-uudecode:
  install-uudecode: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd uudecode && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd uudecode && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-wdiff maybe-configure-wdiff
  maybe-configure-wdiff:
-configure-wdiff: wdiff/Makefile
-
-wdiff/Makefile: config.status
-       @[ -d wdiff ] || mkdir wdiff; \
+configure-wdiff:
+       @test ! -f wdiff/Makefile || exit 0; \
+       [ -d wdiff ] || mkdir wdiff; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -5222,17 +4981,17 @@ wdiff/Makefile: config.status
  maybe-all-wdiff:
  all-wdiff: configure-wdiff
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd wdiff && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd wdiff && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-wdiff
  check-wdiff:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd wdiff && $(MAKE) $(FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd wdiff && $(MAKE) $(FLAGS_TO_PASS) check)
  
  
  
@@ -5240,17 +4999,16 @@ check-wdiff:
  maybe-install-wdiff:
  install-wdiff: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd wdiff && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd wdiff && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-zip maybe-configure-zip
  maybe-configure-zip:
-configure-zip: zip/Makefile
-
-zip/Makefile: config.status
-       @[ -d zip ] || mkdir zip; \
+configure-zip:
+       @test ! -f zip/Makefile || exit 0; \
+       [ -d zip ] || mkdir zip; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -5290,19 +5048,19 @@ zip/Makefile: config.status
  maybe-all-zip:
  all-zip: configure-zip
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd zip && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd zip && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-zip
  # This module is only tested in a native toolchain.
  check-zip:
         @if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
-           r=`${PWD}`; export r; \
-           s=`cd $(srcdir); ${PWD}`; export s; \
-           $(SET_LIB_PATH) \
-           (cd zip && $(MAKE) $(FLAGS_TO_PASS) check); \
+         r=`${PWD}`; export r; \
+         s=`cd $(srcdir); ${PWD}`; export s; \
+         $(SET_LIB_PATH) \
+         (cd zip && $(MAKE) $(FLAGS_TO_PASS) check); \
         fi
  
  
@@ -5311,17 +5069,16 @@ check-zip:
  maybe-install-zip:
  install-zip: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd zip && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd zip && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-zlib maybe-configure-zlib
  maybe-configure-zlib:
-configure-zlib: zlib/Makefile
-
-zlib/Makefile: config.status
-       @[ -d zlib ] || mkdir zlib; \
+configure-zlib:
+       @test ! -f zlib/Makefile || exit 0; \
+       [ -d zlib ] || mkdir zlib; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -5361,9 +5118,9 @@ zlib/Makefile: config.status
  maybe-all-zlib:
  all-zlib: configure-zlib
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd zlib && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd zlib && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-zlib
@@ -5378,10 +5135,9 @@ install-zlib:
  
  .PHONY: configure-gdb maybe-configure-gdb
  maybe-configure-gdb:
-configure-gdb: gdb/Makefile
-
-gdb/Makefile: config.status
-       @[ -d gdb ] || mkdir gdb; \
+configure-gdb:
+       @test ! -f gdb/Makefile || exit 0; \
+       [ -d gdb ] || mkdir gdb; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -5421,17 +5177,17 @@ gdb/Makefile: config.status
  maybe-all-gdb:
  all-gdb: configure-gdb
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
  
  
  .PHONY: check-gdb
  check-gdb:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
  
  
  
@@ -5439,17 +5195,16 @@ check-gdb:
  maybe-install-gdb:
  install-gdb: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-expect maybe-configure-expect
  maybe-configure-expect:
-configure-expect: expect/Makefile
-
-expect/Makefile: config.status
-       @[ -d expect ] || mkdir expect; \
+configure-expect:
+       @test ! -f expect/Makefile || exit 0; \
+       [ -d expect ] || mkdir expect; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -5489,17 +5244,17 @@ expect/Makefile: config.status
  maybe-all-expect:
  all-expect: configure-expect
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
  
  
  .PHONY: check-expect
  check-expect:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
  
  
  
@@ -5507,17 +5262,16 @@ check-expect:
  maybe-install-expect:
  install-expect: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-guile maybe-configure-guile
  maybe-configure-guile:
-configure-guile: guile/Makefile
-
-guile/Makefile: config.status
-       @[ -d guile ] || mkdir guile; \
+configure-guile:
+       @test ! -f guile/Makefile || exit 0; \
+       [ -d guile ] || mkdir guile; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -5557,17 +5311,17 @@ guile/Makefile: config.status
  maybe-all-guile:
  all-guile: configure-guile
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
  
  
  .PHONY: check-guile
  check-guile:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
  
  
  
@@ -5575,17 +5329,16 @@ check-guile:
  maybe-install-guile:
  install-guile: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-tk maybe-configure-tk
  maybe-configure-tk:
-configure-tk: tk/Makefile
-
-tk/Makefile: config.status
-       @[ -d tk ] || mkdir tk; \
+configure-tk:
+       @test ! -f tk/Makefile || exit 0; \
+       [ -d tk ] || mkdir tk; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -5625,17 +5378,17 @@ tk/Makefile: config.status
  maybe-all-tk:
  all-tk: configure-tk
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
  
  
  .PHONY: check-tk
  check-tk:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
  
  
  
@@ -5643,17 +5396,16 @@ check-tk:
  maybe-install-tk:
  install-tk: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-tix maybe-configure-tix
  maybe-configure-tix:
-configure-tix: tix/Makefile
-
-tix/Makefile: config.status
-       @[ -d tix ] || mkdir tix; \
+configure-tix:
+       @test ! -f tix/Makefile || exit 0; \
+       [ -d tix ] || mkdir tix; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -5693,17 +5445,17 @@ tix/Makefile: config.status
  maybe-all-tix:
  all-tix: configure-tix
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
  
  
  .PHONY: check-tix
  check-tix:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
  
  
  
@@ -5711,17 +5463,16 @@ check-tix:
  maybe-install-tix:
  install-tix: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-libtermcap maybe-configure-libtermcap
  maybe-configure-libtermcap:
-configure-libtermcap: libtermcap/Makefile
-
-libtermcap/Makefile: config.status
-       @[ -d libtermcap ] || mkdir libtermcap; \
+configure-libtermcap:
+       @test ! -f libtermcap/Makefile || exit 0; \
+       [ -d libtermcap ] || mkdir libtermcap; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -5761,9 +5512,9 @@ libtermcap/Makefile: config.status
  maybe-all-libtermcap:
  all-libtermcap: configure-libtermcap
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd libtermcap && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd libtermcap && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-libtermcap
@@ -5775,17 +5526,16 @@ check-libtermcap:
  maybe-install-libtermcap:
  install-libtermcap: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd libtermcap && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd libtermcap && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-utils maybe-configure-utils
  maybe-configure-utils:
-configure-utils: utils/Makefile
-
-utils/Makefile: config.status
-       @[ -d utils ] || mkdir utils; \
+configure-utils:
+       @test ! -f utils/Makefile || exit 0; \
+       [ -d utils ] || mkdir utils; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
@@ -5825,9 +5575,9 @@ utils/Makefile: config.status
  maybe-all-utils:
  all-utils: configure-utils
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd utils && $(MAKE) $(FLAGS_TO_PASS) all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd utils && $(MAKE) $(FLAGS_TO_PASS) all)
  
  
  .PHONY: check-utils
@@ -5839,9 +5589,9 @@ check-utils:
  maybe-install-utils:
  install-utils: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd utils && $(MAKE) $(FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd utils && $(MAKE) $(FLAGS_TO_PASS) install)
  
  
  
@@ -5851,465 +5601,485 @@ install-utils: installdirs
  
  .PHONY: configure-target-libstdc++-v3 maybe-configure-target-libstdc++-v3
  maybe-configure-target-libstdc++-v3:
-configure-target-libstdc++-v3: $(TARGET_SUBDIR)/libstdc++-v3/Makefile
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/libstdc++-v3/multilib.out: multilib.out
-       @[ -d $(TARGET_SUBDIR)/libstdc++-v3 ] || mkdir $(TARGET_SUBDIR)/libstdc++-v3;\
+       @[ -d $(TARGET_SUBDIR)/libstdc++-v3 ] || \
+         mkdir $(TARGET_SUBDIR)/libstdc++-v3; \
+       rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || : ; \
         cp multilib.out $(TARGET_SUBDIR)/libstdc++-v3/multilib.out
  
-$(TARGET_SUBDIR)/libstdc++-v3/Makefile: config.status $(TARGET_SUBDIR)/libstdc++-v3/multilib.out
-       @[ -d $(TARGET_SUBDIR)/libstdc++-v3 ] || mkdir $(TARGET_SUBDIR)/libstdc++-v3;\
-           r=`${PWD}`; export r; \
-           s=`cd $(srcdir); ${PWD}`; export s; \
-           $(SET_LIB_PATH) \
-           AR="$(AR_FOR_TARGET)"; export AR; \
-           AS="$(AS_FOR_TARGET)"; export AS; \
-           CC="$(CC_FOR_TARGET)"; export CC; \
-           CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-           CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
-           CXX="$(RAW_CXX_FOR_TARGET)"; export CXX; \
-           CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-           GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
-           DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
-           LD="$(LD_FOR_TARGET)"; export LD; \
-            LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
-           NM="$(NM_FOR_TARGET)"; export NM; \
-           RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
-           WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
-           echo Configuring in $(TARGET_SUBDIR)/libstdc++-v3; \
-           cd "$(TARGET_SUBDIR)/libstdc++-v3" || exit 1; \
-           case $(srcdir) in \
-           /* | [A-Za-z]:[\\/]*) \
-             topdir=$(srcdir) ;; \
-           *) \
-             case "$(TARGET_SUBDIR)" in \
+configure-target-libstdc++-v3: $(TARGET_SUBDIR)/libstdc++-v3/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+       [ -d $(TARGET_SUBDIR)/libstdc++-v3 ] || \
+         mkdir $(TARGET_SUBDIR)/libstdc++-v3;\
+       r=`${PWD}`; export r; \
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       AR="$(AR_FOR_TARGET)"; export AR; \
+       AS="$(AS_FOR_TARGET)"; export AS; \
+       CC="$(CC_FOR_TARGET)"; export CC; \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+       CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
+       CXX="$(RAW_CXX_FOR_TARGET)"; export CXX; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
+       DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
+       LD="$(LD_FOR_TARGET)"; export LD; \
+       LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
+       NM="$(NM_FOR_TARGET)"; export NM; \
+       RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
+       WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
+       echo Configuring in $(TARGET_SUBDIR)/libstdc++-v3; \
+       cd "$(TARGET_SUBDIR)/libstdc++-v3" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) \
+           topdir=$(srcdir) ;; \
+         *) \
+           case "$(TARGET_SUBDIR)" in \
               .) topdir="../$(srcdir)" ;; \
               *) topdir="../../$(srcdir)" ;; \
-             esac ;; \
-           esac; \
-           if [ "$(srcdir)" = "." ] ; then \
-             if [ "$(TARGET_SUBDIR)" != "." ] ; then \
-               if $(SHELL) $$s/symlink-tree $${topdir}/libstdc++-v3 "no-such-file" ; then \
-                 if [ -f Makefile ]; then \
-                   if $(MAKE) distclean; then \
-                     true; \
-                   else \
-                     exit 1; \
-                   fi; \
-                 else \
-                   true; \
-                 fi; \
-               else \
-                 exit 1; \
-               fi; \
+           esac ;; \
+       esac; \
+       if [ "$(srcdir)" = "." ] ; then \
+         if [ "$(TARGET_SUBDIR)" != "." ] ; then \
+           if $(SHELL) $$s/symlink-tree $${topdir}/libstdc++-v3 "no-such-file" ; then \
+             if [ -f Makefile ]; then \
+               if $(MAKE) distclean; then \
+                 true; \
+               else \
+                 exit 1; \
+               fi; \
               else \
-               true; \
+               true; \
               fi; \
-             srcdiroption="--srcdir=."; \
-             libsrcdir="."; \
             else \
-             srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
-             libsrcdir="$$s/libstdc++-v3"; \
+             exit 1; \
             fi; \
-           rm -f no-such-file || : ; \
-           CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-             $(TARGET_CONFIGARGS) $${srcdiroption} \
-             --with-target-subdir="$(TARGET_SUBDIR)" \
-             || exit 1
+         else \
+           true; \
+         fi; \
+         srcdiroption="--srcdir=."; \
+         libsrcdir="."; \
+       else \
+         srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
+         libsrcdir="$$s/libstdc++-v3"; \
+       fi; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)" \
+         || exit 1
  
  .PHONY: all-target-libstdc++-v3 maybe-all-target-libstdc++-v3
  maybe-all-target-libstdc++-v3:
  all-target-libstdc++-v3: configure-target-libstdc++-v3
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  all)
  
  .PHONY: check-target-libstdc++-v3
  check-target-libstdc++-v3:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  check)
  
  
  .PHONY: install-target-libstdc++-v3 maybe-install-target-libstdc++-v3
  maybe-install-target-libstdc++-v3:
  install-target-libstdc++-v3: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-target-newlib maybe-configure-target-newlib
  maybe-configure-target-newlib:
-configure-target-newlib: $(TARGET_SUBDIR)/newlib/Makefile
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/newlib/multilib.out: multilib.out
-       @[ -d $(TARGET_SUBDIR)/newlib ] || mkdir $(TARGET_SUBDIR)/newlib;\
+       @[ -d $(TARGET_SUBDIR)/newlib ] || \
+         mkdir $(TARGET_SUBDIR)/newlib; \
+       rm -f $(TARGET_SUBDIR)/newlib/Makefile || : ; \
         cp multilib.out $(TARGET_SUBDIR)/newlib/multilib.out
  
-$(TARGET_SUBDIR)/newlib/Makefile: config.status $(TARGET_SUBDIR)/newlib/multilib.out
-       @[ -d $(TARGET_SUBDIR)/newlib ] || mkdir $(TARGET_SUBDIR)/newlib;\
-           r=`${PWD}`; export r; \
-           s=`cd $(srcdir); ${PWD}`; export s; \
-           $(SET_LIB_PATH) \
-           AR="$(AR_FOR_TARGET)"; export AR; \
-           AS="$(AS_FOR_TARGET)"; export AS; \
-           CC="$(CC_FOR_TARGET)"; export CC; \
-           CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-           CXX="$(CXX_FOR_TARGET)"; export CXX; \
-           CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-           GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
-           DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
-           LD="$(LD_FOR_TARGET)"; export LD; \
-            LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
-           NM="$(NM_FOR_TARGET)"; export NM; \
-           RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
-           WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
-           echo Configuring in $(TARGET_SUBDIR)/newlib; \
-           cd "$(TARGET_SUBDIR)/newlib" || exit 1; \
-           case $(srcdir) in \
-           /* | [A-Za-z]:[\\/]*) \
-             topdir=$(srcdir) ;; \
-           *) \
-             case "$(TARGET_SUBDIR)" in \
+configure-target-newlib: $(TARGET_SUBDIR)/newlib/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/newlib/Makefile || exit 0; \
+       [ -d $(TARGET_SUBDIR)/newlib ] || \
+         mkdir $(TARGET_SUBDIR)/newlib;\
+       r=`${PWD}`; export r; \
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       AR="$(AR_FOR_TARGET)"; export AR; \
+       AS="$(AS_FOR_TARGET)"; export AS; \
+       CC="$(CC_FOR_TARGET)"; export CC; \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+       CXX="$(CXX_FOR_TARGET)"; export CXX; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
+       DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
+       LD="$(LD_FOR_TARGET)"; export LD; \
+       LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
+       NM="$(NM_FOR_TARGET)"; export NM; \
+       RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
+       WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
+       echo Configuring in $(TARGET_SUBDIR)/newlib; \
+       cd "$(TARGET_SUBDIR)/newlib" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) \
+           topdir=$(srcdir) ;; \
+         *) \
+           case "$(TARGET_SUBDIR)" in \
               .) topdir="../$(srcdir)" ;; \
               *) topdir="../../$(srcdir)" ;; \
-             esac ;; \
-           esac; \
-           if [ "$(srcdir)" = "." ] ; then \
-             if [ "$(TARGET_SUBDIR)" != "." ] ; then \
-               if $(SHELL) $$s/symlink-tree $${topdir}/newlib "no-such-file" ; then \
-                 if [ -f Makefile ]; then \
-                   if $(MAKE) distclean; then \
-                     true; \
-                   else \
-                     exit 1; \
-                   fi; \
-                 else \
-                   true; \
-                 fi; \
-               else \
-                 exit 1; \
-               fi; \
+           esac ;; \
+       esac; \
+       if [ "$(srcdir)" = "." ] ; then \
+         if [ "$(TARGET_SUBDIR)" != "." ] ; then \
+           if $(SHELL) $$s/symlink-tree $${topdir}/newlib "no-such-file" ; then \
+             if [ -f Makefile ]; then \
+               if $(MAKE) distclean; then \
+                 true; \
+               else \
+                 exit 1; \
+               fi; \
               else \
-               true; \
+               true; \
               fi; \
-             srcdiroption="--srcdir=."; \
-             libsrcdir="."; \
             else \
-             srcdiroption="--srcdir=$${topdir}/newlib"; \
-             libsrcdir="$$s/newlib"; \
+             exit 1; \
             fi; \
-           rm -f no-such-file || : ; \
-           CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-             $(TARGET_CONFIGARGS) $${srcdiroption} \
-             --with-target-subdir="$(TARGET_SUBDIR)" \
-             || exit 1
+         else \
+           true; \
+         fi; \
+         srcdiroption="--srcdir=."; \
+         libsrcdir="."; \
+       else \
+         srcdiroption="--srcdir=$${topdir}/newlib"; \
+         libsrcdir="$$s/newlib"; \
+       fi; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)" \
+         || exit 1
  
  .PHONY: all-target-newlib maybe-all-target-newlib
  maybe-all-target-newlib:
  all-target-newlib: configure-target-newlib
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/newlib && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/newlib && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
  
  .PHONY: check-target-newlib
  check-target-newlib:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/newlib && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/newlib && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
  
  
  .PHONY: install-target-newlib maybe-install-target-newlib
  maybe-install-target-newlib:
  install-target-newlib: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/newlib && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/newlib && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-target-libf2c maybe-configure-target-libf2c
  maybe-configure-target-libf2c:
-configure-target-libf2c: $(TARGET_SUBDIR)/libf2c/Makefile
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/libf2c/multilib.out: multilib.out
-       @[ -d $(TARGET_SUBDIR)/libf2c ] || mkdir $(TARGET_SUBDIR)/libf2c;\
+       @[ -d $(TARGET_SUBDIR)/libf2c ] || \
+         mkdir $(TARGET_SUBDIR)/libf2c; \
+       rm -f $(TARGET_SUBDIR)/libf2c/Makefile || : ; \
         cp multilib.out $(TARGET_SUBDIR)/libf2c/multilib.out
  
-$(TARGET_SUBDIR)/libf2c/Makefile: config.status $(TARGET_SUBDIR)/libf2c/multilib.out
-       @[ -d $(TARGET_SUBDIR)/libf2c ] || mkdir $(TARGET_SUBDIR)/libf2c;\
-           r=`${PWD}`; export r; \
-           s=`cd $(srcdir); ${PWD}`; export s; \
-           $(SET_LIB_PATH) \
-           AR="$(AR_FOR_TARGET)"; export AR; \
-           AS="$(AS_FOR_TARGET)"; export AS; \
-           CC="$(CC_FOR_TARGET)"; export CC; \
-           CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-           CXX="$(CXX_FOR_TARGET)"; export CXX; \
-           CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-           GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
-           DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
-           LD="$(LD_FOR_TARGET)"; export LD; \
-            LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
-           NM="$(NM_FOR_TARGET)"; export NM; \
-           RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
-           WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
-           echo Configuring in $(TARGET_SUBDIR)/libf2c; \
-           cd "$(TARGET_SUBDIR)/libf2c" || exit 1; \
-           case $(srcdir) in \
-           /* | [A-Za-z]:[\\/]*) \
-             topdir=$(srcdir) ;; \
-           *) \
-             case "$(TARGET_SUBDIR)" in \
+configure-target-libf2c: $(TARGET_SUBDIR)/libf2c/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/libf2c/Makefile || exit 0; \
+       [ -d $(TARGET_SUBDIR)/libf2c ] || \
+         mkdir $(TARGET_SUBDIR)/libf2c;\
+       r=`${PWD}`; export r; \
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       AR="$(AR_FOR_TARGET)"; export AR; \
+       AS="$(AS_FOR_TARGET)"; export AS; \
+       CC="$(CC_FOR_TARGET)"; export CC; \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+       CXX="$(CXX_FOR_TARGET)"; export CXX; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
+       DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
+       LD="$(LD_FOR_TARGET)"; export LD; \
+       LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
+       NM="$(NM_FOR_TARGET)"; export NM; \
+       RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
+       WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
+       echo Configuring in $(TARGET_SUBDIR)/libf2c; \
+       cd "$(TARGET_SUBDIR)/libf2c" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) \
+           topdir=$(srcdir) ;; \
+         *) \
+           case "$(TARGET_SUBDIR)" in \
               .) topdir="../$(srcdir)" ;; \
               *) topdir="../../$(srcdir)" ;; \
-             esac ;; \
-           esac; \
-           if [ "$(srcdir)" = "." ] ; then \
-             if [ "$(TARGET_SUBDIR)" != "." ] ; then \
-               if $(SHELL) $$s/symlink-tree $${topdir}/libf2c "no-such-file" ; then \
-                 if [ -f Makefile ]; then \
-                   if $(MAKE) distclean; then \
-                     true; \
-                   else \
-                     exit 1; \
-                   fi; \
-                 else \
-                   true; \
-                 fi; \
-               else \
-                 exit 1; \
-               fi; \
+           esac ;; \
+       esac; \
+       if [ "$(srcdir)" = "." ] ; then \
+         if [ "$(TARGET_SUBDIR)" != "." ] ; then \
+           if $(SHELL) $$s/symlink-tree $${topdir}/libf2c "no-such-file" ; then \
+             if [ -f Makefile ]; then \
+               if $(MAKE) distclean; then \
+                 true; \
+               else \
+                 exit 1; \
+               fi; \
               else \
-               true; \
+               true; \
               fi; \
-             srcdiroption="--srcdir=."; \
-             libsrcdir="."; \
             else \
-             srcdiroption="--srcdir=$${topdir}/libf2c"; \
-             libsrcdir="$$s/libf2c"; \
+             exit 1; \
             fi; \
-           rm -f no-such-file || : ; \
-           CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-             $(TARGET_CONFIGARGS) $${srcdiroption} \
-             --with-target-subdir="$(TARGET_SUBDIR)" \
-             || exit 1
+         else \
+           true; \
+         fi; \
+         srcdiroption="--srcdir=."; \
+         libsrcdir="."; \
+       else \
+         srcdiroption="--srcdir=$${topdir}/libf2c"; \
+         libsrcdir="$$s/libf2c"; \
+       fi; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)" \
+         || exit 1
  
  .PHONY: all-target-libf2c maybe-all-target-libf2c
  maybe-all-target-libf2c:
  all-target-libf2c: configure-target-libf2c
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libf2c && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/libf2c && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
  
  .PHONY: check-target-libf2c
  check-target-libf2c:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libf2c && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/libf2c && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
  
  
  .PHONY: install-target-libf2c maybe-install-target-libf2c
  maybe-install-target-libf2c:
  install-target-libf2c: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libf2c && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/libf2c && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-target-libobjc maybe-configure-target-libobjc
  maybe-configure-target-libobjc:
-configure-target-libobjc: $(TARGET_SUBDIR)/libobjc/Makefile
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/libobjc/multilib.out: multilib.out
-       @[ -d $(TARGET_SUBDIR)/libobjc ] || mkdir $(TARGET_SUBDIR)/libobjc;\
+       @[ -d $(TARGET_SUBDIR)/libobjc ] || \
+         mkdir $(TARGET_SUBDIR)/libobjc; \
+       rm -f $(TARGET_SUBDIR)/libobjc/Makefile || : ; \
         cp multilib.out $(TARGET_SUBDIR)/libobjc/multilib.out
  
-$(TARGET_SUBDIR)/libobjc/Makefile: config.status $(TARGET_SUBDIR)/libobjc/multilib.out
-       @[ -d $(TARGET_SUBDIR)/libobjc ] || mkdir $(TARGET_SUBDIR)/libobjc;\
-           r=`${PWD}`; export r; \
-           s=`cd $(srcdir); ${PWD}`; export s; \
-           $(SET_LIB_PATH) \
-           AR="$(AR_FOR_TARGET)"; export AR; \
-           AS="$(AS_FOR_TARGET)"; export AS; \
-           CC="$(CC_FOR_TARGET)"; export CC; \
-           CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-           CXX="$(CXX_FOR_TARGET)"; export CXX; \
-           CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-           GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
-           DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
-           LD="$(LD_FOR_TARGET)"; export LD; \
-            LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
-           NM="$(NM_FOR_TARGET)"; export NM; \
-           RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
-           WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
-           echo Configuring in $(TARGET_SUBDIR)/libobjc; \
-           cd "$(TARGET_SUBDIR)/libobjc" || exit 1; \
-           case $(srcdir) in \
-           /* | [A-Za-z]:[\\/]*) \
-             topdir=$(srcdir) ;; \
-           *) \
-             case "$(TARGET_SUBDIR)" in \
+configure-target-libobjc: $(TARGET_SUBDIR)/libobjc/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/libobjc/Makefile || exit 0; \
+       [ -d $(TARGET_SUBDIR)/libobjc ] || \
+         mkdir $(TARGET_SUBDIR)/libobjc;\
+       r=`${PWD}`; export r; \
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       AR="$(AR_FOR_TARGET)"; export AR; \
+       AS="$(AS_FOR_TARGET)"; export AS; \
+       CC="$(CC_FOR_TARGET)"; export CC; \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+       CXX="$(CXX_FOR_TARGET)"; export CXX; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
+       DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
+       LD="$(LD_FOR_TARGET)"; export LD; \
+       LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
+       NM="$(NM_FOR_TARGET)"; export NM; \
+       RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
+       WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
+       echo Configuring in $(TARGET_SUBDIR)/libobjc; \
+       cd "$(TARGET_SUBDIR)/libobjc" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) \
+           topdir=$(srcdir) ;; \
+         *) \
+           case "$(TARGET_SUBDIR)" in \
               .) topdir="../$(srcdir)" ;; \
               *) topdir="../../$(srcdir)" ;; \
-             esac ;; \
-           esac; \
-           if [ "$(srcdir)" = "." ] ; then \
-             if [ "$(TARGET_SUBDIR)" != "." ] ; then \
-               if $(SHELL) $$s/symlink-tree $${topdir}/libobjc "no-such-file" ; then \
-                 if [ -f Makefile ]; then \
-                   if $(MAKE) distclean; then \
-                     true; \
-                   else \
-                     exit 1; \
-                   fi; \
-                 else \
-                   true; \
-                 fi; \
-               else \
-                 exit 1; \
-               fi; \
+           esac ;; \
+       esac; \
+       if [ "$(srcdir)" = "." ] ; then \
+         if [ "$(TARGET_SUBDIR)" != "." ] ; then \
+           if $(SHELL) $$s/symlink-tree $${topdir}/libobjc "no-such-file" ; then \
+             if [ -f Makefile ]; then \
+               if $(MAKE) distclean; then \
+                 true; \
+               else \
+                 exit 1; \
+               fi; \
               else \
-               true; \
+               true; \
               fi; \
-             srcdiroption="--srcdir=."; \
-             libsrcdir="."; \
             else \
-             srcdiroption="--srcdir=$${topdir}/libobjc"; \
-             libsrcdir="$$s/libobjc"; \
+             exit 1; \
             fi; \
-           rm -f no-such-file || : ; \
-           CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-             $(TARGET_CONFIGARGS) $${srcdiroption} \
-             --with-target-subdir="$(TARGET_SUBDIR)" \
-             || exit 1
+         else \
+           true; \
+         fi; \
+         srcdiroption="--srcdir=."; \
+         libsrcdir="."; \
+       else \
+         srcdiroption="--srcdir=$${topdir}/libobjc"; \
+         libsrcdir="$$s/libobjc"; \
+       fi; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)" \
+         || exit 1
  
  .PHONY: all-target-libobjc maybe-all-target-libobjc
  maybe-all-target-libobjc:
  all-target-libobjc: configure-target-libobjc
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libobjc && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/libobjc && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
  
  .PHONY: check-target-libobjc
  check-target-libobjc:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libobjc && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/libobjc && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
  
  
  .PHONY: install-target-libobjc maybe-install-target-libobjc
  maybe-install-target-libobjc:
  install-target-libobjc: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libobjc && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/libobjc && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-target-libtermcap maybe-configure-target-libtermcap
  maybe-configure-target-libtermcap:
-configure-target-libtermcap: $(TARGET_SUBDIR)/libtermcap/Makefile
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/libtermcap/multilib.out: multilib.out
-       @[ -d $(TARGET_SUBDIR)/libtermcap ] || mkdir $(TARGET_SUBDIR)/libtermcap;\
+       @[ -d $(TARGET_SUBDIR)/libtermcap ] || \
+         mkdir $(TARGET_SUBDIR)/libtermcap; \
+       rm -f $(TARGET_SUBDIR)/libtermcap/Makefile || : ; \
         cp multilib.out $(TARGET_SUBDIR)/libtermcap/multilib.out
  
-$(TARGET_SUBDIR)/libtermcap/Makefile: config.status $(TARGET_SUBDIR)/libtermcap/multilib.out
-       @[ -d $(TARGET_SUBDIR)/libtermcap ] || mkdir $(TARGET_SUBDIR)/libtermcap;\
-           r=`${PWD}`; export r; \
-           s=`cd $(srcdir); ${PWD}`; export s; \
-           $(SET_LIB_PATH) \
-           AR="$(AR_FOR_TARGET)"; export AR; \
-           AS="$(AS_FOR_TARGET)"; export AS; \
-           CC="$(CC_FOR_TARGET)"; export CC; \
-           CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-           CXX="$(CXX_FOR_TARGET)"; export CXX; \
-           CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-           GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
-           DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
-           LD="$(LD_FOR_TARGET)"; export LD; \
-            LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
-           NM="$(NM_FOR_TARGET)"; export NM; \
-           RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
-           WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
-           echo Configuring in $(TARGET_SUBDIR)/libtermcap; \
-           cd "$(TARGET_SUBDIR)/libtermcap" || exit 1; \
-           case $(srcdir) in \
-           /* | [A-Za-z]:[\\/]*) \
-             topdir=$(srcdir) ;; \
-           *) \
-             case "$(TARGET_SUBDIR)" in \
+configure-target-libtermcap: $(TARGET_SUBDIR)/libtermcap/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/libtermcap/Makefile || exit 0; \
+       [ -d $(TARGET_SUBDIR)/libtermcap ] || \
+         mkdir $(TARGET_SUBDIR)/libtermcap;\
+       r=`${PWD}`; export r; \
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       AR="$(AR_FOR_TARGET)"; export AR; \
+       AS="$(AS_FOR_TARGET)"; export AS; \
+       CC="$(CC_FOR_TARGET)"; export CC; \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+       CXX="$(CXX_FOR_TARGET)"; export CXX; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
+       DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
+       LD="$(LD_FOR_TARGET)"; export LD; \
+       LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
+       NM="$(NM_FOR_TARGET)"; export NM; \
+       RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
+       WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
+       echo Configuring in $(TARGET_SUBDIR)/libtermcap; \
+       cd "$(TARGET_SUBDIR)/libtermcap" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) \
+           topdir=$(srcdir) ;; \
+         *) \
+           case "$(TARGET_SUBDIR)" in \
               .) topdir="../$(srcdir)" ;; \
               *) topdir="../../$(srcdir)" ;; \
-             esac ;; \
-           esac; \
-           if [ "$(srcdir)" = "." ] ; then \
-             if [ "$(TARGET_SUBDIR)" != "." ] ; then \
-               if $(SHELL) $$s/symlink-tree $${topdir}/libtermcap "no-such-file" ; then \
-                 if [ -f Makefile ]; then \
-                   if $(MAKE) distclean; then \
-                     true; \
-                   else \
-                     exit 1; \
-                   fi; \
-                 else \
-                   true; \
-                 fi; \
-               else \
-                 exit 1; \
-               fi; \
+           esac ;; \
+       esac; \
+       if [ "$(srcdir)" = "." ] ; then \
+         if [ "$(TARGET_SUBDIR)" != "." ] ; then \
+           if $(SHELL) $$s/symlink-tree $${topdir}/libtermcap "no-such-file" ; then \
+             if [ -f Makefile ]; then \
+               if $(MAKE) distclean; then \
+                 true; \
+               else \
+                 exit 1; \
+               fi; \
               else \
-               true; \
+               true; \
               fi; \
-             srcdiroption="--srcdir=."; \
-             libsrcdir="."; \
             else \
-             srcdiroption="--srcdir=$${topdir}/libtermcap"; \
-             libsrcdir="$$s/libtermcap"; \
+             exit 1; \
             fi; \
-           rm -f no-such-file || : ; \
-           CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-             $(TARGET_CONFIGARGS) $${srcdiroption} \
-             --with-target-subdir="$(TARGET_SUBDIR)" \
-             || exit 1
+         else \
+           true; \
+         fi; \
+         srcdiroption="--srcdir=."; \
+         libsrcdir="."; \
+       else \
+         srcdiroption="--srcdir=$${topdir}/libtermcap"; \
+         libsrcdir="$$s/libtermcap"; \
+       fi; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)" \
+         || exit 1
  
  .PHONY: all-target-libtermcap maybe-all-target-libtermcap
  maybe-all-target-libtermcap:
  all-target-libtermcap: configure-target-libtermcap
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libtermcap && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/libtermcap && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
  
  # Dummy target for uncheckable module.
  .PHONY: check-target-libtermcap
@@ -6319,185 +6089,193 @@ check-target-libtermcap:
  .PHONY: install-target-libtermcap maybe-install-target-libtermcap
  maybe-install-target-libtermcap:
  install-target-libtermcap: installdirs
-       @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libtermcap && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+       @r=`${PWD}`; export r; \
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/libtermcap && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-target-winsup maybe-configure-target-winsup
  maybe-configure-target-winsup:
-configure-target-winsup: $(TARGET_SUBDIR)/winsup/Makefile
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/winsup/multilib.out: multilib.out
-       @[ -d $(TARGET_SUBDIR)/winsup ] || mkdir $(TARGET_SUBDIR)/winsup;\
+       @[ -d $(TARGET_SUBDIR)/winsup ] || \
+         mkdir $(TARGET_SUBDIR)/winsup; \
+       rm -f $(TARGET_SUBDIR)/winsup/Makefile || : ; \
         cp multilib.out $(TARGET_SUBDIR)/winsup/multilib.out
  
-$(TARGET_SUBDIR)/winsup/Makefile: config.status $(TARGET_SUBDIR)/winsup/multilib.out
-       @[ -d $(TARGET_SUBDIR)/winsup ] || mkdir $(TARGET_SUBDIR)/winsup;\
-           r=`${PWD}`; export r; \
-           s=`cd $(srcdir); ${PWD}`; export s; \
-           $(SET_LIB_PATH) \
-           AR="$(AR_FOR_TARGET)"; export AR; \
-           AS="$(AS_FOR_TARGET)"; export AS; \
-           CC="$(CC_FOR_TARGET)"; export CC; \
-           CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-           CXX="$(CXX_FOR_TARGET)"; export CXX; \
-           CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-           GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
-           DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
-           LD="$(LD_FOR_TARGET)"; export LD; \
-            LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
-           NM="$(NM_FOR_TARGET)"; export NM; \
-           RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
-           WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
-           echo Configuring in $(TARGET_SUBDIR)/winsup; \
-           cd "$(TARGET_SUBDIR)/winsup" || exit 1; \
-           case $(srcdir) in \
-           /* | [A-Za-z]:[\\/]*) \
-             topdir=$(srcdir) ;; \
-           *) \
-             case "$(TARGET_SUBDIR)" in \
+configure-target-winsup: $(TARGET_SUBDIR)/winsup/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/winsup/Makefile || exit 0; \
+       [ -d $(TARGET_SUBDIR)/winsup ] || \
+         mkdir $(TARGET_SUBDIR)/winsup;\
+       r=`${PWD}`; export r; \
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       AR="$(AR_FOR_TARGET)"; export AR; \
+       AS="$(AS_FOR_TARGET)"; export AS; \
+       CC="$(CC_FOR_TARGET)"; export CC; \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+       CXX="$(CXX_FOR_TARGET)"; export CXX; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
+       DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
+       LD="$(LD_FOR_TARGET)"; export LD; \
+       LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
+       NM="$(NM_FOR_TARGET)"; export NM; \
+       RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
+       WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
+       echo Configuring in $(TARGET_SUBDIR)/winsup; \
+       cd "$(TARGET_SUBDIR)/winsup" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) \
+           topdir=$(srcdir) ;; \
+         *) \
+           case "$(TARGET_SUBDIR)" in \
               .) topdir="../$(srcdir)" ;; \
               *) topdir="../../$(srcdir)" ;; \
-             esac ;; \
-           esac; \
-           if [ "$(srcdir)" = "." ] ; then \
-             if [ "$(TARGET_SUBDIR)" != "." ] ; then \
-               if $(SHELL) $$s/symlink-tree $${topdir}/winsup "no-such-file" ; then \
-                 if [ -f Makefile ]; then \
-                   if $(MAKE) distclean; then \
-                     true; \
-                   else \
-                     exit 1; \
-                   fi; \
-                 else \
-                   true; \
-                 fi; \
-               else \
-                 exit 1; \
-               fi; \
+           esac ;; \
+       esac; \
+       if [ "$(srcdir)" = "." ] ; then \
+         if [ "$(TARGET_SUBDIR)" != "." ] ; then \
+           if $(SHELL) $$s/symlink-tree $${topdir}/winsup "no-such-file" ; then \
+             if [ -f Makefile ]; then \
+               if $(MAKE) distclean; then \
+                 true; \
+               else \
+                 exit 1; \
+               fi; \
               else \
-               true; \
+               true; \
               fi; \
-             srcdiroption="--srcdir=."; \
-             libsrcdir="."; \
             else \
-             srcdiroption="--srcdir=$${topdir}/winsup"; \
-             libsrcdir="$$s/winsup"; \
+             exit 1; \
             fi; \
-           rm -f no-such-file || : ; \
-           CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-             $(TARGET_CONFIGARGS) $${srcdiroption} \
-             --with-target-subdir="$(TARGET_SUBDIR)" \
-             || exit 1
+         else \
+           true; \
+         fi; \
+         srcdiroption="--srcdir=."; \
+         libsrcdir="."; \
+       else \
+         srcdiroption="--srcdir=$${topdir}/winsup"; \
+         libsrcdir="$$s/winsup"; \
+       fi; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)" \
+         || exit 1
  
  .PHONY: all-target-winsup maybe-all-target-winsup
  maybe-all-target-winsup:
  all-target-winsup: configure-target-winsup
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/winsup && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/winsup && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
  
  .PHONY: check-target-winsup
  check-target-winsup:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/winsup && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/winsup && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
  
  
  .PHONY: install-target-winsup maybe-install-target-winsup
  maybe-install-target-winsup:
  install-target-winsup: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/winsup && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/winsup && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-target-libgloss maybe-configure-target-libgloss
  maybe-configure-target-libgloss:
-configure-target-libgloss: $(TARGET_SUBDIR)/libgloss/Makefile
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/libgloss/multilib.out: multilib.out
-       @[ -d $(TARGET_SUBDIR)/libgloss ] || mkdir $(TARGET_SUBDIR)/libgloss;\
+       @[ -d $(TARGET_SUBDIR)/libgloss ] || \
+         mkdir $(TARGET_SUBDIR)/libgloss; \
+       rm -f $(TARGET_SUBDIR)/libgloss/Makefile || : ; \
         cp multilib.out $(TARGET_SUBDIR)/libgloss/multilib.out
  
-$(TARGET_SUBDIR)/libgloss/Makefile: config.status $(TARGET_SUBDIR)/libgloss/multilib.out
-       @[ -d $(TARGET_SUBDIR)/libgloss ] || mkdir $(TARGET_SUBDIR)/libgloss;\
-           r=`${PWD}`; export r; \
-           s=`cd $(srcdir); ${PWD}`; export s; \
-           $(SET_LIB_PATH) \
-           AR="$(AR_FOR_TARGET)"; export AR; \
-           AS="$(AS_FOR_TARGET)"; export AS; \
-           CC="$(CC_FOR_TARGET)"; export CC; \
-           CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-           CXX="$(CXX_FOR_TARGET)"; export CXX; \
-           CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-           GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
-           DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
-           LD="$(LD_FOR_TARGET)"; export LD; \
-            LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
-           NM="$(NM_FOR_TARGET)"; export NM; \
-           RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
-           WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
-           echo Configuring in $(TARGET_SUBDIR)/libgloss; \
-           cd "$(TARGET_SUBDIR)/libgloss" || exit 1; \
-           case $(srcdir) in \
-           /* | [A-Za-z]:[\\/]*) \
-             topdir=$(srcdir) ;; \
-           *) \
-             case "$(TARGET_SUBDIR)" in \
+configure-target-libgloss: $(TARGET_SUBDIR)/libgloss/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/libgloss/Makefile || exit 0; \
+       [ -d $(TARGET_SUBDIR)/libgloss ] || \
+         mkdir $(TARGET_SUBDIR)/libgloss;\
+       r=`${PWD}`; export r; \
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       AR="$(AR_FOR_TARGET)"; export AR; \
+       AS="$(AS_FOR_TARGET)"; export AS; \
+       CC="$(CC_FOR_TARGET)"; export CC; \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+       CXX="$(CXX_FOR_TARGET)"; export CXX; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
+       DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
+       LD="$(LD_FOR_TARGET)"; export LD; \
+       LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
+       NM="$(NM_FOR_TARGET)"; export NM; \
+       RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
+       WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
+       echo Configuring in $(TARGET_SUBDIR)/libgloss; \
+       cd "$(TARGET_SUBDIR)/libgloss" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) \
+           topdir=$(srcdir) ;; \
+         *) \
+           case "$(TARGET_SUBDIR)" in \
               .) topdir="../$(srcdir)" ;; \
               *) topdir="../../$(srcdir)" ;; \
-             esac ;; \
-           esac; \
-           if [ "$(srcdir)" = "." ] ; then \
-             if [ "$(TARGET_SUBDIR)" != "." ] ; then \
-               if $(SHELL) $$s/symlink-tree $${topdir}/libgloss "no-such-file" ; then \
-                 if [ -f Makefile ]; then \
-                   if $(MAKE) distclean; then \
-                     true; \
-                   else \
-                     exit 1; \
-                   fi; \
-                 else \
-                   true; \
-                 fi; \
-               else \
-                 exit 1; \
-               fi; \
+           esac ;; \
+       esac; \
+       if [ "$(srcdir)" = "." ] ; then \
+         if [ "$(TARGET_SUBDIR)" != "." ] ; then \
+           if $(SHELL) $$s/symlink-tree $${topdir}/libgloss "no-such-file" ; then \
+             if [ -f Makefile ]; then \
+               if $(MAKE) distclean; then \
+                 true; \
+               else \
+                 exit 1; \
+               fi; \
               else \
-               true; \
+               true; \
               fi; \
-             srcdiroption="--srcdir=."; \
-             libsrcdir="."; \
             else \
-             srcdiroption="--srcdir=$${topdir}/libgloss"; \
-             libsrcdir="$$s/libgloss"; \
+             exit 1; \
             fi; \
-           rm -f no-such-file || : ; \
-           CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-             $(TARGET_CONFIGARGS) $${srcdiroption} \
-             --with-target-subdir="$(TARGET_SUBDIR)" \
-             || exit 1
+         else \
+           true; \
+         fi; \
+         srcdiroption="--srcdir=."; \
+         libsrcdir="."; \
+       else \
+         srcdiroption="--srcdir=$${topdir}/libgloss"; \
+         libsrcdir="$$s/libgloss"; \
+       fi; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)" \
+         || exit 1
  
  .PHONY: all-target-libgloss maybe-all-target-libgloss
  maybe-all-target-libgloss:
  all-target-libgloss: configure-target-libgloss
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libgloss && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/libgloss && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
  
  # Dummy target for uncheckable module.
  .PHONY: check-target-libgloss
@@ -6508,280 +6286,292 @@ check-target-libgloss:
  maybe-install-target-libgloss:
  install-target-libgloss: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libgloss && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/libgloss && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-target-libiberty maybe-configure-target-libiberty
  maybe-configure-target-libiberty:
-configure-target-libiberty: $(TARGET_SUBDIR)/libiberty/Makefile
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/libiberty/multilib.out: multilib.out
-       @[ -d $(TARGET_SUBDIR)/libiberty ] || mkdir $(TARGET_SUBDIR)/libiberty;\
+       @[ -d $(TARGET_SUBDIR)/libiberty ] || \
+         mkdir $(TARGET_SUBDIR)/libiberty; \
+       rm -f $(TARGET_SUBDIR)/libiberty/Makefile || : ; \
         cp multilib.out $(TARGET_SUBDIR)/libiberty/multilib.out
  
-$(TARGET_SUBDIR)/libiberty/Makefile: config.status $(TARGET_SUBDIR)/libiberty/multilib.out
-       @[ -d $(TARGET_SUBDIR)/libiberty ] || mkdir $(TARGET_SUBDIR)/libiberty;\
-           r=`${PWD}`; export r; \
-           s=`cd $(srcdir); ${PWD}`; export s; \
-           $(SET_LIB_PATH) \
-           AR="$(AR_FOR_TARGET)"; export AR; \
-           AS="$(AS_FOR_TARGET)"; export AS; \
-           CC="$(CC_FOR_TARGET)"; export CC; \
-           CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-           CXX="$(CXX_FOR_TARGET)"; export CXX; \
-           CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-           GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
-           DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
-           LD="$(LD_FOR_TARGET)"; export LD; \
-            LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
-           NM="$(NM_FOR_TARGET)"; export NM; \
-           RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
-           WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
-           echo Configuring in $(TARGET_SUBDIR)/libiberty; \
-           cd "$(TARGET_SUBDIR)/libiberty" || exit 1; \
-           case $(srcdir) in \
-           /* | [A-Za-z]:[\\/]*) \
-             topdir=$(srcdir) ;; \
-           *) \
-             case "$(TARGET_SUBDIR)" in \
+configure-target-libiberty: $(TARGET_SUBDIR)/libiberty/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/libiberty/Makefile || exit 0; \
+       [ -d $(TARGET_SUBDIR)/libiberty ] || \
+         mkdir $(TARGET_SUBDIR)/libiberty;\
+       r=`${PWD}`; export r; \
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       AR="$(AR_FOR_TARGET)"; export AR; \
+       AS="$(AS_FOR_TARGET)"; export AS; \
+       CC="$(CC_FOR_TARGET)"; export CC; \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+       CXX="$(CXX_FOR_TARGET)"; export CXX; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
+       DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
+       LD="$(LD_FOR_TARGET)"; export LD; \
+       LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
+       NM="$(NM_FOR_TARGET)"; export NM; \
+       RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
+       WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
+       echo Configuring in $(TARGET_SUBDIR)/libiberty; \
+       cd "$(TARGET_SUBDIR)/libiberty" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) \
+           topdir=$(srcdir) ;; \
+         *) \
+           case "$(TARGET_SUBDIR)" in \
               .) topdir="../$(srcdir)" ;; \
               *) topdir="../../$(srcdir)" ;; \
-             esac ;; \
-           esac; \
-           if [ "$(srcdir)" = "." ] ; then \
-             if [ "$(TARGET_SUBDIR)" != "." ] ; then \
-               if $(SHELL) $$s/symlink-tree $${topdir}/libiberty "no-such-file" ; then \
-                 if [ -f Makefile ]; then \
-                   if $(MAKE) distclean; then \
-                     true; \
-                   else \
-                     exit 1; \
-                   fi; \
-                 else \
-                   true; \
-                 fi; \
-               else \
-                 exit 1; \
-               fi; \
+           esac ;; \
+       esac; \
+       if [ "$(srcdir)" = "." ] ; then \
+         if [ "$(TARGET_SUBDIR)" != "." ] ; then \
+           if $(SHELL) $$s/symlink-tree $${topdir}/libiberty "no-such-file" ; then \
+             if [ -f Makefile ]; then \
+               if $(MAKE) distclean; then \
+                 true; \
+               else \
+                 exit 1; \
+               fi; \
               else \
-               true; \
+               true; \
               fi; \
-             srcdiroption="--srcdir=."; \
-             libsrcdir="."; \
             else \
-             srcdiroption="--srcdir=$${topdir}/libiberty"; \
-             libsrcdir="$$s/libiberty"; \
+             exit 1; \
             fi; \
-           rm -f no-such-file || : ; \
-           CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-             $(TARGET_CONFIGARGS) $${srcdiroption} \
-             --with-target-subdir="$(TARGET_SUBDIR)" \
-             || exit 1
+         else \
+           true; \
+         fi; \
+         srcdiroption="--srcdir=."; \
+         libsrcdir="."; \
+       else \
+         srcdiroption="--srcdir=$${topdir}/libiberty"; \
+         libsrcdir="$$s/libiberty"; \
+       fi; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)" \
+         || exit 1
  
  .PHONY: all-target-libiberty maybe-all-target-libiberty
  maybe-all-target-libiberty:
  all-target-libiberty: configure-target-libiberty
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libiberty && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/libiberty && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
  
  .PHONY: check-target-libiberty
  check-target-libiberty:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libiberty && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/libiberty && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
  
  
  .PHONY: install-target-libiberty maybe-install-target-libiberty
  maybe-install-target-libiberty:
  install-target-libiberty: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libiberty && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/libiberty && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-target-gperf maybe-configure-target-gperf
  maybe-configure-target-gperf:
-configure-target-gperf: $(TARGET_SUBDIR)/gperf/Makefile
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/gperf/multilib.out: multilib.out
-       @[ -d $(TARGET_SUBDIR)/gperf ] || mkdir $(TARGET_SUBDIR)/gperf;\
+       @[ -d $(TARGET_SUBDIR)/gperf ] || \
+         mkdir $(TARGET_SUBDIR)/gperf; \
+       rm -f $(TARGET_SUBDIR)/gperf/Makefile || : ; \
         cp multilib.out $(TARGET_SUBDIR)/gperf/multilib.out
  
-$(TARGET_SUBDIR)/gperf/Makefile: config.status $(TARGET_SUBDIR)/gperf/multilib.out
-       @[ -d $(TARGET_SUBDIR)/gperf ] || mkdir $(TARGET_SUBDIR)/gperf;\
-           r=`${PWD}`; export r; \
-           s=`cd $(srcdir); ${PWD}`; export s; \
-           $(SET_LIB_PATH) \
-           AR="$(AR_FOR_TARGET)"; export AR; \
-           AS="$(AS_FOR_TARGET)"; export AS; \
-           CC="$(CC_FOR_TARGET)"; export CC; \
-           CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-           CXX="$(CXX_FOR_TARGET)"; export CXX; \
-           CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-           GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
-           DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
-           LD="$(LD_FOR_TARGET)"; export LD; \
-            LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
-           NM="$(NM_FOR_TARGET)"; export NM; \
-           RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
-           WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
-           echo Configuring in $(TARGET_SUBDIR)/gperf; \
-           cd "$(TARGET_SUBDIR)/gperf" || exit 1; \
-           case $(srcdir) in \
-           /* | [A-Za-z]:[\\/]*) \
-             topdir=$(srcdir) ;; \
-           *) \
-             case "$(TARGET_SUBDIR)" in \
+configure-target-gperf: $(TARGET_SUBDIR)/gperf/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/gperf/Makefile || exit 0; \
+       [ -d $(TARGET_SUBDIR)/gperf ] || \
+         mkdir $(TARGET_SUBDIR)/gperf;\
+       r=`${PWD}`; export r; \
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       AR="$(AR_FOR_TARGET)"; export AR; \
+       AS="$(AS_FOR_TARGET)"; export AS; \
+       CC="$(CC_FOR_TARGET)"; export CC; \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+       CXX="$(CXX_FOR_TARGET)"; export CXX; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
+       DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
+       LD="$(LD_FOR_TARGET)"; export LD; \
+       LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
+       NM="$(NM_FOR_TARGET)"; export NM; \
+       RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
+       WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
+       echo Configuring in $(TARGET_SUBDIR)/gperf; \
+       cd "$(TARGET_SUBDIR)/gperf" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) \
+           topdir=$(srcdir) ;; \
+         *) \
+           case "$(TARGET_SUBDIR)" in \
               .) topdir="../$(srcdir)" ;; \
               *) topdir="../../$(srcdir)" ;; \
-             esac ;; \
-           esac; \
-           if [ "$(srcdir)" = "." ] ; then \
-             if [ "$(TARGET_SUBDIR)" != "." ] ; then \
-               if $(SHELL) $$s/symlink-tree $${topdir}/gperf "no-such-file" ; then \
-                 if [ -f Makefile ]; then \
-                   if $(MAKE) distclean; then \
-                     true; \
-                   else \
-                     exit 1; \
-                   fi; \
-                 else \
-                   true; \
-                 fi; \
-               else \
-                 exit 1; \
-               fi; \
+           esac ;; \
+       esac; \
+       if [ "$(srcdir)" = "." ] ; then \
+         if [ "$(TARGET_SUBDIR)" != "." ] ; then \
+           if $(SHELL) $$s/symlink-tree $${topdir}/gperf "no-such-file" ; then \
+             if [ -f Makefile ]; then \
+               if $(MAKE) distclean; then \
+                 true; \
+               else \
+                 exit 1; \
+               fi; \
               else \
-               true; \
+               true; \
               fi; \
-             srcdiroption="--srcdir=."; \
-             libsrcdir="."; \
             else \
-             srcdiroption="--srcdir=$${topdir}/gperf"; \
-             libsrcdir="$$s/gperf"; \
+             exit 1; \
             fi; \
-           rm -f no-such-file || : ; \
-           CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-             $(TARGET_CONFIGARGS) $${srcdiroption} \
-             --with-target-subdir="$(TARGET_SUBDIR)" \
-             || exit 1
+         else \
+           true; \
+         fi; \
+         srcdiroption="--srcdir=."; \
+         libsrcdir="."; \
+       else \
+         srcdiroption="--srcdir=$${topdir}/gperf"; \
+         libsrcdir="$$s/gperf"; \
+       fi; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)" \
+         || exit 1
  
  .PHONY: all-target-gperf maybe-all-target-gperf
  maybe-all-target-gperf:
  all-target-gperf: configure-target-gperf
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/gperf && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/gperf && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
  
  .PHONY: check-target-gperf
  check-target-gperf:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/gperf && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/gperf && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
  
  
  .PHONY: install-target-gperf maybe-install-target-gperf
  maybe-install-target-gperf:
  install-target-gperf: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/gperf && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/gperf && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-target-examples maybe-configure-target-examples
  maybe-configure-target-examples:
-configure-target-examples: $(TARGET_SUBDIR)/examples/Makefile
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/examples/multilib.out: multilib.out
-       @[ -d $(TARGET_SUBDIR)/examples ] || mkdir $(TARGET_SUBDIR)/examples;\
+       @[ -d $(TARGET_SUBDIR)/examples ] || \
+         mkdir $(TARGET_SUBDIR)/examples; \
+       rm -f $(TARGET_SUBDIR)/examples/Makefile || : ; \
         cp multilib.out $(TARGET_SUBDIR)/examples/multilib.out
  
-$(TARGET_SUBDIR)/examples/Makefile: config.status $(TARGET_SUBDIR)/examples/multilib.out
-       @[ -d $(TARGET_SUBDIR)/examples ] || mkdir $(TARGET_SUBDIR)/examples;\
-           r=`${PWD}`; export r; \
-           s=`cd $(srcdir); ${PWD}`; export s; \
-           $(SET_LIB_PATH) \
-           AR="$(AR_FOR_TARGET)"; export AR; \
-           AS="$(AS_FOR_TARGET)"; export AS; \
-           CC="$(CC_FOR_TARGET)"; export CC; \
-           CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-           CXX="$(CXX_FOR_TARGET)"; export CXX; \
-           CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-           GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
-           DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
-           LD="$(LD_FOR_TARGET)"; export LD; \
-            LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
-           NM="$(NM_FOR_TARGET)"; export NM; \
-           RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
-           WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
-           echo Configuring in $(TARGET_SUBDIR)/examples; \
-           cd "$(TARGET_SUBDIR)/examples" || exit 1; \
-           case $(srcdir) in \
-           /* | [A-Za-z]:[\\/]*) \
-             topdir=$(srcdir) ;; \
-           *) \
-             case "$(TARGET_SUBDIR)" in \
+configure-target-examples: $(TARGET_SUBDIR)/examples/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/examples/Makefile || exit 0; \
+       [ -d $(TARGET_SUBDIR)/examples ] || \
+         mkdir $(TARGET_SUBDIR)/examples;\
+       r=`${PWD}`; export r; \
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       AR="$(AR_FOR_TARGET)"; export AR; \
+       AS="$(AS_FOR_TARGET)"; export AS; \
+       CC="$(CC_FOR_TARGET)"; export CC; \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+       CXX="$(CXX_FOR_TARGET)"; export CXX; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
+       DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
+       LD="$(LD_FOR_TARGET)"; export LD; \
+       LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
+       NM="$(NM_FOR_TARGET)"; export NM; \
+       RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
+       WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
+       echo Configuring in $(TARGET_SUBDIR)/examples; \
+       cd "$(TARGET_SUBDIR)/examples" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) \
+           topdir=$(srcdir) ;; \
+         *) \
+           case "$(TARGET_SUBDIR)" in \
               .) topdir="../$(srcdir)" ;; \
               *) topdir="../../$(srcdir)" ;; \
-             esac ;; \
-           esac; \
-           if [ "$(srcdir)" = "." ] ; then \
-             if [ "$(TARGET_SUBDIR)" != "." ] ; then \
-               if $(SHELL) $$s/symlink-tree $${topdir}/examples "no-such-file" ; then \
-                 if [ -f Makefile ]; then \
-                   if $(MAKE) distclean; then \
-                     true; \
-                   else \
-                     exit 1; \
-                   fi; \
-                 else \
-                   true; \
-                 fi; \
-               else \
-                 exit 1; \
-               fi; \
+           esac ;; \
+       esac; \
+       if [ "$(srcdir)" = "." ] ; then \
+         if [ "$(TARGET_SUBDIR)" != "." ] ; then \
+           if $(SHELL) $$s/symlink-tree $${topdir}/examples "no-such-file" ; then \
+             if [ -f Makefile ]; then \
+               if $(MAKE) distclean; then \
+                 true; \
+               else \
+                 exit 1; \
+               fi; \
               else \
-               true; \
+               true; \
               fi; \
-             srcdiroption="--srcdir=."; \
-             libsrcdir="."; \
             else \
-             srcdiroption="--srcdir=$${topdir}/examples"; \
-             libsrcdir="$$s/examples"; \
+             exit 1; \
             fi; \
-           rm -f no-such-file || : ; \
-           CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-             $(TARGET_CONFIGARGS) $${srcdiroption} \
-             --with-target-subdir="$(TARGET_SUBDIR)" \
-             || exit 1
+         else \
+           true; \
+         fi; \
+         srcdiroption="--srcdir=."; \
+         libsrcdir="."; \
+       else \
+         srcdiroption="--srcdir=$${topdir}/examples"; \
+         libsrcdir="$$s/examples"; \
+       fi; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)" \
+         || exit 1
  
  .PHONY: all-target-examples maybe-all-target-examples
  maybe-all-target-examples:
  all-target-examples: configure-target-examples
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/examples && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/examples && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
  
  # Dummy target for uncheckable module.
  .PHONY: check-target-examples
@@ -6796,575 +6586,603 @@ install-target-examples:
  
  .PHONY: configure-target-libffi maybe-configure-target-libffi
  maybe-configure-target-libffi:
-configure-target-libffi: $(TARGET_SUBDIR)/libffi/Makefile
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/libffi/multilib.out: multilib.out
-       @[ -d $(TARGET_SUBDIR)/libffi ] || mkdir $(TARGET_SUBDIR)/libffi;\
+       @[ -d $(TARGET_SUBDIR)/libffi ] || \
+         mkdir $(TARGET_SUBDIR)/libffi; \
+       rm -f $(TARGET_SUBDIR)/libffi/Makefile || : ; \
         cp multilib.out $(TARGET_SUBDIR)/libffi/multilib.out
  
-$(TARGET_SUBDIR)/libffi/Makefile: config.status $(TARGET_SUBDIR)/libffi/multilib.out
-       @[ -d $(TARGET_SUBDIR)/libffi ] || mkdir $(TARGET_SUBDIR)/libffi;\
-           r=`${PWD}`; export r; \
-           s=`cd $(srcdir); ${PWD}`; export s; \
-           $(SET_LIB_PATH) \
-           AR="$(AR_FOR_TARGET)"; export AR; \
-           AS="$(AS_FOR_TARGET)"; export AS; \
-           CC="$(CC_FOR_TARGET)"; export CC; \
-           CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-           CXX="$(CXX_FOR_TARGET)"; export CXX; \
-           CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-           GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
-           DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
-           LD="$(LD_FOR_TARGET)"; export LD; \
-            LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
-           NM="$(NM_FOR_TARGET)"; export NM; \
-           RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
-           WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
-           echo Configuring in $(TARGET_SUBDIR)/libffi; \
-           cd "$(TARGET_SUBDIR)/libffi" || exit 1; \
-           case $(srcdir) in \
-           /* | [A-Za-z]:[\\/]*) \
-             topdir=$(srcdir) ;; \
-           *) \
-             case "$(TARGET_SUBDIR)" in \
+configure-target-libffi: $(TARGET_SUBDIR)/libffi/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/libffi/Makefile || exit 0; \
+       [ -d $(TARGET_SUBDIR)/libffi ] || \
+         mkdir $(TARGET_SUBDIR)/libffi;\
+       r=`${PWD}`; export r; \
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       AR="$(AR_FOR_TARGET)"; export AR; \
+       AS="$(AS_FOR_TARGET)"; export AS; \
+       CC="$(CC_FOR_TARGET)"; export CC; \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+       CXX="$(CXX_FOR_TARGET)"; export CXX; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
+       DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
+       LD="$(LD_FOR_TARGET)"; export LD; \
+       LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
+       NM="$(NM_FOR_TARGET)"; export NM; \
+       RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
+       WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
+       echo Configuring in $(TARGET_SUBDIR)/libffi; \
+       cd "$(TARGET_SUBDIR)/libffi" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) \
+           topdir=$(srcdir) ;; \
+         *) \
+           case "$(TARGET_SUBDIR)" in \
               .) topdir="../$(srcdir)" ;; \
               *) topdir="../../$(srcdir)" ;; \
-             esac ;; \
-           esac; \
-           if [ "$(srcdir)" = "." ] ; then \
-             if [ "$(TARGET_SUBDIR)" != "." ] ; then \
-               if $(SHELL) $$s/symlink-tree $${topdir}/libffi "no-such-file" ; then \
-                 if [ -f Makefile ]; then \
-                   if $(MAKE) distclean; then \
-                     true; \
-                   else \
-                     exit 1; \
-                   fi; \
-                 else \
-                   true; \
-                 fi; \
-               else \
-                 exit 1; \
-               fi; \
+           esac ;; \
+       esac; \
+       if [ "$(srcdir)" = "." ] ; then \
+         if [ "$(TARGET_SUBDIR)" != "." ] ; then \
+           if $(SHELL) $$s/symlink-tree $${topdir}/libffi "no-such-file" ; then \
+             if [ -f Makefile ]; then \
+               if $(MAKE) distclean; then \
+                 true; \
+               else \
+                 exit 1; \
+               fi; \
               else \
-               true; \
+               true; \
               fi; \
-             srcdiroption="--srcdir=."; \
-             libsrcdir="."; \
             else \
-             srcdiroption="--srcdir=$${topdir}/libffi"; \
-             libsrcdir="$$s/libffi"; \
+             exit 1; \
             fi; \
-           rm -f no-such-file || : ; \
-           CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-             $(TARGET_CONFIGARGS) $${srcdiroption} \
-             --with-target-subdir="$(TARGET_SUBDIR)" \
-             || exit 1
+         else \
+           true; \
+         fi; \
+         srcdiroption="--srcdir=."; \
+         libsrcdir="."; \
+       else \
+         srcdiroption="--srcdir=$${topdir}/libffi"; \
+         libsrcdir="$$s/libffi"; \
+       fi; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)" \
+         || exit 1
  
  .PHONY: all-target-libffi maybe-all-target-libffi
  maybe-all-target-libffi:
  all-target-libffi: configure-target-libffi
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libffi && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/libffi && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
  
  .PHONY: check-target-libffi
  check-target-libffi:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libffi && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/libffi && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
  
  
  .PHONY: install-target-libffi maybe-install-target-libffi
  maybe-install-target-libffi:
-# Dummy target for uninstallable.
-install-target-libffi:
+install-target-libffi: installdirs
+       @r=`${PWD}`; export r; \
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/libffi && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-target-libjava maybe-configure-target-libjava
  maybe-configure-target-libjava:
-configure-target-libjava: $(TARGET_SUBDIR)/libjava/Makefile
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/libjava/multilib.out: multilib.out
-       @[ -d $(TARGET_SUBDIR)/libjava ] || mkdir $(TARGET_SUBDIR)/libjava;\
+       @[ -d $(TARGET_SUBDIR)/libjava ] || \
+         mkdir $(TARGET_SUBDIR)/libjava; \
+       rm -f $(TARGET_SUBDIR)/libjava/Makefile || : ; \
         cp multilib.out $(TARGET_SUBDIR)/libjava/multilib.out
  
-$(TARGET_SUBDIR)/libjava/Makefile: config.status $(TARGET_SUBDIR)/libjava/multilib.out
-       @[ -d $(TARGET_SUBDIR)/libjava ] || mkdir $(TARGET_SUBDIR)/libjava;\
-           r=`${PWD}`; export r; \
-           s=`cd $(srcdir); ${PWD}`; export s; \
-           $(SET_LIB_PATH) \
-           AR="$(AR_FOR_TARGET)"; export AR; \
-           AS="$(AS_FOR_TARGET)"; export AS; \
-           CC="$(CC_FOR_TARGET)"; export CC; \
-           CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-           CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
-           CXX="$(RAW_CXX_FOR_TARGET)"; export CXX; \
-           CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-           GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
-           DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
-           LD="$(LD_FOR_TARGET)"; export LD; \
-            LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
-           NM="$(NM_FOR_TARGET)"; export NM; \
-           RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
-           WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
-           echo Configuring in $(TARGET_SUBDIR)/libjava; \
-           cd "$(TARGET_SUBDIR)/libjava" || exit 1; \
-           case $(srcdir) in \
-           /* | [A-Za-z]:[\\/]*) \
-             topdir=$(srcdir) ;; \
-           *) \
-             case "$(TARGET_SUBDIR)" in \
+configure-target-libjava: $(TARGET_SUBDIR)/libjava/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/libjava/Makefile || exit 0; \
+       [ -d $(TARGET_SUBDIR)/libjava ] || \
+         mkdir $(TARGET_SUBDIR)/libjava;\
+       r=`${PWD}`; export r; \
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       AR="$(AR_FOR_TARGET)"; export AR; \
+       AS="$(AS_FOR_TARGET)"; export AS; \
+       CC="$(CC_FOR_TARGET)"; export CC; \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+       CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
+       CXX="$(RAW_CXX_FOR_TARGET)"; export CXX; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
+       DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
+       LD="$(LD_FOR_TARGET)"; export LD; \
+       LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
+       NM="$(NM_FOR_TARGET)"; export NM; \
+       RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
+       WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
+       echo Configuring in $(TARGET_SUBDIR)/libjava; \
+       cd "$(TARGET_SUBDIR)/libjava" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) \
+           topdir=$(srcdir) ;; \
+         *) \
+           case "$(TARGET_SUBDIR)" in \
               .) topdir="../$(srcdir)" ;; \
               *) topdir="../../$(srcdir)" ;; \
-             esac ;; \
-           esac; \
-           if [ "$(srcdir)" = "." ] ; then \
-             if [ "$(TARGET_SUBDIR)" != "." ] ; then \
-               if $(SHELL) $$s/symlink-tree $${topdir}/libjava "no-such-file" ; then \
-                 if [ -f Makefile ]; then \
-                   if $(MAKE) distclean; then \
-                     true; \
-                   else \
-                     exit 1; \
-                   fi; \
-                 else \
-                   true; \
-                 fi; \
-               else \
-                 exit 1; \
-               fi; \
+           esac ;; \
+       esac; \
+       if [ "$(srcdir)" = "." ] ; then \
+         if [ "$(TARGET_SUBDIR)" != "." ] ; then \
+           if $(SHELL) $$s/symlink-tree $${topdir}/libjava "no-such-file" ; then \
+             if [ -f Makefile ]; then \
+               if $(MAKE) distclean; then \
+                 true; \
+               else \
+                 exit 1; \
+               fi; \
               else \
-               true; \
+               true; \
               fi; \
-             srcdiroption="--srcdir=."; \
-             libsrcdir="."; \
             else \
-             srcdiroption="--srcdir=$${topdir}/libjava"; \
-             libsrcdir="$$s/libjava"; \
+             exit 1; \
             fi; \
-           rm -f no-such-file || : ; \
-           CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-             $(TARGET_CONFIGARGS) $${srcdiroption} \
-             --with-target-subdir="$(TARGET_SUBDIR)" \
-             || exit 1
+         else \
+           true; \
+         fi; \
+         srcdiroption="--srcdir=."; \
+         libsrcdir="."; \
+       else \
+         srcdiroption="--srcdir=$${topdir}/libjava"; \
+         libsrcdir="$$s/libjava"; \
+       fi; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)" \
+         || exit 1
  
  .PHONY: all-target-libjava maybe-all-target-libjava
  maybe-all-target-libjava:
  all-target-libjava: configure-target-libjava
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libjava && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/libjava && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  all)
  
  .PHONY: check-target-libjava
  check-target-libjava:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libjava && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/libjava && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  check)
  
  
  .PHONY: install-target-libjava maybe-install-target-libjava
  maybe-install-target-libjava:
  install-target-libjava: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libjava && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/libjava && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-target-zlib maybe-configure-target-zlib
  maybe-configure-target-zlib:
-configure-target-zlib: $(TARGET_SUBDIR)/zlib/Makefile
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/zlib/multilib.out: multilib.out
-       @[ -d $(TARGET_SUBDIR)/zlib ] || mkdir $(TARGET_SUBDIR)/zlib;\
+       @[ -d $(TARGET_SUBDIR)/zlib ] || \
+         mkdir $(TARGET_SUBDIR)/zlib; \
+       rm -f $(TARGET_SUBDIR)/zlib/Makefile || : ; \
         cp multilib.out $(TARGET_SUBDIR)/zlib/multilib.out
  
-$(TARGET_SUBDIR)/zlib/Makefile: config.status $(TARGET_SUBDIR)/zlib/multilib.out
-       @[ -d $(TARGET_SUBDIR)/zlib ] || mkdir $(TARGET_SUBDIR)/zlib;\
-           r=`${PWD}`; export r; \
-           s=`cd $(srcdir); ${PWD}`; export s; \
-           $(SET_LIB_PATH) \
-           AR="$(AR_FOR_TARGET)"; export AR; \
-           AS="$(AS_FOR_TARGET)"; export AS; \
-           CC="$(CC_FOR_TARGET)"; export CC; \
-           CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-           CXX="$(CXX_FOR_TARGET)"; export CXX; \
-           CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-           GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
-           DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
-           LD="$(LD_FOR_TARGET)"; export LD; \
-            LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
-           NM="$(NM_FOR_TARGET)"; export NM; \
-           RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
-           WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
-           echo Configuring in $(TARGET_SUBDIR)/zlib; \
-           cd "$(TARGET_SUBDIR)/zlib" || exit 1; \
-           case $(srcdir) in \
-           /* | [A-Za-z]:[\\/]*) \
-             topdir=$(srcdir) ;; \
-           *) \
-             case "$(TARGET_SUBDIR)" in \
+configure-target-zlib: $(TARGET_SUBDIR)/zlib/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/zlib/Makefile || exit 0; \
+       [ -d $(TARGET_SUBDIR)/zlib ] || \
+         mkdir $(TARGET_SUBDIR)/zlib;\
+       r=`${PWD}`; export r; \
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       AR="$(AR_FOR_TARGET)"; export AR; \
+       AS="$(AS_FOR_TARGET)"; export AS; \
+       CC="$(CC_FOR_TARGET)"; export CC; \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+       CXX="$(CXX_FOR_TARGET)"; export CXX; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
+       DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
+       LD="$(LD_FOR_TARGET)"; export LD; \
+       LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
+       NM="$(NM_FOR_TARGET)"; export NM; \
+       RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
+       WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
+       echo Configuring in $(TARGET_SUBDIR)/zlib; \
+       cd "$(TARGET_SUBDIR)/zlib" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) \
+           topdir=$(srcdir) ;; \
+         *) \
+           case "$(TARGET_SUBDIR)" in \
               .) topdir="../$(srcdir)" ;; \
               *) topdir="../../$(srcdir)" ;; \
-             esac ;; \
-           esac; \
-           if [ "$(srcdir)" = "." ] ; then \
-             if [ "$(TARGET_SUBDIR)" != "." ] ; then \
-               if $(SHELL) $$s/symlink-tree $${topdir}/zlib "no-such-file" ; then \
-                 if [ -f Makefile ]; then \
-                   if $(MAKE) distclean; then \
-                     true; \
-                   else \
-                     exit 1; \
-                   fi; \
-                 else \
-                   true; \
-                 fi; \
-               else \
-                 exit 1; \
-               fi; \
+           esac ;; \
+       esac; \
+       if [ "$(srcdir)" = "." ] ; then \
+         if [ "$(TARGET_SUBDIR)" != "." ] ; then \
+           if $(SHELL) $$s/symlink-tree $${topdir}/zlib "no-such-file" ; then \
+             if [ -f Makefile ]; then \
+               if $(MAKE) distclean; then \
+                 true; \
+               else \
+                 exit 1; \
+               fi; \
               else \
-               true; \
+               true; \
               fi; \
-             srcdiroption="--srcdir=."; \
-             libsrcdir="."; \
             else \
-             srcdiroption="--srcdir=$${topdir}/zlib"; \
-             libsrcdir="$$s/zlib"; \
+             exit 1; \
             fi; \
-           rm -f no-such-file || : ; \
-           CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-             $(TARGET_CONFIGARGS) $${srcdiroption} \
-             --with-target-subdir="$(TARGET_SUBDIR)" \
-             || exit 1
+         else \
+           true; \
+         fi; \
+         srcdiroption="--srcdir=."; \
+         libsrcdir="."; \
+       else \
+         srcdiroption="--srcdir=$${topdir}/zlib"; \
+         libsrcdir="$$s/zlib"; \
+       fi; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)" \
+         || exit 1
  
  .PHONY: all-target-zlib maybe-all-target-zlib
  maybe-all-target-zlib:
  all-target-zlib: configure-target-zlib
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/zlib && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/zlib && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
  
  .PHONY: check-target-zlib
  check-target-zlib:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/zlib && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/zlib && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
  
  
  .PHONY: install-target-zlib maybe-install-target-zlib
  maybe-install-target-zlib:
  install-target-zlib: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/zlib && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/zlib && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-target-boehm-gc maybe-configure-target-boehm-gc
  maybe-configure-target-boehm-gc:
-configure-target-boehm-gc: $(TARGET_SUBDIR)/boehm-gc/Makefile
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/boehm-gc/multilib.out: multilib.out
-       @[ -d $(TARGET_SUBDIR)/boehm-gc ] || mkdir $(TARGET_SUBDIR)/boehm-gc;\
+       @[ -d $(TARGET_SUBDIR)/boehm-gc ] || \
+         mkdir $(TARGET_SUBDIR)/boehm-gc; \
+       rm -f $(TARGET_SUBDIR)/boehm-gc/Makefile || : ; \
         cp multilib.out $(TARGET_SUBDIR)/boehm-gc/multilib.out
  
-$(TARGET_SUBDIR)/boehm-gc/Makefile: config.status $(TARGET_SUBDIR)/boehm-gc/multilib.out
-       @[ -d $(TARGET_SUBDIR)/boehm-gc ] || mkdir $(TARGET_SUBDIR)/boehm-gc;\
-           r=`${PWD}`; export r; \
-           s=`cd $(srcdir); ${PWD}`; export s; \
-           $(SET_LIB_PATH) \
-           AR="$(AR_FOR_TARGET)"; export AR; \
-           AS="$(AS_FOR_TARGET)"; export AS; \
-           CC="$(CC_FOR_TARGET)"; export CC; \
-           CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-           CXX="$(CXX_FOR_TARGET)"; export CXX; \
-           CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-           GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
-           DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
-           LD="$(LD_FOR_TARGET)"; export LD; \
-            LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
-           NM="$(NM_FOR_TARGET)"; export NM; \
-           RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
-           WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
-           echo Configuring in $(TARGET_SUBDIR)/boehm-gc; \
-           cd "$(TARGET_SUBDIR)/boehm-gc" || exit 1; \
-           case $(srcdir) in \
-           /* | [A-Za-z]:[\\/]*) \
-             topdir=$(srcdir) ;; \
-           *) \
-             case "$(TARGET_SUBDIR)" in \
+configure-target-boehm-gc: $(TARGET_SUBDIR)/boehm-gc/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/boehm-gc/Makefile || exit 0; \
+       [ -d $(TARGET_SUBDIR)/boehm-gc ] || \
+         mkdir $(TARGET_SUBDIR)/boehm-gc;\
+       r=`${PWD}`; export r; \
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       AR="$(AR_FOR_TARGET)"; export AR; \
+       AS="$(AS_FOR_TARGET)"; export AS; \
+       CC="$(CC_FOR_TARGET)"; export CC; \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+       CXX="$(CXX_FOR_TARGET)"; export CXX; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
+       DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
+       LD="$(LD_FOR_TARGET)"; export LD; \
+       LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
+       NM="$(NM_FOR_TARGET)"; export NM; \
+       RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
+       WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
+       echo Configuring in $(TARGET_SUBDIR)/boehm-gc; \
+       cd "$(TARGET_SUBDIR)/boehm-gc" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) \
+           topdir=$(srcdir) ;; \
+         *) \
+           case "$(TARGET_SUBDIR)" in \
               .) topdir="../$(srcdir)" ;; \
               *) topdir="../../$(srcdir)" ;; \
-             esac ;; \
-           esac; \
-           if [ "$(srcdir)" = "." ] ; then \
-             if [ "$(TARGET_SUBDIR)" != "." ] ; then \
-               if $(SHELL) $$s/symlink-tree $${topdir}/boehm-gc "no-such-file" ; then \
-                 if [ -f Makefile ]; then \
-                   if $(MAKE) distclean; then \
-                     true; \
-                   else \
-                     exit 1; \
-                   fi; \
-                 else \
-                   true; \
-                 fi; \
-               else \
-                 exit 1; \
-               fi; \
+           esac ;; \
+       esac; \
+       if [ "$(srcdir)" = "." ] ; then \
+         if [ "$(TARGET_SUBDIR)" != "." ] ; then \
+           if $(SHELL) $$s/symlink-tree $${topdir}/boehm-gc "no-such-file" ; then \
+             if [ -f Makefile ]; then \
+               if $(MAKE) distclean; then \
+                 true; \
+               else \
+                 exit 1; \
+               fi; \
               else \
-               true; \
+               true; \
               fi; \
-             srcdiroption="--srcdir=."; \
-             libsrcdir="."; \
             else \
-             srcdiroption="--srcdir=$${topdir}/boehm-gc"; \
-             libsrcdir="$$s/boehm-gc"; \
+             exit 1; \
             fi; \
-           rm -f no-such-file || : ; \
-           CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-             $(TARGET_CONFIGARGS) $${srcdiroption} \
-             --with-target-subdir="$(TARGET_SUBDIR)" \
-             || exit 1
+         else \
+           true; \
+         fi; \
+         srcdiroption="--srcdir=."; \
+         libsrcdir="."; \
+       else \
+         srcdiroption="--srcdir=$${topdir}/boehm-gc"; \
+         libsrcdir="$$s/boehm-gc"; \
+       fi; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)" \
+         || exit 1
  
  .PHONY: all-target-boehm-gc maybe-all-target-boehm-gc
  maybe-all-target-boehm-gc:
  all-target-boehm-gc: configure-target-boehm-gc
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/boehm-gc && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/boehm-gc && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
  
  .PHONY: check-target-boehm-gc
  check-target-boehm-gc:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/boehm-gc && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/boehm-gc && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
  
  
  .PHONY: install-target-boehm-gc maybe-install-target-boehm-gc
  maybe-install-target-boehm-gc:
  install-target-boehm-gc: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/boehm-gc && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/boehm-gc && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-target-qthreads maybe-configure-target-qthreads
  maybe-configure-target-qthreads:
-configure-target-qthreads: $(TARGET_SUBDIR)/qthreads/Makefile
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/qthreads/multilib.out: multilib.out
-       @[ -d $(TARGET_SUBDIR)/qthreads ] || mkdir $(TARGET_SUBDIR)/qthreads;\
+       @[ -d $(TARGET_SUBDIR)/qthreads ] || \
+         mkdir $(TARGET_SUBDIR)/qthreads; \
+       rm -f $(TARGET_SUBDIR)/qthreads/Makefile || : ; \
         cp multilib.out $(TARGET_SUBDIR)/qthreads/multilib.out
  
-$(TARGET_SUBDIR)/qthreads/Makefile: config.status $(TARGET_SUBDIR)/qthreads/multilib.out
-       @[ -d $(TARGET_SUBDIR)/qthreads ] || mkdir $(TARGET_SUBDIR)/qthreads;\
-           r=`${PWD}`; export r; \
-           s=`cd $(srcdir); ${PWD}`; export s; \
-           $(SET_LIB_PATH) \
-           AR="$(AR_FOR_TARGET)"; export AR; \
-           AS="$(AS_FOR_TARGET)"; export AS; \
-           CC="$(CC_FOR_TARGET)"; export CC; \
-           CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-           CXX="$(CXX_FOR_TARGET)"; export CXX; \
-           CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-           GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
-           DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
-           LD="$(LD_FOR_TARGET)"; export LD; \
-            LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
-           NM="$(NM_FOR_TARGET)"; export NM; \
-           RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
-           WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
-           echo Configuring in $(TARGET_SUBDIR)/qthreads; \
-           cd "$(TARGET_SUBDIR)/qthreads" || exit 1; \
-           case $(srcdir) in \
-           /* | [A-Za-z]:[\\/]*) \
-             topdir=$(srcdir) ;; \
-           *) \
-             case "$(TARGET_SUBDIR)" in \
+configure-target-qthreads: $(TARGET_SUBDIR)/qthreads/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/qthreads/Makefile || exit 0; \
+       [ -d $(TARGET_SUBDIR)/qthreads ] || \
+         mkdir $(TARGET_SUBDIR)/qthreads;\
+       r=`${PWD}`; export r; \
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       AR="$(AR_FOR_TARGET)"; export AR; \
+       AS="$(AS_FOR_TARGET)"; export AS; \
+       CC="$(CC_FOR_TARGET)"; export CC; \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+       CXX="$(CXX_FOR_TARGET)"; export CXX; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
+       DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
+       LD="$(LD_FOR_TARGET)"; export LD; \
+       LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
+       NM="$(NM_FOR_TARGET)"; export NM; \
+       RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
+       WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
+       echo Configuring in $(TARGET_SUBDIR)/qthreads; \
+       cd "$(TARGET_SUBDIR)/qthreads" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) \
+           topdir=$(srcdir) ;; \
+         *) \
+           case "$(TARGET_SUBDIR)" in \
               .) topdir="../$(srcdir)" ;; \
               *) topdir="../../$(srcdir)" ;; \
-             esac ;; \
-           esac; \
-           if [ "$(srcdir)" = "." ] ; then \
-             if [ "$(TARGET_SUBDIR)" != "." ] ; then \
-               if $(SHELL) $$s/symlink-tree $${topdir}/qthreads "no-such-file" ; then \
-                 if [ -f Makefile ]; then \
-                   if $(MAKE) distclean; then \
-                     true; \
-                   else \
-                     exit 1; \
-                   fi; \
-                 else \
-                   true; \
-                 fi; \
-               else \
-                 exit 1; \
-               fi; \
+           esac ;; \
+       esac; \
+       if [ "$(srcdir)" = "." ] ; then \
+         if [ "$(TARGET_SUBDIR)" != "." ] ; then \
+           if $(SHELL) $$s/symlink-tree $${topdir}/qthreads "no-such-file" ; then \
+             if [ -f Makefile ]; then \
+               if $(MAKE) distclean; then \
+                 true; \
+               else \
+                 exit 1; \
+               fi; \
               else \
-               true; \
+               true; \
               fi; \
-             srcdiroption="--srcdir=."; \
-             libsrcdir="."; \
             else \
-             srcdiroption="--srcdir=$${topdir}/qthreads"; \
-             libsrcdir="$$s/qthreads"; \
+             exit 1; \
             fi; \
-           rm -f no-such-file || : ; \
-           CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-             $(TARGET_CONFIGARGS) $${srcdiroption} \
-             --with-target-subdir="$(TARGET_SUBDIR)" \
-             || exit 1
+         else \
+           true; \
+         fi; \
+         srcdiroption="--srcdir=."; \
+         libsrcdir="."; \
+       else \
+         srcdiroption="--srcdir=$${topdir}/qthreads"; \
+         libsrcdir="$$s/qthreads"; \
+       fi; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)" \
+         || exit 1
  
  .PHONY: all-target-qthreads maybe-all-target-qthreads
  maybe-all-target-qthreads:
  all-target-qthreads: configure-target-qthreads
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/qthreads && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/qthreads && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
  
  .PHONY: check-target-qthreads
  check-target-qthreads:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/qthreads && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/qthreads && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
  
  
  .PHONY: install-target-qthreads maybe-install-target-qthreads
  maybe-install-target-qthreads:
  install-target-qthreads: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/qthreads && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/qthreads && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
  
  
  .PHONY: configure-target-rda maybe-configure-target-rda
  maybe-configure-target-rda:
-configure-target-rda: $(TARGET_SUBDIR)/rda/Makefile
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/rda/multilib.out: multilib.out
-       @[ -d $(TARGET_SUBDIR)/rda ] || mkdir $(TARGET_SUBDIR)/rda;\
+       @[ -d $(TARGET_SUBDIR)/rda ] || \
+         mkdir $(TARGET_SUBDIR)/rda; \
+       rm -f $(TARGET_SUBDIR)/rda/Makefile || : ; \
         cp multilib.out $(TARGET_SUBDIR)/rda/multilib.out
  
-$(TARGET_SUBDIR)/rda/Makefile: config.status $(TARGET_SUBDIR)/rda/multilib.out
-       @[ -d $(TARGET_SUBDIR)/rda ] || mkdir $(TARGET_SUBDIR)/rda;\
-           r=`${PWD}`; export r; \
-           s=`cd $(srcdir); ${PWD}`; export s; \
-           $(SET_LIB_PATH) \
-           AR="$(AR_FOR_TARGET)"; export AR; \
-           AS="$(AS_FOR_TARGET)"; export AS; \
-           CC="$(CC_FOR_TARGET)"; export CC; \
-           CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-           CXX="$(CXX_FOR_TARGET)"; export CXX; \
-           CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-           GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
-           DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
-           LD="$(LD_FOR_TARGET)"; export LD; \
-            LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
-           NM="$(NM_FOR_TARGET)"; export NM; \
-           RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
-           WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
-           echo Configuring in $(TARGET_SUBDIR)/rda; \
-           cd "$(TARGET_SUBDIR)/rda" || exit 1; \
-           case $(srcdir) in \
-           /* | [A-Za-z]:[\\/]*) \
-             topdir=$(srcdir) ;; \
-           *) \
-             case "$(TARGET_SUBDIR)" in \
+configure-target-rda: $(TARGET_SUBDIR)/rda/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/rda/Makefile || exit 0; \
+       [ -d $(TARGET_SUBDIR)/rda ] || \
+         mkdir $(TARGET_SUBDIR)/rda;\
+       r=`${PWD}`; export r; \
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       AR="$(AR_FOR_TARGET)"; export AR; \
+       AS="$(AS_FOR_TARGET)"; export AS; \
+       CC="$(CC_FOR_TARGET)"; export CC; \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+       CXX="$(CXX_FOR_TARGET)"; export CXX; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
+       DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
+       LD="$(LD_FOR_TARGET)"; export LD; \
+       LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
+       NM="$(NM_FOR_TARGET)"; export NM; \
+       RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
+       WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
+       echo Configuring in $(TARGET_SUBDIR)/rda; \
+       cd "$(TARGET_SUBDIR)/rda" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) \
+           topdir=$(srcdir) ;; \
+         *) \
+           case "$(TARGET_SUBDIR)" in \
               .) topdir="../$(srcdir)" ;; \
               *) topdir="../../$(srcdir)" ;; \
-             esac ;; \
-           esac; \
-           if [ "$(srcdir)" = "." ] ; then \
-             if [ "$(TARGET_SUBDIR)" != "." ] ; then \
-               if $(SHELL) $$s/symlink-tree $${topdir}/rda "no-such-file" ; then \
-                 if [ -f Makefile ]; then \
-                   if $(MAKE) distclean; then \
-                     true; \
-                   else \
-                     exit 1; \
-                   fi; \
-                 else \
-                   true; \
-                 fi; \
-               else \
-                 exit 1; \
-               fi; \
+           esac ;; \
+       esac; \
+       if [ "$(srcdir)" = "." ] ; then \
+         if [ "$(TARGET_SUBDIR)" != "." ] ; then \
+           if $(SHELL) $$s/symlink-tree $${topdir}/rda "no-such-file" ; then \
+             if [ -f Makefile ]; then \
+               if $(MAKE) distclean; then \
+                 true; \
+               else \
+                 exit 1; \
+               fi; \
               else \
-               true; \
+               true; \
               fi; \
-             srcdiroption="--srcdir=."; \
-             libsrcdir="."; \
             else \
-             srcdiroption="--srcdir=$${topdir}/rda"; \
-             libsrcdir="$$s/rda"; \
+             exit 1; \
             fi; \
-           rm -f no-such-file || : ; \
-           CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-             $(TARGET_CONFIGARGS) $${srcdiroption} \
-             --with-target-subdir="$(TARGET_SUBDIR)" \
-             || exit 1
+         else \
+           true; \
+         fi; \
+         srcdiroption="--srcdir=."; \
+         libsrcdir="."; \
+       else \
+         srcdiroption="--srcdir=$${topdir}/rda"; \
+         libsrcdir="$$s/rda"; \
+       fi; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)" \
+         || exit 1
  
  .PHONY: all-target-rda maybe-all-target-rda
  maybe-all-target-rda:
  all-target-rda: configure-target-rda
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/rda && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/rda && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
  
  .PHONY: check-target-rda
  check-target-rda:
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/rda && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/rda && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
  
  
  .PHONY: install-target-rda maybe-install-target-rda
  maybe-install-target-rda:
  install-target-rda: installdirs
         @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/rda && \
-           $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/rda && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
  
  
  
@@ -7379,16 +7197,16 @@ install-target-rda: installdirs
  # gcc is the only module which uses GCC_FLAGS_TO_PASS.
  .PHONY: configure-gcc maybe-configure-gcc
  maybe-configure-gcc:
-configure-gcc: gcc/Makefile
-
-gcc/Makefile: config.status
-       @[ -d gcc ] || mkdir gcc; \
+configure-gcc:
+       @test ! -f gcc/Makefile || exit 0; \
+       [ -d gcc ] || mkdir gcc; \
         r=`${PWD}`; export r; \
         s=`cd $(srcdir); ${PWD}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
+       TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
         if [ z$(build_canonical) !=  z$(host_canoncial) ] ; then \
           AR="$(AR)"; export AR; \
           AS="$(AS)"; export AS; \
@@ -7457,14 +7275,17 @@ bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean b
         s=`cd $(srcdir); ${PWD}`; export s; \
         case "$@" in \
           *bootstrap4-lean ) \
-                       msg="Comparing stage3 and stage4 of the compiler"; \
-                       compare=compare3-lean ;; \
-         *bootstrap4 ) msg="Comparing stage3 and stage4 of the compiler"; \
-                       compare=compare3 ;; \
-         *-lean )      msg="Comparing stage2 and stage3 of the compiler"; \
-                       compare=compare-lean ;; \
-         * )           msg="Comparing stage2 and stage3 of the compiler"; \
-                       compare=compare ;; \
+           msg="Comparing stage3 and stage4 of the compiler"; \
+           compare=compare3-lean ;; \
+         *bootstrap4 ) \
+           msg="Comparing stage3 and stage4 of the compiler"; \
+           compare=compare3 ;; \
+         *-lean ) \
+           msg="Comparing stage2 and stage3 of the compiler"; \
+           compare=compare-lean ;; \
+         * ) \
+           msg="Comparing stage2 and stage3 of the compiler"; \
+           compare=compare ;; \
         esac; \
         $(SET_LIB_PATH) \
         echo "$$msg"; \
@@ -7512,7 +7333,8 @@ check-gcc-c++:
         fi
  
  .PHONY: check-c++
-check-c++: check-target-libstdc++-v3 check-gcc-c++
+check-c++:
+       $(MAKE) check-target-libstdc++-v3 check-gcc-c++ NOTPARALLEL=parallel-ok
  
  .PHONY: install-gcc maybe-install-gcc
  maybe-install-gcc:
@@ -7598,7 +7420,7 @@ all-itcl: maybe-all-tcl maybe-all-tk
  # We put install-tcl before install-itcl because itcl wants to run a
  # program on installation which uses the Tcl libraries.
  install-itcl: maybe-install-tcl
-all-sid: maybe-all-tcl maybe-all-tk
+all-sid: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-tcl maybe-all-tk
  install-sid: maybe-install-tcl maybe-install-tk
  all-sim: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-readline maybe-configure-gdb
  configure-tk: maybe-configure-tcl
@@ -7615,7 +7437,6 @@ all-diff: maybe-all-libiberty
  all-fastjar: maybe-all-zlib maybe-all-libiberty
  all-fileutils: maybe-all-libiberty
  all-flex: maybe-all-libiberty maybe-all-bison maybe-all-byacc
-all-grep: maybe-all-libiberty
  all-gzip: maybe-all-libiberty
  all-hello: maybe-all-libiberty
  all-m4: maybe-all-libiberty maybe-all-texinfo
@@ -7625,7 +7446,6 @@ all-prms: maybe-all-libiberty
  all-recode: maybe-all-libiberty
  all-sed: maybe-all-libiberty
  all-send-pr: maybe-all-prms
-all-snavigator: maybe-all-tcl maybe-all-tk maybe-all-itcl maybe-all-tix maybe-all-db maybe-all-grep maybe-all-libgui
  all-tar: maybe-all-libiberty
  all-uudecode: maybe-all-libiberty
  
@@ -7682,31 +7502,40 @@ configure-target-qthreads: $(ALL_GCC_C)
  # work around various timestamp bugs on some systems.
  # We use move-if-change so that it's only considered updated when it
  # actually changes, because it has to depend on a phony target.
-multilib.out: multilib.ts
-       @if [ -f multilib.out ] ; then : else \
-         rm -f multilib.ts; $(MAKE) multilib.ts; \
-       fi
-
-multilib.ts: maybe-all-gcc
+multilib.out: maybe-all-gcc
         @r=`${PWD}`; export r; \
         echo "Checking multilib configuration..."; \
         $(CC_FOR_TARGET) --print-multi-lib > multilib.tmp 2> /dev/null ; \
         $(SHELL) $(srcdir)/move-if-change multilib.tmp multilib.out ; \
-       echo timestamp > multilib.ts
  
  # Rebuilding Makefile.in, using autogen.
-$(srcdir)/Makefile.in: # $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def
-       cd $(srcdir) && autogen Makefile.def
+AUTOGEN = autogen
+$(srcdir)/Makefile.in: @MAINT@ $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def
+       cd $(srcdir) && $(AUTOGEN) Makefile.def
  
  # Rebuilding Makefile.
-Makefile: Makefile.in configure $(gcc_version_trigger)
+Makefile: $(srcdir)/Makefile.in config.status
+       CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+config.status: configure $(gcc_version_trigger)
         $(SHELL) ./config.status --recheck
  
  # Rebuilding configure.
-configure: configure.in
-       cd $(srcdir) && autoconf
-#
+AUTOCONF = autoconf
+$(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4
+       cd $(srcdir) && $(AUTOCONF)
+
+# ------------------------------
+# Special directives to GNU Make
+# ------------------------------
+
+# Tell GNU make 3.79 not to run the top level in parallel.  This 
+# prevents contention for $builddir/$target/config.cache, as well
+# as minimizing scatter in file system caches.
+NOTPARALLEL = .NOTPARALLEL
+$(NOTPARALLEL):
  
+# Don't pass command-line variables to submakes.
  .NOEXPORT:
  MAKEOVERRIDES=