OSDN Git Service

* g++.dg/abi/empty6.C (B): Request alignment of 8 bytes.
[pf3gnuchains/gcc-fork.git] / Makefile.in
index 7acf526..3b316d6 100644 (file)
@@ -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
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 
+# -------------------------------
+# Standard Autoconf-set variables
+# -------------------------------
 VPATH=@srcdir@
-links=@configlinks@
 
 build_alias=@build_alias@
 build_cpu=@build_cpu@
@@ -39,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@
@@ -63,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
@@ -80,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.
@@ -101,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 \
@@ -154,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/ ; \
@@ -163,28 +180,31 @@ 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`
 
-# For an installed makeinfo, we require it to be from texinfo 4 or
+# For an installed makeinfo, we require it to be from texinfo 4.2 or
 # higher, else we use the "missing" dummy.
 MAKEINFO=@MAKEINFO@
 USUAL_MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \
        then echo $$r/texinfo/makeinfo/makeinfo ; \
        else if (makeinfo --version \
-         | egrep 'texinfo[^0-9]*([1-3][0-9]|[4-9])') >/dev/null 2>&1; \
+         | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])') >/dev/null 2>&1; \
         then echo makeinfo; else echo $$s/missing makeinfo; fi; fi`
 
 # This just becomes part of the MAKEINFO definition passed down to
 # sub-makes.  It lets flags be given on the command line while still
 # using the makeinfo from the object tree.
-MAKEINFOFLAGS =
+# (Default to avoid splitting info files by setting the threshold high.)
+MAKEINFOFLAGS = --split-size=5000000
 
 EXPECT = `if [ -f $$r/expect/expect ] ; \
        then echo $$r/expect/expect ; \
@@ -194,74 +214,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 = ` \
@@ -277,19 +284,26 @@ USUAL_AS_FOR_TARGET = ` \
     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 \
-       echo ld | sed '$(program_transform_name)' ; \
-    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 = ` \
@@ -303,27 +317,35 @@ USUAL_DLLTOOL_FOR_TARGET = ` \
     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 \
-       echo windres | sed '$(program_transform_name)' ; \
+       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 \
-       echo ar | sed '$(program_transform_name)' ; \
+       echo nm | sed '$(program_transform_name)' ; \
     fi; \
   fi`
 
@@ -343,20 +365,24 @@ USUAL_RANLIB_FOR_TARGET = ` \
     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 \
-       echo nm | sed '$(program_transform_name)' ; \
+       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
@@ -455,7 +481,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)
@@ -509,7 +535,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)" \
@@ -525,8 +551,90 @@ EXTRA_GCC_FLAGS = \
 
 GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS)
 
-configure-host: @configure_host_modules@
-configure-target: @configure_target_modules@
+.PHONY: configure-host
+configure-host: maybe-configure-gcc  \
+    maybe-configure-ash \
+    maybe-configure-autoconf \
+    maybe-configure-automake \
+    maybe-configure-bash \
+    maybe-configure-bfd \
+    maybe-configure-opcodes \
+    maybe-configure-binutils \
+    maybe-configure-bison \
+    maybe-configure-byacc \
+    maybe-configure-bzip2 \
+    maybe-configure-dejagnu \
+    maybe-configure-diff \
+    maybe-configure-dosutils \
+    maybe-configure-etc \
+    maybe-configure-fastjar \
+    maybe-configure-fileutils \
+    maybe-configure-findutils \
+    maybe-configure-find \
+    maybe-configure-flex \
+    maybe-configure-gas \
+    maybe-configure-gawk \
+    maybe-configure-gettext \
+    maybe-configure-gnuserv \
+    maybe-configure-gprof \
+    maybe-configure-gzip \
+    maybe-configure-hello \
+    maybe-configure-indent \
+    maybe-configure-intl \
+    maybe-configure-tcl \
+    maybe-configure-itcl \
+    maybe-configure-ld \
+    maybe-configure-libgui \
+    maybe-configure-libiberty \
+    maybe-configure-libtool \
+    maybe-configure-m4 \
+    maybe-configure-make \
+    maybe-configure-mmalloc \
+    maybe-configure-patch \
+    maybe-configure-perl \
+    maybe-configure-prms \
+    maybe-configure-rcs \
+    maybe-configure-readline \
+    maybe-configure-release \
+    maybe-configure-recode \
+    maybe-configure-sed \
+    maybe-configure-send-pr \
+    maybe-configure-shellutils \
+    maybe-configure-sid \
+    maybe-configure-sim \
+    maybe-configure-tar \
+    maybe-configure-texinfo \
+    maybe-configure-textutils \
+    maybe-configure-time \
+    maybe-configure-uudecode \
+    maybe-configure-wdiff \
+    maybe-configure-zip \
+    maybe-configure-zlib \
+    maybe-configure-gdb \
+    maybe-configure-expect \
+    maybe-configure-guile \
+    maybe-configure-tk \
+    maybe-configure-tix \
+    maybe-configure-libtermcap \
+    maybe-configure-utils
+.PHONY: configure-target
+configure-target:  \
+    maybe-configure-target-libstdc++-v3 \
+    maybe-configure-target-newlib \
+    maybe-configure-target-libf2c \
+    maybe-configure-target-libobjc \
+    maybe-configure-target-libtermcap \
+    maybe-configure-target-winsup \
+    maybe-configure-target-libgloss \
+    maybe-configure-target-libiberty \
+    maybe-configure-target-gperf \
+    maybe-configure-target-examples \
+    maybe-configure-target-libffi \
+    maybe-configure-target-libjava \
+    maybe-configure-target-zlib \
+    maybe-configure-target-boehm-gc \
+    maybe-configure-target-qthreads \
+    maybe-configure-target-rda
 
 # This is a list of the targets for which we can do a clean-{target}.
 CLEAN_MODULES = \
@@ -540,7 +648,6 @@ CLEAN_MODULES = \
        clean-bison \
        clean-byacc \
        clean-bzip2 \
-       clean-db \
        clean-dejagnu \
        clean-diff \
        clean-dosutils \
@@ -555,7 +662,6 @@ CLEAN_MODULES = \
        clean-gettext \
        clean-gnuserv \
        clean-gprof \
-       clean-grep \
        clean-gzip \
        clean-hello \
        clean-indent \
@@ -581,7 +687,6 @@ CLEAN_MODULES = \
        clean-shellutils \
        clean-sid \
        clean-sim \
-       clean-snavigator \
        clean-tar \
        clean-texinfo \
        clean-textutils \
@@ -619,14 +724,93 @@ CLEAN_X11_MODULES = \
        clean-tix 
 
 # The target built for a native build.
-# This list only includes modules actually being configured and built.
 .PHONY: all.normal
-all.normal: @all_build_modules@ \
-       @all_host_modules@ \
-       @all_target_modules@
-
-all-host: @all_host_modules@
-all-target: @all_target_modules@
+all.normal: @all_build_modules@ all-host all-target
+
+.PHONY: all-host
+all-host: maybe-all-gcc  \
+    maybe-all-ash \
+    maybe-all-autoconf \
+    maybe-all-automake \
+    maybe-all-bash \
+    maybe-all-bfd \
+    maybe-all-opcodes \
+    maybe-all-binutils \
+    maybe-all-bison \
+    maybe-all-byacc \
+    maybe-all-bzip2 \
+    maybe-all-dejagnu \
+    maybe-all-diff \
+    maybe-all-dosutils \
+    maybe-all-etc \
+    maybe-all-fastjar \
+    maybe-all-fileutils \
+    maybe-all-findutils \
+    maybe-all-find \
+    maybe-all-flex \
+    maybe-all-gas \
+    maybe-all-gawk \
+    maybe-all-gettext \
+    maybe-all-gnuserv \
+    maybe-all-gprof \
+    maybe-all-gzip \
+    maybe-all-hello \
+    maybe-all-indent \
+    maybe-all-intl \
+    maybe-all-tcl \
+    maybe-all-itcl \
+    maybe-all-ld \
+    maybe-all-libgui \
+    maybe-all-libiberty \
+    maybe-all-libtool \
+    maybe-all-m4 \
+    maybe-all-make \
+    maybe-all-mmalloc \
+    maybe-all-patch \
+    maybe-all-perl \
+    maybe-all-prms \
+    maybe-all-rcs \
+    maybe-all-readline \
+    maybe-all-release \
+    maybe-all-recode \
+    maybe-all-sed \
+    maybe-all-send-pr \
+    maybe-all-shellutils \
+    maybe-all-sid \
+    maybe-all-sim \
+    maybe-all-tar \
+    maybe-all-texinfo \
+    maybe-all-textutils \
+    maybe-all-time \
+    maybe-all-uudecode \
+    maybe-all-wdiff \
+    maybe-all-zip \
+    maybe-all-zlib \
+    maybe-all-gdb \
+    maybe-all-expect \
+    maybe-all-guile \
+    maybe-all-tk \
+    maybe-all-tix \
+    maybe-all-libtermcap \
+    maybe-all-utils
+.PHONY: all-target
+all-target:  \
+    maybe-all-target-libstdc++-v3 \
+    maybe-all-target-newlib \
+    maybe-all-target-libf2c \
+    maybe-all-target-libobjc \
+    maybe-all-target-libtermcap \
+    maybe-all-target-winsup \
+    maybe-all-target-libgloss \
+    maybe-all-target-libiberty \
+    maybe-all-target-gperf \
+    maybe-all-target-examples \
+    maybe-all-target-libffi \
+    maybe-all-target-libjava \
+    maybe-all-target-zlib \
+    maybe-all-target-boehm-gc \
+    maybe-all-target-qthreads \
+    maybe-all-target-rda
 
 # Do a target for all the subdirectories.  A ``make do-X'' will do a
 # ``make X'' in all subdirectories (because, in general, there is a
@@ -658,7 +842,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; \
@@ -676,7 +860,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; \
@@ -705,7 +889,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; \
@@ -723,7 +907,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; \
@@ -752,7 +936,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; \
@@ -770,7 +954,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; \
@@ -799,7 +983,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; \
@@ -817,7 +1001,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; \
@@ -846,7 +1030,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; \
@@ -864,7 +1048,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; \
@@ -893,7 +1077,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; \
@@ -911,7 +1095,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; \
@@ -940,7 +1124,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; \
@@ -958,7 +1142,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; \
@@ -987,7 +1171,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; \
@@ -1005,7 +1189,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; \
@@ -1034,7 +1218,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; \
@@ -1052,7 +1236,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; \
@@ -1089,6 +1273,7 @@ local-distclean:
        -if [ "$(TARGET_SUBDIR)" != "." ]; then \
          rm -rf $(TARGET_SUBDIR); \
        else true; fi
+       -rm -rf $(BUILD_SUBDIR)
        -rm -f texinfo/po/Makefile texinfo/po/Makefile.in texinfo/info/Makefile
        -rm -f texinfo/doc/Makefile texinfo/po/POTFILES
        -rmdir texinfo/doc texinfo/info texinfo/intl texinfo/lib 2>/dev/null
@@ -1146,8 +1331,87 @@ check:
        $(MAKE) do-check NOTPARALLEL=parallel-ok
 
 # Only include modules actually being configured and built.
-do-check: @check_host_modules@ \
-       @check_target_modules@
+do-check: maybe-check-gcc  \
+    maybe-check-ash \
+    maybe-check-autoconf \
+    maybe-check-automake \
+    maybe-check-bash \
+    maybe-check-bfd \
+    maybe-check-opcodes \
+    maybe-check-binutils \
+    maybe-check-bison \
+    maybe-check-byacc \
+    maybe-check-bzip2 \
+    maybe-check-dejagnu \
+    maybe-check-diff \
+    maybe-check-dosutils \
+    maybe-check-etc \
+    maybe-check-fastjar \
+    maybe-check-fileutils \
+    maybe-check-findutils \
+    maybe-check-find \
+    maybe-check-flex \
+    maybe-check-gas \
+    maybe-check-gawk \
+    maybe-check-gettext \
+    maybe-check-gnuserv \
+    maybe-check-gprof \
+    maybe-check-gzip \
+    maybe-check-hello \
+    maybe-check-indent \
+    maybe-check-intl \
+    maybe-check-tcl \
+    maybe-check-itcl \
+    maybe-check-ld \
+    maybe-check-libgui \
+    maybe-check-libiberty \
+    maybe-check-libtool \
+    maybe-check-m4 \
+    maybe-check-make \
+    maybe-check-mmalloc \
+    maybe-check-patch \
+    maybe-check-perl \
+    maybe-check-prms \
+    maybe-check-rcs \
+    maybe-check-readline \
+    maybe-check-release \
+    maybe-check-recode \
+    maybe-check-sed \
+    maybe-check-send-pr \
+    maybe-check-shellutils \
+    maybe-check-sid \
+    maybe-check-sim \
+    maybe-check-tar \
+    maybe-check-texinfo \
+    maybe-check-textutils \
+    maybe-check-time \
+    maybe-check-uudecode \
+    maybe-check-wdiff \
+    maybe-check-zip \
+    maybe-check-zlib \
+    maybe-check-gdb \
+    maybe-check-expect \
+    maybe-check-guile \
+    maybe-check-tk \
+    maybe-check-tix \
+    maybe-check-libtermcap \
+    maybe-check-utils \
+    maybe-check-target-libstdc++-v3 \
+    maybe-check-target-newlib \
+    maybe-check-target-libf2c \
+    maybe-check-target-libobjc \
+    maybe-check-target-libtermcap \
+    maybe-check-target-winsup \
+    maybe-check-target-libgloss \
+    maybe-check-target-libiberty \
+    maybe-check-target-gperf \
+    maybe-check-target-examples \
+    maybe-check-target-libffi \
+    maybe-check-target-libjava \
+    maybe-check-target-zlib \
+    maybe-check-target-boehm-gc \
+    maybe-check-target-qthreads \
+    maybe-check-target-rda
 
 # Automated reporting of test results.
 
@@ -1173,9 +1437,160 @@ mail-report-with-warnings.log: warning.log
 # Installation targets.
 
 .PHONY: install uninstall
-install: installdirs @install_host_modules@ @install_target_modules@
-
-install-target: @install_target_modules@
+install: installdirs install-host install-target
+
+.PHONY: install-host-nogcc
+install-host-nogcc:  \
+    maybe-install-ash \
+    maybe-install-autoconf \
+    maybe-install-automake \
+    maybe-install-bash \
+    maybe-install-bfd \
+    maybe-install-opcodes \
+    maybe-install-binutils \
+    maybe-install-bison \
+    maybe-install-byacc \
+    maybe-install-bzip2 \
+    maybe-install-dejagnu \
+    maybe-install-diff \
+    maybe-install-dosutils \
+    maybe-install-etc \
+    maybe-install-fastjar \
+    maybe-install-fileutils \
+    maybe-install-findutils \
+    maybe-install-find \
+    maybe-install-flex \
+    maybe-install-gas \
+    maybe-install-gawk \
+    maybe-install-gettext \
+    maybe-install-gnuserv \
+    maybe-install-gprof \
+    maybe-install-gzip \
+    maybe-install-hello \
+    maybe-install-indent \
+    maybe-install-intl \
+    maybe-install-tcl \
+    maybe-install-itcl \
+    maybe-install-ld \
+    maybe-install-libgui \
+    maybe-install-libiberty \
+    maybe-install-libtool \
+    maybe-install-m4 \
+    maybe-install-make \
+    maybe-install-mmalloc \
+    maybe-install-patch \
+    maybe-install-perl \
+    maybe-install-prms \
+    maybe-install-rcs \
+    maybe-install-readline \
+    maybe-install-release \
+    maybe-install-recode \
+    maybe-install-sed \
+    maybe-install-send-pr \
+    maybe-install-shellutils \
+    maybe-install-sid \
+    maybe-install-sim \
+    maybe-install-tar \
+    maybe-install-texinfo \
+    maybe-install-textutils \
+    maybe-install-time \
+    maybe-install-uudecode \
+    maybe-install-wdiff \
+    maybe-install-zip \
+    maybe-install-zlib \
+    maybe-install-gdb \
+    maybe-install-expect \
+    maybe-install-guile \
+    maybe-install-tk \
+    maybe-install-tix \
+    maybe-install-libtermcap \
+    maybe-install-utils
+
+.PHONY: install-host
+install-host: maybe-install-gcc  \
+    maybe-install-ash \
+    maybe-install-autoconf \
+    maybe-install-automake \
+    maybe-install-bash \
+    maybe-install-bfd \
+    maybe-install-opcodes \
+    maybe-install-binutils \
+    maybe-install-bison \
+    maybe-install-byacc \
+    maybe-install-bzip2 \
+    maybe-install-dejagnu \
+    maybe-install-diff \
+    maybe-install-dosutils \
+    maybe-install-etc \
+    maybe-install-fastjar \
+    maybe-install-fileutils \
+    maybe-install-findutils \
+    maybe-install-find \
+    maybe-install-flex \
+    maybe-install-gas \
+    maybe-install-gawk \
+    maybe-install-gettext \
+    maybe-install-gnuserv \
+    maybe-install-gprof \
+    maybe-install-gzip \
+    maybe-install-hello \
+    maybe-install-indent \
+    maybe-install-intl \
+    maybe-install-tcl \
+    maybe-install-itcl \
+    maybe-install-ld \
+    maybe-install-libgui \
+    maybe-install-libiberty \
+    maybe-install-libtool \
+    maybe-install-m4 \
+    maybe-install-make \
+    maybe-install-mmalloc \
+    maybe-install-patch \
+    maybe-install-perl \
+    maybe-install-prms \
+    maybe-install-rcs \
+    maybe-install-readline \
+    maybe-install-release \
+    maybe-install-recode \
+    maybe-install-sed \
+    maybe-install-send-pr \
+    maybe-install-shellutils \
+    maybe-install-sid \
+    maybe-install-sim \
+    maybe-install-tar \
+    maybe-install-texinfo \
+    maybe-install-textutils \
+    maybe-install-time \
+    maybe-install-uudecode \
+    maybe-install-wdiff \
+    maybe-install-zip \
+    maybe-install-zlib \
+    maybe-install-gdb \
+    maybe-install-expect \
+    maybe-install-guile \
+    maybe-install-tk \
+    maybe-install-tix \
+    maybe-install-libtermcap \
+    maybe-install-utils
+
+.PHONY: install-target
+install-target:  \
+    maybe-install-target-libstdc++-v3 \
+    maybe-install-target-newlib \
+    maybe-install-target-libf2c \
+    maybe-install-target-libobjc \
+    maybe-install-target-libtermcap \
+    maybe-install-target-winsup \
+    maybe-install-target-libgloss \
+    maybe-install-target-libiberty \
+    maybe-install-target-gperf \
+    maybe-install-target-examples \
+    maybe-install-target-libffi \
+    maybe-install-target-libjava \
+    maybe-install-target-zlib \
+    maybe-install-target-boehm-gc \
+    maybe-install-target-qthreads \
+    maybe-install-target-rda
 
 uninstall:
        @echo "the uninstall target is not supported in this tree"
@@ -1194,8 +1609,8 @@ install.all: install-no-fixedincludes
 # install-no-fixedincludes is used because Cygnus can not distribute
 # the fixed header files.
 .PHONY: install-no-fixedincludes
-install-no-fixedincludes: installdirs @install_host_modules_nogcc@ \
-       @install_target_modules@ gcc-no-fixedincludes
+install-no-fixedincludes: installdirs install-host-nogcc \
+       install-target gcc-no-fixedincludes
 
 ### other supporting targets
 
@@ -1235,70 +1650,70 @@ TAGS: do-TAGS
 maybe-configure-build-libiberty:
 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 \
+       [ -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)
 
 
 # --------------------------------------
@@ -1349,27 +1764,28 @@ configure-ash:
 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 maybe-check-ash
+maybe-check-ash:
 
-.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)
 
 
 .PHONY: install-ash maybe-install-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
@@ -1416,27 +1832,28 @@ configure-autoconf:
 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 maybe-check-autoconf
+maybe-check-autoconf:
 
-.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)
 
 
 .PHONY: install-autoconf maybe-install-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
@@ -1483,27 +1900,28 @@ configure-automake:
 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 maybe-check-automake
+maybe-check-automake:
 
-.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)
 
 
 .PHONY: install-automake maybe-install-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
@@ -1550,27 +1968,28 @@ configure-bash:
 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 maybe-check-bash
+maybe-check-bash:
 
-.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)
 
 
 .PHONY: install-bash maybe-install-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
@@ -1617,27 +2036,28 @@ configure-bfd:
 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 maybe-check-bfd
+maybe-check-bfd:
 
-.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)
 
 
 .PHONY: install-bfd maybe-install-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
@@ -1684,27 +2104,28 @@ configure-opcodes:
 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 maybe-check-opcodes
+maybe-check-opcodes:
 
-.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)
 
 
 .PHONY: install-opcodes maybe-install-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
@@ -1751,27 +2172,28 @@ configure-binutils:
 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 maybe-check-binutils
+maybe-check-binutils:
 
-.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)
 
 
 .PHONY: install-binutils maybe-install-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
@@ -1818,30 +2240,31 @@ configure-bison:
 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 maybe-check-bison
+maybe-check-bison:
 
-.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
 
 
-
 .PHONY: install-bison maybe-install-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
@@ -1888,30 +2311,31 @@ configure-byacc:
 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 maybe-check-byacc
+maybe-check-byacc:
 
-.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
 
 
-
 .PHONY: install-byacc maybe-install-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
@@ -1958,94 +2382,28 @@ configure-bzip2:
 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 maybe-check-bzip2
+maybe-check-bzip2:
 
-.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)
 
 
 .PHONY: install-bzip2 maybe-install-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:
-       @test ! -f db/Makefile || exit 0; \
-       [ -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
@@ -2092,27 +2450,28 @@ configure-dejagnu:
 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 maybe-check-dejagnu
+maybe-check-dejagnu:
 
-.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)
 
 
 .PHONY: install-dejagnu maybe-install-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
@@ -2159,27 +2518,28 @@ configure-diff:
 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 maybe-check-diff
+maybe-check-diff:
 
-.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)
 
 
 .PHONY: install-diff maybe-install-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
@@ -2226,23 +2586,24 @@ configure-dosutils:
 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 maybe-check-dosutils
+maybe-check-dosutils:
 
-.PHONY: check-dosutils
 check-dosutils:
 
 
-
 .PHONY: install-dosutils maybe-install-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
@@ -2289,27 +2650,28 @@ configure-etc:
 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 maybe-check-etc
+maybe-check-etc:
 
-.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)
 
 
 .PHONY: install-etc maybe-install-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
@@ -2356,30 +2718,31 @@ configure-fastjar:
 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 maybe-check-fastjar
+maybe-check-fastjar:
 
-.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
 
 
-
 .PHONY: install-fastjar maybe-install-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
@@ -2426,27 +2789,28 @@ configure-fileutils:
 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 maybe-check-fileutils
+maybe-check-fileutils:
 
-.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)
 
 
 .PHONY: install-fileutils maybe-install-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
@@ -2493,27 +2857,28 @@ configure-findutils:
 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 maybe-check-findutils
+maybe-check-findutils:
 
-.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)
 
 
 .PHONY: install-findutils maybe-install-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
@@ -2560,27 +2925,28 @@ configure-find:
 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 maybe-check-find
+maybe-check-find:
 
-.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)
 
 
 .PHONY: install-find maybe-install-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
@@ -2627,30 +2993,31 @@ configure-flex:
 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 maybe-check-flex
+maybe-check-flex:
 
-.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
 
 
-
 .PHONY: install-flex maybe-install-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
@@ -2697,27 +3064,28 @@ configure-gas:
 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 maybe-check-gas
+maybe-check-gas:
 
-.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)
 
 
 .PHONY: install-gas maybe-install-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
@@ -2764,27 +3132,28 @@ configure-gawk:
 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 maybe-check-gawk
+maybe-check-gawk:
 
-.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)
 
 
 .PHONY: install-gawk maybe-install-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
@@ -2831,27 +3200,28 @@ configure-gettext:
 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 maybe-check-gettext
+maybe-check-gettext:
 
-.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)
 
 
 .PHONY: install-gettext maybe-install-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
@@ -2898,27 +3268,28 @@ configure-gnuserv:
 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 maybe-check-gnuserv
+maybe-check-gnuserv:
 
-.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)
 
 
 .PHONY: install-gnuserv maybe-install-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
@@ -2965,94 +3336,28 @@ configure-gprof:
 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 maybe-check-gprof
+maybe-check-gprof:
 
-.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)
 
 
 .PHONY: install-gprof maybe-install-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:
-       @test ! -f grep/Makefile || exit 0; \
-       [ -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
@@ -3099,27 +3404,28 @@ configure-gzip:
 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 maybe-check-gzip
+maybe-check-gzip:
 
-.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)
 
 
 .PHONY: install-gzip maybe-install-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
@@ -3166,27 +3472,28 @@ configure-hello:
 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 maybe-check-hello
+maybe-check-hello:
 
-.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)
 
 
 .PHONY: install-hello maybe-install-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
@@ -3233,27 +3540,28 @@ configure-indent:
 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 maybe-check-indent
+maybe-check-indent:
 
-.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)
 
 
 .PHONY: install-indent maybe-install-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
@@ -3300,27 +3608,28 @@ configure-intl:
 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 maybe-check-intl
+maybe-check-intl:
 
-.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)
 
 
 .PHONY: install-intl maybe-install-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
@@ -3367,27 +3676,28 @@ configure-tcl:
 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 maybe-check-tcl
+maybe-check-tcl:
 
-.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)
 
 
 .PHONY: install-tcl maybe-install-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
@@ -3434,27 +3744,28 @@ configure-itcl:
 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 maybe-check-itcl
+maybe-check-itcl:
 
-.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)
 
 
 .PHONY: install-itcl maybe-install-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
@@ -3501,27 +3812,28 @@ configure-ld:
 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 maybe-check-ld
+maybe-check-ld:
 
-.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)
 
 
 .PHONY: install-ld maybe-install-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
@@ -3568,27 +3880,28 @@ configure-libgui:
 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 maybe-check-libgui
+maybe-check-libgui:
 
-.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)
 
 
 .PHONY: install-libgui maybe-install-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
@@ -3635,27 +3948,28 @@ configure-libiberty:
 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 maybe-check-libiberty
+maybe-check-libiberty:
 
-.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)
 
 
 .PHONY: install-libiberty maybe-install-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
@@ -3702,27 +4016,28 @@ configure-libtool:
 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 maybe-check-libtool
+maybe-check-libtool:
 
-.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)
 
 
 .PHONY: install-libtool maybe-install-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
@@ -3769,27 +4084,28 @@ configure-m4:
 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 maybe-check-m4
+maybe-check-m4:
 
-.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)
 
 
 .PHONY: install-m4 maybe-install-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
@@ -3836,27 +4152,28 @@ configure-make:
 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 maybe-check-make
+maybe-check-make:
 
-.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)
 
 
 .PHONY: install-make maybe-install-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
@@ -3903,23 +4220,24 @@ configure-mmalloc:
 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 maybe-check-mmalloc
+maybe-check-mmalloc:
 
-.PHONY: check-mmalloc
 check-mmalloc:
 
 
-
 .PHONY: install-mmalloc maybe-install-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
@@ -3966,27 +4284,28 @@ configure-patch:
 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 maybe-check-patch
+maybe-check-patch:
 
-.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)
 
 
 .PHONY: install-patch maybe-install-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
@@ -4033,27 +4352,28 @@ configure-perl:
 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 maybe-check-perl
+maybe-check-perl:
 
-.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)
 
 
 .PHONY: install-perl maybe-install-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
@@ -4100,27 +4420,28 @@ configure-prms:
 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 maybe-check-prms
+maybe-check-prms:
 
-.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)
 
 
 .PHONY: install-prms maybe-install-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
@@ -4167,27 +4488,28 @@ configure-rcs:
 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 maybe-check-rcs
+maybe-check-rcs:
 
-.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)
 
 
 .PHONY: install-rcs maybe-install-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
@@ -4234,27 +4556,28 @@ configure-readline:
 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 maybe-check-readline
+maybe-check-readline:
 
-.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)
 
 
 .PHONY: install-readline maybe-install-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
@@ -4301,18 +4624,19 @@ configure-release:
 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 maybe-check-release
+maybe-check-release:
 
-.PHONY: check-release
 check-release:
 
 
-
 .PHONY: install-release maybe-install-release
 maybe-install-release:
+
 install-release:
 
 
@@ -4360,27 +4684,28 @@ configure-recode:
 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 maybe-check-recode
+maybe-check-recode:
 
-.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)
 
 
 .PHONY: install-recode maybe-install-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
@@ -4427,27 +4752,28 @@ configure-sed:
 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 maybe-check-sed
+maybe-check-sed:
 
-.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)
 
 
 .PHONY: install-sed maybe-install-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
@@ -4494,27 +4820,28 @@ configure-send-pr:
 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 maybe-check-send-pr
+maybe-check-send-pr:
 
-.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)
 
 
 .PHONY: install-send-pr maybe-install-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
@@ -4561,27 +4888,28 @@ configure-shellutils:
 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 maybe-check-shellutils
+maybe-check-shellutils:
 
-.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)
 
 
 .PHONY: install-shellutils maybe-install-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
@@ -4628,27 +4956,28 @@ configure-sid:
 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 maybe-check-sid
+maybe-check-sid:
 
-.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)
 
 
 .PHONY: install-sid maybe-install-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
@@ -4695,94 +5024,28 @@ configure-sim:
 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 maybe-check-sim
+maybe-check-sim:
 
-.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)
 
 
 .PHONY: install-sim maybe-install-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:
-       @test ! -f snavigator/Makefile || exit 0; \
-       [ -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
@@ -4829,27 +5092,28 @@ configure-tar:
 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 maybe-check-tar
+maybe-check-tar:
 
-.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)
 
 
 .PHONY: install-tar maybe-install-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
@@ -4896,22 +5160,23 @@ configure-texinfo:
 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 maybe-check-texinfo
+maybe-check-texinfo:
 
-.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)
 
 
 .PHONY: install-texinfo maybe-install-texinfo
 maybe-install-texinfo:
+
 install-texinfo:
 
 
@@ -4959,27 +5224,28 @@ configure-textutils:
 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 maybe-check-textutils
+maybe-check-textutils:
 
-.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)
-
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd textutils && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 .PHONY: install-textutils maybe-install-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
@@ -5026,27 +5292,28 @@ configure-time:
 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 maybe-check-time
+maybe-check-time:
 
-.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)
 
 
 .PHONY: install-time maybe-install-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
@@ -5093,27 +5360,28 @@ configure-uudecode:
 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 maybe-check-uudecode
+maybe-check-uudecode:
 
-.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)
 
 
 .PHONY: install-uudecode maybe-install-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
@@ -5159,28 +5427,29 @@ configure-wdiff:
 .PHONY: all-wdiff maybe-all-wdiff
 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)
+       @r=`${PWD}`; export r; \
+       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd wdiff && $(MAKE) $(FLAGS_TO_PASS) all)
 
+.PHONY: check-wdiff maybe-check-wdiff
+maybe-check-wdiff:
 
-.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)
 
 
 .PHONY: install-wdiff maybe-install-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
@@ -5227,30 +5496,31 @@ configure-zip:
 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 maybe-check-zip
+maybe-check-zip:
 
-.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
 
 
-
 .PHONY: install-zip maybe-install-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
@@ -5297,18 +5567,19 @@ configure-zlib:
 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 maybe-check-zlib
+maybe-check-zlib:
 
-.PHONY: check-zlib
 check-zlib:
 
 
-
 .PHONY: install-zlib maybe-install-zlib
 maybe-install-zlib:
+
 install-zlib:
 
 
@@ -5356,27 +5627,28 @@ configure-gdb:
 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 maybe-check-gdb
+maybe-check-gdb:
 
-.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)
 
 
 .PHONY: install-gdb maybe-install-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
@@ -5423,27 +5695,28 @@ configure-expect:
 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 maybe-check-expect
+maybe-check-expect:
 
-.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)
 
 
 .PHONY: install-expect maybe-install-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
@@ -5490,27 +5763,28 @@ configure-guile:
 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 maybe-check-guile
+maybe-check-guile:
 
-.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)
 
 
 .PHONY: install-guile maybe-install-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
@@ -5557,27 +5831,28 @@ configure-tk:
 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 maybe-check-tk
+maybe-check-tk:
 
-.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)
 
 
 .PHONY: install-tk maybe-install-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
@@ -5624,27 +5899,28 @@ configure-tix:
 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 maybe-check-tix
+maybe-check-tix:
 
-.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)
 
 
 .PHONY: install-tix maybe-install-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
@@ -5691,23 +5967,24 @@ configure-libtermcap:
 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 maybe-check-libtermcap
+maybe-check-libtermcap:
 
-.PHONY: check-libtermcap
 check-libtermcap:
 
 
-
 .PHONY: install-libtermcap maybe-install-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
@@ -5754,23 +6031,24 @@ configure-utils:
 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 maybe-check-utils
+maybe-check-utils:
 
-.PHONY: check-utils
 check-utils:
 
 
-
 .PHONY: install-utils maybe-install-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)
 
 
 
@@ -5784,98 +6062,102 @@ maybe-configure-target-libstdc++-v3:
 # 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; \
+         mkdir $(TARGET_SUBDIR)/libstdc++-v3; \
        rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || : ; \
        cp multilib.out $(TARGET_SUBDIR)/libstdc++-v3/multilib.out
 
 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; \
-           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 \
+       [ -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 maybe-check-target-libstdc++-v3
+maybe-check-target-libstdc++-v3:
 
-.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
@@ -5884,97 +6166,101 @@ maybe-configure-target-newlib:
 # 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; \
+         mkdir $(TARGET_SUBDIR)/newlib; \
        rm -f $(TARGET_SUBDIR)/newlib/Makefile || : ; \
        cp multilib.out $(TARGET_SUBDIR)/newlib/multilib.out
 
 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; \
-           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 \
+       [ -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 maybe-check-target-newlib
+maybe-check-target-newlib:
 
-.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
@@ -5983,97 +6269,101 @@ maybe-configure-target-libf2c:
 # 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; \
+         mkdir $(TARGET_SUBDIR)/libf2c; \
        rm -f $(TARGET_SUBDIR)/libf2c/Makefile || : ; \
        cp multilib.out $(TARGET_SUBDIR)/libf2c/multilib.out
 
 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; \
-           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 \
+       [ -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 maybe-check-target-libf2c
+maybe-check-target-libf2c:
 
-.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
@@ -6082,97 +6372,101 @@ maybe-configure-target-libobjc:
 # 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; \
+         mkdir $(TARGET_SUBDIR)/libobjc; \
        rm -f $(TARGET_SUBDIR)/libobjc/Makefile || : ; \
        cp multilib.out $(TARGET_SUBDIR)/libobjc/multilib.out
 
 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; \
-           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 \
+       [ -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 maybe-check-target-libobjc
+maybe-check-target-libobjc:
 
-.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
@@ -6181,93 +6475,97 @@ maybe-configure-target-libtermcap:
 # 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; \
+         mkdir $(TARGET_SUBDIR)/libtermcap; \
        rm -f $(TARGET_SUBDIR)/libtermcap/Makefile || : ; \
        cp multilib.out $(TARGET_SUBDIR)/libtermcap/multilib.out
 
 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; \
-           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 \
+       [ -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)
+
+.PHONY: check-target-libtermcap maybe-check-target-libtermcap
+maybe-check-target-libtermcap:
 
 # Dummy target for uncheckable module.
-.PHONY: check-target-libtermcap
 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)
+       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
@@ -6276,97 +6574,101 @@ maybe-configure-target-winsup:
 # 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; \
+         mkdir $(TARGET_SUBDIR)/winsup; \
        rm -f $(TARGET_SUBDIR)/winsup/Makefile || : ; \
        cp multilib.out $(TARGET_SUBDIR)/winsup/multilib.out
 
 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; \
-           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 \
+       [ -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 maybe-check-target-winsup
+maybe-check-target-winsup:
 
-.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
@@ -6375,93 +6677,97 @@ maybe-configure-target-libgloss:
 # 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; \
+         mkdir $(TARGET_SUBDIR)/libgloss; \
        rm -f $(TARGET_SUBDIR)/libgloss/Makefile || : ; \
        cp multilib.out $(TARGET_SUBDIR)/libgloss/multilib.out
 
 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; \
-           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 \
+       [ -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)
+
+.PHONY: check-target-libgloss maybe-check-target-libgloss
+maybe-check-target-libgloss:
 
 # Dummy target for uncheckable module.
-.PHONY: check-target-libgloss
 check-target-libgloss:
 
 
 .PHONY: install-target-libgloss maybe-install-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
@@ -6470,97 +6776,101 @@ maybe-configure-target-libiberty:
 # 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; \
+         mkdir $(TARGET_SUBDIR)/libiberty; \
        rm -f $(TARGET_SUBDIR)/libiberty/Makefile || : ; \
        cp multilib.out $(TARGET_SUBDIR)/libiberty/multilib.out
 
 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; \
-           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 \
+       [ -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 maybe-check-target-libiberty
+maybe-check-target-libiberty:
 
-.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
@@ -6569,97 +6879,101 @@ maybe-configure-target-gperf:
 # 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; \
+         mkdir $(TARGET_SUBDIR)/gperf; \
        rm -f $(TARGET_SUBDIR)/gperf/Makefile || : ; \
        cp multilib.out $(TARGET_SUBDIR)/gperf/multilib.out
 
 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; \
-           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 \
+       [ -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 maybe-check-target-gperf
+maybe-check-target-gperf:
 
-.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
@@ -6668,87 +6982,91 @@ maybe-configure-target-examples:
 # 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; \
+         mkdir $(TARGET_SUBDIR)/examples; \
        rm -f $(TARGET_SUBDIR)/examples/Makefile || : ; \
        cp multilib.out $(TARGET_SUBDIR)/examples/multilib.out
 
 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; \
-           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 \
+       [ -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)
+
+.PHONY: check-target-examples maybe-check-target-examples
+maybe-check-target-examples:
 
 # Dummy target for uncheckable module.
-.PHONY: check-target-examples
 check-target-examples:
 
 
 .PHONY: install-target-examples maybe-install-target-examples
 maybe-install-target-examples:
+
 # Dummy target for uninstallable.
 install-target-examples:
 
@@ -6759,97 +7077,101 @@ maybe-configure-target-libffi:
 # 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; \
+         mkdir $(TARGET_SUBDIR)/libffi; \
        rm -f $(TARGET_SUBDIR)/libffi/Makefile || : ; \
        cp multilib.out $(TARGET_SUBDIR)/libffi/multilib.out
 
 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; \
-           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 \
+       [ -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 maybe-check-target-libffi
+maybe-check-target-libffi:
 
-.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:
+
 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)
+       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
@@ -6858,98 +7180,102 @@ maybe-configure-target-libjava:
 # 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; \
+         mkdir $(TARGET_SUBDIR)/libjava; \
        rm -f $(TARGET_SUBDIR)/libjava/Makefile || : ; \
        cp multilib.out $(TARGET_SUBDIR)/libjava/multilib.out
 
 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; \
-           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 \
+       [ -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 maybe-check-target-libjava
+maybe-check-target-libjava:
 
-.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
@@ -6958,97 +7284,101 @@ maybe-configure-target-zlib:
 # 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; \
+         mkdir $(TARGET_SUBDIR)/zlib; \
        rm -f $(TARGET_SUBDIR)/zlib/Makefile || : ; \
        cp multilib.out $(TARGET_SUBDIR)/zlib/multilib.out
 
 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; \
-           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 \
+       [ -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 maybe-check-target-zlib
+maybe-check-target-zlib:
 
-.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
@@ -7057,97 +7387,101 @@ maybe-configure-target-boehm-gc:
 # 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; \
+         mkdir $(TARGET_SUBDIR)/boehm-gc; \
        rm -f $(TARGET_SUBDIR)/boehm-gc/Makefile || : ; \
        cp multilib.out $(TARGET_SUBDIR)/boehm-gc/multilib.out
 
 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; \
-           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 \
+       [ -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 maybe-check-target-boehm-gc
+maybe-check-target-boehm-gc:
 
-.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
@@ -7156,97 +7490,101 @@ maybe-configure-target-qthreads:
 # 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; \
+         mkdir $(TARGET_SUBDIR)/qthreads; \
        rm -f $(TARGET_SUBDIR)/qthreads/Makefile || : ; \
        cp multilib.out $(TARGET_SUBDIR)/qthreads/multilib.out
 
 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; \
-           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 \
+       [ -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 maybe-check-target-qthreads
+maybe-check-target-qthreads:
 
-.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
@@ -7255,97 +7593,101 @@ maybe-configure-target-rda:
 # 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; \
+         mkdir $(TARGET_SUBDIR)/rda; \
        rm -f $(TARGET_SUBDIR)/rda/Makefile || : ; \
        cp multilib.out $(TARGET_SUBDIR)/rda/multilib.out
 
 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; \
-           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 \
+       [ -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 maybe-check-target-rda
+maybe-check-target-rda:
 
-.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)
 
 
 
@@ -7369,6 +7711,7 @@ configure-gcc:
        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; \
@@ -7426,8 +7769,9 @@ all-gcc: configure-gcc
 # In theory, on an SMP all those dependencies can be resolved
 # in parallel.
 #
-.PHONY: bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean bubblestrap quickstrap cleanstrap restrap
-bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean bubblestrap quickstrap cleanstrap restrap: all-bootstrap configure-gcc
+GCC_STRAP_TARGETS = bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean bubblestrap quickstrap cleanstrap restrap
+.PHONY: $(GCC_STRAP_TARGETS)
+$(GCC_STRAP_TARGETS): all-bootstrap configure-gcc
        @r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        $(SET_LIB_PATH) \
@@ -7437,14 +7781,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"; \
@@ -7469,7 +7816,8 @@ cross: all-texinfo all-bison all-byacc all-binutils all-gas all-ld
        $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) \
          LANGUAGES="c c++" all
 
-.PHONY: check-gcc
+.PHONY: check-gcc maybe-check-gcc
+maybe-check-gcc:
 check-gcc:
        @if [ -f ./gcc/Makefile ] ; then \
          r=`${PWD}`; export r; \
@@ -7492,7 +7840,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:
@@ -7564,6 +7913,8 @@ all-binutils: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-flex
 # binutils might be on PATH, and they might need the shared opcodes
 # library.
 install-binutils: maybe-install-opcodes
+# libopcodes depends on libbfd
+install-opcodes: maybe-install-bfd
 all-gas: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-intl
 all-gprof: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-intl
 all-ld: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-bison maybe-all-byacc maybe-all-flex maybe-all-intl
@@ -7578,7 +7929,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
@@ -7595,7 +7946,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
@@ -7605,7 +7955,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
 
@@ -7632,7 +7981,7 @@ configure-target-zlib: $(ALL_GCC_C)
 configure-target-examples: $(ALL_GCC_C)
 configure-target-libgloss: $(ALL_GCC)
 all-target-libgloss: maybe-configure-target-newlib
-configure-target-libiberty: $(ALL_GCC_C)
+configure-target-libiberty: $(ALL_GCC)
 configure-target-libtermcap: $(ALL_GCC_C)
 configure-target-newlib: $(ALL_GCC)
 configure-target-rda: $(ALL_GCC_C)
@@ -7670,7 +8019,7 @@ multilib.out: maybe-all-gcc
 
 # Rebuilding Makefile.in, using autogen.
 AUTOGEN = autogen
-$(srcdir)/Makefile.in: # $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def
+$(srcdir)/Makefile.in: @MAINT@ $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def
        cd $(srcdir) && $(AUTOGEN) Makefile.def
 
 # Rebuilding Makefile.
@@ -7682,12 +8031,12 @@ config.status: configure $(gcc_version_trigger)
 
 # Rebuilding configure.
 AUTOCONF = autoconf
-$(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/config/acx.m4
+$(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4
        cd $(srcdir) && $(AUTOCONF)
-#
 
-.NOEXPORT:
-MAKEOVERRIDES=
+# ------------------------------
+# 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
@@ -7695,4 +8044,8 @@ MAKEOVERRIDES=
 NOTPARALLEL = .NOTPARALLEL
 $(NOTPARALLEL):
 
+# Don't pass command-line variables to submakes.
+.NOEXPORT:
+MAKEOVERRIDES=
+
 # end of Makefile.in