* inclhack.def: Avoid changing NULL on C++ friendly systems.

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

index 29e7cd1..0867ec9 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,7 +3,7 @@
  #
  # Makefile for directory with subdirs to build.
  #   Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-#   1999, 2000, 2001, 2002, 2003 Free Software Foundation
+#   1999, 2000, 2001, 2002, 2003, 2004 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
@@ -65,6 +65,8 @@ INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_DATA = @INSTALL_DATA@
+LN = @LN@
+LN_S = @LN_S@
  
  # -------------------------------------------------
  # Miscellaneous non-standard autoconf-set variables
@@ -99,6 +101,7 @@ SET_LIB_PATH = @SET_LIB_PATH@
  # Some platforms don't like blank entries, so we remove duplicate,
  # leading and trailing colons.
  REALLY_SET_LIB_PATH = \
+  @SET_GCC_LIB_PATH@ \
    $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH):$(TARGET_LIB_PATH):$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
  
  # This is the list of directories to be built for the build system.
@@ -109,11 +112,74 @@ BUILD_SUBDIR = @build_subdir@
  # directories built for the build system.
  BUILD_CONFIGARGS = @build_configargs@
  
+# This is the list of variables to export in the environment when
+# configuring any subdirectory.  It must also be exported whenever
+# recursing into a build directory in case that directory's Makefile
+# re-runs configure.
+BASE_EXPORTS = \
+       FLEX="$(FLEX)"; export FLEX; \
+       LEX="$(LEX)"; export LEX; \
+       BISON="$(BISON)"; export BISON; \
+       YACC="$(YACC)"; export YACC; \
+       M4="$(M4)"; export M4; \
+       MAKEINFO="$(MAKEINFO)"; export MAKEINFO;
+
+# This is the list of variables to export in the environment when
+# configuring subdirectories for the build system.
+BUILD_EXPORTS = \
+       $(BASE_EXPORTS) \
+       AR="$(AR_FOR_BUILD)"; export AR; \
+       AS="$(AS_FOR_BUILD)"; export AS; \
+       CC="$(CC_FOR_BUILD)"; export CC; \
+       CFLAGS="$(CFLAGS_FOR_BUILD)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+       CXX="$(CXX_FOR_BUILD)"; export CXX; \
+       CXXFLAGS="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS; \
+       GCJ="$(GCJ_FOR_BUILD)"; export GCJ; \
+       GFORTRAN="$(GFORTRAN_FOR_BUILD)"; export GFORTRAN; \
+       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;
+
  # 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 the list of variables to export in the environment when
+# configuring subdirectories for the host system.
+HOST_EXPORTS = \
+       $(BASE_EXPORTS) \
+       CC="$(CC)"; export CC; \
+       CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+       CXX="$(CXX)"; export CXX; \
+       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
+       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; \
+       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
+       NM="$(NM)"; export NM; \
+       RANLIB="$(RANLIB)"; export RANLIB; \
+       WINDRES="$(WINDRES)"; export WINDRES; \
+       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
+       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
+       GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
+       GMPINC="$(HOST_GMPINC)"; export GMPINC; \
+       SET_GCC_LIB_PATH_CMD="@SET_GCC_LIB_PATH@"; export SET_GCC_LIB_PATH_CMD; \
+       @SET_GCC_LIB_PATH@
+
+# Similar, for later GCC stages.
+STAGE_HOST_EXPORTS = \
+       $(HOST_EXPORTS) \
+       CC="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/"; export CC; \
+       CC_FOR_BUILD="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/"; export CC_FOR_BUILD;
  
  # This is set by the configure script to the list of directories which
  # should be built using the target tools.
@@ -123,6 +189,40 @@ 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@
+# This is the list of variables to export in the environment when
+# configuring subdirectories for the host system.
+BASE_TARGET_EXPORTS = \
+       $(BASE_EXPORTS) \
+       AR="$(AR_FOR_TARGET)"; export AR; \
+       AS="$(AS_FOR_TARGET)"; export AS; \
+       CC="$(CC_FOR_TARGET)"; export CC; \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+       CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
+       GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \
+       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; \
+       SET_GCC_LIB_PATH_CMD="@SET_GCC_LIB_PATH@"; export SET_GCC_LIB_PATH_CMD; \
+       @SET_GCC_LIB_PATH@
+
+RAW_CXX_TARGET_EXPORTS = \
+       $(BASE_TARGET_EXPORTS) \
+       CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
+       CXX="$(RAW_CXX_FOR_TARGET)"; export CXX;
+
+NORMAL_TARGET_EXPORTS = \
+       $(BASE_TARGET_EXPORTS) \
+       CXX="$(CXX_FOR_TARGET)"; export CXX;
+
+# Where to find GMP
+HOST_GMPLIBS = @gmplibs@
+HOST_GMPINC = @gmpinc@
  
  # ----------------------------------------------
  # Programs producing files for the BUILD machine
@@ -150,42 +250,51 @@ CXX_FOR_BUILD = $(CXX)
  BUILD_PREFIX = @BUILD_PREFIX@
  BUILD_PREFIX_1 = @BUILD_PREFIX_1@
  
-BISON=@BISON@
-USUAL_BISON = `if [ -f $$r/bison/bison ] ; then \
-           echo $$r/bison/bison -L $$s/bison/ ; \
+# Flags to pass to stage2 and later makes.  They are defined
+# here so that they can be overridden by Makefile fragments.
+BOOT_CFLAGS= -g -O2
+
+CONFIGURED_BISON = @CONFIGURED_BISON@
+BISON = `if [ -f $$r/$(BUILD_SUBDIR)/bison/tests/bison ] ; then \
+           echo $$r/$(BUILD_SUBDIR)/bison/tests/bison ; \
          else \
-           echo bison ; \
+           echo ${CONFIGURED_BISON} ; \
          fi`
  
-DEFAULT_YACC = @DEFAULT_YACC@
-YACC=@YACC@
-USUAL_YACC = `if [ -f $$r/bison/bison ] ; then \
-           echo $$r/bison/bison -y -L $$s/bison/ ; \
-       elif [ -f $$r/byacc/byacc ] ; then \
-           echo $$r/byacc/byacc ; \
+CONFIGURED_YACC = @CONFIGURED_YACC@
+YACC = `if [ -f $$r/$(BUILD_SUBDIR)/bison/tests/bison ] ; then \
+           echo $$r/$(BUILD_SUBDIR)/bison/tests/bison -y ; \
+       elif [ -f $$r/$(BUILD_SUBDIR)/byacc/byacc ] ; then \
+           echo $$r/$(BUILD_SUBDIR)/byacc/byacc ; \
         else \
-           echo ${DEFAULT_YACC} ; \
+           echo ${CONFIGURED_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`
+CONFIGURED_FLEX = @CONFIGURED_FLEX@
+FLEX = `if [ -f $$r/$(BUILD_SUBDIR)/flex/flex ] ; \
+       then echo $$r/$(BUILD_SUBDIR)/flex/flex ; \
+       else echo ${CONFIGURED_FLEX} ; fi`
+
+CONFIGURED_LEX = @CONFIGURED_LEX@
+LEX = `if [ -f $$r/$(BUILD_SUBDIR)/flex/flex ] ; \
+       then echo $$r/$(BUILD_SUBDIR)/flex/flex ; \
+       else echo ${CONFIGURED_LEX} ; fi`
  
-DEFAULT_M4 = @DEFAULT_M4@
-M4 = `if [ -f $$r/m4/m4 ] ; \
-       then echo $$r/m4/m4 ; \
-       else echo ${DEFAULT_M4} ; fi`
+CONFIGURED_M4 = @CONFIGURED_M4@
+M4 = `if [ -f $$r/$(BUILD_SUBDIR)/m4/m4 ] ; \
+       then echo $$r/$(BUILD_SUBDIR)/m4/m4 ; \
+       else echo ${CONFIGURED_M4} ; fi`
  
  # 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 \
+# higher, else we use the "missing" dummy.  We also pass the subdirectory
+# makeinfo even if only the Makefile is there, because Texinfo builds its
+# manual when made, and it requires its own version.
+CONFIGURED_MAKEINFO = @CONFIGURED_MAKEINFO@
+MAKEINFO = `if [ -f $$r/$(BUILD_SUBDIR)/texinfo/makeinfo/Makefile ] ; \
+       then echo $$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo ; \
+       else if (${CONFIGURED_MAKEINFO} --version \
           | 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`
+        then echo ${CONFIGURED_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
@@ -241,7 +350,7 @@ PICFLAG =
  
  # 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:
+TARGET_LIB_PATH = $$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs:$$r/$(TARGET_SUBDIR)/libmudflap/.libs
  
  FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
  
@@ -308,6 +417,7 @@ USUAL_DLLTOOL_FOR_TARGET = ` \
    fi`
  
  GCJ_FOR_TARGET = @GCJ_FOR_TARGET@
+GFORTRAN_FOR_TARGET = @GFORTRAN_FOR_TARGET@
  
  LD_FOR_TARGET=@LD_FOR_TARGET@
  CONFIGURED_LD_FOR_TARGET=@CONFIGURED_LD_FOR_TARGET@
@@ -379,8 +489,7 @@ PICFLAG_FOR_TARGET =
  
  # 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
-.PHONY: all
+@default_target@:
  
  #### host and target specific makefile fragments come in here.
  @target_makefile_frag@
@@ -394,8 +503,23 @@ BASE_FLAGS_TO_PASS = \
         "DESTDIR=$(DESTDIR)" \
         "RPATH_ENVVAR=$(RPATH_ENVVAR)" \
         "TARGET_SUBDIR=$(TARGET_SUBDIR)" \
+       "bindir=$(bindir)" \
+       "datadir=$(datadir)" \
+       "exec_prefix=$(exec_prefix)" \
+       "includedir=$(includedir)" \
+       "infodir=$(infodir)" \
+       "libdir=$(libdir)" \
+       "libexecdir=$(libexecdir)" \
+       "lispdir=$(lispdir)" \
         "libstdcxx_incdir=$(libstdcxx_incdir)" \
+       "libsubdir=$(libsubdir)" \
+       "localstatedir=$(localstatedir)" \
+       "mandir=$(mandir)" \
         "oldincludedir=$(oldincludedir)" \
+       "prefix=$(prefix)" \
+       "sbindir=$(sbindir)" \
+       "sharedstatedir=$(sharedstatedir)" \
+       "sysconfdir=$(sysconfdir)" \
         "tooldir=$(tooldir)" \
         "build_tooldir=$(build_tooldir)" \
         "gxx_include_dir=$(gxx_include_dir)" \
@@ -406,6 +530,7 @@ BASE_FLAGS_TO_PASS = \
         "CC_FOR_BUILD=$(CC_FOR_BUILD)" \
         "CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
         "EXPECT=$(EXPECT)" \
+       "FLEX=$(FLEX)" \
         "INSTALL=$(INSTALL)" \
         "INSTALL_DATA=$(INSTALL_DATA)" \
         "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
@@ -431,6 +556,7 @@ BASE_FLAGS_TO_PASS = \
         "CXXFLAGS_FOR_TARGET=$(CXXFLAGS_FOR_TARGET)" \
         "DLLTOOL_FOR_TARGET=$(DLLTOOL_FOR_TARGET)" \
         "GCJ_FOR_TARGET=$(GCJ_FOR_TARGET)" \
+       "GFORTRAN_FOR_TARGET=$(GFORTRAN_FOR_TARGET)" \
         "LD_FOR_TARGET=$(LD_FOR_TARGET)" \
         "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
         "LIBCXXFLAGS_FOR_TARGET=$(LIBCXXFLAGS_FOR_TARGET)" \
@@ -449,6 +575,8 @@ RECURSE_FLAGS = \
         CXX_FOR_TARGET='$(CXX_FOR_TARGET_FOR_RECURSIVE_MAKE)' \
         RAW_CXX_FOR_TARGET='$(RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE)' \
  
+RECURSE_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS)
+
  # Flags to pass down to most sub-makes, in which we're building with
  # the host environment.
  EXTRA_HOST_FLAGS = \
@@ -520,7 +648,7 @@ EXTRA_GCC_FLAGS = \
  GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS)
  
  .PHONY: configure-host
-configure-host: maybe-configure-gcc  \
+configure-host:  \
      maybe-configure-ash \
      maybe-configure-autoconf \
      maybe-configure-automake \
@@ -541,6 +669,7 @@ configure-host: maybe-configure-gcc  \
      maybe-configure-find \
      maybe-configure-flex \
      maybe-configure-gas \
+    maybe-configure-gcc \
      maybe-configure-gawk \
      maybe-configure-gettext \
      maybe-configure-gnuserv \
@@ -552,6 +681,7 @@ configure-host: maybe-configure-gcc  \
      maybe-configure-tcl \
      maybe-configure-itcl \
      maybe-configure-ld \
+    maybe-configure-libcpp \
      maybe-configure-libgui \
      maybe-configure-libiberty \
      maybe-configure-libtool \
@@ -582,14 +712,14 @@ configure-host: maybe-configure-gcc  \
      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-libmudflap \
      maybe-configure-target-newlib \
-    maybe-configure-target-libf2c \
+    maybe-configure-target-libgfortran \
      maybe-configure-target-libobjc \
      maybe-configure-target-libtermcap \
      maybe-configure-target-winsup \
@@ -605,12 +735,21 @@ configure-target:  \
      maybe-configure-target-rda \
      maybe-configure-target-libada
  
-# The target built for a native build.
-.PHONY: all.normal
-all.normal: @all_build_modules@ all-host all-target
-
+# The target built for a native non-bootstrap build.
+.PHONY: all
+all: unstage all-host all-target stage
+
+.PHONY: all-build
+all-build:  \
+    maybe-all-build-libiberty \
+    maybe-all-build-bison \
+    maybe-all-build-byacc \
+    maybe-all-build-flex \
+    maybe-all-build-m4 \
+    maybe-all-build-texinfo \
+    maybe-all-build-fixincludes
  .PHONY: all-host
-all-host: maybe-all-gcc  \
+all-host:  \
      maybe-all-ash \
      maybe-all-autoconf \
      maybe-all-automake \
@@ -631,6 +770,7 @@ all-host: maybe-all-gcc  \
      maybe-all-find \
      maybe-all-flex \
      maybe-all-gas \
+    maybe-all-gcc \
      maybe-all-gawk \
      maybe-all-gettext \
      maybe-all-gnuserv \
@@ -642,6 +782,7 @@ all-host: maybe-all-gcc  \
      maybe-all-tcl \
      maybe-all-itcl \
      maybe-all-ld \
+    maybe-all-libcpp \
      maybe-all-libgui \
      maybe-all-libiberty \
      maybe-all-libtool \
@@ -672,14 +813,14 @@ all-host: maybe-all-gcc  \
      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-libmudflap \
      maybe-all-target-newlib \
-    maybe-all-target-libf2c \
+    maybe-all-target-libgfortran \
      maybe-all-target-libobjc \
      maybe-all-target-libtermcap \
      maybe-all-target-winsup \
@@ -701,10 +842,10 @@ all-target:  \
  # but it may do additional work as well).
  
  .PHONY: do-info
-do-info: info-host info-target
+do-info: unstage info-host info-target stage
  
  .PHONY: info-host
-info-host: maybe-info-gcc  \
+info-host:  \
      maybe-info-ash \
      maybe-info-autoconf \
      maybe-info-automake \
@@ -725,6 +866,7 @@ info-host: maybe-info-gcc  \
      maybe-info-find \
      maybe-info-flex \
      maybe-info-gas \
+    maybe-info-gcc \
      maybe-info-gawk \
      maybe-info-gettext \
      maybe-info-gnuserv \
@@ -736,6 +878,7 @@ info-host: maybe-info-gcc  \
      maybe-info-tcl \
      maybe-info-itcl \
      maybe-info-ld \
+    maybe-info-libcpp \
      maybe-info-libgui \
      maybe-info-libiberty \
      maybe-info-libtool \
@@ -766,15 +909,15 @@ info-host: maybe-info-gcc  \
      maybe-info-expect \
      maybe-info-guile \
      maybe-info-tk \
-    maybe-info-tix \
      maybe-info-libtermcap \
      maybe-info-utils
  
  .PHONY: info-target
  info-target:  \
      maybe-info-target-libstdc++-v3 \
+    maybe-info-target-libmudflap \
      maybe-info-target-newlib \
-    maybe-info-target-libf2c \
+    maybe-info-target-libgfortran \
      maybe-info-target-libobjc \
      maybe-info-target-libtermcap \
      maybe-info-target-winsup \
@@ -791,10 +934,10 @@ info-target:  \
      maybe-info-target-libada
  
  .PHONY: do-dvi
-do-dvi: dvi-host dvi-target
+do-dvi: unstage dvi-host dvi-target stage
  
  .PHONY: dvi-host
-dvi-host: maybe-dvi-gcc  \
+dvi-host:  \
      maybe-dvi-ash \
      maybe-dvi-autoconf \
      maybe-dvi-automake \
@@ -815,6 +958,7 @@ dvi-host: maybe-dvi-gcc  \
      maybe-dvi-find \
      maybe-dvi-flex \
      maybe-dvi-gas \
+    maybe-dvi-gcc \
      maybe-dvi-gawk \
      maybe-dvi-gettext \
      maybe-dvi-gnuserv \
@@ -826,6 +970,7 @@ dvi-host: maybe-dvi-gcc  \
      maybe-dvi-tcl \
      maybe-dvi-itcl \
      maybe-dvi-ld \
+    maybe-dvi-libcpp \
      maybe-dvi-libgui \
      maybe-dvi-libiberty \
      maybe-dvi-libtool \
@@ -856,15 +1001,15 @@ dvi-host: maybe-dvi-gcc  \
      maybe-dvi-expect \
      maybe-dvi-guile \
      maybe-dvi-tk \
-    maybe-dvi-tix \
      maybe-dvi-libtermcap \
      maybe-dvi-utils
  
  .PHONY: dvi-target
  dvi-target:  \
      maybe-dvi-target-libstdc++-v3 \
+    maybe-dvi-target-libmudflap \
      maybe-dvi-target-newlib \
-    maybe-dvi-target-libf2c \
+    maybe-dvi-target-libgfortran \
      maybe-dvi-target-libobjc \
      maybe-dvi-target-libtermcap \
      maybe-dvi-target-winsup \
@@ -881,10 +1026,10 @@ dvi-target:  \
      maybe-dvi-target-libada
  
  .PHONY: do-TAGS
-do-TAGS: TAGS-host TAGS-target
+do-TAGS: unstage TAGS-host TAGS-target stage
  
  .PHONY: TAGS-host
-TAGS-host: maybe-TAGS-gcc  \
+TAGS-host:  \
      maybe-TAGS-ash \
      maybe-TAGS-autoconf \
      maybe-TAGS-automake \
@@ -905,6 +1050,7 @@ TAGS-host: maybe-TAGS-gcc  \
      maybe-TAGS-find \
      maybe-TAGS-flex \
      maybe-TAGS-gas \
+    maybe-TAGS-gcc \
      maybe-TAGS-gawk \
      maybe-TAGS-gettext \
      maybe-TAGS-gnuserv \
@@ -916,6 +1062,7 @@ TAGS-host: maybe-TAGS-gcc  \
      maybe-TAGS-tcl \
      maybe-TAGS-itcl \
      maybe-TAGS-ld \
+    maybe-TAGS-libcpp \
      maybe-TAGS-libgui \
      maybe-TAGS-libiberty \
      maybe-TAGS-libtool \
@@ -946,15 +1093,15 @@ TAGS-host: maybe-TAGS-gcc  \
      maybe-TAGS-expect \
      maybe-TAGS-guile \
      maybe-TAGS-tk \
-    maybe-TAGS-tix \
      maybe-TAGS-libtermcap \
      maybe-TAGS-utils
  
  .PHONY: TAGS-target
  TAGS-target:  \
      maybe-TAGS-target-libstdc++-v3 \
+    maybe-TAGS-target-libmudflap \
      maybe-TAGS-target-newlib \
-    maybe-TAGS-target-libf2c \
+    maybe-TAGS-target-libgfortran \
      maybe-TAGS-target-libobjc \
      maybe-TAGS-target-libtermcap \
      maybe-TAGS-target-winsup \
@@ -971,10 +1118,10 @@ TAGS-target:  \
      maybe-TAGS-target-libada
  
  .PHONY: do-install-info
-do-install-info: install-info-host install-info-target
+do-install-info: unstage install-info-host install-info-target stage
  
  .PHONY: install-info-host
-install-info-host: maybe-install-info-gcc  \
+install-info-host:  \
      maybe-install-info-ash \
      maybe-install-info-autoconf \
      maybe-install-info-automake \
@@ -995,6 +1142,7 @@ install-info-host: maybe-install-info-gcc  \
      maybe-install-info-find \
      maybe-install-info-flex \
      maybe-install-info-gas \
+    maybe-install-info-gcc \
      maybe-install-info-gawk \
      maybe-install-info-gettext \
      maybe-install-info-gnuserv \
@@ -1006,6 +1154,7 @@ install-info-host: maybe-install-info-gcc  \
      maybe-install-info-tcl \
      maybe-install-info-itcl \
      maybe-install-info-ld \
+    maybe-install-info-libcpp \
      maybe-install-info-libgui \
      maybe-install-info-libiberty \
      maybe-install-info-libtool \
@@ -1036,15 +1185,15 @@ install-info-host: maybe-install-info-gcc  \
      maybe-install-info-expect \
      maybe-install-info-guile \
      maybe-install-info-tk \
-    maybe-install-info-tix \
      maybe-install-info-libtermcap \
      maybe-install-info-utils
  
  .PHONY: install-info-target
  install-info-target:  \
      maybe-install-info-target-libstdc++-v3 \
+    maybe-install-info-target-libmudflap \
      maybe-install-info-target-newlib \
-    maybe-install-info-target-libf2c \
+    maybe-install-info-target-libgfortran \
      maybe-install-info-target-libobjc \
      maybe-install-info-target-libtermcap \
      maybe-install-info-target-winsup \
@@ -1061,10 +1210,10 @@ install-info-target:  \
      maybe-install-info-target-libada
  
  .PHONY: do-installcheck
-do-installcheck: installcheck-host installcheck-target
+do-installcheck: unstage installcheck-host installcheck-target stage
  
  .PHONY: installcheck-host
-installcheck-host: maybe-installcheck-gcc  \
+installcheck-host:  \
      maybe-installcheck-ash \
      maybe-installcheck-autoconf \
      maybe-installcheck-automake \
@@ -1085,6 +1234,7 @@ installcheck-host: maybe-installcheck-gcc  \
      maybe-installcheck-find \
      maybe-installcheck-flex \
      maybe-installcheck-gas \
+    maybe-installcheck-gcc \
      maybe-installcheck-gawk \
      maybe-installcheck-gettext \
      maybe-installcheck-gnuserv \
@@ -1096,6 +1246,7 @@ installcheck-host: maybe-installcheck-gcc  \
      maybe-installcheck-tcl \
      maybe-installcheck-itcl \
      maybe-installcheck-ld \
+    maybe-installcheck-libcpp \
      maybe-installcheck-libgui \
      maybe-installcheck-libiberty \
      maybe-installcheck-libtool \
@@ -1126,15 +1277,15 @@ installcheck-host: maybe-installcheck-gcc  \
      maybe-installcheck-expect \
      maybe-installcheck-guile \
      maybe-installcheck-tk \
-    maybe-installcheck-tix \
      maybe-installcheck-libtermcap \
      maybe-installcheck-utils
  
  .PHONY: installcheck-target
  installcheck-target:  \
      maybe-installcheck-target-libstdc++-v3 \
+    maybe-installcheck-target-libmudflap \
      maybe-installcheck-target-newlib \
-    maybe-installcheck-target-libf2c \
+    maybe-installcheck-target-libgfortran \
      maybe-installcheck-target-libobjc \
      maybe-installcheck-target-libtermcap \
      maybe-installcheck-target-winsup \
@@ -1151,10 +1302,10 @@ installcheck-target:  \
      maybe-installcheck-target-libada
  
  .PHONY: do-mostlyclean
-do-mostlyclean: mostlyclean-host mostlyclean-target
+do-mostlyclean: unstage mostlyclean-host mostlyclean-target stage
  
  .PHONY: mostlyclean-host
-mostlyclean-host: maybe-mostlyclean-gcc  \
+mostlyclean-host:  \
      maybe-mostlyclean-ash \
      maybe-mostlyclean-autoconf \
      maybe-mostlyclean-automake \
@@ -1175,6 +1326,7 @@ mostlyclean-host: maybe-mostlyclean-gcc  \
      maybe-mostlyclean-find \
      maybe-mostlyclean-flex \
      maybe-mostlyclean-gas \
+    maybe-mostlyclean-gcc \
      maybe-mostlyclean-gawk \
      maybe-mostlyclean-gettext \
      maybe-mostlyclean-gnuserv \
@@ -1186,6 +1338,7 @@ mostlyclean-host: maybe-mostlyclean-gcc  \
      maybe-mostlyclean-tcl \
      maybe-mostlyclean-itcl \
      maybe-mostlyclean-ld \
+    maybe-mostlyclean-libcpp \
      maybe-mostlyclean-libgui \
      maybe-mostlyclean-libiberty \
      maybe-mostlyclean-libtool \
@@ -1216,15 +1369,15 @@ mostlyclean-host: maybe-mostlyclean-gcc  \
      maybe-mostlyclean-expect \
      maybe-mostlyclean-guile \
      maybe-mostlyclean-tk \
-    maybe-mostlyclean-tix \
      maybe-mostlyclean-libtermcap \
      maybe-mostlyclean-utils
  
  .PHONY: mostlyclean-target
  mostlyclean-target:  \
      maybe-mostlyclean-target-libstdc++-v3 \
+    maybe-mostlyclean-target-libmudflap \
      maybe-mostlyclean-target-newlib \
-    maybe-mostlyclean-target-libf2c \
+    maybe-mostlyclean-target-libgfortran \
      maybe-mostlyclean-target-libobjc \
      maybe-mostlyclean-target-libtermcap \
      maybe-mostlyclean-target-winsup \
@@ -1241,10 +1394,10 @@ mostlyclean-target:  \
      maybe-mostlyclean-target-libada
  
  .PHONY: do-clean
-do-clean: clean-host clean-target
+do-clean: unstage clean-host clean-target stage
  
  .PHONY: clean-host
-clean-host: maybe-clean-gcc  \
+clean-host:  \
      maybe-clean-ash \
      maybe-clean-autoconf \
      maybe-clean-automake \
@@ -1265,6 +1418,7 @@ clean-host: maybe-clean-gcc  \
      maybe-clean-find \
      maybe-clean-flex \
      maybe-clean-gas \
+    maybe-clean-gcc \
      maybe-clean-gawk \
      maybe-clean-gettext \
      maybe-clean-gnuserv \
@@ -1276,6 +1430,7 @@ clean-host: maybe-clean-gcc  \
      maybe-clean-tcl \
      maybe-clean-itcl \
      maybe-clean-ld \
+    maybe-clean-libcpp \
      maybe-clean-libgui \
      maybe-clean-libiberty \
      maybe-clean-libtool \
@@ -1306,15 +1461,15 @@ clean-host: maybe-clean-gcc  \
      maybe-clean-expect \
      maybe-clean-guile \
      maybe-clean-tk \
-    maybe-clean-tix \
      maybe-clean-libtermcap \
      maybe-clean-utils
  
  .PHONY: clean-target
  clean-target:  \
      maybe-clean-target-libstdc++-v3 \
+    maybe-clean-target-libmudflap \
      maybe-clean-target-newlib \
-    maybe-clean-target-libf2c \
+    maybe-clean-target-libgfortran \
      maybe-clean-target-libobjc \
      maybe-clean-target-libtermcap \
      maybe-clean-target-winsup \
@@ -1331,10 +1486,10 @@ clean-target:  \
      maybe-clean-target-libada
  
  .PHONY: do-distclean
-do-distclean: distclean-host distclean-target
+do-distclean: unstage distclean-host distclean-target stage
  
  .PHONY: distclean-host
-distclean-host: maybe-distclean-gcc  \
+distclean-host:  \
      maybe-distclean-ash \
      maybe-distclean-autoconf \
      maybe-distclean-automake \
@@ -1355,6 +1510,7 @@ distclean-host: maybe-distclean-gcc  \
      maybe-distclean-find \
      maybe-distclean-flex \
      maybe-distclean-gas \
+    maybe-distclean-gcc \
      maybe-distclean-gawk \
      maybe-distclean-gettext \
      maybe-distclean-gnuserv \
@@ -1366,6 +1522,7 @@ distclean-host: maybe-distclean-gcc  \
      maybe-distclean-tcl \
      maybe-distclean-itcl \
      maybe-distclean-ld \
+    maybe-distclean-libcpp \
      maybe-distclean-libgui \
      maybe-distclean-libiberty \
      maybe-distclean-libtool \
@@ -1396,15 +1553,15 @@ distclean-host: maybe-distclean-gcc  \
      maybe-distclean-expect \
      maybe-distclean-guile \
      maybe-distclean-tk \
-    maybe-distclean-tix \
      maybe-distclean-libtermcap \
      maybe-distclean-utils
  
  .PHONY: distclean-target
  distclean-target:  \
      maybe-distclean-target-libstdc++-v3 \
+    maybe-distclean-target-libmudflap \
      maybe-distclean-target-newlib \
-    maybe-distclean-target-libf2c \
+    maybe-distclean-target-libgfortran \
      maybe-distclean-target-libobjc \
      maybe-distclean-target-libtermcap \
      maybe-distclean-target-winsup \
@@ -1421,10 +1578,10 @@ distclean-target:  \
      maybe-distclean-target-libada
  
  .PHONY: do-maintainer-clean
-do-maintainer-clean: maintainer-clean-host maintainer-clean-target
+do-maintainer-clean: unstage maintainer-clean-host maintainer-clean-target stage
  
  .PHONY: maintainer-clean-host
-maintainer-clean-host: maybe-maintainer-clean-gcc  \
+maintainer-clean-host:  \
      maybe-maintainer-clean-ash \
      maybe-maintainer-clean-autoconf \
      maybe-maintainer-clean-automake \
@@ -1445,6 +1602,7 @@ maintainer-clean-host: maybe-maintainer-clean-gcc  \
      maybe-maintainer-clean-find \
      maybe-maintainer-clean-flex \
      maybe-maintainer-clean-gas \
+    maybe-maintainer-clean-gcc \
      maybe-maintainer-clean-gawk \
      maybe-maintainer-clean-gettext \
      maybe-maintainer-clean-gnuserv \
@@ -1456,6 +1614,7 @@ maintainer-clean-host: maybe-maintainer-clean-gcc  \
      maybe-maintainer-clean-tcl \
      maybe-maintainer-clean-itcl \
      maybe-maintainer-clean-ld \
+    maybe-maintainer-clean-libcpp \
      maybe-maintainer-clean-libgui \
      maybe-maintainer-clean-libiberty \
      maybe-maintainer-clean-libtool \
@@ -1486,15 +1645,15 @@ maintainer-clean-host: maybe-maintainer-clean-gcc  \
      maybe-maintainer-clean-expect \
      maybe-maintainer-clean-guile \
      maybe-maintainer-clean-tk \
-    maybe-maintainer-clean-tix \
      maybe-maintainer-clean-libtermcap \
      maybe-maintainer-clean-utils
  
  .PHONY: maintainer-clean-target
  maintainer-clean-target:  \
      maybe-maintainer-clean-target-libstdc++-v3 \
+    maybe-maintainer-clean-target-libmudflap \
      maybe-maintainer-clean-target-newlib \
-    maybe-maintainer-clean-target-libf2c \
+    maybe-maintainer-clean-target-libgfortran \
      maybe-maintainer-clean-target-libobjc \
      maybe-maintainer-clean-target-libtermcap \
      maybe-maintainer-clean-target-winsup \
@@ -1571,7 +1730,7 @@ clean-target-libgcc:
  check: do-check
  
  # Only include modules actually being configured and built.
-do-check: maybe-check-gcc  \
+do-check: unstage  \
      maybe-check-ash \
      maybe-check-autoconf \
      maybe-check-automake \
@@ -1592,6 +1751,7 @@ do-check: maybe-check-gcc  \
      maybe-check-find \
      maybe-check-flex \
      maybe-check-gas \
+    maybe-check-gcc \
      maybe-check-gawk \
      maybe-check-gettext \
      maybe-check-gnuserv \
@@ -1603,6 +1763,7 @@ do-check: maybe-check-gcc  \
      maybe-check-tcl \
      maybe-check-itcl \
      maybe-check-ld \
+    maybe-check-libcpp \
      maybe-check-libgui \
      maybe-check-libiberty \
      maybe-check-libtool \
@@ -1633,12 +1794,12 @@ do-check: maybe-check-gcc  \
      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-libmudflap \
      maybe-check-target-newlib \
-    maybe-check-target-libf2c \
+    maybe-check-target-libgfortran \
      maybe-check-target-libobjc \
      maybe-check-target-libtermcap \
      maybe-check-target-winsup \
@@ -1652,7 +1813,7 @@ do-check: maybe-check-gcc  \
      maybe-check-target-boehm-gc \
      maybe-check-target-qthreads \
      maybe-check-target-rda \
-    maybe-check-target-libada
+    maybe-check-target-libada stage
  
  # Automated reporting of test results.
  
@@ -1713,6 +1874,7 @@ install-host-nogcc:  \
      maybe-install-tcl \
      maybe-install-itcl \
      maybe-install-ld \
+    maybe-install-libcpp \
      maybe-install-libgui \
      maybe-install-libiberty \
      maybe-install-libtool \
@@ -1743,12 +1905,11 @@ install-host-nogcc:  \
      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  \
+install-host:  \
      maybe-install-ash \
      maybe-install-autoconf \
      maybe-install-automake \
@@ -1769,6 +1930,7 @@ install-host: maybe-install-gcc  \
      maybe-install-find \
      maybe-install-flex \
      maybe-install-gas \
+    maybe-install-gcc \
      maybe-install-gawk \
      maybe-install-gettext \
      maybe-install-gnuserv \
@@ -1780,6 +1942,7 @@ install-host: maybe-install-gcc  \
      maybe-install-tcl \
      maybe-install-itcl \
      maybe-install-ld \
+    maybe-install-libcpp \
      maybe-install-libgui \
      maybe-install-libiberty \
      maybe-install-libtool \
@@ -1810,15 +1973,15 @@ install-host: maybe-install-gcc  \
      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-libmudflap \
      maybe-install-target-newlib \
-    maybe-install-target-libf2c \
+    maybe-install-target-libgfortran \
      maybe-install-target-libobjc \
      maybe-install-target-libtermcap \
      maybe-install-target-winsup \
@@ -1842,6 +2005,7 @@ install.all: install-no-fixedincludes
         @if [ -f ./gcc/Makefile ] ; then \
                 r=`${PWD_COMMAND}` ; export r ; \
                 $(SET_LIB_PATH) \
+               $(HOST_EXPORTS) \
                 (cd ./gcc && \
                 $(MAKE) $(FLAGS_TO_PASS) install-headers) ; \
         else \
@@ -1890,25 +2054,14 @@ TAGS: do-TAGS
  
  .PHONY: configure-build-libiberty maybe-configure-build-libiberty
  maybe-configure-build-libiberty:
+@if build-libiberty
+maybe-configure-build-libiberty: configure-build-libiberty
  configure-build-libiberty:
         @test ! -f $(BUILD_SUBDIR)/libiberty/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/libiberty ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; 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; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       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; \
+       $(BUILD_EXPORTS) \
         echo Configuring in $(BUILD_SUBDIR)/libiberty; \
         cd "$(BUILD_SUBDIR)/libiberty" || exit 1; \
         case $(srcdir) in \
@@ -1947,137 +2100,546 @@ configure-build-libiberty:
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
           $(BUILD_CONFIGARGS) $${srcdiroption} \
-         --with-build-subdir="$(BUILD_SUBDIR)" \
+         --with-build-subdir="$(BUILD_SUBDIR)"  \
           || exit 1
+@endif build-libiberty
  
  .PHONY: all-build-libiberty maybe-all-build-libiberty
  maybe-all-build-libiberty:
+@if build-libiberty
+TARGET-build-libiberty=all
+maybe-all-build-libiberty: all-build-libiberty
  all-build-libiberty: configure-build-libiberty
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       (cd $(BUILD_SUBDIR)/libiberty && $(MAKE) all)
-
+       $(BUILD_EXPORTS) \
+       (cd $(BUILD_SUBDIR)/libiberty && \
+         $(MAKE)  $(TARGET-build-libiberty))
+@endif build-libiberty
  
-# --------------------------------------
-# Modules which run on the host machine
-# --------------------------------------
-
-.PHONY: configure-ash maybe-configure-ash
-maybe-configure-ash:
-configure-ash:
-       @test ! -f ash/Makefile || exit 0; \
-       [ -d ash ] || mkdir ash; \
+.PHONY: configure-build-bison maybe-configure-build-bison
+maybe-configure-build-bison:
+@if build-bison
+maybe-configure-build-bison: configure-build-bison
+configure-build-bison:
+       @test ! -f $(BUILD_SUBDIR)/bison/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/bison ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in ash; \
-       cd ash || exit 1; \
+       $(BUILD_EXPORTS) \
+       echo Configuring in $(BUILD_SUBDIR)/bison; \
+       cd "$(BUILD_SUBDIR)/bison" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/ash"; \
-           libsrcdir="$$s/ash";; \
+           topdir=$(srcdir) ;; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/ash"; \
-           libsrcdir="$$s/ash";; \
+           case "$(BUILD_SUBDIR)" in \
+             .) topdir="../$(srcdir)" ;; \
+             *) topdir="../../$(srcdir)" ;; \
+           esac ;; \
         esac; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+       if [ "$(srcdir)" = "." ] ; then \
+         if [ "$(BUILD_SUBDIR)" != "." ] ; then \
+           if $(SHELL) $$s/symlink-tree $${topdir}/bison "no-such-file" ; then \
+             if [ -f Makefile ]; then \
+               if $(MAKE) distclean; then \
+                 true; \
+               else \
+                 exit 1; \
+               fi; \
+             else \
+               true; \
+             fi; \
+           else \
+             exit 1; \
+           fi; \
+         else \
+           true; \
+         fi; \
+         srcdiroption="--srcdir=."; \
+         libsrcdir="."; \
+       else \
+         srcdiroption="--srcdir=$${topdir}/bison"; \
+         libsrcdir="$$s/bison"; \
+       fi; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(BUILD_CONFIGARGS) $${srcdiroption} \
+         --with-build-subdir="$(BUILD_SUBDIR)"  \
           || exit 1
+@endif build-bison
  
-.PHONY: all-ash maybe-all-ash
-maybe-all-ash:
-all-ash: configure-ash
+.PHONY: all-build-bison maybe-all-build-bison
+maybe-all-build-bison:
+@if build-bison
+TARGET-build-bison=all
+maybe-all-build-bison: all-build-bison
+all-build-bison: configure-build-bison
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       (cd ash && $(MAKE) $(FLAGS_TO_PASS) all)
-
-.PHONY: check-ash maybe-check-ash
-maybe-check-ash:
+       $(BUILD_EXPORTS) \
+       (cd $(BUILD_SUBDIR)/bison && \
+         $(MAKE)  $(TARGET-build-bison))
+@endif build-bison
  
-check-ash:
-       @r=`${PWD_COMMAND}`; export r; \
+.PHONY: configure-build-byacc maybe-configure-build-byacc
+maybe-configure-build-byacc:
+@if build-byacc
+maybe-configure-build-byacc: configure-build-byacc
+configure-build-byacc:
+       @test ! -f $(BUILD_SUBDIR)/byacc/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/byacc ; \
+       r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       (cd ash && $(MAKE) $(FLAGS_TO_PASS) check)
-
-
-.PHONY: install-ash maybe-install-ash
-maybe-install-ash:
+       $(BUILD_EXPORTS) \
+       echo Configuring in $(BUILD_SUBDIR)/byacc; \
+       cd "$(BUILD_SUBDIR)/byacc" || 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}/byacc "no-such-file" ; then \
+             if [ -f Makefile ]; then \
+               if $(MAKE) distclean; then \
+                 true; \
+               else \
+                 exit 1; \
+               fi; \
+             else \
+               true; \
+             fi; \
+           else \
+             exit 1; \
+           fi; \
+         else \
+           true; \
+         fi; \
+         srcdiroption="--srcdir=."; \
+         libsrcdir="."; \
+       else \
+         srcdiroption="--srcdir=$${topdir}/byacc"; \
+         libsrcdir="$$s/byacc"; \
+       fi; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(BUILD_CONFIGARGS) $${srcdiroption} \
+         --with-build-subdir="$(BUILD_SUBDIR)"  \
+         || exit 1
+@endif build-byacc
  
-install-ash: installdirs
+.PHONY: all-build-byacc maybe-all-build-byacc
+maybe-all-build-byacc:
+@if build-byacc
+TARGET-build-byacc=all
+maybe-all-build-byacc: all-build-byacc
+all-build-byacc: configure-build-byacc
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       (cd ash && $(MAKE) $(FLAGS_TO_PASS) install)
-
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-ash info-ash
-maybe-info-ash:
+       $(BUILD_EXPORTS) \
+       (cd $(BUILD_SUBDIR)/byacc && \
+         $(MAKE)  $(TARGET-build-byacc))
+@endif build-byacc
  
-info-ash: \
-    configure-ash 
-       @[ -f ./ash/Makefile ] || exit 0; \
+.PHONY: configure-build-flex maybe-configure-build-flex
+maybe-configure-build-flex:
+@if build-flex
+maybe-configure-build-flex: configure-build-flex
+configure-build-flex:
+       @test ! -f $(BUILD_SUBDIR)/flex/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/flex ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing info in ash" ; \
-       (cd ash && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+       $(BUILD_EXPORTS) \
+       echo Configuring in $(BUILD_SUBDIR)/flex; \
+       cd "$(BUILD_SUBDIR)/flex" || 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}/flex "no-such-file" ; then \
+             if [ -f Makefile ]; then \
+               if $(MAKE) distclean; then \
+                 true; \
+               else \
+                 exit 1; \
+               fi; \
+             else \
+               true; \
+             fi; \
+           else \
+             exit 1; \
+           fi; \
+         else \
+           true; \
+         fi; \
+         srcdiroption="--srcdir=."; \
+         libsrcdir="."; \
+       else \
+         srcdiroption="--srcdir=$${topdir}/flex"; \
+         libsrcdir="$$s/flex"; \
+       fi; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(BUILD_CONFIGARGS) $${srcdiroption} \
+         --with-build-subdir="$(BUILD_SUBDIR)"  \
           || exit 1
+@endif build-flex
  
+.PHONY: all-build-flex maybe-all-build-flex
+maybe-all-build-flex:
+@if build-flex
+TARGET-build-flex=all
+maybe-all-build-flex: all-build-flex
+all-build-flex: configure-build-flex
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(BUILD_EXPORTS) \
+       (cd $(BUILD_SUBDIR)/flex && \
+         $(MAKE)  $(TARGET-build-flex))
+@endif build-flex
  
-.PHONY: maybe-dvi-ash dvi-ash
-maybe-dvi-ash:
-
-dvi-ash: \
-    configure-ash 
-       @[ -f ./ash/Makefile ] || exit 0; \
+.PHONY: configure-build-m4 maybe-configure-build-m4
+maybe-configure-build-m4:
+@if build-m4
+maybe-configure-build-m4: configure-build-m4
+configure-build-m4:
+       @test ! -f $(BUILD_SUBDIR)/m4/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/m4 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing dvi in ash" ; \
-       (cd ash && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+       $(BUILD_EXPORTS) \
+       echo Configuring in $(BUILD_SUBDIR)/m4; \
+       cd "$(BUILD_SUBDIR)/m4" || 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}/m4 "no-such-file" ; then \
+             if [ -f Makefile ]; then \
+               if $(MAKE) distclean; then \
+                 true; \
+               else \
+                 exit 1; \
+               fi; \
+             else \
+               true; \
+             fi; \
+           else \
+             exit 1; \
+           fi; \
+         else \
+           true; \
+         fi; \
+         srcdiroption="--srcdir=."; \
+         libsrcdir="."; \
+       else \
+         srcdiroption="--srcdir=$${topdir}/m4"; \
+         libsrcdir="$$s/m4"; \
+       fi; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(BUILD_CONFIGARGS) $${srcdiroption} \
+         --with-build-subdir="$(BUILD_SUBDIR)"  \
+         || exit 1
+@endif build-m4
+
+.PHONY: all-build-m4 maybe-all-build-m4
+maybe-all-build-m4:
+@if build-m4
+TARGET-build-m4=all
+maybe-all-build-m4: all-build-m4
+all-build-m4: configure-build-m4
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(BUILD_EXPORTS) \
+       (cd $(BUILD_SUBDIR)/m4 && \
+         $(MAKE)  $(TARGET-build-m4))
+@endif build-m4
+
+.PHONY: configure-build-texinfo maybe-configure-build-texinfo
+maybe-configure-build-texinfo:
+@if build-texinfo
+maybe-configure-build-texinfo: configure-build-texinfo
+configure-build-texinfo:
+       @test ! -f $(BUILD_SUBDIR)/texinfo/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/texinfo ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(BUILD_EXPORTS) \
+       echo Configuring in $(BUILD_SUBDIR)/texinfo; \
+       cd "$(BUILD_SUBDIR)/texinfo" || 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}/texinfo "no-such-file" ; then \
+             if [ -f Makefile ]; then \
+               if $(MAKE) distclean; then \
+                 true; \
+               else \
+                 exit 1; \
+               fi; \
+             else \
+               true; \
+             fi; \
+           else \
+             exit 1; \
+           fi; \
+         else \
+           true; \
+         fi; \
+         srcdiroption="--srcdir=."; \
+         libsrcdir="."; \
+       else \
+         srcdiroption="--srcdir=$${topdir}/texinfo"; \
+         libsrcdir="$$s/texinfo"; \
+       fi; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(BUILD_CONFIGARGS) $${srcdiroption} \
+         --with-build-subdir="$(BUILD_SUBDIR)"  \
+         || exit 1
+@endif build-texinfo
+
+.PHONY: all-build-texinfo maybe-all-build-texinfo
+maybe-all-build-texinfo:
+@if build-texinfo
+TARGET-build-texinfo=all
+maybe-all-build-texinfo: all-build-texinfo
+all-build-texinfo: configure-build-texinfo
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(BUILD_EXPORTS) \
+       (cd $(BUILD_SUBDIR)/texinfo && \
+         $(MAKE)  $(TARGET-build-texinfo))
+@endif build-texinfo
+
+.PHONY: configure-build-fixincludes maybe-configure-build-fixincludes
+maybe-configure-build-fixincludes:
+@if build-fixincludes
+maybe-configure-build-fixincludes: configure-build-fixincludes
+configure-build-fixincludes:
+       @test ! -f $(BUILD_SUBDIR)/fixincludes/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/fixincludes ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(BUILD_EXPORTS) \
+       echo Configuring in $(BUILD_SUBDIR)/fixincludes; \
+       cd "$(BUILD_SUBDIR)/fixincludes" || 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}/fixincludes "no-such-file" ; then \
+             if [ -f Makefile ]; then \
+               if $(MAKE) distclean; then \
+                 true; \
+               else \
+                 exit 1; \
+               fi; \
+             else \
+               true; \
+             fi; \
+           else \
+             exit 1; \
+           fi; \
+         else \
+           true; \
+         fi; \
+         srcdiroption="--srcdir=."; \
+         libsrcdir="."; \
+       else \
+         srcdiroption="--srcdir=$${topdir}/fixincludes"; \
+         libsrcdir="$$s/fixincludes"; \
+       fi; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(BUILD_CONFIGARGS) $${srcdiroption} \
+         --with-build-subdir="$(BUILD_SUBDIR)"  \
+         || exit 1
+@endif build-fixincludes
+
+.PHONY: all-build-fixincludes maybe-all-build-fixincludes
+maybe-all-build-fixincludes:
+@if build-fixincludes
+TARGET-build-fixincludes=all
+maybe-all-build-fixincludes: all-build-fixincludes
+all-build-fixincludes: configure-build-fixincludes
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(BUILD_EXPORTS) \
+       (cd $(BUILD_SUBDIR)/fixincludes && \
+         $(MAKE)  $(TARGET-build-fixincludes))
+@endif build-fixincludes
+
+
+# --------------------------------------
+# Modules which run on the host machine
+# --------------------------------------
+
+.PHONY: configure-ash maybe-configure-ash
+maybe-configure-ash:
+@if ash
+maybe-configure-ash: configure-ash
+configure-ash:
+       @test ! -f ash/Makefile || exit 0; \
+       [ -d ash ] || mkdir ash; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       echo Configuring in ash; \
+       cd ash || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/ash"; \
+           libsrcdir="$$s/ash";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/ash"; \
+           libsrcdir="$$s/ash";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
+         || exit 1
+@endif ash
+
+.PHONY: all-ash maybe-all-ash
+maybe-all-ash:
+@if ash
+TARGET-ash=all
+maybe-all-ash: all-ash
+all-ash: configure-ash
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       (cd ash && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-ash))
+@endif ash
+
+.PHONY: check-ash maybe-check-ash
+maybe-check-ash:
+@if ash
+maybe-check-ash: check-ash
+
+check-ash:
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       (cd ash && $(MAKE) $(FLAGS_TO_PASS) check)
+
+@endif ash
+
+.PHONY: install-ash maybe-install-ash
+maybe-install-ash:
+@if ash
+maybe-install-ash: install-ash
+
+install-ash: installdirs
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       (cd ash && $(MAKE) $(FLAGS_TO_PASS) install)
+
+@endif ash
+
+# Other targets (info, dvi, etc.)
+
+.PHONY: maybe-info-ash info-ash
+maybe-info-ash:
+@if ash
+maybe-info-ash: info-ash
+
+info-ash: \
+    configure-ash 
+       @[ -f ./ash/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing info in ash" ; \
+       (cd ash && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 info) \
+         || exit 1
+
+@endif ash
+
+.PHONY: maybe-dvi-ash dvi-ash
+maybe-dvi-ash:
+@if ash
+maybe-dvi-ash: dvi-ash
+
+dvi-ash: \
+    configure-ash 
+       @[ -f ./ash/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing dvi in ash" ; \
+       (cd ash && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
                   dvi) \
           || exit 1
  
+@endif ash
  
  .PHONY: maybe-TAGS-ash TAGS-ash
  maybe-TAGS-ash:
+@if ash
+maybe-TAGS-ash: TAGS-ash
  
  TAGS-ash: \
      configure-ash 
@@ -2085,7 +2647,8 @@ TAGS-ash: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in ash" ; \
@@ -2097,9 +2660,12 @@ TAGS-ash: \
                   TAGS) \
           || exit 1
  
+@endif ash
  
  .PHONY: maybe-install-info-ash install-info-ash
  maybe-install-info-ash:
+@if ash
+maybe-install-info-ash: install-info-ash
  
  install-info-ash: \
      configure-ash \
@@ -2108,7 +2674,8 @@ install-info-ash: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in ash" ; \
@@ -2120,9 +2687,12 @@ install-info-ash: \
                   install-info) \
           || exit 1
  
+@endif ash
  
  .PHONY: maybe-installcheck-ash installcheck-ash
  maybe-installcheck-ash:
+@if ash
+maybe-installcheck-ash: installcheck-ash
  
  installcheck-ash: \
      configure-ash 
@@ -2130,7 +2700,8 @@ installcheck-ash: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in ash" ; \
@@ -2142,16 +2713,20 @@ installcheck-ash: \
                   installcheck) \
           || exit 1
  
+@endif ash
  
  .PHONY: maybe-mostlyclean-ash mostlyclean-ash
  maybe-mostlyclean-ash:
+@if ash
+maybe-mostlyclean-ash: mostlyclean-ash
  
  mostlyclean-ash: 
         @[ -f ./ash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in ash" ; \
@@ -2163,16 +2738,20 @@ mostlyclean-ash:
                   mostlyclean) \
           || exit 1
  
+@endif ash
  
  .PHONY: maybe-clean-ash clean-ash
  maybe-clean-ash:
+@if ash
+maybe-clean-ash: clean-ash
  
  clean-ash: 
         @[ -f ./ash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in ash" ; \
@@ -2184,16 +2763,20 @@ clean-ash:
                   clean) \
           || exit 1
  
+@endif ash
  
  .PHONY: maybe-distclean-ash distclean-ash
  maybe-distclean-ash:
+@if ash
+maybe-distclean-ash: distclean-ash
  
  distclean-ash: 
         @[ -f ./ash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in ash" ; \
@@ -2205,16 +2788,20 @@ distclean-ash:
                   distclean) \
           || exit 1
  
+@endif ash
  
  .PHONY: maybe-maintainer-clean-ash maintainer-clean-ash
  maybe-maintainer-clean-ash:
+@if ash
+maybe-maintainer-clean-ash: maintainer-clean-ash
  
  maintainer-clean-ash: 
         @[ -f ./ash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in ash" ; \
@@ -2226,31 +2813,19 @@ maintainer-clean-ash:
                   maintainer-clean) \
           || exit 1
  
+@endif ash
  
  
  .PHONY: configure-autoconf maybe-configure-autoconf
  maybe-configure-autoconf:
+@if autoconf
+maybe-configure-autoconf: configure-autoconf
  configure-autoconf:
         @test ! -f autoconf/Makefile || exit 0; \
         [ -d autoconf ] || mkdir autoconf; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in autoconf; \
         cd autoconf || exit 1; \
         case $(srcdir) in \
@@ -2265,41 +2840,58 @@ configure-autoconf:
             libsrcdir="$$s/autoconf";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif autoconf
  
  .PHONY: all-autoconf maybe-all-autoconf
  maybe-all-autoconf:
+@if autoconf
+TARGET-autoconf=all
+maybe-all-autoconf: all-autoconf
  all-autoconf: configure-autoconf
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd autoconf && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd autoconf && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-autoconf))
+@endif autoconf
  
  .PHONY: check-autoconf maybe-check-autoconf
  maybe-check-autoconf:
+@if autoconf
+maybe-check-autoconf: check-autoconf
  
  check-autoconf:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd autoconf && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif autoconf
  
  .PHONY: install-autoconf maybe-install-autoconf
  maybe-install-autoconf:
+@if autoconf
+maybe-install-autoconf: install-autoconf
  
  install-autoconf: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd autoconf && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif autoconf
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-autoconf info-autoconf
  maybe-info-autoconf:
+@if autoconf
+maybe-info-autoconf: info-autoconf
  
  info-autoconf: \
      configure-autoconf 
@@ -2307,7 +2899,8 @@ info-autoconf: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in autoconf" ; \
@@ -2319,9 +2912,12 @@ info-autoconf: \
                   info) \
           || exit 1
  
+@endif autoconf
  
  .PHONY: maybe-dvi-autoconf dvi-autoconf
  maybe-dvi-autoconf:
+@if autoconf
+maybe-dvi-autoconf: dvi-autoconf
  
  dvi-autoconf: \
      configure-autoconf 
@@ -2329,7 +2925,8 @@ dvi-autoconf: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in autoconf" ; \
@@ -2341,9 +2938,12 @@ dvi-autoconf: \
                   dvi) \
           || exit 1
  
+@endif autoconf
  
  .PHONY: maybe-TAGS-autoconf TAGS-autoconf
  maybe-TAGS-autoconf:
+@if autoconf
+maybe-TAGS-autoconf: TAGS-autoconf
  
  TAGS-autoconf: \
      configure-autoconf 
@@ -2351,7 +2951,8 @@ TAGS-autoconf: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in autoconf" ; \
@@ -2363,9 +2964,12 @@ TAGS-autoconf: \
                   TAGS) \
           || exit 1
  
+@endif autoconf
  
  .PHONY: maybe-install-info-autoconf install-info-autoconf
  maybe-install-info-autoconf:
+@if autoconf
+maybe-install-info-autoconf: install-info-autoconf
  
  install-info-autoconf: \
      configure-autoconf \
@@ -2374,7 +2978,8 @@ install-info-autoconf: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in autoconf" ; \
@@ -2386,9 +2991,12 @@ install-info-autoconf: \
                   install-info) \
           || exit 1
  
+@endif autoconf
  
  .PHONY: maybe-installcheck-autoconf installcheck-autoconf
  maybe-installcheck-autoconf:
+@if autoconf
+maybe-installcheck-autoconf: installcheck-autoconf
  
  installcheck-autoconf: \
      configure-autoconf 
@@ -2396,7 +3004,8 @@ installcheck-autoconf: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in autoconf" ; \
@@ -2408,16 +3017,20 @@ installcheck-autoconf: \
                   installcheck) \
           || exit 1
  
+@endif autoconf
  
  .PHONY: maybe-mostlyclean-autoconf mostlyclean-autoconf
  maybe-mostlyclean-autoconf:
+@if autoconf
+maybe-mostlyclean-autoconf: mostlyclean-autoconf
  
  mostlyclean-autoconf: 
         @[ -f ./autoconf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in autoconf" ; \
@@ -2429,16 +3042,20 @@ mostlyclean-autoconf:
                   mostlyclean) \
           || exit 1
  
+@endif autoconf
  
  .PHONY: maybe-clean-autoconf clean-autoconf
  maybe-clean-autoconf:
+@if autoconf
+maybe-clean-autoconf: clean-autoconf
  
  clean-autoconf: 
         @[ -f ./autoconf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in autoconf" ; \
@@ -2450,16 +3067,20 @@ clean-autoconf:
                   clean) \
           || exit 1
  
+@endif autoconf
  
  .PHONY: maybe-distclean-autoconf distclean-autoconf
  maybe-distclean-autoconf:
+@if autoconf
+maybe-distclean-autoconf: distclean-autoconf
  
  distclean-autoconf: 
         @[ -f ./autoconf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in autoconf" ; \
@@ -2471,16 +3092,20 @@ distclean-autoconf:
                   distclean) \
           || exit 1
  
+@endif autoconf
  
  .PHONY: maybe-maintainer-clean-autoconf maintainer-clean-autoconf
  maybe-maintainer-clean-autoconf:
+@if autoconf
+maybe-maintainer-clean-autoconf: maintainer-clean-autoconf
  
  maintainer-clean-autoconf: 
         @[ -f ./autoconf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in autoconf" ; \
@@ -2492,31 +3117,19 @@ maintainer-clean-autoconf:
                   maintainer-clean) \
           || exit 1
  
+@endif autoconf
  
  
  .PHONY: configure-automake maybe-configure-automake
  maybe-configure-automake:
+@if automake
+maybe-configure-automake: configure-automake
  configure-automake:
         @test ! -f automake/Makefile || exit 0; \
         [ -d automake ] || mkdir automake; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in automake; \
         cd automake || exit 1; \
         case $(srcdir) in \
@@ -2531,41 +3144,58 @@ configure-automake:
             libsrcdir="$$s/automake";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif automake
  
  .PHONY: all-automake maybe-all-automake
  maybe-all-automake:
+@if automake
+TARGET-automake=all
+maybe-all-automake: all-automake
  all-automake: configure-automake
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd automake && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd automake && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-automake))
+@endif automake
  
  .PHONY: check-automake maybe-check-automake
  maybe-check-automake:
+@if automake
+maybe-check-automake: check-automake
  
  check-automake:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd automake && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif automake
  
  .PHONY: install-automake maybe-install-automake
  maybe-install-automake:
+@if automake
+maybe-install-automake: install-automake
  
  install-automake: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd automake && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif automake
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-automake info-automake
  maybe-info-automake:
+@if automake
+maybe-info-automake: info-automake
  
  info-automake: \
      configure-automake 
@@ -2573,7 +3203,8 @@ info-automake: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in automake" ; \
@@ -2585,9 +3216,12 @@ info-automake: \
                   info) \
           || exit 1
  
+@endif automake
  
  .PHONY: maybe-dvi-automake dvi-automake
  maybe-dvi-automake:
+@if automake
+maybe-dvi-automake: dvi-automake
  
  dvi-automake: \
      configure-automake 
@@ -2595,7 +3229,8 @@ dvi-automake: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in automake" ; \
@@ -2607,9 +3242,12 @@ dvi-automake: \
                   dvi) \
           || exit 1
  
+@endif automake
  
  .PHONY: maybe-TAGS-automake TAGS-automake
  maybe-TAGS-automake:
+@if automake
+maybe-TAGS-automake: TAGS-automake
  
  TAGS-automake: \
      configure-automake 
@@ -2617,7 +3255,8 @@ TAGS-automake: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in automake" ; \
@@ -2629,9 +3268,12 @@ TAGS-automake: \
                   TAGS) \
           || exit 1
  
+@endif automake
  
  .PHONY: maybe-install-info-automake install-info-automake
  maybe-install-info-automake:
+@if automake
+maybe-install-info-automake: install-info-automake
  
  install-info-automake: \
      configure-automake \
@@ -2640,7 +3282,8 @@ install-info-automake: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in automake" ; \
@@ -2652,9 +3295,12 @@ install-info-automake: \
                   install-info) \
           || exit 1
  
+@endif automake
  
  .PHONY: maybe-installcheck-automake installcheck-automake
  maybe-installcheck-automake:
+@if automake
+maybe-installcheck-automake: installcheck-automake
  
  installcheck-automake: \
      configure-automake 
@@ -2662,7 +3308,8 @@ installcheck-automake: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in automake" ; \
@@ -2674,16 +3321,20 @@ installcheck-automake: \
                   installcheck) \
           || exit 1
  
+@endif automake
  
  .PHONY: maybe-mostlyclean-automake mostlyclean-automake
  maybe-mostlyclean-automake:
+@if automake
+maybe-mostlyclean-automake: mostlyclean-automake
  
  mostlyclean-automake: 
         @[ -f ./automake/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in automake" ; \
@@ -2695,16 +3346,20 @@ mostlyclean-automake:
                   mostlyclean) \
           || exit 1
  
+@endif automake
  
  .PHONY: maybe-clean-automake clean-automake
  maybe-clean-automake:
+@if automake
+maybe-clean-automake: clean-automake
  
  clean-automake: 
         @[ -f ./automake/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in automake" ; \
@@ -2716,16 +3371,20 @@ clean-automake:
                   clean) \
           || exit 1
  
+@endif automake
  
  .PHONY: maybe-distclean-automake distclean-automake
  maybe-distclean-automake:
+@if automake
+maybe-distclean-automake: distclean-automake
  
  distclean-automake: 
         @[ -f ./automake/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in automake" ; \
@@ -2737,16 +3396,20 @@ distclean-automake:
                   distclean) \
           || exit 1
  
+@endif automake
  
  .PHONY: maybe-maintainer-clean-automake maintainer-clean-automake
  maybe-maintainer-clean-automake:
+@if automake
+maybe-maintainer-clean-automake: maintainer-clean-automake
  
  maintainer-clean-automake: 
         @[ -f ./automake/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in automake" ; \
@@ -2758,31 +3421,19 @@ maintainer-clean-automake:
                   maintainer-clean) \
           || exit 1
  
+@endif automake
  
  
  .PHONY: configure-bash maybe-configure-bash
  maybe-configure-bash:
+@if bash
+maybe-configure-bash: configure-bash
  configure-bash:
         @test ! -f bash/Makefile || exit 0; \
         [ -d bash ] || mkdir bash; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in bash; \
         cd bash || exit 1; \
         case $(srcdir) in \
@@ -2797,41 +3448,58 @@ configure-bash:
             libsrcdir="$$s/bash";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif bash
  
  .PHONY: all-bash maybe-all-bash
  maybe-all-bash:
+@if bash
+TARGET-bash=all
+maybe-all-bash: all-bash
  all-bash: configure-bash
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd bash && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd bash && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-bash))
+@endif bash
  
  .PHONY: check-bash maybe-check-bash
  maybe-check-bash:
+@if bash
+maybe-check-bash: check-bash
  
  check-bash:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd bash && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif bash
  
  .PHONY: install-bash maybe-install-bash
  maybe-install-bash:
+@if bash
+maybe-install-bash: install-bash
  
  install-bash: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd bash && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif bash
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-bash info-bash
  maybe-info-bash:
+@if bash
+maybe-info-bash: info-bash
  
  info-bash: \
      configure-bash 
@@ -2839,7 +3507,8 @@ info-bash: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in bash" ; \
@@ -2851,9 +3520,12 @@ info-bash: \
                   info) \
           || exit 1
  
+@endif bash
  
  .PHONY: maybe-dvi-bash dvi-bash
  maybe-dvi-bash:
+@if bash
+maybe-dvi-bash: dvi-bash
  
  dvi-bash: \
      configure-bash 
@@ -2861,7 +3533,8 @@ dvi-bash: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in bash" ; \
@@ -2873,9 +3546,12 @@ dvi-bash: \
                   dvi) \
           || exit 1
  
+@endif bash
  
  .PHONY: maybe-TAGS-bash TAGS-bash
  maybe-TAGS-bash:
+@if bash
+maybe-TAGS-bash: TAGS-bash
  
  TAGS-bash: \
      configure-bash 
@@ -2883,7 +3559,8 @@ TAGS-bash: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in bash" ; \
@@ -2895,9 +3572,12 @@ TAGS-bash: \
                   TAGS) \
           || exit 1
  
+@endif bash
  
  .PHONY: maybe-install-info-bash install-info-bash
  maybe-install-info-bash:
+@if bash
+maybe-install-info-bash: install-info-bash
  
  install-info-bash: \
      configure-bash \
@@ -2906,7 +3586,8 @@ install-info-bash: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in bash" ; \
@@ -2918,9 +3599,12 @@ install-info-bash: \
                   install-info) \
           || exit 1
  
+@endif bash
  
  .PHONY: maybe-installcheck-bash installcheck-bash
  maybe-installcheck-bash:
+@if bash
+maybe-installcheck-bash: installcheck-bash
  
  installcheck-bash: \
      configure-bash 
@@ -2928,7 +3612,8 @@ installcheck-bash: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in bash" ; \
@@ -2940,16 +3625,20 @@ installcheck-bash: \
                   installcheck) \
           || exit 1
  
+@endif bash
  
  .PHONY: maybe-mostlyclean-bash mostlyclean-bash
  maybe-mostlyclean-bash:
+@if bash
+maybe-mostlyclean-bash: mostlyclean-bash
  
  mostlyclean-bash: 
         @[ -f ./bash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in bash" ; \
@@ -2961,16 +3650,20 @@ mostlyclean-bash:
                   mostlyclean) \
           || exit 1
  
+@endif bash
  
  .PHONY: maybe-clean-bash clean-bash
  maybe-clean-bash:
+@if bash
+maybe-clean-bash: clean-bash
  
  clean-bash: 
         @[ -f ./bash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in bash" ; \
@@ -2982,16 +3675,20 @@ clean-bash:
                   clean) \
           || exit 1
  
+@endif bash
  
  .PHONY: maybe-distclean-bash distclean-bash
  maybe-distclean-bash:
+@if bash
+maybe-distclean-bash: distclean-bash
  
  distclean-bash: 
         @[ -f ./bash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in bash" ; \
@@ -3003,16 +3700,20 @@ distclean-bash:
                   distclean) \
           || exit 1
  
+@endif bash
  
  .PHONY: maybe-maintainer-clean-bash maintainer-clean-bash
  maybe-maintainer-clean-bash:
+@if bash
+maybe-maintainer-clean-bash: maintainer-clean-bash
  
  maintainer-clean-bash: 
         @[ -f ./bash/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in bash" ; \
@@ -3024,31 +3725,20 @@ maintainer-clean-bash:
                   maintainer-clean) \
           || exit 1
  
+@endif bash
  
  
  .PHONY: configure-bfd maybe-configure-bfd
  maybe-configure-bfd:
+@if bfd
+maybe-configure-bfd: configure-bfd
  configure-bfd:
-       @test ! -f bfd/Makefile || exit 0; \
+       @test -f stage_last && exit 0; \
+       test ! -f bfd/Makefile || exit 0; \
         [ -d bfd ] || mkdir bfd; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in bfd; \
         cd bfd || exit 1; \
         case $(srcdir) in \
@@ -3063,41 +3753,59 @@ configure-bfd:
             libsrcdir="$$s/bfd";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif bfd
  
  .PHONY: all-bfd maybe-all-bfd
  maybe-all-bfd:
+@if bfd
+TARGET-bfd=all
+maybe-all-bfd: all-bfd
  all-bfd: configure-bfd
-       @r=`${PWD_COMMAND}`; export r; \
+       @test -f stage_last && exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd bfd && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd bfd && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-bfd))
+@endif bfd
  
  .PHONY: check-bfd maybe-check-bfd
  maybe-check-bfd:
+@if bfd
+maybe-check-bfd: check-bfd
  
  check-bfd:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd bfd && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif bfd
  
  .PHONY: install-bfd maybe-install-bfd
  maybe-install-bfd:
+@if bfd
+maybe-install-bfd: install-bfd
  
  install-bfd: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd bfd && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif bfd
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-bfd info-bfd
  maybe-info-bfd:
+@if bfd
+maybe-info-bfd: info-bfd
  
  info-bfd: \
      configure-bfd 
@@ -3105,7 +3813,8 @@ info-bfd: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in bfd" ; \
@@ -3117,9 +3826,12 @@ info-bfd: \
                   info) \
           || exit 1
  
+@endif bfd
  
  .PHONY: maybe-dvi-bfd dvi-bfd
  maybe-dvi-bfd:
+@if bfd
+maybe-dvi-bfd: dvi-bfd
  
  dvi-bfd: \
      configure-bfd 
@@ -3127,7 +3839,8 @@ dvi-bfd: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in bfd" ; \
@@ -3139,9 +3852,12 @@ dvi-bfd: \
                   dvi) \
           || exit 1
  
+@endif bfd
  
  .PHONY: maybe-TAGS-bfd TAGS-bfd
  maybe-TAGS-bfd:
+@if bfd
+maybe-TAGS-bfd: TAGS-bfd
  
  TAGS-bfd: \
      configure-bfd 
@@ -3149,7 +3865,8 @@ TAGS-bfd: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in bfd" ; \
@@ -3161,9 +3878,12 @@ TAGS-bfd: \
                   TAGS) \
           || exit 1
  
+@endif bfd
  
  .PHONY: maybe-install-info-bfd install-info-bfd
  maybe-install-info-bfd:
+@if bfd
+maybe-install-info-bfd: install-info-bfd
  
  install-info-bfd: \
      configure-bfd \
@@ -3172,7 +3892,8 @@ install-info-bfd: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in bfd" ; \
@@ -3184,9 +3905,12 @@ install-info-bfd: \
                   install-info) \
           || exit 1
  
+@endif bfd
  
  .PHONY: maybe-installcheck-bfd installcheck-bfd
  maybe-installcheck-bfd:
+@if bfd
+maybe-installcheck-bfd: installcheck-bfd
  
  installcheck-bfd: \
      configure-bfd 
@@ -3194,7 +3918,8 @@ installcheck-bfd: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in bfd" ; \
@@ -3206,16 +3931,20 @@ installcheck-bfd: \
                   installcheck) \
           || exit 1
  
+@endif bfd
  
  .PHONY: maybe-mostlyclean-bfd mostlyclean-bfd
  maybe-mostlyclean-bfd:
+@if bfd
+maybe-mostlyclean-bfd: mostlyclean-bfd
  
  mostlyclean-bfd: 
         @[ -f ./bfd/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in bfd" ; \
@@ -3227,16 +3956,20 @@ mostlyclean-bfd:
                   mostlyclean) \
           || exit 1
  
+@endif bfd
  
  .PHONY: maybe-clean-bfd clean-bfd
  maybe-clean-bfd:
+@if bfd
+maybe-clean-bfd: clean-bfd
  
  clean-bfd: 
         @[ -f ./bfd/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in bfd" ; \
@@ -3248,16 +3981,20 @@ clean-bfd:
                   clean) \
           || exit 1
  
+@endif bfd
  
  .PHONY: maybe-distclean-bfd distclean-bfd
  maybe-distclean-bfd:
+@if bfd
+maybe-distclean-bfd: distclean-bfd
  
  distclean-bfd: 
         @[ -f ./bfd/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in bfd" ; \
@@ -3269,16 +4006,20 @@ distclean-bfd:
                   distclean) \
           || exit 1
  
+@endif bfd
  
  .PHONY: maybe-maintainer-clean-bfd maintainer-clean-bfd
  maybe-maintainer-clean-bfd:
+@if bfd
+maybe-maintainer-clean-bfd: maintainer-clean-bfd
  
  maintainer-clean-bfd: 
         @[ -f ./bfd/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in bfd" ; \
@@ -3290,31 +4031,20 @@ maintainer-clean-bfd:
                   maintainer-clean) \
           || exit 1
  
+@endif bfd
  
  
  .PHONY: configure-opcodes maybe-configure-opcodes
  maybe-configure-opcodes:
+@if opcodes
+maybe-configure-opcodes: configure-opcodes
  configure-opcodes:
-       @test ! -f opcodes/Makefile || exit 0; \
+       @test -f stage_last && exit 0; \
+       test ! -f opcodes/Makefile || exit 0; \
         [ -d opcodes ] || mkdir opcodes; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in opcodes; \
         cd opcodes || exit 1; \
         case $(srcdir) in \
@@ -3329,41 +4059,59 @@ configure-opcodes:
             libsrcdir="$$s/opcodes";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif opcodes
  
  .PHONY: all-opcodes maybe-all-opcodes
  maybe-all-opcodes:
+@if opcodes
+TARGET-opcodes=all
+maybe-all-opcodes: all-opcodes
  all-opcodes: configure-opcodes
-       @r=`${PWD_COMMAND}`; export r; \
+       @test -f stage_last && exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd opcodes && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd opcodes && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-opcodes))
+@endif opcodes
  
  .PHONY: check-opcodes maybe-check-opcodes
  maybe-check-opcodes:
+@if opcodes
+maybe-check-opcodes: check-opcodes
  
  check-opcodes:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd opcodes && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif opcodes
  
  .PHONY: install-opcodes maybe-install-opcodes
  maybe-install-opcodes:
+@if opcodes
+maybe-install-opcodes: install-opcodes
  
  install-opcodes: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd opcodes && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif opcodes
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-opcodes info-opcodes
  maybe-info-opcodes:
+@if opcodes
+maybe-info-opcodes: info-opcodes
  
  info-opcodes: \
      configure-opcodes 
@@ -3371,7 +4119,8 @@ info-opcodes: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in opcodes" ; \
@@ -3383,9 +4132,12 @@ info-opcodes: \
                   info) \
           || exit 1
  
+@endif opcodes
  
  .PHONY: maybe-dvi-opcodes dvi-opcodes
  maybe-dvi-opcodes:
+@if opcodes
+maybe-dvi-opcodes: dvi-opcodes
  
  dvi-opcodes: \
      configure-opcodes 
@@ -3393,7 +4145,8 @@ dvi-opcodes: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in opcodes" ; \
@@ -3405,9 +4158,12 @@ dvi-opcodes: \
                   dvi) \
           || exit 1
  
+@endif opcodes
  
  .PHONY: maybe-TAGS-opcodes TAGS-opcodes
  maybe-TAGS-opcodes:
+@if opcodes
+maybe-TAGS-opcodes: TAGS-opcodes
  
  TAGS-opcodes: \
      configure-opcodes 
@@ -3415,7 +4171,8 @@ TAGS-opcodes: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in opcodes" ; \
@@ -3427,9 +4184,12 @@ TAGS-opcodes: \
                   TAGS) \
           || exit 1
  
+@endif opcodes
  
  .PHONY: maybe-install-info-opcodes install-info-opcodes
  maybe-install-info-opcodes:
+@if opcodes
+maybe-install-info-opcodes: install-info-opcodes
  
  install-info-opcodes: \
      configure-opcodes \
@@ -3438,7 +4198,8 @@ install-info-opcodes: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in opcodes" ; \
@@ -3450,9 +4211,12 @@ install-info-opcodes: \
                   install-info) \
           || exit 1
  
+@endif opcodes
  
  .PHONY: maybe-installcheck-opcodes installcheck-opcodes
  maybe-installcheck-opcodes:
+@if opcodes
+maybe-installcheck-opcodes: installcheck-opcodes
  
  installcheck-opcodes: \
      configure-opcodes 
@@ -3460,7 +4224,8 @@ installcheck-opcodes: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in opcodes" ; \
@@ -3472,16 +4237,20 @@ installcheck-opcodes: \
                   installcheck) \
           || exit 1
  
+@endif opcodes
  
  .PHONY: maybe-mostlyclean-opcodes mostlyclean-opcodes
  maybe-mostlyclean-opcodes:
+@if opcodes
+maybe-mostlyclean-opcodes: mostlyclean-opcodes
  
  mostlyclean-opcodes: 
         @[ -f ./opcodes/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in opcodes" ; \
@@ -3493,16 +4262,20 @@ mostlyclean-opcodes:
                   mostlyclean) \
           || exit 1
  
+@endif opcodes
  
  .PHONY: maybe-clean-opcodes clean-opcodes
  maybe-clean-opcodes:
+@if opcodes
+maybe-clean-opcodes: clean-opcodes
  
  clean-opcodes: 
         @[ -f ./opcodes/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in opcodes" ; \
@@ -3514,16 +4287,20 @@ clean-opcodes:
                   clean) \
           || exit 1
  
+@endif opcodes
  
  .PHONY: maybe-distclean-opcodes distclean-opcodes
  maybe-distclean-opcodes:
+@if opcodes
+maybe-distclean-opcodes: distclean-opcodes
  
  distclean-opcodes: 
         @[ -f ./opcodes/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in opcodes" ; \
@@ -3535,16 +4312,20 @@ distclean-opcodes:
                   distclean) \
           || exit 1
  
+@endif opcodes
  
  .PHONY: maybe-maintainer-clean-opcodes maintainer-clean-opcodes
  maybe-maintainer-clean-opcodes:
+@if opcodes
+maybe-maintainer-clean-opcodes: maintainer-clean-opcodes
  
  maintainer-clean-opcodes: 
         @[ -f ./opcodes/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in opcodes" ; \
@@ -3556,31 +4337,20 @@ maintainer-clean-opcodes:
                   maintainer-clean) \
           || exit 1
  
+@endif opcodes
  
  
  .PHONY: configure-binutils maybe-configure-binutils
  maybe-configure-binutils:
+@if binutils
+maybe-configure-binutils: configure-binutils
  configure-binutils:
-       @test ! -f binutils/Makefile || exit 0; \
+       @test -f stage_last && exit 0; \
+       test ! -f binutils/Makefile || exit 0; \
         [ -d binutils ] || mkdir binutils; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in binutils; \
         cd binutils || exit 1; \
         case $(srcdir) in \
@@ -3595,41 +4365,59 @@ configure-binutils:
             libsrcdir="$$s/binutils";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif binutils
  
  .PHONY: all-binutils maybe-all-binutils
  maybe-all-binutils:
+@if binutils
+TARGET-binutils=all
+maybe-all-binutils: all-binutils
  all-binutils: configure-binutils
-       @r=`${PWD_COMMAND}`; export r; \
+       @test -f stage_last && exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd binutils && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd binutils && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-binutils))
+@endif binutils
  
  .PHONY: check-binutils maybe-check-binutils
  maybe-check-binutils:
+@if binutils
+maybe-check-binutils: check-binutils
  
  check-binutils:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd binutils && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif binutils
  
  .PHONY: install-binutils maybe-install-binutils
  maybe-install-binutils:
+@if binutils
+maybe-install-binutils: install-binutils
  
  install-binutils: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd binutils && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif binutils
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-binutils info-binutils
  maybe-info-binutils:
+@if binutils
+maybe-info-binutils: info-binutils
  
  info-binutils: \
      configure-binutils 
@@ -3637,7 +4425,8 @@ info-binutils: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in binutils" ; \
@@ -3649,9 +4438,12 @@ info-binutils: \
                   info) \
           || exit 1
  
+@endif binutils
  
  .PHONY: maybe-dvi-binutils dvi-binutils
  maybe-dvi-binutils:
+@if binutils
+maybe-dvi-binutils: dvi-binutils
  
  dvi-binutils: \
      configure-binutils 
@@ -3659,7 +4451,8 @@ dvi-binutils: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in binutils" ; \
@@ -3671,9 +4464,12 @@ dvi-binutils: \
                   dvi) \
           || exit 1
  
+@endif binutils
  
  .PHONY: maybe-TAGS-binutils TAGS-binutils
  maybe-TAGS-binutils:
+@if binutils
+maybe-TAGS-binutils: TAGS-binutils
  
  TAGS-binutils: \
      configure-binutils 
@@ -3681,7 +4477,8 @@ TAGS-binutils: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in binutils" ; \
@@ -3693,9 +4490,12 @@ TAGS-binutils: \
                   TAGS) \
           || exit 1
  
+@endif binutils
  
  .PHONY: maybe-install-info-binutils install-info-binutils
  maybe-install-info-binutils:
+@if binutils
+maybe-install-info-binutils: install-info-binutils
  
  install-info-binutils: \
      configure-binutils \
@@ -3704,7 +4504,8 @@ install-info-binutils: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in binutils" ; \
@@ -3716,9 +4517,12 @@ install-info-binutils: \
                   install-info) \
           || exit 1
  
+@endif binutils
  
  .PHONY: maybe-installcheck-binutils installcheck-binutils
  maybe-installcheck-binutils:
+@if binutils
+maybe-installcheck-binutils: installcheck-binutils
  
  installcheck-binutils: \
      configure-binutils 
@@ -3726,7 +4530,8 @@ installcheck-binutils: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in binutils" ; \
@@ -3738,16 +4543,20 @@ installcheck-binutils: \
                   installcheck) \
           || exit 1
  
+@endif binutils
  
  .PHONY: maybe-mostlyclean-binutils mostlyclean-binutils
  maybe-mostlyclean-binutils:
+@if binutils
+maybe-mostlyclean-binutils: mostlyclean-binutils
  
  mostlyclean-binutils: 
         @[ -f ./binutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in binutils" ; \
@@ -3759,16 +4568,20 @@ mostlyclean-binutils:
                   mostlyclean) \
           || exit 1
  
+@endif binutils
  
  .PHONY: maybe-clean-binutils clean-binutils
  maybe-clean-binutils:
+@if binutils
+maybe-clean-binutils: clean-binutils
  
  clean-binutils: 
         @[ -f ./binutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in binutils" ; \
@@ -3780,16 +4593,20 @@ clean-binutils:
                   clean) \
           || exit 1
  
+@endif binutils
  
  .PHONY: maybe-distclean-binutils distclean-binutils
  maybe-distclean-binutils:
+@if binutils
+maybe-distclean-binutils: distclean-binutils
  
  distclean-binutils: 
         @[ -f ./binutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in binutils" ; \
@@ -3801,16 +4618,20 @@ distclean-binutils:
                   distclean) \
           || exit 1
  
+@endif binutils
  
  .PHONY: maybe-maintainer-clean-binutils maintainer-clean-binutils
  maybe-maintainer-clean-binutils:
+@if binutils
+maybe-maintainer-clean-binutils: maintainer-clean-binutils
  
  maintainer-clean-binutils: 
         @[ -f ./binutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in binutils" ; \
@@ -3822,31 +4643,19 @@ maintainer-clean-binutils:
                   maintainer-clean) \
           || exit 1
  
+@endif binutils
  
  
  .PHONY: configure-bison maybe-configure-bison
  maybe-configure-bison:
+@if bison
+maybe-configure-bison: configure-bison
  configure-bison:
         @test ! -f bison/Makefile || exit 0; \
         [ -d bison ] || mkdir bison; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in bison; \
         cd bison || exit 1; \
         case $(srcdir) in \
@@ -3861,19 +4670,28 @@ configure-bison:
             libsrcdir="$$s/bison";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif bison
  
  .PHONY: all-bison maybe-all-bison
  maybe-all-bison:
+@if bison
+TARGET-bison=all
+maybe-all-bison: all-bison
  all-bison: configure-bison
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd bison && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd bison && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-bison))
+@endif bison
  
  .PHONY: check-bison maybe-check-bison
  maybe-check-bison:
+@if bison
+maybe-check-bison: check-bison
  
  # This module is only tested in a native toolchain.
  check-bison:
@@ -3881,24 +4699,32 @@ check-bison:
           r=`${PWD_COMMAND}`; export r; \
           s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
           $(SET_LIB_PATH) \
-         (cd bison && $(MAKE) $(FLAGS_TO_PASS) check); \
+         $(HOST_EXPORTS) \
+         (cd bison && $(MAKE) $(FLAGS_TO_PASS)  check); \
         fi
  
+@endif bison
  
  .PHONY: install-bison maybe-install-bison
  maybe-install-bison:
+@if bison
+maybe-install-bison: install-bison
  
  install-bison: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd bison && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif bison
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-bison info-bison
  maybe-info-bison:
+@if bison
+maybe-info-bison: info-bison
  
  info-bison: \
      configure-bison 
@@ -3906,7 +4732,8 @@ info-bison: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in bison" ; \
@@ -3918,9 +4745,12 @@ info-bison: \
                   info) \
           || exit 1
  
+@endif bison
  
  .PHONY: maybe-dvi-bison dvi-bison
  maybe-dvi-bison:
+@if bison
+maybe-dvi-bison: dvi-bison
  
  dvi-bison: \
      configure-bison 
@@ -3928,7 +4758,8 @@ dvi-bison: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in bison" ; \
@@ -3940,9 +4771,12 @@ dvi-bison: \
                   dvi) \
           || exit 1
  
+@endif bison
  
  .PHONY: maybe-TAGS-bison TAGS-bison
  maybe-TAGS-bison:
+@if bison
+maybe-TAGS-bison: TAGS-bison
  
  TAGS-bison: \
      configure-bison 
@@ -3950,7 +4784,8 @@ TAGS-bison: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in bison" ; \
@@ -3962,9 +4797,12 @@ TAGS-bison: \
                   TAGS) \
           || exit 1
  
+@endif bison
  
  .PHONY: maybe-install-info-bison install-info-bison
  maybe-install-info-bison:
+@if bison
+maybe-install-info-bison: install-info-bison
  
  install-info-bison: \
      configure-bison \
@@ -3973,7 +4811,8 @@ install-info-bison: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in bison" ; \
@@ -3985,9 +4824,12 @@ install-info-bison: \
                   install-info) \
           || exit 1
  
+@endif bison
  
  .PHONY: maybe-installcheck-bison installcheck-bison
  maybe-installcheck-bison:
+@if bison
+maybe-installcheck-bison: installcheck-bison
  
  installcheck-bison: \
      configure-bison 
@@ -3995,7 +4837,8 @@ installcheck-bison: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in bison" ; \
@@ -4007,16 +4850,20 @@ installcheck-bison: \
                   installcheck) \
           || exit 1
  
+@endif bison
  
  .PHONY: maybe-mostlyclean-bison mostlyclean-bison
  maybe-mostlyclean-bison:
+@if bison
+maybe-mostlyclean-bison: mostlyclean-bison
  
  mostlyclean-bison: 
         @[ -f ./bison/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in bison" ; \
@@ -4028,16 +4875,20 @@ mostlyclean-bison:
                   mostlyclean) \
           || exit 1
  
+@endif bison
  
  .PHONY: maybe-clean-bison clean-bison
  maybe-clean-bison:
+@if bison
+maybe-clean-bison: clean-bison
  
  clean-bison: 
         @[ -f ./bison/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in bison" ; \
@@ -4049,16 +4900,20 @@ clean-bison:
                   clean) \
           || exit 1
  
+@endif bison
  
  .PHONY: maybe-distclean-bison distclean-bison
  maybe-distclean-bison:
+@if bison
+maybe-distclean-bison: distclean-bison
  
  distclean-bison: 
         @[ -f ./bison/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in bison" ; \
@@ -4070,16 +4925,20 @@ distclean-bison:
                   distclean) \
           || exit 1
  
+@endif bison
  
  .PHONY: maybe-maintainer-clean-bison maintainer-clean-bison
  maybe-maintainer-clean-bison:
+@if bison
+maybe-maintainer-clean-bison: maintainer-clean-bison
  
  maintainer-clean-bison: 
         @[ -f ./bison/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in bison" ; \
@@ -4091,31 +4950,19 @@ maintainer-clean-bison:
                   maintainer-clean) \
           || exit 1
  
+@endif bison
  
  
  .PHONY: configure-byacc maybe-configure-byacc
  maybe-configure-byacc:
+@if byacc
+maybe-configure-byacc: configure-byacc
  configure-byacc:
         @test ! -f byacc/Makefile || exit 0; \
         [ -d byacc ] || mkdir byacc; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in byacc; \
         cd byacc || exit 1; \
         case $(srcdir) in \
@@ -4130,19 +4977,28 @@ configure-byacc:
             libsrcdir="$$s/byacc";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif byacc
  
  .PHONY: all-byacc maybe-all-byacc
  maybe-all-byacc:
+@if byacc
+TARGET-byacc=all
+maybe-all-byacc: all-byacc
  all-byacc: configure-byacc
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd byacc && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd byacc && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-byacc))
+@endif byacc
  
  .PHONY: check-byacc maybe-check-byacc
  maybe-check-byacc:
+@if byacc
+maybe-check-byacc: check-byacc
  
  # This module is only tested in a native toolchain.
  check-byacc:
@@ -4150,24 +5006,32 @@ check-byacc:
           r=`${PWD_COMMAND}`; export r; \
           s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
           $(SET_LIB_PATH) \
-         (cd byacc && $(MAKE) $(FLAGS_TO_PASS) check); \
+         $(HOST_EXPORTS) \
+         (cd byacc && $(MAKE) $(FLAGS_TO_PASS)  check); \
         fi
  
+@endif byacc
  
  .PHONY: install-byacc maybe-install-byacc
  maybe-install-byacc:
+@if byacc
+maybe-install-byacc: install-byacc
  
  install-byacc: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd byacc && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif byacc
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-byacc info-byacc
  maybe-info-byacc:
+@if byacc
+maybe-info-byacc: info-byacc
  
  info-byacc: \
      configure-byacc 
@@ -4175,7 +5039,8 @@ info-byacc: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in byacc" ; \
@@ -4187,9 +5052,12 @@ info-byacc: \
                   info) \
           || exit 1
  
+@endif byacc
  
  .PHONY: maybe-dvi-byacc dvi-byacc
  maybe-dvi-byacc:
+@if byacc
+maybe-dvi-byacc: dvi-byacc
  
  dvi-byacc: \
      configure-byacc 
@@ -4197,7 +5065,8 @@ dvi-byacc: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in byacc" ; \
@@ -4209,9 +5078,12 @@ dvi-byacc: \
                   dvi) \
           || exit 1
  
+@endif byacc
  
  .PHONY: maybe-TAGS-byacc TAGS-byacc
  maybe-TAGS-byacc:
+@if byacc
+maybe-TAGS-byacc: TAGS-byacc
  
  TAGS-byacc: \
      configure-byacc 
@@ -4219,7 +5091,8 @@ TAGS-byacc: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in byacc" ; \
@@ -4231,9 +5104,12 @@ TAGS-byacc: \
                   TAGS) \
           || exit 1
  
+@endif byacc
  
  .PHONY: maybe-install-info-byacc install-info-byacc
  maybe-install-info-byacc:
+@if byacc
+maybe-install-info-byacc: install-info-byacc
  
  install-info-byacc: \
      configure-byacc \
@@ -4242,7 +5118,8 @@ install-info-byacc: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in byacc" ; \
@@ -4254,9 +5131,12 @@ install-info-byacc: \
                   install-info) \
           || exit 1
  
+@endif byacc
  
  .PHONY: maybe-installcheck-byacc installcheck-byacc
  maybe-installcheck-byacc:
+@if byacc
+maybe-installcheck-byacc: installcheck-byacc
  
  installcheck-byacc: \
      configure-byacc 
@@ -4264,7 +5144,8 @@ installcheck-byacc: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in byacc" ; \
@@ -4276,16 +5157,20 @@ installcheck-byacc: \
                   installcheck) \
           || exit 1
  
+@endif byacc
  
  .PHONY: maybe-mostlyclean-byacc mostlyclean-byacc
  maybe-mostlyclean-byacc:
+@if byacc
+maybe-mostlyclean-byacc: mostlyclean-byacc
  
  mostlyclean-byacc: 
         @[ -f ./byacc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in byacc" ; \
@@ -4297,16 +5182,20 @@ mostlyclean-byacc:
                   mostlyclean) \
           || exit 1
  
+@endif byacc
  
  .PHONY: maybe-clean-byacc clean-byacc
  maybe-clean-byacc:
+@if byacc
+maybe-clean-byacc: clean-byacc
  
  clean-byacc: 
         @[ -f ./byacc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in byacc" ; \
@@ -4318,16 +5207,20 @@ clean-byacc:
                   clean) \
           || exit 1
  
+@endif byacc
  
  .PHONY: maybe-distclean-byacc distclean-byacc
  maybe-distclean-byacc:
+@if byacc
+maybe-distclean-byacc: distclean-byacc
  
  distclean-byacc: 
         @[ -f ./byacc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in byacc" ; \
@@ -4339,16 +5232,20 @@ distclean-byacc:
                   distclean) \
           || exit 1
  
+@endif byacc
  
  .PHONY: maybe-maintainer-clean-byacc maintainer-clean-byacc
  maybe-maintainer-clean-byacc:
+@if byacc
+maybe-maintainer-clean-byacc: maintainer-clean-byacc
  
  maintainer-clean-byacc: 
         @[ -f ./byacc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in byacc" ; \
@@ -4360,31 +5257,19 @@ maintainer-clean-byacc:
                   maintainer-clean) \
           || exit 1
  
+@endif byacc
  
  
  .PHONY: configure-bzip2 maybe-configure-bzip2
  maybe-configure-bzip2:
+@if bzip2
+maybe-configure-bzip2: configure-bzip2
  configure-bzip2:
         @test ! -f bzip2/Makefile || exit 0; \
         [ -d bzip2 ] || mkdir bzip2; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in bzip2; \
         cd bzip2 || exit 1; \
         case $(srcdir) in \
@@ -4399,41 +5284,58 @@ configure-bzip2:
             libsrcdir="$$s/bzip2";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif bzip2
  
  .PHONY: all-bzip2 maybe-all-bzip2
  maybe-all-bzip2:
+@if bzip2
+TARGET-bzip2=all
+maybe-all-bzip2: all-bzip2
  all-bzip2: configure-bzip2
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd bzip2 && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd bzip2 && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-bzip2))
+@endif bzip2
  
  .PHONY: check-bzip2 maybe-check-bzip2
  maybe-check-bzip2:
+@if bzip2
+maybe-check-bzip2: check-bzip2
  
  check-bzip2:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd bzip2 && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif bzip2
  
  .PHONY: install-bzip2 maybe-install-bzip2
  maybe-install-bzip2:
+@if bzip2
+maybe-install-bzip2: install-bzip2
  
  install-bzip2: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd bzip2 && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif bzip2
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-bzip2 info-bzip2
  maybe-info-bzip2:
+@if bzip2
+maybe-info-bzip2: info-bzip2
  
  info-bzip2: \
      configure-bzip2 
@@ -4441,7 +5343,8 @@ info-bzip2: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in bzip2" ; \
@@ -4453,9 +5356,12 @@ info-bzip2: \
                   info) \
           || exit 1
  
+@endif bzip2
  
  .PHONY: maybe-dvi-bzip2 dvi-bzip2
  maybe-dvi-bzip2:
+@if bzip2
+maybe-dvi-bzip2: dvi-bzip2
  
  dvi-bzip2: \
      configure-bzip2 
@@ -4463,7 +5369,8 @@ dvi-bzip2: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in bzip2" ; \
@@ -4475,9 +5382,12 @@ dvi-bzip2: \
                   dvi) \
           || exit 1
  
+@endif bzip2
  
  .PHONY: maybe-TAGS-bzip2 TAGS-bzip2
  maybe-TAGS-bzip2:
+@if bzip2
+maybe-TAGS-bzip2: TAGS-bzip2
  
  TAGS-bzip2: \
      configure-bzip2 
@@ -4485,7 +5395,8 @@ TAGS-bzip2: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in bzip2" ; \
@@ -4497,9 +5408,12 @@ TAGS-bzip2: \
                   TAGS) \
           || exit 1
  
+@endif bzip2
  
  .PHONY: maybe-install-info-bzip2 install-info-bzip2
  maybe-install-info-bzip2:
+@if bzip2
+maybe-install-info-bzip2: install-info-bzip2
  
  install-info-bzip2: \
      configure-bzip2 \
@@ -4508,7 +5422,8 @@ install-info-bzip2: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in bzip2" ; \
@@ -4520,9 +5435,12 @@ install-info-bzip2: \
                   install-info) \
           || exit 1
  
+@endif bzip2
  
  .PHONY: maybe-installcheck-bzip2 installcheck-bzip2
  maybe-installcheck-bzip2:
+@if bzip2
+maybe-installcheck-bzip2: installcheck-bzip2
  
  installcheck-bzip2: \
      configure-bzip2 
@@ -4530,7 +5448,8 @@ installcheck-bzip2: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in bzip2" ; \
@@ -4542,16 +5461,20 @@ installcheck-bzip2: \
                   installcheck) \
           || exit 1
  
+@endif bzip2
  
  .PHONY: maybe-mostlyclean-bzip2 mostlyclean-bzip2
  maybe-mostlyclean-bzip2:
+@if bzip2
+maybe-mostlyclean-bzip2: mostlyclean-bzip2
  
  mostlyclean-bzip2: 
         @[ -f ./bzip2/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in bzip2" ; \
@@ -4563,16 +5486,20 @@ mostlyclean-bzip2:
                   mostlyclean) \
           || exit 1
  
+@endif bzip2
  
  .PHONY: maybe-clean-bzip2 clean-bzip2
  maybe-clean-bzip2:
+@if bzip2
+maybe-clean-bzip2: clean-bzip2
  
  clean-bzip2: 
         @[ -f ./bzip2/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in bzip2" ; \
@@ -4584,16 +5511,20 @@ clean-bzip2:
                   clean) \
           || exit 1
  
+@endif bzip2
  
  .PHONY: maybe-distclean-bzip2 distclean-bzip2
  maybe-distclean-bzip2:
+@if bzip2
+maybe-distclean-bzip2: distclean-bzip2
  
  distclean-bzip2: 
         @[ -f ./bzip2/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in bzip2" ; \
@@ -4605,16 +5536,20 @@ distclean-bzip2:
                   distclean) \
           || exit 1
  
+@endif bzip2
  
  .PHONY: maybe-maintainer-clean-bzip2 maintainer-clean-bzip2
  maybe-maintainer-clean-bzip2:
+@if bzip2
+maybe-maintainer-clean-bzip2: maintainer-clean-bzip2
  
  maintainer-clean-bzip2: 
         @[ -f ./bzip2/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in bzip2" ; \
@@ -4626,31 +5561,19 @@ maintainer-clean-bzip2:
                   maintainer-clean) \
           || exit 1
  
+@endif bzip2
  
  
  .PHONY: configure-dejagnu maybe-configure-dejagnu
  maybe-configure-dejagnu:
+@if dejagnu
+maybe-configure-dejagnu: configure-dejagnu
  configure-dejagnu:
         @test ! -f dejagnu/Makefile || exit 0; \
         [ -d dejagnu ] || mkdir dejagnu; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in dejagnu; \
         cd dejagnu || exit 1; \
         case $(srcdir) in \
@@ -4665,41 +5588,58 @@ configure-dejagnu:
             libsrcdir="$$s/dejagnu";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif dejagnu
  
  .PHONY: all-dejagnu maybe-all-dejagnu
  maybe-all-dejagnu:
+@if dejagnu
+TARGET-dejagnu=all
+maybe-all-dejagnu: all-dejagnu
  all-dejagnu: configure-dejagnu
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd dejagnu && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd dejagnu && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-dejagnu))
+@endif dejagnu
  
  .PHONY: check-dejagnu maybe-check-dejagnu
  maybe-check-dejagnu:
+@if dejagnu
+maybe-check-dejagnu: check-dejagnu
  
  check-dejagnu:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd dejagnu && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif dejagnu
  
  .PHONY: install-dejagnu maybe-install-dejagnu
  maybe-install-dejagnu:
+@if dejagnu
+maybe-install-dejagnu: install-dejagnu
  
  install-dejagnu: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd dejagnu && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif dejagnu
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-dejagnu info-dejagnu
  maybe-info-dejagnu:
+@if dejagnu
+maybe-info-dejagnu: info-dejagnu
  
  info-dejagnu: \
      configure-dejagnu 
@@ -4707,7 +5647,8 @@ info-dejagnu: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in dejagnu" ; \
@@ -4719,9 +5660,12 @@ info-dejagnu: \
                   info) \
           || exit 1
  
+@endif dejagnu
  
  .PHONY: maybe-dvi-dejagnu dvi-dejagnu
  maybe-dvi-dejagnu:
+@if dejagnu
+maybe-dvi-dejagnu: dvi-dejagnu
  
  dvi-dejagnu: \
      configure-dejagnu 
@@ -4729,7 +5673,8 @@ dvi-dejagnu: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in dejagnu" ; \
@@ -4741,9 +5686,12 @@ dvi-dejagnu: \
                   dvi) \
           || exit 1
  
+@endif dejagnu
  
  .PHONY: maybe-TAGS-dejagnu TAGS-dejagnu
  maybe-TAGS-dejagnu:
+@if dejagnu
+maybe-TAGS-dejagnu: TAGS-dejagnu
  
  TAGS-dejagnu: \
      configure-dejagnu 
@@ -4751,7 +5699,8 @@ TAGS-dejagnu: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in dejagnu" ; \
@@ -4763,9 +5712,12 @@ TAGS-dejagnu: \
                   TAGS) \
           || exit 1
  
+@endif dejagnu
  
  .PHONY: maybe-install-info-dejagnu install-info-dejagnu
  maybe-install-info-dejagnu:
+@if dejagnu
+maybe-install-info-dejagnu: install-info-dejagnu
  
  install-info-dejagnu: \
      configure-dejagnu \
@@ -4774,7 +5726,8 @@ install-info-dejagnu: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in dejagnu" ; \
@@ -4786,9 +5739,12 @@ install-info-dejagnu: \
                   install-info) \
           || exit 1
  
+@endif dejagnu
  
  .PHONY: maybe-installcheck-dejagnu installcheck-dejagnu
  maybe-installcheck-dejagnu:
+@if dejagnu
+maybe-installcheck-dejagnu: installcheck-dejagnu
  
  installcheck-dejagnu: \
      configure-dejagnu 
@@ -4796,7 +5752,8 @@ installcheck-dejagnu: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in dejagnu" ; \
@@ -4808,16 +5765,20 @@ installcheck-dejagnu: \
                   installcheck) \
           || exit 1
  
+@endif dejagnu
  
  .PHONY: maybe-mostlyclean-dejagnu mostlyclean-dejagnu
  maybe-mostlyclean-dejagnu:
+@if dejagnu
+maybe-mostlyclean-dejagnu: mostlyclean-dejagnu
  
  mostlyclean-dejagnu: 
         @[ -f ./dejagnu/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in dejagnu" ; \
@@ -4829,16 +5790,20 @@ mostlyclean-dejagnu:
                   mostlyclean) \
           || exit 1
  
+@endif dejagnu
  
  .PHONY: maybe-clean-dejagnu clean-dejagnu
  maybe-clean-dejagnu:
+@if dejagnu
+maybe-clean-dejagnu: clean-dejagnu
  
  clean-dejagnu: 
         @[ -f ./dejagnu/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in dejagnu" ; \
@@ -4850,16 +5815,20 @@ clean-dejagnu:
                   clean) \
           || exit 1
  
+@endif dejagnu
  
  .PHONY: maybe-distclean-dejagnu distclean-dejagnu
  maybe-distclean-dejagnu:
+@if dejagnu
+maybe-distclean-dejagnu: distclean-dejagnu
  
  distclean-dejagnu: 
         @[ -f ./dejagnu/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in dejagnu" ; \
@@ -4871,16 +5840,20 @@ distclean-dejagnu:
                   distclean) \
           || exit 1
  
+@endif dejagnu
  
  .PHONY: maybe-maintainer-clean-dejagnu maintainer-clean-dejagnu
  maybe-maintainer-clean-dejagnu:
+@if dejagnu
+maybe-maintainer-clean-dejagnu: maintainer-clean-dejagnu
  
  maintainer-clean-dejagnu: 
         @[ -f ./dejagnu/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in dejagnu" ; \
@@ -4892,31 +5865,19 @@ maintainer-clean-dejagnu:
                   maintainer-clean) \
           || exit 1
  
+@endif dejagnu
  
  
  .PHONY: configure-diff maybe-configure-diff
  maybe-configure-diff:
+@if diff
+maybe-configure-diff: configure-diff
  configure-diff:
         @test ! -f diff/Makefile || exit 0; \
         [ -d diff ] || mkdir diff; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in diff; \
         cd diff || exit 1; \
         case $(srcdir) in \
@@ -4931,41 +5892,58 @@ configure-diff:
             libsrcdir="$$s/diff";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif diff
  
  .PHONY: all-diff maybe-all-diff
  maybe-all-diff:
+@if diff
+TARGET-diff=all
+maybe-all-diff: all-diff
  all-diff: configure-diff
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd diff && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd diff && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-diff))
+@endif diff
  
  .PHONY: check-diff maybe-check-diff
  maybe-check-diff:
+@if diff
+maybe-check-diff: check-diff
  
  check-diff:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd diff && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif diff
  
  .PHONY: install-diff maybe-install-diff
  maybe-install-diff:
+@if diff
+maybe-install-diff: install-diff
  
  install-diff: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd diff && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif diff
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-diff info-diff
  maybe-info-diff:
+@if diff
+maybe-info-diff: info-diff
  
  info-diff: \
      configure-diff 
@@ -4973,7 +5951,8 @@ info-diff: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in diff" ; \
@@ -4985,9 +5964,12 @@ info-diff: \
                   info) \
           || exit 1
  
+@endif diff
  
  .PHONY: maybe-dvi-diff dvi-diff
  maybe-dvi-diff:
+@if diff
+maybe-dvi-diff: dvi-diff
  
  dvi-diff: \
      configure-diff 
@@ -4995,7 +5977,8 @@ dvi-diff: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in diff" ; \
@@ -5007,9 +5990,12 @@ dvi-diff: \
                   dvi) \
           || exit 1
  
+@endif diff
  
  .PHONY: maybe-TAGS-diff TAGS-diff
  maybe-TAGS-diff:
+@if diff
+maybe-TAGS-diff: TAGS-diff
  
  TAGS-diff: \
      configure-diff 
@@ -5017,7 +6003,8 @@ TAGS-diff: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in diff" ; \
@@ -5029,9 +6016,12 @@ TAGS-diff: \
                   TAGS) \
           || exit 1
  
+@endif diff
  
  .PHONY: maybe-install-info-diff install-info-diff
  maybe-install-info-diff:
+@if diff
+maybe-install-info-diff: install-info-diff
  
  install-info-diff: \
      configure-diff \
@@ -5040,7 +6030,8 @@ install-info-diff: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in diff" ; \
@@ -5052,9 +6043,12 @@ install-info-diff: \
                   install-info) \
           || exit 1
  
+@endif diff
  
  .PHONY: maybe-installcheck-diff installcheck-diff
  maybe-installcheck-diff:
+@if diff
+maybe-installcheck-diff: installcheck-diff
  
  installcheck-diff: \
      configure-diff 
@@ -5062,7 +6056,8 @@ installcheck-diff: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in diff" ; \
@@ -5074,16 +6069,20 @@ installcheck-diff: \
                   installcheck) \
           || exit 1
  
+@endif diff
  
  .PHONY: maybe-mostlyclean-diff mostlyclean-diff
  maybe-mostlyclean-diff:
+@if diff
+maybe-mostlyclean-diff: mostlyclean-diff
  
  mostlyclean-diff: 
         @[ -f ./diff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in diff" ; \
@@ -5095,16 +6094,20 @@ mostlyclean-diff:
                   mostlyclean) \
           || exit 1
  
+@endif diff
  
  .PHONY: maybe-clean-diff clean-diff
  maybe-clean-diff:
+@if diff
+maybe-clean-diff: clean-diff
  
  clean-diff: 
         @[ -f ./diff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in diff" ; \
@@ -5116,16 +6119,20 @@ clean-diff:
                   clean) \
           || exit 1
  
+@endif diff
  
  .PHONY: maybe-distclean-diff distclean-diff
  maybe-distclean-diff:
+@if diff
+maybe-distclean-diff: distclean-diff
  
  distclean-diff: 
         @[ -f ./diff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in diff" ; \
@@ -5137,16 +6144,20 @@ distclean-diff:
                   distclean) \
           || exit 1
  
+@endif diff
  
  .PHONY: maybe-maintainer-clean-diff maintainer-clean-diff
  maybe-maintainer-clean-diff:
+@if diff
+maybe-maintainer-clean-diff: maintainer-clean-diff
  
  maintainer-clean-diff: 
         @[ -f ./diff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in diff" ; \
@@ -5158,31 +6169,19 @@ maintainer-clean-diff:
                   maintainer-clean) \
           || exit 1
  
+@endif diff
  
  
  .PHONY: configure-dosutils maybe-configure-dosutils
  maybe-configure-dosutils:
+@if dosutils
+maybe-configure-dosutils: configure-dosutils
  configure-dosutils:
         @test ! -f dosutils/Makefile || exit 0; \
         [ -d dosutils ] || mkdir dosutils; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in dosutils; \
         cd dosutils || exit 1; \
         case $(srcdir) in \
@@ -5197,37 +6196,53 @@ configure-dosutils:
             libsrcdir="$$s/dosutils";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif dosutils
  
  .PHONY: all-dosutils maybe-all-dosutils
  maybe-all-dosutils:
+@if dosutils
+TARGET-dosutils=all
+maybe-all-dosutils: all-dosutils
  all-dosutils: configure-dosutils
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd dosutils && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd dosutils && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-dosutils))
+@endif dosutils
  
  .PHONY: check-dosutils maybe-check-dosutils
  maybe-check-dosutils:
+@if dosutils
+maybe-check-dosutils: check-dosutils
  
  check-dosutils:
  
+@endif dosutils
  
  .PHONY: install-dosutils maybe-install-dosutils
  maybe-install-dosutils:
+@if dosutils
+maybe-install-dosutils: install-dosutils
  
  install-dosutils: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd dosutils && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif dosutils
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-dosutils info-dosutils
  maybe-info-dosutils:
+@if dosutils
+maybe-info-dosutils: info-dosutils
  
  info-dosutils: \
      configure-dosutils 
@@ -5235,7 +6250,8 @@ info-dosutils: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in dosutils" ; \
@@ -5247,9 +6263,12 @@ info-dosutils: \
                   info) \
           || exit 1
  
+@endif dosutils
  
  .PHONY: maybe-dvi-dosutils dvi-dosutils
  maybe-dvi-dosutils:
+@if dosutils
+maybe-dvi-dosutils: dvi-dosutils
  
  dvi-dosutils: \
      configure-dosutils 
@@ -5257,7 +6276,8 @@ dvi-dosutils: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in dosutils" ; \
@@ -5269,9 +6289,12 @@ dvi-dosutils: \
                   dvi) \
           || exit 1
  
+@endif dosutils
  
  .PHONY: maybe-TAGS-dosutils TAGS-dosutils
  maybe-TAGS-dosutils:
+@if dosutils
+maybe-TAGS-dosutils: TAGS-dosutils
  
  TAGS-dosutils: \
      configure-dosutils 
@@ -5279,7 +6302,8 @@ TAGS-dosutils: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in dosutils" ; \
@@ -5291,9 +6315,12 @@ TAGS-dosutils: \
                   TAGS) \
           || exit 1
  
+@endif dosutils
  
  .PHONY: maybe-install-info-dosutils install-info-dosutils
  maybe-install-info-dosutils:
+@if dosutils
+maybe-install-info-dosutils: install-info-dosutils
  
  install-info-dosutils: \
      configure-dosutils \
@@ -5302,7 +6329,8 @@ install-info-dosutils: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in dosutils" ; \
@@ -5314,9 +6342,12 @@ install-info-dosutils: \
                   install-info) \
           || exit 1
  
+@endif dosutils
  
  .PHONY: maybe-installcheck-dosutils installcheck-dosutils
  maybe-installcheck-dosutils:
+@if dosutils
+maybe-installcheck-dosutils: installcheck-dosutils
  
  installcheck-dosutils: \
      configure-dosutils 
@@ -5324,7 +6355,8 @@ installcheck-dosutils: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in dosutils" ; \
@@ -5336,16 +6368,20 @@ installcheck-dosutils: \
                   installcheck) \
           || exit 1
  
+@endif dosutils
  
  .PHONY: maybe-mostlyclean-dosutils mostlyclean-dosutils
  maybe-mostlyclean-dosutils:
+@if dosutils
+maybe-mostlyclean-dosutils: mostlyclean-dosutils
  
  mostlyclean-dosutils: 
         @[ -f ./dosutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in dosutils" ; \
@@ -5357,16 +6393,20 @@ mostlyclean-dosutils:
                   mostlyclean) \
           || exit 1
  
+@endif dosutils
  
  .PHONY: maybe-clean-dosutils clean-dosutils
  maybe-clean-dosutils:
+@if dosutils
+maybe-clean-dosutils: clean-dosutils
  
  clean-dosutils: 
         @[ -f ./dosutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in dosutils" ; \
@@ -5378,16 +6418,20 @@ clean-dosutils:
                   clean) \
           || exit 1
  
+@endif dosutils
  
  .PHONY: maybe-distclean-dosutils distclean-dosutils
  maybe-distclean-dosutils:
+@if dosutils
+maybe-distclean-dosutils: distclean-dosutils
  
  distclean-dosutils: 
         @[ -f ./dosutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in dosutils" ; \
@@ -5399,16 +6443,20 @@ distclean-dosutils:
                   distclean) \
           || exit 1
  
+@endif dosutils
  
  .PHONY: maybe-maintainer-clean-dosutils maintainer-clean-dosutils
  maybe-maintainer-clean-dosutils:
+@if dosutils
+maybe-maintainer-clean-dosutils: maintainer-clean-dosutils
  
  maintainer-clean-dosutils: 
         @[ -f ./dosutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in dosutils" ; \
@@ -5420,31 +6468,19 @@ maintainer-clean-dosutils:
                   maintainer-clean) \
           || exit 1
  
+@endif dosutils
  
  
  .PHONY: configure-etc maybe-configure-etc
  maybe-configure-etc:
+@if etc
+maybe-configure-etc: configure-etc
  configure-etc:
         @test ! -f etc/Makefile || exit 0; \
         [ -d etc ] || mkdir etc; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in etc; \
         cd etc || exit 1; \
         case $(srcdir) in \
@@ -5459,41 +6495,58 @@ configure-etc:
             libsrcdir="$$s/etc";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif etc
  
  .PHONY: all-etc maybe-all-etc
  maybe-all-etc:
+@if etc
+TARGET-etc=all
+maybe-all-etc: all-etc
  all-etc: configure-etc
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd etc && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd etc && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-etc))
+@endif etc
  
  .PHONY: check-etc maybe-check-etc
  maybe-check-etc:
+@if etc
+maybe-check-etc: check-etc
  
  check-etc:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd etc && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif etc
  
  .PHONY: install-etc maybe-install-etc
  maybe-install-etc:
+@if etc
+maybe-install-etc: install-etc
  
  install-etc: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd etc && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif etc
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-etc info-etc
  maybe-info-etc:
+@if etc
+maybe-info-etc: info-etc
  
  info-etc: \
      configure-etc 
@@ -5501,7 +6554,8 @@ info-etc: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in etc" ; \
@@ -5513,9 +6567,12 @@ info-etc: \
                   info) \
           || exit 1
  
+@endif etc
  
  .PHONY: maybe-dvi-etc dvi-etc
  maybe-dvi-etc:
+@if etc
+maybe-dvi-etc: dvi-etc
  
  dvi-etc: \
      configure-etc 
@@ -5523,7 +6580,8 @@ dvi-etc: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in etc" ; \
@@ -5535,9 +6593,12 @@ dvi-etc: \
                   dvi) \
           || exit 1
  
+@endif etc
  
  .PHONY: maybe-TAGS-etc TAGS-etc
  maybe-TAGS-etc:
+@if etc
+maybe-TAGS-etc: TAGS-etc
  
  TAGS-etc: \
      configure-etc 
@@ -5545,7 +6606,8 @@ TAGS-etc: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in etc" ; \
@@ -5557,9 +6619,12 @@ TAGS-etc: \
                   TAGS) \
           || exit 1
  
+@endif etc
  
  .PHONY: maybe-install-info-etc install-info-etc
  maybe-install-info-etc:
+@if etc
+maybe-install-info-etc: install-info-etc
  
  install-info-etc: \
      configure-etc \
@@ -5568,7 +6633,8 @@ install-info-etc: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in etc" ; \
@@ -5580,9 +6646,12 @@ install-info-etc: \
                   install-info) \
           || exit 1
  
+@endif etc
  
  .PHONY: maybe-installcheck-etc installcheck-etc
  maybe-installcheck-etc:
+@if etc
+maybe-installcheck-etc: installcheck-etc
  
  installcheck-etc: \
      configure-etc 
@@ -5590,7 +6659,8 @@ installcheck-etc: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in etc" ; \
@@ -5602,16 +6672,20 @@ installcheck-etc: \
                   installcheck) \
           || exit 1
  
+@endif etc
  
  .PHONY: maybe-mostlyclean-etc mostlyclean-etc
  maybe-mostlyclean-etc:
+@if etc
+maybe-mostlyclean-etc: mostlyclean-etc
  
  mostlyclean-etc: 
         @[ -f ./etc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in etc" ; \
@@ -5623,16 +6697,20 @@ mostlyclean-etc:
                   mostlyclean) \
           || exit 1
  
+@endif etc
  
  .PHONY: maybe-clean-etc clean-etc
  maybe-clean-etc:
+@if etc
+maybe-clean-etc: clean-etc
  
  clean-etc: 
         @[ -f ./etc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in etc" ; \
@@ -5644,16 +6722,20 @@ clean-etc:
                   clean) \
           || exit 1
  
+@endif etc
  
  .PHONY: maybe-distclean-etc distclean-etc
  maybe-distclean-etc:
+@if etc
+maybe-distclean-etc: distclean-etc
  
  distclean-etc: 
         @[ -f ./etc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in etc" ; \
@@ -5665,16 +6747,20 @@ distclean-etc:
                   distclean) \
           || exit 1
  
+@endif etc
  
  .PHONY: maybe-maintainer-clean-etc maintainer-clean-etc
  maybe-maintainer-clean-etc:
+@if etc
+maybe-maintainer-clean-etc: maintainer-clean-etc
  
  maintainer-clean-etc: 
         @[ -f ./etc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in etc" ; \
@@ -5686,31 +6772,19 @@ maintainer-clean-etc:
                   maintainer-clean) \
           || exit 1
  
+@endif etc
  
  
  .PHONY: configure-fastjar maybe-configure-fastjar
  maybe-configure-fastjar:
+@if fastjar
+maybe-configure-fastjar: configure-fastjar
  configure-fastjar:
         @test ! -f fastjar/Makefile || exit 0; \
         [ -d fastjar ] || mkdir fastjar; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in fastjar; \
         cd fastjar || exit 1; \
         case $(srcdir) in \
@@ -5725,19 +6799,28 @@ configure-fastjar:
             libsrcdir="$$s/fastjar";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif fastjar
  
  .PHONY: all-fastjar maybe-all-fastjar
  maybe-all-fastjar:
+@if fastjar
+TARGET-fastjar=all
+maybe-all-fastjar: all-fastjar
  all-fastjar: configure-fastjar
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd fastjar && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd fastjar && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-fastjar))
+@endif fastjar
  
  .PHONY: check-fastjar maybe-check-fastjar
  maybe-check-fastjar:
+@if fastjar
+maybe-check-fastjar: check-fastjar
  
  # This module is only tested in a native toolchain.
  check-fastjar:
@@ -5745,24 +6828,32 @@ check-fastjar:
           r=`${PWD_COMMAND}`; export r; \
           s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
           $(SET_LIB_PATH) \
-         (cd fastjar && $(MAKE) $(FLAGS_TO_PASS) check); \
+         $(HOST_EXPORTS) \
+         (cd fastjar && $(MAKE) $(FLAGS_TO_PASS)  check); \
         fi
  
+@endif fastjar
  
  .PHONY: install-fastjar maybe-install-fastjar
  maybe-install-fastjar:
+@if fastjar
+maybe-install-fastjar: install-fastjar
  
  install-fastjar: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd fastjar && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif fastjar
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-fastjar info-fastjar
  maybe-info-fastjar:
+@if fastjar
+maybe-info-fastjar: info-fastjar
  
  info-fastjar: \
      configure-fastjar 
@@ -5770,7 +6861,8 @@ info-fastjar: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in fastjar" ; \
@@ -5782,9 +6874,12 @@ info-fastjar: \
                   info) \
           || exit 1
  
+@endif fastjar
  
  .PHONY: maybe-dvi-fastjar dvi-fastjar
  maybe-dvi-fastjar:
+@if fastjar
+maybe-dvi-fastjar: dvi-fastjar
  
  dvi-fastjar: \
      configure-fastjar 
@@ -5792,7 +6887,8 @@ dvi-fastjar: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in fastjar" ; \
@@ -5804,9 +6900,12 @@ dvi-fastjar: \
                   dvi) \
           || exit 1
  
+@endif fastjar
  
  .PHONY: maybe-TAGS-fastjar TAGS-fastjar
  maybe-TAGS-fastjar:
+@if fastjar
+maybe-TAGS-fastjar: TAGS-fastjar
  
  TAGS-fastjar: \
      configure-fastjar 
@@ -5814,7 +6913,8 @@ TAGS-fastjar: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in fastjar" ; \
@@ -5826,9 +6926,12 @@ TAGS-fastjar: \
                   TAGS) \
           || exit 1
  
+@endif fastjar
  
  .PHONY: maybe-install-info-fastjar install-info-fastjar
  maybe-install-info-fastjar:
+@if fastjar
+maybe-install-info-fastjar: install-info-fastjar
  
  install-info-fastjar: \
      configure-fastjar \
@@ -5837,7 +6940,8 @@ install-info-fastjar: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in fastjar" ; \
@@ -5849,9 +6953,12 @@ install-info-fastjar: \
                   install-info) \
           || exit 1
  
+@endif fastjar
  
  .PHONY: maybe-installcheck-fastjar installcheck-fastjar
  maybe-installcheck-fastjar:
+@if fastjar
+maybe-installcheck-fastjar: installcheck-fastjar
  
  installcheck-fastjar: \
      configure-fastjar 
@@ -5859,7 +6966,8 @@ installcheck-fastjar: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in fastjar" ; \
@@ -5871,16 +6979,20 @@ installcheck-fastjar: \
                   installcheck) \
           || exit 1
  
+@endif fastjar
  
  .PHONY: maybe-mostlyclean-fastjar mostlyclean-fastjar
  maybe-mostlyclean-fastjar:
+@if fastjar
+maybe-mostlyclean-fastjar: mostlyclean-fastjar
  
  mostlyclean-fastjar: 
         @[ -f ./fastjar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in fastjar" ; \
@@ -5892,16 +7004,20 @@ mostlyclean-fastjar:
                   mostlyclean) \
           || exit 1
  
+@endif fastjar
  
  .PHONY: maybe-clean-fastjar clean-fastjar
  maybe-clean-fastjar:
+@if fastjar
+maybe-clean-fastjar: clean-fastjar
  
  clean-fastjar: 
         @[ -f ./fastjar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in fastjar" ; \
@@ -5913,16 +7029,20 @@ clean-fastjar:
                   clean) \
           || exit 1
  
+@endif fastjar
  
  .PHONY: maybe-distclean-fastjar distclean-fastjar
  maybe-distclean-fastjar:
+@if fastjar
+maybe-distclean-fastjar: distclean-fastjar
  
  distclean-fastjar: 
         @[ -f ./fastjar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in fastjar" ; \
@@ -5934,16 +7054,20 @@ distclean-fastjar:
                   distclean) \
           || exit 1
  
+@endif fastjar
  
  .PHONY: maybe-maintainer-clean-fastjar maintainer-clean-fastjar
  maybe-maintainer-clean-fastjar:
+@if fastjar
+maybe-maintainer-clean-fastjar: maintainer-clean-fastjar
  
  maintainer-clean-fastjar: 
         @[ -f ./fastjar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in fastjar" ; \
@@ -5955,31 +7079,19 @@ maintainer-clean-fastjar:
                   maintainer-clean) \
           || exit 1
  
+@endif fastjar
  
  
  .PHONY: configure-fileutils maybe-configure-fileutils
  maybe-configure-fileutils:
+@if fileutils
+maybe-configure-fileutils: configure-fileutils
  configure-fileutils:
         @test ! -f fileutils/Makefile || exit 0; \
         [ -d fileutils ] || mkdir fileutils; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in fileutils; \
         cd fileutils || exit 1; \
         case $(srcdir) in \
@@ -5994,41 +7106,58 @@ configure-fileutils:
             libsrcdir="$$s/fileutils";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif fileutils
  
  .PHONY: all-fileutils maybe-all-fileutils
  maybe-all-fileutils:
+@if fileutils
+TARGET-fileutils=all
+maybe-all-fileutils: all-fileutils
  all-fileutils: configure-fileutils
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd fileutils && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd fileutils && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-fileutils))
+@endif fileutils
  
  .PHONY: check-fileutils maybe-check-fileutils
  maybe-check-fileutils:
+@if fileutils
+maybe-check-fileutils: check-fileutils
  
  check-fileutils:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd fileutils && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif fileutils
  
  .PHONY: install-fileutils maybe-install-fileutils
  maybe-install-fileutils:
+@if fileutils
+maybe-install-fileutils: install-fileutils
  
  install-fileutils: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd fileutils && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif fileutils
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-fileutils info-fileutils
  maybe-info-fileutils:
+@if fileutils
+maybe-info-fileutils: info-fileutils
  
  info-fileutils: \
      configure-fileutils 
@@ -6036,7 +7165,8 @@ info-fileutils: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in fileutils" ; \
@@ -6048,9 +7178,12 @@ info-fileutils: \
                   info) \
           || exit 1
  
+@endif fileutils
  
  .PHONY: maybe-dvi-fileutils dvi-fileutils
  maybe-dvi-fileutils:
+@if fileutils
+maybe-dvi-fileutils: dvi-fileutils
  
  dvi-fileutils: \
      configure-fileutils 
@@ -6058,7 +7191,8 @@ dvi-fileutils: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in fileutils" ; \
@@ -6070,9 +7204,12 @@ dvi-fileutils: \
                   dvi) \
           || exit 1
  
+@endif fileutils
  
  .PHONY: maybe-TAGS-fileutils TAGS-fileutils
  maybe-TAGS-fileutils:
+@if fileutils
+maybe-TAGS-fileutils: TAGS-fileutils
  
  TAGS-fileutils: \
      configure-fileutils 
@@ -6080,7 +7217,8 @@ TAGS-fileutils: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in fileutils" ; \
@@ -6092,9 +7230,12 @@ TAGS-fileutils: \
                   TAGS) \
           || exit 1
  
+@endif fileutils
  
  .PHONY: maybe-install-info-fileutils install-info-fileutils
  maybe-install-info-fileutils:
+@if fileutils
+maybe-install-info-fileutils: install-info-fileutils
  
  install-info-fileutils: \
      configure-fileutils \
@@ -6103,7 +7244,8 @@ install-info-fileutils: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in fileutils" ; \
@@ -6115,9 +7257,12 @@ install-info-fileutils: \
                   install-info) \
           || exit 1
  
+@endif fileutils
  
  .PHONY: maybe-installcheck-fileutils installcheck-fileutils
  maybe-installcheck-fileutils:
+@if fileutils
+maybe-installcheck-fileutils: installcheck-fileutils
  
  installcheck-fileutils: \
      configure-fileutils 
@@ -6125,7 +7270,8 @@ installcheck-fileutils: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in fileutils" ; \
@@ -6137,16 +7283,20 @@ installcheck-fileutils: \
                   installcheck) \
           || exit 1
  
+@endif fileutils
  
  .PHONY: maybe-mostlyclean-fileutils mostlyclean-fileutils
  maybe-mostlyclean-fileutils:
+@if fileutils
+maybe-mostlyclean-fileutils: mostlyclean-fileutils
  
  mostlyclean-fileutils: 
         @[ -f ./fileutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in fileutils" ; \
@@ -6158,16 +7308,20 @@ mostlyclean-fileutils:
                   mostlyclean) \
           || exit 1
  
+@endif fileutils
  
  .PHONY: maybe-clean-fileutils clean-fileutils
  maybe-clean-fileutils:
+@if fileutils
+maybe-clean-fileutils: clean-fileutils
  
  clean-fileutils: 
         @[ -f ./fileutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in fileutils" ; \
@@ -6179,16 +7333,20 @@ clean-fileutils:
                   clean) \
           || exit 1
  
+@endif fileutils
  
  .PHONY: maybe-distclean-fileutils distclean-fileutils
  maybe-distclean-fileutils:
+@if fileutils
+maybe-distclean-fileutils: distclean-fileutils
  
  distclean-fileutils: 
         @[ -f ./fileutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in fileutils" ; \
@@ -6200,16 +7358,20 @@ distclean-fileutils:
                   distclean) \
           || exit 1
  
+@endif fileutils
  
  .PHONY: maybe-maintainer-clean-fileutils maintainer-clean-fileutils
  maybe-maintainer-clean-fileutils:
+@if fileutils
+maybe-maintainer-clean-fileutils: maintainer-clean-fileutils
  
  maintainer-clean-fileutils: 
         @[ -f ./fileutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in fileutils" ; \
@@ -6221,31 +7383,19 @@ maintainer-clean-fileutils:
                   maintainer-clean) \
           || exit 1
  
+@endif fileutils
  
  
  .PHONY: configure-findutils maybe-configure-findutils
  maybe-configure-findutils:
+@if findutils
+maybe-configure-findutils: configure-findutils
  configure-findutils:
         @test ! -f findutils/Makefile || exit 0; \
         [ -d findutils ] || mkdir findutils; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in findutils; \
         cd findutils || exit 1; \
         case $(srcdir) in \
@@ -6260,41 +7410,58 @@ configure-findutils:
             libsrcdir="$$s/findutils";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif findutils
  
  .PHONY: all-findutils maybe-all-findutils
  maybe-all-findutils:
+@if findutils
+TARGET-findutils=all
+maybe-all-findutils: all-findutils
  all-findutils: configure-findutils
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd findutils && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd findutils && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-findutils))
+@endif findutils
  
  .PHONY: check-findutils maybe-check-findutils
  maybe-check-findutils:
+@if findutils
+maybe-check-findutils: check-findutils
  
  check-findutils:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd findutils && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif findutils
  
  .PHONY: install-findutils maybe-install-findutils
  maybe-install-findutils:
+@if findutils
+maybe-install-findutils: install-findutils
  
  install-findutils: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd findutils && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif findutils
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-findutils info-findutils
  maybe-info-findutils:
+@if findutils
+maybe-info-findutils: info-findutils
  
  info-findutils: \
      configure-findutils 
@@ -6302,7 +7469,8 @@ info-findutils: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in findutils" ; \
@@ -6314,9 +7482,12 @@ info-findutils: \
                   info) \
           || exit 1
  
+@endif findutils
  
  .PHONY: maybe-dvi-findutils dvi-findutils
  maybe-dvi-findutils:
+@if findutils
+maybe-dvi-findutils: dvi-findutils
  
  dvi-findutils: \
      configure-findutils 
@@ -6324,7 +7495,8 @@ dvi-findutils: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in findutils" ; \
@@ -6336,9 +7508,12 @@ dvi-findutils: \
                   dvi) \
           || exit 1
  
+@endif findutils
  
  .PHONY: maybe-TAGS-findutils TAGS-findutils
  maybe-TAGS-findutils:
+@if findutils
+maybe-TAGS-findutils: TAGS-findutils
  
  TAGS-findutils: \
      configure-findutils 
@@ -6346,7 +7521,8 @@ TAGS-findutils: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in findutils" ; \
@@ -6358,9 +7534,12 @@ TAGS-findutils: \
                   TAGS) \
           || exit 1
  
+@endif findutils
  
  .PHONY: maybe-install-info-findutils install-info-findutils
  maybe-install-info-findutils:
+@if findutils
+maybe-install-info-findutils: install-info-findutils
  
  install-info-findutils: \
      configure-findutils \
@@ -6369,7 +7548,8 @@ install-info-findutils: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in findutils" ; \
@@ -6381,9 +7561,12 @@ install-info-findutils: \
                   install-info) \
           || exit 1
  
+@endif findutils
  
  .PHONY: maybe-installcheck-findutils installcheck-findutils
  maybe-installcheck-findutils:
+@if findutils
+maybe-installcheck-findutils: installcheck-findutils
  
  installcheck-findutils: \
      configure-findutils 
@@ -6391,7 +7574,8 @@ installcheck-findutils: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in findutils" ; \
@@ -6403,16 +7587,20 @@ installcheck-findutils: \
                   installcheck) \
           || exit 1
  
+@endif findutils
  
  .PHONY: maybe-mostlyclean-findutils mostlyclean-findutils
  maybe-mostlyclean-findutils:
+@if findutils
+maybe-mostlyclean-findutils: mostlyclean-findutils
  
  mostlyclean-findutils: 
         @[ -f ./findutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in findutils" ; \
@@ -6424,16 +7612,20 @@ mostlyclean-findutils:
                   mostlyclean) \
           || exit 1
  
+@endif findutils
  
  .PHONY: maybe-clean-findutils clean-findutils
  maybe-clean-findutils:
+@if findutils
+maybe-clean-findutils: clean-findutils
  
  clean-findutils: 
         @[ -f ./findutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in findutils" ; \
@@ -6445,16 +7637,20 @@ clean-findutils:
                   clean) \
           || exit 1
  
+@endif findutils
  
  .PHONY: maybe-distclean-findutils distclean-findutils
  maybe-distclean-findutils:
+@if findutils
+maybe-distclean-findutils: distclean-findutils
  
  distclean-findutils: 
         @[ -f ./findutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in findutils" ; \
@@ -6466,16 +7662,20 @@ distclean-findutils:
                   distclean) \
           || exit 1
  
+@endif findutils
  
  .PHONY: maybe-maintainer-clean-findutils maintainer-clean-findutils
  maybe-maintainer-clean-findutils:
+@if findutils
+maybe-maintainer-clean-findutils: maintainer-clean-findutils
  
  maintainer-clean-findutils: 
         @[ -f ./findutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in findutils" ; \
@@ -6487,31 +7687,19 @@ maintainer-clean-findutils:
                   maintainer-clean) \
           || exit 1
  
+@endif findutils
  
  
  .PHONY: configure-find maybe-configure-find
  maybe-configure-find:
+@if find
+maybe-configure-find: configure-find
  configure-find:
         @test ! -f find/Makefile || exit 0; \
         [ -d find ] || mkdir find; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in find; \
         cd find || exit 1; \
         case $(srcdir) in \
@@ -6526,41 +7714,58 @@ configure-find:
             libsrcdir="$$s/find";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif find
  
  .PHONY: all-find maybe-all-find
  maybe-all-find:
+@if find
+TARGET-find=all
+maybe-all-find: all-find
  all-find: configure-find
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd find && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd find && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-find))
+@endif find
  
  .PHONY: check-find maybe-check-find
  maybe-check-find:
+@if find
+maybe-check-find: check-find
  
  check-find:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd find && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif find
  
  .PHONY: install-find maybe-install-find
  maybe-install-find:
+@if find
+maybe-install-find: install-find
  
  install-find: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd find && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif find
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-find info-find
  maybe-info-find:
+@if find
+maybe-info-find: info-find
  
  info-find: \
      configure-find 
@@ -6568,7 +7773,8 @@ info-find: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in find" ; \
@@ -6580,9 +7786,12 @@ info-find: \
                   info) \
           || exit 1
  
+@endif find
  
  .PHONY: maybe-dvi-find dvi-find
  maybe-dvi-find:
+@if find
+maybe-dvi-find: dvi-find
  
  dvi-find: \
      configure-find 
@@ -6590,7 +7799,8 @@ dvi-find: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in find" ; \
@@ -6602,9 +7812,12 @@ dvi-find: \
                   dvi) \
           || exit 1
  
+@endif find
  
  .PHONY: maybe-TAGS-find TAGS-find
  maybe-TAGS-find:
+@if find
+maybe-TAGS-find: TAGS-find
  
  TAGS-find: \
      configure-find 
@@ -6612,7 +7825,8 @@ TAGS-find: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in find" ; \
@@ -6624,9 +7838,12 @@ TAGS-find: \
                   TAGS) \
           || exit 1
  
+@endif find
  
  .PHONY: maybe-install-info-find install-info-find
  maybe-install-info-find:
+@if find
+maybe-install-info-find: install-info-find
  
  install-info-find: \
      configure-find \
@@ -6635,7 +7852,8 @@ install-info-find: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in find" ; \
@@ -6647,9 +7865,12 @@ install-info-find: \
                   install-info) \
           || exit 1
  
+@endif find
  
  .PHONY: maybe-installcheck-find installcheck-find
  maybe-installcheck-find:
+@if find
+maybe-installcheck-find: installcheck-find
  
  installcheck-find: \
      configure-find 
@@ -6657,7 +7878,8 @@ installcheck-find: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in find" ; \
@@ -6669,16 +7891,20 @@ installcheck-find: \
                   installcheck) \
           || exit 1
  
+@endif find
  
  .PHONY: maybe-mostlyclean-find mostlyclean-find
  maybe-mostlyclean-find:
+@if find
+maybe-mostlyclean-find: mostlyclean-find
  
  mostlyclean-find: 
         @[ -f ./find/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in find" ; \
@@ -6690,16 +7916,20 @@ mostlyclean-find:
                   mostlyclean) \
           || exit 1
  
+@endif find
  
  .PHONY: maybe-clean-find clean-find
  maybe-clean-find:
+@if find
+maybe-clean-find: clean-find
  
  clean-find: 
         @[ -f ./find/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in find" ; \
@@ -6711,16 +7941,20 @@ clean-find:
                   clean) \
           || exit 1
  
+@endif find
  
  .PHONY: maybe-distclean-find distclean-find
  maybe-distclean-find:
+@if find
+maybe-distclean-find: distclean-find
  
  distclean-find: 
         @[ -f ./find/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in find" ; \
@@ -6732,16 +7966,20 @@ distclean-find:
                   distclean) \
           || exit 1
  
+@endif find
  
  .PHONY: maybe-maintainer-clean-find maintainer-clean-find
  maybe-maintainer-clean-find:
+@if find
+maybe-maintainer-clean-find: maintainer-clean-find
  
  maintainer-clean-find: 
         @[ -f ./find/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in find" ; \
@@ -6753,31 +7991,19 @@ maintainer-clean-find:
                   maintainer-clean) \
           || exit 1
  
+@endif find
  
  
  .PHONY: configure-flex maybe-configure-flex
  maybe-configure-flex:
+@if flex
+maybe-configure-flex: configure-flex
  configure-flex:
         @test ! -f flex/Makefile || exit 0; \
         [ -d flex ] || mkdir flex; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in flex; \
         cd flex || exit 1; \
         case $(srcdir) in \
@@ -6792,19 +8018,28 @@ configure-flex:
             libsrcdir="$$s/flex";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif flex
  
  .PHONY: all-flex maybe-all-flex
  maybe-all-flex:
+@if flex
+TARGET-flex=all
+maybe-all-flex: all-flex
  all-flex: configure-flex
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd flex && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd flex && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-flex))
+@endif flex
  
  .PHONY: check-flex maybe-check-flex
  maybe-check-flex:
+@if flex
+maybe-check-flex: check-flex
  
  # This module is only tested in a native toolchain.
  check-flex:
@@ -6812,24 +8047,32 @@ check-flex:
           r=`${PWD_COMMAND}`; export r; \
           s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
           $(SET_LIB_PATH) \
-         (cd flex && $(MAKE) $(FLAGS_TO_PASS) check); \
+         $(HOST_EXPORTS) \
+         (cd flex && $(MAKE) $(FLAGS_TO_PASS)  check); \
         fi
  
+@endif flex
  
  .PHONY: install-flex maybe-install-flex
  maybe-install-flex:
+@if flex
+maybe-install-flex: install-flex
  
  install-flex: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd flex && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif flex
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-flex info-flex
  maybe-info-flex:
+@if flex
+maybe-info-flex: info-flex
  
  info-flex: \
      configure-flex 
@@ -6837,7 +8080,8 @@ info-flex: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in flex" ; \
@@ -6849,9 +8093,12 @@ info-flex: \
                   info) \
           || exit 1
  
+@endif flex
  
  .PHONY: maybe-dvi-flex dvi-flex
  maybe-dvi-flex:
+@if flex
+maybe-dvi-flex: dvi-flex
  
  dvi-flex: \
      configure-flex 
@@ -6859,7 +8106,8 @@ dvi-flex: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in flex" ; \
@@ -6871,9 +8119,12 @@ dvi-flex: \
                   dvi) \
           || exit 1
  
+@endif flex
  
  .PHONY: maybe-TAGS-flex TAGS-flex
  maybe-TAGS-flex:
+@if flex
+maybe-TAGS-flex: TAGS-flex
  
  TAGS-flex: \
      configure-flex 
@@ -6881,7 +8132,8 @@ TAGS-flex: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in flex" ; \
@@ -6893,9 +8145,12 @@ TAGS-flex: \
                   TAGS) \
           || exit 1
  
+@endif flex
  
  .PHONY: maybe-install-info-flex install-info-flex
  maybe-install-info-flex:
+@if flex
+maybe-install-info-flex: install-info-flex
  
  install-info-flex: \
      configure-flex \
@@ -6904,7 +8159,8 @@ install-info-flex: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in flex" ; \
@@ -6916,9 +8172,12 @@ install-info-flex: \
                   install-info) \
           || exit 1
  
+@endif flex
  
  .PHONY: maybe-installcheck-flex installcheck-flex
  maybe-installcheck-flex:
+@if flex
+maybe-installcheck-flex: installcheck-flex
  
  installcheck-flex: \
      configure-flex 
@@ -6926,7 +8185,8 @@ installcheck-flex: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in flex" ; \
@@ -6938,16 +8198,20 @@ installcheck-flex: \
                   installcheck) \
           || exit 1
  
+@endif flex
  
  .PHONY: maybe-mostlyclean-flex mostlyclean-flex
  maybe-mostlyclean-flex:
+@if flex
+maybe-mostlyclean-flex: mostlyclean-flex
  
  mostlyclean-flex: 
         @[ -f ./flex/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in flex" ; \
@@ -6959,16 +8223,20 @@ mostlyclean-flex:
                   mostlyclean) \
           || exit 1
  
+@endif flex
  
  .PHONY: maybe-clean-flex clean-flex
  maybe-clean-flex:
+@if flex
+maybe-clean-flex: clean-flex
  
  clean-flex: 
         @[ -f ./flex/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in flex" ; \
@@ -6980,16 +8248,20 @@ clean-flex:
                   clean) \
           || exit 1
  
+@endif flex
  
  .PHONY: maybe-distclean-flex distclean-flex
  maybe-distclean-flex:
+@if flex
+maybe-distclean-flex: distclean-flex
  
  distclean-flex: 
         @[ -f ./flex/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in flex" ; \
@@ -7001,16 +8273,20 @@ distclean-flex:
                   distclean) \
           || exit 1
  
+@endif flex
  
  .PHONY: maybe-maintainer-clean-flex maintainer-clean-flex
  maybe-maintainer-clean-flex:
+@if flex
+maybe-maintainer-clean-flex: maintainer-clean-flex
  
  maintainer-clean-flex: 
         @[ -f ./flex/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in flex" ; \
@@ -7022,31 +8298,20 @@ maintainer-clean-flex:
                   maintainer-clean) \
           || exit 1
  
+@endif flex
  
  
  .PHONY: configure-gas maybe-configure-gas
  maybe-configure-gas:
+@if gas
+maybe-configure-gas: configure-gas
  configure-gas:
-       @test ! -f gas/Makefile || exit 0; \
+       @test -f stage_last && exit 0; \
+       test ! -f gas/Makefile || exit 0; \
         [ -d gas ] || mkdir gas; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in gas; \
         cd gas || exit 1; \
         case $(srcdir) in \
@@ -7061,41 +8326,59 @@ configure-gas:
             libsrcdir="$$s/gas";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif gas
  
  .PHONY: all-gas maybe-all-gas
  maybe-all-gas:
+@if gas
+TARGET-gas=all
+maybe-all-gas: all-gas
  all-gas: configure-gas
-       @r=`${PWD_COMMAND}`; export r; \
+       @test -f stage_last && exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd gas && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd gas && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-gas))
+@endif gas
  
  .PHONY: check-gas maybe-check-gas
  maybe-check-gas:
+@if gas
+maybe-check-gas: check-gas
  
  check-gas:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd gas && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif gas
  
  .PHONY: install-gas maybe-install-gas
  maybe-install-gas:
+@if gas
+maybe-install-gas: install-gas
  
  install-gas: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd gas && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif gas
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-gas info-gas
  maybe-info-gas:
+@if gas
+maybe-info-gas: info-gas
  
  info-gas: \
      configure-gas 
@@ -7103,7 +8386,8 @@ info-gas: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in gas" ; \
@@ -7115,9 +8399,12 @@ info-gas: \
                   info) \
           || exit 1
  
+@endif gas
  
  .PHONY: maybe-dvi-gas dvi-gas
  maybe-dvi-gas:
+@if gas
+maybe-dvi-gas: dvi-gas
  
  dvi-gas: \
      configure-gas 
@@ -7125,7 +8412,8 @@ dvi-gas: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in gas" ; \
@@ -7137,9 +8425,12 @@ dvi-gas: \
                   dvi) \
           || exit 1
  
+@endif gas
  
  .PHONY: maybe-TAGS-gas TAGS-gas
  maybe-TAGS-gas:
+@if gas
+maybe-TAGS-gas: TAGS-gas
  
  TAGS-gas: \
      configure-gas 
@@ -7147,7 +8438,8 @@ TAGS-gas: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in gas" ; \
@@ -7159,9 +8451,12 @@ TAGS-gas: \
                   TAGS) \
           || exit 1
  
+@endif gas
  
  .PHONY: maybe-install-info-gas install-info-gas
  maybe-install-info-gas:
+@if gas
+maybe-install-info-gas: install-info-gas
  
  install-info-gas: \
      configure-gas \
@@ -7170,7 +8465,8 @@ install-info-gas: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in gas" ; \
@@ -7182,9 +8478,12 @@ install-info-gas: \
                   install-info) \
           || exit 1
  
+@endif gas
  
  .PHONY: maybe-installcheck-gas installcheck-gas
  maybe-installcheck-gas:
+@if gas
+maybe-installcheck-gas: installcheck-gas
  
  installcheck-gas: \
      configure-gas 
@@ -7192,7 +8491,8 @@ installcheck-gas: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in gas" ; \
@@ -7204,16 +8504,20 @@ installcheck-gas: \
                   installcheck) \
           || exit 1
  
+@endif gas
  
  .PHONY: maybe-mostlyclean-gas mostlyclean-gas
  maybe-mostlyclean-gas:
+@if gas
+maybe-mostlyclean-gas: mostlyclean-gas
  
  mostlyclean-gas: 
         @[ -f ./gas/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in gas" ; \
@@ -7225,16 +8529,20 @@ mostlyclean-gas:
                   mostlyclean) \
           || exit 1
  
+@endif gas
  
  .PHONY: maybe-clean-gas clean-gas
  maybe-clean-gas:
+@if gas
+maybe-clean-gas: clean-gas
  
  clean-gas: 
         @[ -f ./gas/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in gas" ; \
@@ -7246,16 +8554,20 @@ clean-gas:
                   clean) \
           || exit 1
  
+@endif gas
  
  .PHONY: maybe-distclean-gas distclean-gas
  maybe-distclean-gas:
+@if gas
+maybe-distclean-gas: distclean-gas
  
  distclean-gas: 
         @[ -f ./gas/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in gas" ; \
@@ -7267,16 +8579,20 @@ distclean-gas:
                   distclean) \
           || exit 1
  
+@endif gas
  
  .PHONY: maybe-maintainer-clean-gas maintainer-clean-gas
  maybe-maintainer-clean-gas:
+@if gas
+maybe-maintainer-clean-gas: maintainer-clean-gas
  
  maintainer-clean-gas: 
         @[ -f ./gas/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in gas" ; \
@@ -7288,92 +8604,100 @@ maintainer-clean-gas:
                   maintainer-clean) \
           || exit 1
  
+@endif gas
  
  
-.PHONY: configure-gawk maybe-configure-gawk
-maybe-configure-gawk:
-configure-gawk:
-       @test ! -f gawk/Makefile || exit 0; \
-       [ -d gawk ] || mkdir gawk; \
+.PHONY: configure-gcc maybe-configure-gcc
+maybe-configure-gcc:
+@if gcc
+maybe-configure-gcc: configure-gcc
+configure-gcc:
+       @test -f stage_last && exit 0; \
+       test ! -f gcc/Makefile || exit 0; \
+       [ -d gcc ] || mkdir gcc; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in gawk; \
-       cd gawk || exit 1; \
+       $(HOST_EXPORTS) \
+       echo Configuring in gcc; \
+       cd gcc || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/gawk"; \
-           libsrcdir="$$s/gawk";; \
+           srcdiroption="--srcdir=$(srcdir)/gcc"; \
+           libsrcdir="$$s/gcc";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/gawk"; \
-           libsrcdir="$$s/gawk";; \
+           srcdiroption="--srcdir=../$(srcdir)/gcc"; \
+           libsrcdir="$$s/gcc";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif gcc
  
-.PHONY: all-gawk maybe-all-gawk
-maybe-all-gawk:
-all-gawk: configure-gawk
-       @r=`${PWD_COMMAND}`; export r; \
+.PHONY: all-gcc maybe-all-gcc
+maybe-all-gcc:
+@if gcc
+TARGET-gcc=`if [ -f gcc/stage_last ]; then echo quickstrap ; else echo all; fi`
+maybe-all-gcc: all-gcc
+all-gcc: configure-gcc
+       @test -f stage_last && exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd gawk && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd gcc && $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
+         $(TARGET-gcc))
+@endif gcc
  
-.PHONY: check-gawk maybe-check-gawk
-maybe-check-gawk:
+.PHONY: check-gcc maybe-check-gcc
+maybe-check-gcc:
+@if gcc
+maybe-check-gcc: check-gcc
  
-check-gawk:
+check-gcc:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd gawk && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(HOST_EXPORTS) \
+       (cd gcc && $(MAKE) $(FLAGS_TO_PASS)$(EXTRA_GCC_FLAGS) check)
  
+@endif gcc
  
-.PHONY: install-gawk maybe-install-gawk
-maybe-install-gawk:
+.PHONY: install-gcc maybe-install-gcc
+maybe-install-gcc:
+@if gcc
+maybe-install-gcc: install-gcc
  
-install-gawk: installdirs
+install-gcc: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd gawk && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(HOST_EXPORTS) \
+       (cd gcc && $(MAKE) $(FLAGS_TO_PASS)$(EXTRA_GCC_FLAGS) install)
  
+@endif gcc
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-gawk info-gawk
-maybe-info-gawk:
+.PHONY: maybe-info-gcc info-gcc
+maybe-info-gcc:
+@if gcc
+maybe-info-gcc: info-gcc
  
-info-gawk: \
-    configure-gawk 
-       @[ -f ./gawk/Makefile ] || exit 0; \
+info-gcc: \
+    configure-gcc 
+       @[ -f ./gcc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in gawk" ; \
-       (cd gawk && \
+       echo "Doing info in gcc" ; \
+       (cd gcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7381,21 +8705,25 @@ info-gawk: \
                   info) \
           || exit 1
  
+@endif gcc
  
-.PHONY: maybe-dvi-gawk dvi-gawk
-maybe-dvi-gawk:
+.PHONY: maybe-dvi-gcc dvi-gcc
+maybe-dvi-gcc:
+@if gcc
+maybe-dvi-gcc: dvi-gcc
  
-dvi-gawk: \
-    configure-gawk 
-       @[ -f ./gawk/Makefile ] || exit 0; \
+dvi-gcc: \
+    configure-gcc 
+       @[ -f ./gcc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in gawk" ; \
-       (cd gawk && \
+       echo "Doing dvi in gcc" ; \
+       (cd gcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7403,21 +8731,25 @@ dvi-gawk: \
                   dvi) \
           || exit 1
  
+@endif gcc
  
-.PHONY: maybe-TAGS-gawk TAGS-gawk
-maybe-TAGS-gawk:
+.PHONY: maybe-TAGS-gcc TAGS-gcc
+maybe-TAGS-gcc:
+@if gcc
+maybe-TAGS-gcc: TAGS-gcc
  
-TAGS-gawk: \
-    configure-gawk 
-       @[ -f ./gawk/Makefile ] || exit 0; \
+TAGS-gcc: \
+    configure-gcc 
+       @[ -f ./gcc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in gawk" ; \
-       (cd gawk && \
+       echo "Doing TAGS in gcc" ; \
+       (cd gcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7425,22 +8757,26 @@ TAGS-gawk: \
                   TAGS) \
           || exit 1
  
+@endif gcc
  
-.PHONY: maybe-install-info-gawk install-info-gawk
-maybe-install-info-gawk:
+.PHONY: maybe-install-info-gcc install-info-gcc
+maybe-install-info-gcc:
+@if gcc
+maybe-install-info-gcc: install-info-gcc
  
-install-info-gawk: \
-    configure-gawk \
-    info-gawk 
-       @[ -f ./gawk/Makefile ] || exit 0; \
+install-info-gcc: \
+    configure-gcc \
+    info-gcc 
+       @[ -f ./gcc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in gawk" ; \
-       (cd gawk && \
+       echo "Doing install-info in gcc" ; \
+       (cd gcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7448,21 +8784,25 @@ install-info-gawk: \
                   install-info) \
           || exit 1
  
+@endif gcc
  
-.PHONY: maybe-installcheck-gawk installcheck-gawk
-maybe-installcheck-gawk:
+.PHONY: maybe-installcheck-gcc installcheck-gcc
+maybe-installcheck-gcc:
+@if gcc
+maybe-installcheck-gcc: installcheck-gcc
  
-installcheck-gawk: \
-    configure-gawk 
-       @[ -f ./gawk/Makefile ] || exit 0; \
+installcheck-gcc: \
+    configure-gcc 
+       @[ -f ./gcc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in gawk" ; \
-       (cd gawk && \
+       echo "Doing installcheck in gcc" ; \
+       (cd gcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7470,20 +8810,24 @@ installcheck-gawk: \
                   installcheck) \
           || exit 1
  
+@endif gcc
  
-.PHONY: maybe-mostlyclean-gawk mostlyclean-gawk
-maybe-mostlyclean-gawk:
+.PHONY: maybe-mostlyclean-gcc mostlyclean-gcc
+maybe-mostlyclean-gcc:
+@if gcc
+maybe-mostlyclean-gcc: mostlyclean-gcc
  
-mostlyclean-gawk: 
-       @[ -f ./gawk/Makefile ] || exit 0; \
+mostlyclean-gcc: 
+       @[ -f ./gcc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in gawk" ; \
-       (cd gawk && \
+       echo "Doing mostlyclean in gcc" ; \
+       (cd gcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7491,20 +8835,24 @@ mostlyclean-gawk:
                   mostlyclean) \
           || exit 1
  
+@endif gcc
  
-.PHONY: maybe-clean-gawk clean-gawk
-maybe-clean-gawk:
+.PHONY: maybe-clean-gcc clean-gcc
+maybe-clean-gcc:
+@if gcc
+maybe-clean-gcc: clean-gcc
  
-clean-gawk: 
-       @[ -f ./gawk/Makefile ] || exit 0; \
+clean-gcc: 
+       @[ -f ./gcc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in gawk" ; \
-       (cd gawk && \
+       echo "Doing clean in gcc" ; \
+       (cd gcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7512,20 +8860,24 @@ clean-gawk:
                   clean) \
           || exit 1
  
+@endif gcc
  
-.PHONY: maybe-distclean-gawk distclean-gawk
-maybe-distclean-gawk:
+.PHONY: maybe-distclean-gcc distclean-gcc
+maybe-distclean-gcc:
+@if gcc
+maybe-distclean-gcc: distclean-gcc
  
-distclean-gawk: 
-       @[ -f ./gawk/Makefile ] || exit 0; \
+distclean-gcc: 
+       @[ -f ./gcc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in gawk" ; \
-       (cd gawk && \
+       echo "Doing distclean in gcc" ; \
+       (cd gcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7533,20 +8885,24 @@ distclean-gawk:
                   distclean) \
           || exit 1
  
+@endif gcc
  
-.PHONY: maybe-maintainer-clean-gawk maintainer-clean-gawk
-maybe-maintainer-clean-gawk:
+.PHONY: maybe-maintainer-clean-gcc maintainer-clean-gcc
+maybe-maintainer-clean-gcc:
+@if gcc
+maybe-maintainer-clean-gcc: maintainer-clean-gcc
  
-maintainer-clean-gawk: 
-       @[ -f ./gawk/Makefile ] || exit 0; \
+maintainer-clean-gcc: 
+       @[ -f ./gcc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in gawk" ; \
-       (cd gawk && \
+       echo "Doing maintainer-clean in gcc" ; \
+       (cd gcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7554,92 +8910,98 @@ maintainer-clean-gawk:
                   maintainer-clean) \
           || exit 1
  
+@endif gcc
  
  
-.PHONY: configure-gettext maybe-configure-gettext
-maybe-configure-gettext:
-configure-gettext:
-       @test ! -f gettext/Makefile || exit 0; \
-       [ -d gettext ] || mkdir gettext; \
+.PHONY: configure-gawk maybe-configure-gawk
+maybe-configure-gawk:
+@if gawk
+maybe-configure-gawk: configure-gawk
+configure-gawk:
+       @test ! -f gawk/Makefile || exit 0; \
+       [ -d gawk ] || mkdir gawk; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in gettext; \
-       cd gettext || exit 1; \
+       $(HOST_EXPORTS) \
+       echo Configuring in gawk; \
+       cd gawk || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/gettext"; \
-           libsrcdir="$$s/gettext";; \
+           srcdiroption="--srcdir=$(srcdir)/gawk"; \
+           libsrcdir="$$s/gawk";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/gettext"; \
-           libsrcdir="$$s/gettext";; \
+           srcdiroption="--srcdir=../$(srcdir)/gawk"; \
+           libsrcdir="$$s/gawk";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif gawk
  
-.PHONY: all-gettext maybe-all-gettext
-maybe-all-gettext:
-all-gettext: configure-gettext
+.PHONY: all-gawk maybe-all-gawk
+maybe-all-gawk:
+@if gawk
+TARGET-gawk=all
+maybe-all-gawk: all-gawk
+all-gawk: configure-gawk
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd gettext && $(MAKE) $(FLAGS_TO_PASS) all)
-
-.PHONY: check-gettext maybe-check-gettext
-maybe-check-gettext:
+       $(HOST_EXPORTS) \
+       (cd gawk && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-gawk))
+@endif gawk
  
-check-gettext:
+.PHONY: check-gawk maybe-check-gawk
+maybe-check-gawk:
+@if gawk
+maybe-check-gawk: check-gawk
+
+check-gawk:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd gettext && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(HOST_EXPORTS) \
+       (cd gawk && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif gawk
  
-.PHONY: install-gettext maybe-install-gettext
-maybe-install-gettext:
+.PHONY: install-gawk maybe-install-gawk
+maybe-install-gawk:
+@if gawk
+maybe-install-gawk: install-gawk
  
-install-gettext: installdirs
+install-gawk: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd gettext && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(HOST_EXPORTS) \
+       (cd gawk && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif gawk
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-gettext info-gettext
-maybe-info-gettext:
+.PHONY: maybe-info-gawk info-gawk
+maybe-info-gawk:
+@if gawk
+maybe-info-gawk: info-gawk
  
-info-gettext: \
-    configure-gettext 
-       @[ -f ./gettext/Makefile ] || exit 0; \
+info-gawk: \
+    configure-gawk 
+       @[ -f ./gawk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in gettext" ; \
-       (cd gettext && \
+       echo "Doing info in gawk" ; \
+       (cd gawk && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7647,21 +9009,25 @@ info-gettext: \
                   info) \
           || exit 1
  
+@endif gawk
  
-.PHONY: maybe-dvi-gettext dvi-gettext
-maybe-dvi-gettext:
+.PHONY: maybe-dvi-gawk dvi-gawk
+maybe-dvi-gawk:
+@if gawk
+maybe-dvi-gawk: dvi-gawk
  
-dvi-gettext: \
-    configure-gettext 
-       @[ -f ./gettext/Makefile ] || exit 0; \
+dvi-gawk: \
+    configure-gawk 
+       @[ -f ./gawk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in gettext" ; \
-       (cd gettext && \
+       echo "Doing dvi in gawk" ; \
+       (cd gawk && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7669,21 +9035,25 @@ dvi-gettext: \
                   dvi) \
           || exit 1
  
+@endif gawk
  
-.PHONY: maybe-TAGS-gettext TAGS-gettext
-maybe-TAGS-gettext:
+.PHONY: maybe-TAGS-gawk TAGS-gawk
+maybe-TAGS-gawk:
+@if gawk
+maybe-TAGS-gawk: TAGS-gawk
  
-TAGS-gettext: \
-    configure-gettext 
-       @[ -f ./gettext/Makefile ] || exit 0; \
+TAGS-gawk: \
+    configure-gawk 
+       @[ -f ./gawk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in gettext" ; \
-       (cd gettext && \
+       echo "Doing TAGS in gawk" ; \
+       (cd gawk && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7691,22 +9061,26 @@ TAGS-gettext: \
                   TAGS) \
           || exit 1
  
+@endif gawk
  
-.PHONY: maybe-install-info-gettext install-info-gettext
-maybe-install-info-gettext:
+.PHONY: maybe-install-info-gawk install-info-gawk
+maybe-install-info-gawk:
+@if gawk
+maybe-install-info-gawk: install-info-gawk
  
-install-info-gettext: \
-    configure-gettext \
-    info-gettext 
-       @[ -f ./gettext/Makefile ] || exit 0; \
+install-info-gawk: \
+    configure-gawk \
+    info-gawk 
+       @[ -f ./gawk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in gettext" ; \
-       (cd gettext && \
+       echo "Doing install-info in gawk" ; \
+       (cd gawk && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7714,21 +9088,25 @@ install-info-gettext: \
                   install-info) \
           || exit 1
  
+@endif gawk
  
-.PHONY: maybe-installcheck-gettext installcheck-gettext
-maybe-installcheck-gettext:
+.PHONY: maybe-installcheck-gawk installcheck-gawk
+maybe-installcheck-gawk:
+@if gawk
+maybe-installcheck-gawk: installcheck-gawk
  
-installcheck-gettext: \
-    configure-gettext 
-       @[ -f ./gettext/Makefile ] || exit 0; \
+installcheck-gawk: \
+    configure-gawk 
+       @[ -f ./gawk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in gettext" ; \
-       (cd gettext && \
+       echo "Doing installcheck in gawk" ; \
+       (cd gawk && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7736,20 +9114,24 @@ installcheck-gettext: \
                   installcheck) \
           || exit 1
  
+@endif gawk
  
-.PHONY: maybe-mostlyclean-gettext mostlyclean-gettext
-maybe-mostlyclean-gettext:
+.PHONY: maybe-mostlyclean-gawk mostlyclean-gawk
+maybe-mostlyclean-gawk:
+@if gawk
+maybe-mostlyclean-gawk: mostlyclean-gawk
  
-mostlyclean-gettext: 
-       @[ -f ./gettext/Makefile ] || exit 0; \
+mostlyclean-gawk: 
+       @[ -f ./gawk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in gettext" ; \
-       (cd gettext && \
+       echo "Doing mostlyclean in gawk" ; \
+       (cd gawk && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7757,20 +9139,24 @@ mostlyclean-gettext:
                   mostlyclean) \
           || exit 1
  
+@endif gawk
  
-.PHONY: maybe-clean-gettext clean-gettext
-maybe-clean-gettext:
+.PHONY: maybe-clean-gawk clean-gawk
+maybe-clean-gawk:
+@if gawk
+maybe-clean-gawk: clean-gawk
  
-clean-gettext: 
-       @[ -f ./gettext/Makefile ] || exit 0; \
+clean-gawk: 
+       @[ -f ./gawk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in gettext" ; \
-       (cd gettext && \
+       echo "Doing clean in gawk" ; \
+       (cd gawk && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7778,20 +9164,24 @@ clean-gettext:
                   clean) \
           || exit 1
  
+@endif gawk
  
-.PHONY: maybe-distclean-gettext distclean-gettext
-maybe-distclean-gettext:
+.PHONY: maybe-distclean-gawk distclean-gawk
+maybe-distclean-gawk:
+@if gawk
+maybe-distclean-gawk: distclean-gawk
  
-distclean-gettext: 
-       @[ -f ./gettext/Makefile ] || exit 0; \
+distclean-gawk: 
+       @[ -f ./gawk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in gettext" ; \
-       (cd gettext && \
+       echo "Doing distclean in gawk" ; \
+       (cd gawk && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7799,20 +9189,24 @@ distclean-gettext:
                   distclean) \
           || exit 1
  
+@endif gawk
  
-.PHONY: maybe-maintainer-clean-gettext maintainer-clean-gettext
-maybe-maintainer-clean-gettext:
+.PHONY: maybe-maintainer-clean-gawk maintainer-clean-gawk
+maybe-maintainer-clean-gawk:
+@if gawk
+maybe-maintainer-clean-gawk: maintainer-clean-gawk
  
-maintainer-clean-gettext: 
-       @[ -f ./gettext/Makefile ] || exit 0; \
+maintainer-clean-gawk: 
+       @[ -f ./gawk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in gettext" ; \
-       (cd gettext && \
+       echo "Doing maintainer-clean in gawk" ; \
+       (cd gawk && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7820,92 +9214,98 @@ maintainer-clean-gettext:
                   maintainer-clean) \
           || exit 1
  
+@endif gawk
  
  
-.PHONY: configure-gnuserv maybe-configure-gnuserv
-maybe-configure-gnuserv:
-configure-gnuserv:
-       @test ! -f gnuserv/Makefile || exit 0; \
-       [ -d gnuserv ] || mkdir gnuserv; \
+.PHONY: configure-gettext maybe-configure-gettext
+maybe-configure-gettext:
+@if gettext
+maybe-configure-gettext: configure-gettext
+configure-gettext:
+       @test ! -f gettext/Makefile || exit 0; \
+       [ -d gettext ] || mkdir gettext; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in gnuserv; \
-       cd gnuserv || exit 1; \
+       $(HOST_EXPORTS) \
+       echo Configuring in gettext; \
+       cd gettext || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/gnuserv"; \
-           libsrcdir="$$s/gnuserv";; \
+           srcdiroption="--srcdir=$(srcdir)/gettext"; \
+           libsrcdir="$$s/gettext";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/gnuserv"; \
-           libsrcdir="$$s/gnuserv";; \
+           srcdiroption="--srcdir=../$(srcdir)/gettext"; \
+           libsrcdir="$$s/gettext";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif gettext
  
-.PHONY: all-gnuserv maybe-all-gnuserv
-maybe-all-gnuserv:
-all-gnuserv: configure-gnuserv
+.PHONY: all-gettext maybe-all-gettext
+maybe-all-gettext:
+@if gettext
+TARGET-gettext=all
+maybe-all-gettext: all-gettext
+all-gettext: configure-gettext
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd gettext && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-gettext))
+@endif gettext
  
-.PHONY: check-gnuserv maybe-check-gnuserv
-maybe-check-gnuserv:
+.PHONY: check-gettext maybe-check-gettext
+maybe-check-gettext:
+@if gettext
+maybe-check-gettext: check-gettext
  
-check-gnuserv:
+check-gettext:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(HOST_EXPORTS) \
+       (cd gettext && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif gettext
  
-.PHONY: install-gnuserv maybe-install-gnuserv
-maybe-install-gnuserv:
+.PHONY: install-gettext maybe-install-gettext
+maybe-install-gettext:
+@if gettext
+maybe-install-gettext: install-gettext
  
-install-gnuserv: installdirs
+install-gettext: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(HOST_EXPORTS) \
+       (cd gettext && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif gettext
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-gnuserv info-gnuserv
-maybe-info-gnuserv:
+.PHONY: maybe-info-gettext info-gettext
+maybe-info-gettext:
+@if gettext
+maybe-info-gettext: info-gettext
  
-info-gnuserv: \
-    configure-gnuserv 
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
+info-gettext: \
+    configure-gettext 
+       @[ -f ./gettext/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in gnuserv" ; \
-       (cd gnuserv && \
+       echo "Doing info in gettext" ; \
+       (cd gettext && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7913,21 +9313,25 @@ info-gnuserv: \
                   info) \
           || exit 1
  
+@endif gettext
  
-.PHONY: maybe-dvi-gnuserv dvi-gnuserv
-maybe-dvi-gnuserv:
+.PHONY: maybe-dvi-gettext dvi-gettext
+maybe-dvi-gettext:
+@if gettext
+maybe-dvi-gettext: dvi-gettext
  
-dvi-gnuserv: \
-    configure-gnuserv 
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
+dvi-gettext: \
+    configure-gettext 
+       @[ -f ./gettext/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in gnuserv" ; \
-       (cd gnuserv && \
+       echo "Doing dvi in gettext" ; \
+       (cd gettext && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7935,21 +9339,25 @@ dvi-gnuserv: \
                   dvi) \
           || exit 1
  
+@endif gettext
  
-.PHONY: maybe-TAGS-gnuserv TAGS-gnuserv
-maybe-TAGS-gnuserv:
+.PHONY: maybe-TAGS-gettext TAGS-gettext
+maybe-TAGS-gettext:
+@if gettext
+maybe-TAGS-gettext: TAGS-gettext
  
-TAGS-gnuserv: \
-    configure-gnuserv 
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
+TAGS-gettext: \
+    configure-gettext 
+       @[ -f ./gettext/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in gnuserv" ; \
-       (cd gnuserv && \
+       echo "Doing TAGS in gettext" ; \
+       (cd gettext && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7957,22 +9365,26 @@ TAGS-gnuserv: \
                   TAGS) \
           || exit 1
  
+@endif gettext
  
-.PHONY: maybe-install-info-gnuserv install-info-gnuserv
-maybe-install-info-gnuserv:
+.PHONY: maybe-install-info-gettext install-info-gettext
+maybe-install-info-gettext:
+@if gettext
+maybe-install-info-gettext: install-info-gettext
  
-install-info-gnuserv: \
-    configure-gnuserv \
-    info-gnuserv 
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
+install-info-gettext: \
+    configure-gettext \
+    info-gettext 
+       @[ -f ./gettext/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in gnuserv" ; \
-       (cd gnuserv && \
+       echo "Doing install-info in gettext" ; \
+       (cd gettext && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -7980,21 +9392,25 @@ install-info-gnuserv: \
                   install-info) \
           || exit 1
  
+@endif gettext
  
-.PHONY: maybe-installcheck-gnuserv installcheck-gnuserv
-maybe-installcheck-gnuserv:
+.PHONY: maybe-installcheck-gettext installcheck-gettext
+maybe-installcheck-gettext:
+@if gettext
+maybe-installcheck-gettext: installcheck-gettext
  
-installcheck-gnuserv: \
-    configure-gnuserv 
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
+installcheck-gettext: \
+    configure-gettext 
+       @[ -f ./gettext/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in gnuserv" ; \
-       (cd gnuserv && \
+       echo "Doing installcheck in gettext" ; \
+       (cd gettext && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8002,20 +9418,24 @@ installcheck-gnuserv: \
                   installcheck) \
           || exit 1
  
+@endif gettext
  
-.PHONY: maybe-mostlyclean-gnuserv mostlyclean-gnuserv
-maybe-mostlyclean-gnuserv:
+.PHONY: maybe-mostlyclean-gettext mostlyclean-gettext
+maybe-mostlyclean-gettext:
+@if gettext
+maybe-mostlyclean-gettext: mostlyclean-gettext
  
-mostlyclean-gnuserv: 
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
+mostlyclean-gettext: 
+       @[ -f ./gettext/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in gnuserv" ; \
-       (cd gnuserv && \
+       echo "Doing mostlyclean in gettext" ; \
+       (cd gettext && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8023,20 +9443,24 @@ mostlyclean-gnuserv:
                   mostlyclean) \
           || exit 1
  
+@endif gettext
  
-.PHONY: maybe-clean-gnuserv clean-gnuserv
-maybe-clean-gnuserv:
+.PHONY: maybe-clean-gettext clean-gettext
+maybe-clean-gettext:
+@if gettext
+maybe-clean-gettext: clean-gettext
  
-clean-gnuserv: 
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
+clean-gettext: 
+       @[ -f ./gettext/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in gnuserv" ; \
-       (cd gnuserv && \
+       echo "Doing clean in gettext" ; \
+       (cd gettext && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8044,20 +9468,24 @@ clean-gnuserv:
                   clean) \
           || exit 1
  
+@endif gettext
  
-.PHONY: maybe-distclean-gnuserv distclean-gnuserv
-maybe-distclean-gnuserv:
+.PHONY: maybe-distclean-gettext distclean-gettext
+maybe-distclean-gettext:
+@if gettext
+maybe-distclean-gettext: distclean-gettext
  
-distclean-gnuserv: 
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
+distclean-gettext: 
+       @[ -f ./gettext/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in gnuserv" ; \
-       (cd gnuserv && \
+       echo "Doing distclean in gettext" ; \
+       (cd gettext && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8065,20 +9493,24 @@ distclean-gnuserv:
                   distclean) \
           || exit 1
  
+@endif gettext
  
-.PHONY: maybe-maintainer-clean-gnuserv maintainer-clean-gnuserv
-maybe-maintainer-clean-gnuserv:
+.PHONY: maybe-maintainer-clean-gettext maintainer-clean-gettext
+maybe-maintainer-clean-gettext:
+@if gettext
+maybe-maintainer-clean-gettext: maintainer-clean-gettext
  
-maintainer-clean-gnuserv: 
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
+maintainer-clean-gettext: 
+       @[ -f ./gettext/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in gnuserv" ; \
-       (cd gnuserv && \
+       echo "Doing maintainer-clean in gettext" ; \
+       (cd gettext && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8086,92 +9518,98 @@ maintainer-clean-gnuserv:
                   maintainer-clean) \
           || exit 1
  
+@endif gettext
  
  
-.PHONY: configure-gprof maybe-configure-gprof
-maybe-configure-gprof:
-configure-gprof:
-       @test ! -f gprof/Makefile || exit 0; \
-       [ -d gprof ] || mkdir gprof; \
+.PHONY: configure-gnuserv maybe-configure-gnuserv
+maybe-configure-gnuserv:
+@if gnuserv
+maybe-configure-gnuserv: configure-gnuserv
+configure-gnuserv:
+       @test ! -f gnuserv/Makefile || exit 0; \
+       [ -d gnuserv ] || mkdir gnuserv; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in gprof; \
-       cd gprof || exit 1; \
+       $(HOST_EXPORTS) \
+       echo Configuring in gnuserv; \
+       cd gnuserv || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/gprof"; \
-           libsrcdir="$$s/gprof";; \
+           srcdiroption="--srcdir=$(srcdir)/gnuserv"; \
+           libsrcdir="$$s/gnuserv";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/gprof"; \
-           libsrcdir="$$s/gprof";; \
+           srcdiroption="--srcdir=../$(srcdir)/gnuserv"; \
+           libsrcdir="$$s/gnuserv";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif gnuserv
  
-.PHONY: all-gprof maybe-all-gprof
-maybe-all-gprof:
-all-gprof: configure-gprof
+.PHONY: all-gnuserv maybe-all-gnuserv
+maybe-all-gnuserv:
+@if gnuserv
+TARGET-gnuserv=all
+maybe-all-gnuserv: all-gnuserv
+all-gnuserv: configure-gnuserv
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd gprof && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-gnuserv))
+@endif gnuserv
  
-.PHONY: check-gprof maybe-check-gprof
-maybe-check-gprof:
+.PHONY: check-gnuserv maybe-check-gnuserv
+maybe-check-gnuserv:
+@if gnuserv
+maybe-check-gnuserv: check-gnuserv
  
-check-gprof:
+check-gnuserv:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd gprof && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(HOST_EXPORTS) \
+       (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif gnuserv
  
-.PHONY: install-gprof maybe-install-gprof
-maybe-install-gprof:
+.PHONY: install-gnuserv maybe-install-gnuserv
+maybe-install-gnuserv:
+@if gnuserv
+maybe-install-gnuserv: install-gnuserv
  
-install-gprof: installdirs
+install-gnuserv: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd gprof && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(HOST_EXPORTS) \
+       (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif gnuserv
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-gprof info-gprof
-maybe-info-gprof:
+.PHONY: maybe-info-gnuserv info-gnuserv
+maybe-info-gnuserv:
+@if gnuserv
+maybe-info-gnuserv: info-gnuserv
  
-info-gprof: \
-    configure-gprof 
-       @[ -f ./gprof/Makefile ] || exit 0; \
+info-gnuserv: \
+    configure-gnuserv 
+       @[ -f ./gnuserv/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in gprof" ; \
-       (cd gprof && \
+       echo "Doing info in gnuserv" ; \
+       (cd gnuserv && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8179,21 +9617,25 @@ info-gprof: \
                   info) \
           || exit 1
  
+@endif gnuserv
  
-.PHONY: maybe-dvi-gprof dvi-gprof
-maybe-dvi-gprof:
+.PHONY: maybe-dvi-gnuserv dvi-gnuserv
+maybe-dvi-gnuserv:
+@if gnuserv
+maybe-dvi-gnuserv: dvi-gnuserv
  
-dvi-gprof: \
-    configure-gprof 
-       @[ -f ./gprof/Makefile ] || exit 0; \
+dvi-gnuserv: \
+    configure-gnuserv 
+       @[ -f ./gnuserv/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in gprof" ; \
-       (cd gprof && \
+       echo "Doing dvi in gnuserv" ; \
+       (cd gnuserv && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8201,21 +9643,25 @@ dvi-gprof: \
                   dvi) \
           || exit 1
  
+@endif gnuserv
  
-.PHONY: maybe-TAGS-gprof TAGS-gprof
-maybe-TAGS-gprof:
+.PHONY: maybe-TAGS-gnuserv TAGS-gnuserv
+maybe-TAGS-gnuserv:
+@if gnuserv
+maybe-TAGS-gnuserv: TAGS-gnuserv
  
-TAGS-gprof: \
-    configure-gprof 
-       @[ -f ./gprof/Makefile ] || exit 0; \
+TAGS-gnuserv: \
+    configure-gnuserv 
+       @[ -f ./gnuserv/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in gprof" ; \
-       (cd gprof && \
+       echo "Doing TAGS in gnuserv" ; \
+       (cd gnuserv && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8223,22 +9669,26 @@ TAGS-gprof: \
                   TAGS) \
           || exit 1
  
+@endif gnuserv
  
-.PHONY: maybe-install-info-gprof install-info-gprof
-maybe-install-info-gprof:
+.PHONY: maybe-install-info-gnuserv install-info-gnuserv
+maybe-install-info-gnuserv:
+@if gnuserv
+maybe-install-info-gnuserv: install-info-gnuserv
  
-install-info-gprof: \
-    configure-gprof \
-    info-gprof 
-       @[ -f ./gprof/Makefile ] || exit 0; \
+install-info-gnuserv: \
+    configure-gnuserv \
+    info-gnuserv 
+       @[ -f ./gnuserv/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in gprof" ; \
-       (cd gprof && \
+       echo "Doing install-info in gnuserv" ; \
+       (cd gnuserv && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8246,21 +9696,25 @@ install-info-gprof: \
                   install-info) \
           || exit 1
  
+@endif gnuserv
  
-.PHONY: maybe-installcheck-gprof installcheck-gprof
-maybe-installcheck-gprof:
+.PHONY: maybe-installcheck-gnuserv installcheck-gnuserv
+maybe-installcheck-gnuserv:
+@if gnuserv
+maybe-installcheck-gnuserv: installcheck-gnuserv
  
-installcheck-gprof: \
-    configure-gprof 
-       @[ -f ./gprof/Makefile ] || exit 0; \
+installcheck-gnuserv: \
+    configure-gnuserv 
+       @[ -f ./gnuserv/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in gprof" ; \
-       (cd gprof && \
+       echo "Doing installcheck in gnuserv" ; \
+       (cd gnuserv && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8268,20 +9722,24 @@ installcheck-gprof: \
                   installcheck) \
           || exit 1
  
+@endif gnuserv
  
-.PHONY: maybe-mostlyclean-gprof mostlyclean-gprof
-maybe-mostlyclean-gprof:
+.PHONY: maybe-mostlyclean-gnuserv mostlyclean-gnuserv
+maybe-mostlyclean-gnuserv:
+@if gnuserv
+maybe-mostlyclean-gnuserv: mostlyclean-gnuserv
  
-mostlyclean-gprof: 
-       @[ -f ./gprof/Makefile ] || exit 0; \
+mostlyclean-gnuserv: 
+       @[ -f ./gnuserv/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in gprof" ; \
-       (cd gprof && \
+       echo "Doing mostlyclean in gnuserv" ; \
+       (cd gnuserv && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8289,20 +9747,24 @@ mostlyclean-gprof:
                   mostlyclean) \
           || exit 1
  
+@endif gnuserv
  
-.PHONY: maybe-clean-gprof clean-gprof
-maybe-clean-gprof:
+.PHONY: maybe-clean-gnuserv clean-gnuserv
+maybe-clean-gnuserv:
+@if gnuserv
+maybe-clean-gnuserv: clean-gnuserv
  
-clean-gprof: 
-       @[ -f ./gprof/Makefile ] || exit 0; \
+clean-gnuserv: 
+       @[ -f ./gnuserv/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in gprof" ; \
-       (cd gprof && \
+       echo "Doing clean in gnuserv" ; \
+       (cd gnuserv && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8310,20 +9772,24 @@ clean-gprof:
                   clean) \
           || exit 1
  
+@endif gnuserv
  
-.PHONY: maybe-distclean-gprof distclean-gprof
-maybe-distclean-gprof:
+.PHONY: maybe-distclean-gnuserv distclean-gnuserv
+maybe-distclean-gnuserv:
+@if gnuserv
+maybe-distclean-gnuserv: distclean-gnuserv
  
-distclean-gprof: 
-       @[ -f ./gprof/Makefile ] || exit 0; \
+distclean-gnuserv: 
+       @[ -f ./gnuserv/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in gprof" ; \
-       (cd gprof && \
+       echo "Doing distclean in gnuserv" ; \
+       (cd gnuserv && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8331,20 +9797,24 @@ distclean-gprof:
                   distclean) \
           || exit 1
  
+@endif gnuserv
  
-.PHONY: maybe-maintainer-clean-gprof maintainer-clean-gprof
-maybe-maintainer-clean-gprof:
+.PHONY: maybe-maintainer-clean-gnuserv maintainer-clean-gnuserv
+maybe-maintainer-clean-gnuserv:
+@if gnuserv
+maybe-maintainer-clean-gnuserv: maintainer-clean-gnuserv
  
-maintainer-clean-gprof: 
-       @[ -f ./gprof/Makefile ] || exit 0; \
+maintainer-clean-gnuserv: 
+       @[ -f ./gnuserv/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in gprof" ; \
-       (cd gprof && \
+       echo "Doing maintainer-clean in gnuserv" ; \
+       (cd gnuserv && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -8352,31 +9822,323 @@ maintainer-clean-gprof:
                   maintainer-clean) \
           || exit 1
  
+@endif gnuserv
  
  
-.PHONY: configure-gzip maybe-configure-gzip
-maybe-configure-gzip:
-configure-gzip:
-       @test ! -f gzip/Makefile || exit 0; \
-       [ -d gzip ] || mkdir gzip; \
+.PHONY: configure-gprof maybe-configure-gprof
+maybe-configure-gprof:
+@if gprof
+maybe-configure-gprof: configure-gprof
+configure-gprof:
+       @test ! -f gprof/Makefile || exit 0; \
+       [ -d gprof ] || mkdir gprof; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
+       echo Configuring in gprof; \
+       cd gprof || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/gprof"; \
+           libsrcdir="$$s/gprof";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/gprof"; \
+           libsrcdir="$$s/gprof";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
+         || exit 1
+@endif gprof
+
+.PHONY: all-gprof maybe-all-gprof
+maybe-all-gprof:
+@if gprof
+TARGET-gprof=all
+maybe-all-gprof: all-gprof
+all-gprof: configure-gprof
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       (cd gprof && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-gprof))
+@endif gprof
+
+.PHONY: check-gprof maybe-check-gprof
+maybe-check-gprof:
+@if gprof
+maybe-check-gprof: check-gprof
+
+check-gprof:
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       (cd gprof && $(MAKE) $(FLAGS_TO_PASS) check)
+
+@endif gprof
+
+.PHONY: install-gprof maybe-install-gprof
+maybe-install-gprof:
+@if gprof
+maybe-install-gprof: install-gprof
+
+install-gprof: installdirs
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       (cd gprof && $(MAKE) $(FLAGS_TO_PASS) install)
+
+@endif gprof
+
+# Other targets (info, dvi, etc.)
+
+.PHONY: maybe-info-gprof info-gprof
+maybe-info-gprof:
+@if gprof
+maybe-info-gprof: info-gprof
+
+info-gprof: \
+    configure-gprof 
+       @[ -f ./gprof/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing info in gprof" ; \
+       (cd gprof && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 info) \
+         || exit 1
+
+@endif gprof
+
+.PHONY: maybe-dvi-gprof dvi-gprof
+maybe-dvi-gprof:
+@if gprof
+maybe-dvi-gprof: dvi-gprof
+
+dvi-gprof: \
+    configure-gprof 
+       @[ -f ./gprof/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing dvi in gprof" ; \
+       (cd gprof && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 dvi) \
+         || exit 1
+
+@endif gprof
+
+.PHONY: maybe-TAGS-gprof TAGS-gprof
+maybe-TAGS-gprof:
+@if gprof
+maybe-TAGS-gprof: TAGS-gprof
+
+TAGS-gprof: \
+    configure-gprof 
+       @[ -f ./gprof/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing TAGS in gprof" ; \
+       (cd gprof && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 TAGS) \
+         || exit 1
+
+@endif gprof
+
+.PHONY: maybe-install-info-gprof install-info-gprof
+maybe-install-info-gprof:
+@if gprof
+maybe-install-info-gprof: install-info-gprof
+
+install-info-gprof: \
+    configure-gprof \
+    info-gprof 
+       @[ -f ./gprof/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing install-info in gprof" ; \
+       (cd gprof && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 install-info) \
+         || exit 1
+
+@endif gprof
+
+.PHONY: maybe-installcheck-gprof installcheck-gprof
+maybe-installcheck-gprof:
+@if gprof
+maybe-installcheck-gprof: installcheck-gprof
+
+installcheck-gprof: \
+    configure-gprof 
+       @[ -f ./gprof/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing installcheck in gprof" ; \
+       (cd gprof && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 installcheck) \
+         || exit 1
+
+@endif gprof
+
+.PHONY: maybe-mostlyclean-gprof mostlyclean-gprof
+maybe-mostlyclean-gprof:
+@if gprof
+maybe-mostlyclean-gprof: mostlyclean-gprof
+
+mostlyclean-gprof: 
+       @[ -f ./gprof/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing mostlyclean in gprof" ; \
+       (cd gprof && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 mostlyclean) \
+         || exit 1
+
+@endif gprof
+
+.PHONY: maybe-clean-gprof clean-gprof
+maybe-clean-gprof:
+@if gprof
+maybe-clean-gprof: clean-gprof
+
+clean-gprof: 
+       @[ -f ./gprof/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing clean in gprof" ; \
+       (cd gprof && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 clean) \
+         || exit 1
+
+@endif gprof
+
+.PHONY: maybe-distclean-gprof distclean-gprof
+maybe-distclean-gprof:
+@if gprof
+maybe-distclean-gprof: distclean-gprof
+
+distclean-gprof: 
+       @[ -f ./gprof/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing distclean in gprof" ; \
+       (cd gprof && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 distclean) \
+         || exit 1
+
+@endif gprof
+
+.PHONY: maybe-maintainer-clean-gprof maintainer-clean-gprof
+maybe-maintainer-clean-gprof:
+@if gprof
+maybe-maintainer-clean-gprof: maintainer-clean-gprof
+
+maintainer-clean-gprof: 
+       @[ -f ./gprof/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing maintainer-clean in gprof" ; \
+       (cd gprof && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 maintainer-clean) \
+         || exit 1
+
+@endif gprof
+
+
+.PHONY: configure-gzip maybe-configure-gzip
+maybe-configure-gzip:
+@if gzip
+maybe-configure-gzip: configure-gzip
+configure-gzip:
+       @test ! -f gzip/Makefile || exit 0; \
+       [ -d gzip ] || mkdir gzip; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
         echo Configuring in gzip; \
         cd gzip || exit 1; \
         case $(srcdir) in \
@@ -8391,41 +10153,58 @@ configure-gzip:
             libsrcdir="$$s/gzip";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif gzip
  
  .PHONY: all-gzip maybe-all-gzip
  maybe-all-gzip:
+@if gzip
+TARGET-gzip=all
+maybe-all-gzip: all-gzip
  all-gzip: configure-gzip
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd gzip && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd gzip && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-gzip))
+@endif gzip
  
  .PHONY: check-gzip maybe-check-gzip
  maybe-check-gzip:
+@if gzip
+maybe-check-gzip: check-gzip
  
  check-gzip:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd gzip && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif gzip
  
  .PHONY: install-gzip maybe-install-gzip
  maybe-install-gzip:
+@if gzip
+maybe-install-gzip: install-gzip
  
  install-gzip: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd gzip && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif gzip
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-gzip info-gzip
  maybe-info-gzip:
+@if gzip
+maybe-info-gzip: info-gzip
  
  info-gzip: \
      configure-gzip 
@@ -8433,7 +10212,8 @@ info-gzip: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in gzip" ; \
@@ -8445,9 +10225,12 @@ info-gzip: \
                   info) \
           || exit 1
  
+@endif gzip
  
  .PHONY: maybe-dvi-gzip dvi-gzip
  maybe-dvi-gzip:
+@if gzip
+maybe-dvi-gzip: dvi-gzip
  
  dvi-gzip: \
      configure-gzip 
@@ -8455,7 +10238,8 @@ dvi-gzip: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in gzip" ; \
@@ -8467,9 +10251,12 @@ dvi-gzip: \
                   dvi) \
           || exit 1
  
+@endif gzip
  
  .PHONY: maybe-TAGS-gzip TAGS-gzip
  maybe-TAGS-gzip:
+@if gzip
+maybe-TAGS-gzip: TAGS-gzip
  
  TAGS-gzip: \
      configure-gzip 
@@ -8477,7 +10264,8 @@ TAGS-gzip: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in gzip" ; \
@@ -8489,9 +10277,12 @@ TAGS-gzip: \
                   TAGS) \
           || exit 1
  
+@endif gzip
  
  .PHONY: maybe-install-info-gzip install-info-gzip
  maybe-install-info-gzip:
+@if gzip
+maybe-install-info-gzip: install-info-gzip
  
  install-info-gzip: \
      configure-gzip \
@@ -8500,7 +10291,8 @@ install-info-gzip: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in gzip" ; \
@@ -8512,9 +10304,12 @@ install-info-gzip: \
                   install-info) \
           || exit 1
  
+@endif gzip
  
  .PHONY: maybe-installcheck-gzip installcheck-gzip
  maybe-installcheck-gzip:
+@if gzip
+maybe-installcheck-gzip: installcheck-gzip
  
  installcheck-gzip: \
      configure-gzip 
@@ -8522,7 +10317,8 @@ installcheck-gzip: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in gzip" ; \
@@ -8534,16 +10330,20 @@ installcheck-gzip: \
                   installcheck) \
           || exit 1
  
+@endif gzip
  
  .PHONY: maybe-mostlyclean-gzip mostlyclean-gzip
  maybe-mostlyclean-gzip:
+@if gzip
+maybe-mostlyclean-gzip: mostlyclean-gzip
  
  mostlyclean-gzip: 
         @[ -f ./gzip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in gzip" ; \
@@ -8555,16 +10355,20 @@ mostlyclean-gzip:
                   mostlyclean) \
           || exit 1
  
+@endif gzip
  
  .PHONY: maybe-clean-gzip clean-gzip
  maybe-clean-gzip:
+@if gzip
+maybe-clean-gzip: clean-gzip
  
  clean-gzip: 
         @[ -f ./gzip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in gzip" ; \
@@ -8576,16 +10380,20 @@ clean-gzip:
                   clean) \
           || exit 1
  
+@endif gzip
  
  .PHONY: maybe-distclean-gzip distclean-gzip
  maybe-distclean-gzip:
+@if gzip
+maybe-distclean-gzip: distclean-gzip
  
  distclean-gzip: 
         @[ -f ./gzip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in gzip" ; \
@@ -8597,16 +10405,20 @@ distclean-gzip:
                   distclean) \
           || exit 1
  
+@endif gzip
  
  .PHONY: maybe-maintainer-clean-gzip maintainer-clean-gzip
  maybe-maintainer-clean-gzip:
+@if gzip
+maybe-maintainer-clean-gzip: maintainer-clean-gzip
  
  maintainer-clean-gzip: 
         @[ -f ./gzip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in gzip" ; \
@@ -8618,31 +10430,19 @@ maintainer-clean-gzip:
                   maintainer-clean) \
           || exit 1
  
+@endif gzip
  
  
  .PHONY: configure-hello maybe-configure-hello
  maybe-configure-hello:
+@if hello
+maybe-configure-hello: configure-hello
  configure-hello:
         @test ! -f hello/Makefile || exit 0; \
         [ -d hello ] || mkdir hello; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in hello; \
         cd hello || exit 1; \
         case $(srcdir) in \
@@ -8657,41 +10457,58 @@ configure-hello:
             libsrcdir="$$s/hello";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif hello
  
  .PHONY: all-hello maybe-all-hello
  maybe-all-hello:
+@if hello
+TARGET-hello=all
+maybe-all-hello: all-hello
  all-hello: configure-hello
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd hello && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd hello && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-hello))
+@endif hello
  
  .PHONY: check-hello maybe-check-hello
  maybe-check-hello:
+@if hello
+maybe-check-hello: check-hello
  
  check-hello:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd hello && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif hello
  
  .PHONY: install-hello maybe-install-hello
  maybe-install-hello:
+@if hello
+maybe-install-hello: install-hello
  
  install-hello: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd hello && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif hello
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-hello info-hello
  maybe-info-hello:
+@if hello
+maybe-info-hello: info-hello
  
  info-hello: \
      configure-hello 
@@ -8699,7 +10516,8 @@ info-hello: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in hello" ; \
@@ -8711,9 +10529,12 @@ info-hello: \
                   info) \
           || exit 1
  
+@endif hello
  
  .PHONY: maybe-dvi-hello dvi-hello
  maybe-dvi-hello:
+@if hello
+maybe-dvi-hello: dvi-hello
  
  dvi-hello: \
      configure-hello 
@@ -8721,7 +10542,8 @@ dvi-hello: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in hello" ; \
@@ -8733,9 +10555,12 @@ dvi-hello: \
                   dvi) \
           || exit 1
  
+@endif hello
  
  .PHONY: maybe-TAGS-hello TAGS-hello
  maybe-TAGS-hello:
+@if hello
+maybe-TAGS-hello: TAGS-hello
  
  TAGS-hello: \
      configure-hello 
@@ -8743,7 +10568,8 @@ TAGS-hello: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in hello" ; \
@@ -8755,9 +10581,12 @@ TAGS-hello: \
                   TAGS) \
           || exit 1
  
+@endif hello
  
  .PHONY: maybe-install-info-hello install-info-hello
  maybe-install-info-hello:
+@if hello
+maybe-install-info-hello: install-info-hello
  
  install-info-hello: \
      configure-hello \
@@ -8766,7 +10595,8 @@ install-info-hello: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in hello" ; \
@@ -8778,9 +10608,12 @@ install-info-hello: \
                   install-info) \
           || exit 1
  
+@endif hello
  
  .PHONY: maybe-installcheck-hello installcheck-hello
  maybe-installcheck-hello:
+@if hello
+maybe-installcheck-hello: installcheck-hello
  
  installcheck-hello: \
      configure-hello 
@@ -8788,7 +10621,8 @@ installcheck-hello: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in hello" ; \
@@ -8800,16 +10634,20 @@ installcheck-hello: \
                   installcheck) \
           || exit 1
  
+@endif hello
  
  .PHONY: maybe-mostlyclean-hello mostlyclean-hello
  maybe-mostlyclean-hello:
+@if hello
+maybe-mostlyclean-hello: mostlyclean-hello
  
  mostlyclean-hello: 
         @[ -f ./hello/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in hello" ; \
@@ -8821,16 +10659,20 @@ mostlyclean-hello:
                   mostlyclean) \
           || exit 1
  
+@endif hello
  
  .PHONY: maybe-clean-hello clean-hello
  maybe-clean-hello:
+@if hello
+maybe-clean-hello: clean-hello
  
  clean-hello: 
         @[ -f ./hello/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in hello" ; \
@@ -8842,16 +10684,20 @@ clean-hello:
                   clean) \
           || exit 1
  
+@endif hello
  
  .PHONY: maybe-distclean-hello distclean-hello
  maybe-distclean-hello:
+@if hello
+maybe-distclean-hello: distclean-hello
  
  distclean-hello: 
         @[ -f ./hello/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in hello" ; \
@@ -8863,16 +10709,20 @@ distclean-hello:
                   distclean) \
           || exit 1
  
+@endif hello
  
  .PHONY: maybe-maintainer-clean-hello maintainer-clean-hello
  maybe-maintainer-clean-hello:
+@if hello
+maybe-maintainer-clean-hello: maintainer-clean-hello
  
  maintainer-clean-hello: 
         @[ -f ./hello/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in hello" ; \
@@ -8884,31 +10734,19 @@ maintainer-clean-hello:
                   maintainer-clean) \
           || exit 1
  
+@endif hello
  
  
  .PHONY: configure-indent maybe-configure-indent
  maybe-configure-indent:
+@if indent
+maybe-configure-indent: configure-indent
  configure-indent:
         @test ! -f indent/Makefile || exit 0; \
         [ -d indent ] || mkdir indent; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in indent; \
         cd indent || exit 1; \
         case $(srcdir) in \
@@ -8923,41 +10761,58 @@ configure-indent:
             libsrcdir="$$s/indent";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif indent
  
  .PHONY: all-indent maybe-all-indent
  maybe-all-indent:
+@if indent
+TARGET-indent=all
+maybe-all-indent: all-indent
  all-indent: configure-indent
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd indent && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd indent && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-indent))
+@endif indent
  
  .PHONY: check-indent maybe-check-indent
  maybe-check-indent:
+@if indent
+maybe-check-indent: check-indent
  
  check-indent:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd indent && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif indent
  
  .PHONY: install-indent maybe-install-indent
  maybe-install-indent:
+@if indent
+maybe-install-indent: install-indent
  
  install-indent: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd indent && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif indent
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-indent info-indent
  maybe-info-indent:
+@if indent
+maybe-info-indent: info-indent
  
  info-indent: \
      configure-indent 
@@ -8965,7 +10820,8 @@ info-indent: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in indent" ; \
@@ -8977,9 +10833,12 @@ info-indent: \
                   info) \
           || exit 1
  
+@endif indent
  
  .PHONY: maybe-dvi-indent dvi-indent
  maybe-dvi-indent:
+@if indent
+maybe-dvi-indent: dvi-indent
  
  dvi-indent: \
      configure-indent 
@@ -8987,7 +10846,8 @@ dvi-indent: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in indent" ; \
@@ -8999,9 +10859,12 @@ dvi-indent: \
                   dvi) \
           || exit 1
  
+@endif indent
  
  .PHONY: maybe-TAGS-indent TAGS-indent
  maybe-TAGS-indent:
+@if indent
+maybe-TAGS-indent: TAGS-indent
  
  TAGS-indent: \
      configure-indent 
@@ -9009,7 +10872,8 @@ TAGS-indent: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in indent" ; \
@@ -9021,9 +10885,12 @@ TAGS-indent: \
                   TAGS) \
           || exit 1
  
+@endif indent
  
  .PHONY: maybe-install-info-indent install-info-indent
  maybe-install-info-indent:
+@if indent
+maybe-install-info-indent: install-info-indent
  
  install-info-indent: \
      configure-indent \
@@ -9032,7 +10899,8 @@ install-info-indent: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in indent" ; \
@@ -9044,9 +10912,12 @@ install-info-indent: \
                   install-info) \
           || exit 1
  
+@endif indent
  
  .PHONY: maybe-installcheck-indent installcheck-indent
  maybe-installcheck-indent:
+@if indent
+maybe-installcheck-indent: installcheck-indent
  
  installcheck-indent: \
      configure-indent 
@@ -9054,7 +10925,8 @@ installcheck-indent: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in indent" ; \
@@ -9066,16 +10938,20 @@ installcheck-indent: \
                   installcheck) \
           || exit 1
  
+@endif indent
  
  .PHONY: maybe-mostlyclean-indent mostlyclean-indent
  maybe-mostlyclean-indent:
+@if indent
+maybe-mostlyclean-indent: mostlyclean-indent
  
  mostlyclean-indent: 
         @[ -f ./indent/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in indent" ; \
@@ -9087,16 +10963,20 @@ mostlyclean-indent:
                   mostlyclean) \
           || exit 1
  
+@endif indent
  
  .PHONY: maybe-clean-indent clean-indent
  maybe-clean-indent:
+@if indent
+maybe-clean-indent: clean-indent
  
  clean-indent: 
         @[ -f ./indent/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in indent" ; \
@@ -9108,16 +10988,20 @@ clean-indent:
                   clean) \
           || exit 1
  
+@endif indent
  
  .PHONY: maybe-distclean-indent distclean-indent
  maybe-distclean-indent:
+@if indent
+maybe-distclean-indent: distclean-indent
  
  distclean-indent: 
         @[ -f ./indent/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in indent" ; \
@@ -9129,16 +11013,20 @@ distclean-indent:
                   distclean) \
           || exit 1
  
+@endif indent
  
  .PHONY: maybe-maintainer-clean-indent maintainer-clean-indent
  maybe-maintainer-clean-indent:
+@if indent
+maybe-maintainer-clean-indent: maintainer-clean-indent
  
  maintainer-clean-indent: 
         @[ -f ./indent/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in indent" ; \
@@ -9150,31 +11038,20 @@ maintainer-clean-indent:
                   maintainer-clean) \
           || exit 1
  
+@endif indent
  
  
  .PHONY: configure-intl maybe-configure-intl
  maybe-configure-intl:
+@if intl
+maybe-configure-intl: configure-intl
  configure-intl:
-       @test ! -f intl/Makefile || exit 0; \
+       @test -f stage_last && exit 0; \
+       test ! -f intl/Makefile || exit 0; \
         [ -d intl ] || mkdir intl; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in intl; \
         cd intl || exit 1; \
         case $(srcdir) in \
@@ -9189,41 +11066,59 @@ configure-intl:
             libsrcdir="$$s/intl";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif intl
  
  .PHONY: all-intl maybe-all-intl
  maybe-all-intl:
+@if intl
+TARGET-intl=all
+maybe-all-intl: all-intl
  all-intl: configure-intl
-       @r=`${PWD_COMMAND}`; export r; \
+       @test -f stage_last && exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd intl && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd intl && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-intl))
+@endif intl
  
  .PHONY: check-intl maybe-check-intl
  maybe-check-intl:
+@if intl
+maybe-check-intl: check-intl
  
  check-intl:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd intl && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif intl
  
  .PHONY: install-intl maybe-install-intl
  maybe-install-intl:
+@if intl
+maybe-install-intl: install-intl
  
  install-intl: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd intl && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif intl
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-intl info-intl
  maybe-info-intl:
+@if intl
+maybe-info-intl: info-intl
  
  info-intl: \
      configure-intl 
@@ -9231,7 +11126,8 @@ info-intl: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in intl" ; \
@@ -9243,9 +11139,12 @@ info-intl: \
                   info) \
           || exit 1
  
+@endif intl
  
  .PHONY: maybe-dvi-intl dvi-intl
  maybe-dvi-intl:
+@if intl
+maybe-dvi-intl: dvi-intl
  
  dvi-intl: \
      configure-intl 
@@ -9253,7 +11152,8 @@ dvi-intl: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in intl" ; \
@@ -9265,9 +11165,12 @@ dvi-intl: \
                   dvi) \
           || exit 1
  
+@endif intl
  
  .PHONY: maybe-TAGS-intl TAGS-intl
  maybe-TAGS-intl:
+@if intl
+maybe-TAGS-intl: TAGS-intl
  
  TAGS-intl: \
      configure-intl 
@@ -9275,7 +11178,8 @@ TAGS-intl: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in intl" ; \
@@ -9287,9 +11191,12 @@ TAGS-intl: \
                   TAGS) \
           || exit 1
  
+@endif intl
  
  .PHONY: maybe-install-info-intl install-info-intl
  maybe-install-info-intl:
+@if intl
+maybe-install-info-intl: install-info-intl
  
  install-info-intl: \
      configure-intl \
@@ -9298,7 +11205,8 @@ install-info-intl: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in intl" ; \
@@ -9310,9 +11218,12 @@ install-info-intl: \
                   install-info) \
           || exit 1
  
+@endif intl
  
  .PHONY: maybe-installcheck-intl installcheck-intl
  maybe-installcheck-intl:
+@if intl
+maybe-installcheck-intl: installcheck-intl
  
  installcheck-intl: \
      configure-intl 
@@ -9320,7 +11231,8 @@ installcheck-intl: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in intl" ; \
@@ -9332,16 +11244,20 @@ installcheck-intl: \
                   installcheck) \
           || exit 1
  
+@endif intl
  
  .PHONY: maybe-mostlyclean-intl mostlyclean-intl
  maybe-mostlyclean-intl:
+@if intl
+maybe-mostlyclean-intl: mostlyclean-intl
  
  mostlyclean-intl: 
         @[ -f ./intl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in intl" ; \
@@ -9353,16 +11269,20 @@ mostlyclean-intl:
                   mostlyclean) \
           || exit 1
  
+@endif intl
  
  .PHONY: maybe-clean-intl clean-intl
  maybe-clean-intl:
+@if intl
+maybe-clean-intl: clean-intl
  
  clean-intl: 
         @[ -f ./intl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in intl" ; \
@@ -9374,16 +11294,20 @@ clean-intl:
                   clean) \
           || exit 1
  
+@endif intl
  
  .PHONY: maybe-distclean-intl distclean-intl
  maybe-distclean-intl:
+@if intl
+maybe-distclean-intl: distclean-intl
  
  distclean-intl: 
         @[ -f ./intl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in intl" ; \
@@ -9395,16 +11319,20 @@ distclean-intl:
                   distclean) \
           || exit 1
  
+@endif intl
  
  .PHONY: maybe-maintainer-clean-intl maintainer-clean-intl
  maybe-maintainer-clean-intl:
+@if intl
+maybe-maintainer-clean-intl: maintainer-clean-intl
  
  maintainer-clean-intl: 
         @[ -f ./intl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in intl" ; \
@@ -9416,31 +11344,19 @@ maintainer-clean-intl:
                   maintainer-clean) \
           || exit 1
  
+@endif intl
  
  
  .PHONY: configure-tcl maybe-configure-tcl
  maybe-configure-tcl:
+@if tcl
+maybe-configure-tcl: configure-tcl
  configure-tcl:
         @test ! -f tcl/Makefile || exit 0; \
         [ -d tcl ] || mkdir tcl; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in tcl; \
         cd tcl || exit 1; \
         case $(srcdir) in \
@@ -9455,41 +11371,58 @@ configure-tcl:
             libsrcdir="$$s/tcl";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif tcl
  
  .PHONY: all-tcl maybe-all-tcl
  maybe-all-tcl:
+@if tcl
+TARGET-tcl=all
+maybe-all-tcl: all-tcl
  all-tcl: configure-tcl
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd tcl && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd tcl && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-tcl))
+@endif tcl
  
  .PHONY: check-tcl maybe-check-tcl
  maybe-check-tcl:
+@if tcl
+maybe-check-tcl: check-tcl
  
  check-tcl:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd tcl && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif tcl
  
  .PHONY: install-tcl maybe-install-tcl
  maybe-install-tcl:
+@if tcl
+maybe-install-tcl: install-tcl
  
  install-tcl: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd tcl && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif tcl
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-tcl info-tcl
  maybe-info-tcl:
+@if tcl
+maybe-info-tcl: info-tcl
  
  info-tcl: \
      configure-tcl 
@@ -9497,7 +11430,8 @@ info-tcl: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in tcl" ; \
@@ -9509,9 +11443,12 @@ info-tcl: \
                   info) \
           || exit 1
  
+@endif tcl
  
  .PHONY: maybe-dvi-tcl dvi-tcl
  maybe-dvi-tcl:
+@if tcl
+maybe-dvi-tcl: dvi-tcl
  
  dvi-tcl: \
      configure-tcl 
@@ -9519,7 +11456,8 @@ dvi-tcl: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in tcl" ; \
@@ -9531,9 +11469,12 @@ dvi-tcl: \
                   dvi) \
           || exit 1
  
+@endif tcl
  
  .PHONY: maybe-TAGS-tcl TAGS-tcl
  maybe-TAGS-tcl:
+@if tcl
+maybe-TAGS-tcl: TAGS-tcl
  
  TAGS-tcl: \
      configure-tcl 
@@ -9541,7 +11482,8 @@ TAGS-tcl: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in tcl" ; \
@@ -9553,9 +11495,12 @@ TAGS-tcl: \
                   TAGS) \
           || exit 1
  
+@endif tcl
  
  .PHONY: maybe-install-info-tcl install-info-tcl
  maybe-install-info-tcl:
+@if tcl
+maybe-install-info-tcl: install-info-tcl
  
  install-info-tcl: \
      configure-tcl \
@@ -9564,7 +11509,8 @@ install-info-tcl: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in tcl" ; \
@@ -9576,9 +11522,12 @@ install-info-tcl: \
                   install-info) \
           || exit 1
  
+@endif tcl
  
  .PHONY: maybe-installcheck-tcl installcheck-tcl
  maybe-installcheck-tcl:
+@if tcl
+maybe-installcheck-tcl: installcheck-tcl
  
  installcheck-tcl: \
      configure-tcl 
@@ -9586,7 +11535,8 @@ installcheck-tcl: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in tcl" ; \
@@ -9598,23 +11548,30 @@ installcheck-tcl: \
                   installcheck) \
           || exit 1
  
+@endif tcl
  
  .PHONY: maybe-mostlyclean-tcl mostlyclean-tcl
  maybe-mostlyclean-tcl:
+@if tcl
+maybe-mostlyclean-tcl: mostlyclean-tcl
  
  # tcl doesn't support mostlyclean.
  mostlyclean-tcl:
  
+@endif tcl
  
  .PHONY: maybe-clean-tcl clean-tcl
  maybe-clean-tcl:
+@if tcl
+maybe-clean-tcl: clean-tcl
  
  clean-tcl: 
         @[ -f ./tcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in tcl" ; \
@@ -9626,16 +11583,20 @@ clean-tcl:
                   clean) \
           || exit 1
  
+@endif tcl
  
  .PHONY: maybe-distclean-tcl distclean-tcl
  maybe-distclean-tcl:
+@if tcl
+maybe-distclean-tcl: distclean-tcl
  
  distclean-tcl: 
         @[ -f ./tcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in tcl" ; \
@@ -9647,16 +11608,20 @@ distclean-tcl:
                   distclean) \
           || exit 1
  
+@endif tcl
  
  .PHONY: maybe-maintainer-clean-tcl maintainer-clean-tcl
  maybe-maintainer-clean-tcl:
+@if tcl
+maybe-maintainer-clean-tcl: maintainer-clean-tcl
  
  maintainer-clean-tcl: 
         @[ -f ./tcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in tcl" ; \
@@ -9668,31 +11633,19 @@ maintainer-clean-tcl:
                   maintainer-clean) \
           || exit 1
  
+@endif tcl
  
  
  .PHONY: configure-itcl maybe-configure-itcl
  maybe-configure-itcl:
+@if itcl
+maybe-configure-itcl: configure-itcl
  configure-itcl:
         @test ! -f itcl/Makefile || exit 0; \
         [ -d itcl ] || mkdir itcl; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in itcl; \
         cd itcl || exit 1; \
         case $(srcdir) in \
@@ -9707,41 +11660,58 @@ configure-itcl:
             libsrcdir="$$s/itcl";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif itcl
  
  .PHONY: all-itcl maybe-all-itcl
  maybe-all-itcl:
+@if itcl
+TARGET-itcl=all
+maybe-all-itcl: all-itcl
  all-itcl: configure-itcl
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd itcl && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd itcl && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-itcl))
+@endif itcl
  
  .PHONY: check-itcl maybe-check-itcl
  maybe-check-itcl:
+@if itcl
+maybe-check-itcl: check-itcl
  
  check-itcl:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd itcl && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif itcl
  
  .PHONY: install-itcl maybe-install-itcl
  maybe-install-itcl:
+@if itcl
+maybe-install-itcl: install-itcl
  
  install-itcl: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd itcl && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif itcl
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-itcl info-itcl
  maybe-info-itcl:
+@if itcl
+maybe-info-itcl: info-itcl
  
  info-itcl: \
      configure-itcl 
@@ -9749,7 +11719,8 @@ info-itcl: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in itcl" ; \
@@ -9761,9 +11732,12 @@ info-itcl: \
                   info) \
           || exit 1
  
+@endif itcl
  
  .PHONY: maybe-dvi-itcl dvi-itcl
  maybe-dvi-itcl:
+@if itcl
+maybe-dvi-itcl: dvi-itcl
  
  dvi-itcl: \
      configure-itcl 
@@ -9771,7 +11745,8 @@ dvi-itcl: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in itcl" ; \
@@ -9783,9 +11758,12 @@ dvi-itcl: \
                   dvi) \
           || exit 1
  
+@endif itcl
  
  .PHONY: maybe-TAGS-itcl TAGS-itcl
  maybe-TAGS-itcl:
+@if itcl
+maybe-TAGS-itcl: TAGS-itcl
  
  TAGS-itcl: \
      configure-itcl 
@@ -9793,7 +11771,8 @@ TAGS-itcl: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in itcl" ; \
@@ -9805,9 +11784,12 @@ TAGS-itcl: \
                   TAGS) \
           || exit 1
  
+@endif itcl
  
  .PHONY: maybe-install-info-itcl install-info-itcl
  maybe-install-info-itcl:
+@if itcl
+maybe-install-info-itcl: install-info-itcl
  
  install-info-itcl: \
      configure-itcl \
@@ -9816,7 +11798,8 @@ install-info-itcl: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in itcl" ; \
@@ -9828,9 +11811,12 @@ install-info-itcl: \
                   install-info) \
           || exit 1
  
+@endif itcl
  
  .PHONY: maybe-installcheck-itcl installcheck-itcl
  maybe-installcheck-itcl:
+@if itcl
+maybe-installcheck-itcl: installcheck-itcl
  
  installcheck-itcl: \
      configure-itcl 
@@ -9838,7 +11824,8 @@ installcheck-itcl: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in itcl" ; \
@@ -9850,16 +11837,20 @@ installcheck-itcl: \
                   installcheck) \
           || exit 1
  
+@endif itcl
  
  .PHONY: maybe-mostlyclean-itcl mostlyclean-itcl
  maybe-mostlyclean-itcl:
+@if itcl
+maybe-mostlyclean-itcl: mostlyclean-itcl
  
  mostlyclean-itcl: 
         @[ -f ./itcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in itcl" ; \
@@ -9871,16 +11862,20 @@ mostlyclean-itcl:
                   mostlyclean) \
           || exit 1
  
+@endif itcl
  
  .PHONY: maybe-clean-itcl clean-itcl
  maybe-clean-itcl:
+@if itcl
+maybe-clean-itcl: clean-itcl
  
  clean-itcl: 
         @[ -f ./itcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in itcl" ; \
@@ -9892,16 +11887,20 @@ clean-itcl:
                   clean) \
           || exit 1
  
+@endif itcl
  
  .PHONY: maybe-distclean-itcl distclean-itcl
  maybe-distclean-itcl:
+@if itcl
+maybe-distclean-itcl: distclean-itcl
  
  distclean-itcl: 
         @[ -f ./itcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in itcl" ; \
@@ -9913,16 +11912,20 @@ distclean-itcl:
                   distclean) \
           || exit 1
  
+@endif itcl
  
  .PHONY: maybe-maintainer-clean-itcl maintainer-clean-itcl
  maybe-maintainer-clean-itcl:
+@if itcl
+maybe-maintainer-clean-itcl: maintainer-clean-itcl
  
  maintainer-clean-itcl: 
         @[ -f ./itcl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in itcl" ; \
@@ -9934,31 +11937,20 @@ maintainer-clean-itcl:
                   maintainer-clean) \
           || exit 1
  
+@endif itcl
  
  
  .PHONY: configure-ld maybe-configure-ld
  maybe-configure-ld:
+@if ld
+maybe-configure-ld: configure-ld
  configure-ld:
-       @test ! -f ld/Makefile || exit 0; \
+       @test -f stage_last && exit 0; \
+       test ! -f ld/Makefile || exit 0; \
         [ -d ld ] || mkdir ld; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in ld; \
         cd ld || exit 1; \
         case $(srcdir) in \
@@ -9973,41 +11965,59 @@ configure-ld:
             libsrcdir="$$s/ld";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif ld
  
  .PHONY: all-ld maybe-all-ld
  maybe-all-ld:
+@if ld
+TARGET-ld=all
+maybe-all-ld: all-ld
  all-ld: configure-ld
-       @r=`${PWD_COMMAND}`; export r; \
+       @test -f stage_last && exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd ld && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd ld && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-ld))
+@endif ld
  
  .PHONY: check-ld maybe-check-ld
  maybe-check-ld:
+@if ld
+maybe-check-ld: check-ld
  
  check-ld:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd ld && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif ld
  
  .PHONY: install-ld maybe-install-ld
  maybe-install-ld:
+@if ld
+maybe-install-ld: install-ld
  
  install-ld: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd ld && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif ld
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-ld info-ld
  maybe-info-ld:
+@if ld
+maybe-info-ld: info-ld
  
  info-ld: \
      configure-ld 
@@ -10015,7 +12025,8 @@ info-ld: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in ld" ; \
@@ -10027,9 +12038,12 @@ info-ld: \
                   info) \
           || exit 1
  
+@endif ld
  
  .PHONY: maybe-dvi-ld dvi-ld
  maybe-dvi-ld:
+@if ld
+maybe-dvi-ld: dvi-ld
  
  dvi-ld: \
      configure-ld 
@@ -10037,7 +12051,8 @@ dvi-ld: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in ld" ; \
@@ -10049,9 +12064,12 @@ dvi-ld: \
                   dvi) \
           || exit 1
  
+@endif ld
  
  .PHONY: maybe-TAGS-ld TAGS-ld
  maybe-TAGS-ld:
+@if ld
+maybe-TAGS-ld: TAGS-ld
  
  TAGS-ld: \
      configure-ld 
@@ -10059,7 +12077,8 @@ TAGS-ld: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in ld" ; \
@@ -10071,9 +12090,12 @@ TAGS-ld: \
                   TAGS) \
           || exit 1
  
+@endif ld
  
  .PHONY: maybe-install-info-ld install-info-ld
  maybe-install-info-ld:
+@if ld
+maybe-install-info-ld: install-info-ld
  
  install-info-ld: \
      configure-ld \
@@ -10082,7 +12104,8 @@ install-info-ld: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in ld" ; \
@@ -10094,9 +12117,12 @@ install-info-ld: \
                   install-info) \
           || exit 1
  
+@endif ld
  
  .PHONY: maybe-installcheck-ld installcheck-ld
  maybe-installcheck-ld:
+@if ld
+maybe-installcheck-ld: installcheck-ld
  
  installcheck-ld: \
      configure-ld 
@@ -10104,7 +12130,8 @@ installcheck-ld: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in ld" ; \
@@ -10116,16 +12143,20 @@ installcheck-ld: \
                   installcheck) \
           || exit 1
  
+@endif ld
  
  .PHONY: maybe-mostlyclean-ld mostlyclean-ld
  maybe-mostlyclean-ld:
+@if ld
+maybe-mostlyclean-ld: mostlyclean-ld
  
  mostlyclean-ld: 
         @[ -f ./ld/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in ld" ; \
@@ -10137,16 +12168,20 @@ mostlyclean-ld:
                   mostlyclean) \
           || exit 1
  
+@endif ld
  
  .PHONY: maybe-clean-ld clean-ld
  maybe-clean-ld:
+@if ld
+maybe-clean-ld: clean-ld
  
  clean-ld: 
         @[ -f ./ld/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in ld" ; \
@@ -10158,16 +12193,20 @@ clean-ld:
                   clean) \
           || exit 1
  
+@endif ld
  
  .PHONY: maybe-distclean-ld distclean-ld
  maybe-distclean-ld:
+@if ld
+maybe-distclean-ld: distclean-ld
  
  distclean-ld: 
         @[ -f ./ld/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in ld" ; \
@@ -10179,16 +12218,20 @@ distclean-ld:
                   distclean) \
           || exit 1
  
+@endif ld
  
  .PHONY: maybe-maintainer-clean-ld maintainer-clean-ld
  maybe-maintainer-clean-ld:
+@if ld
+maybe-maintainer-clean-ld: maintainer-clean-ld
  
  maintainer-clean-ld: 
         @[ -f ./ld/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in ld" ; \
@@ -10200,92 +12243,100 @@ maintainer-clean-ld:
                   maintainer-clean) \
           || exit 1
  
+@endif ld
  
  
-.PHONY: configure-libgui maybe-configure-libgui
-maybe-configure-libgui:
-configure-libgui:
-       @test ! -f libgui/Makefile || exit 0; \
-       [ -d libgui ] || mkdir libgui; \
+.PHONY: configure-libcpp maybe-configure-libcpp
+maybe-configure-libcpp:
+@if libcpp
+maybe-configure-libcpp: configure-libcpp
+configure-libcpp:
+       @test -f stage_last && exit 0; \
+       test ! -f libcpp/Makefile || exit 0; \
+       [ -d libcpp ] || mkdir libcpp; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in libgui; \
-       cd libgui || exit 1; \
+       $(HOST_EXPORTS) \
+       echo Configuring in libcpp; \
+       cd libcpp || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/libgui"; \
-           libsrcdir="$$s/libgui";; \
+           srcdiroption="--srcdir=$(srcdir)/libcpp"; \
+           libsrcdir="$$s/libcpp";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/libgui"; \
-           libsrcdir="$$s/libgui";; \
+           srcdiroption="--srcdir=../$(srcdir)/libcpp"; \
+           libsrcdir="$$s/libcpp";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif libcpp
  
-.PHONY: all-libgui maybe-all-libgui
-maybe-all-libgui:
-all-libgui: configure-libgui
-       @r=`${PWD_COMMAND}`; export r; \
+.PHONY: all-libcpp maybe-all-libcpp
+maybe-all-libcpp:
+@if libcpp
+TARGET-libcpp=all
+maybe-all-libcpp: all-libcpp
+all-libcpp: configure-libcpp
+       @test -f stage_last && exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd libgui && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd libcpp && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-libcpp))
+@endif libcpp
  
-.PHONY: check-libgui maybe-check-libgui
-maybe-check-libgui:
+.PHONY: check-libcpp maybe-check-libcpp
+maybe-check-libcpp:
+@if libcpp
+maybe-check-libcpp: check-libcpp
  
-check-libgui:
+check-libcpp:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd libgui && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(HOST_EXPORTS) \
+       (cd libcpp && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif libcpp
  
-.PHONY: install-libgui maybe-install-libgui
-maybe-install-libgui:
+.PHONY: install-libcpp maybe-install-libcpp
+maybe-install-libcpp:
+@if libcpp
+maybe-install-libcpp: install-libcpp
  
-install-libgui: installdirs
+install-libcpp: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd libgui && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(HOST_EXPORTS) \
+       (cd libcpp && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif libcpp
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-libgui info-libgui
-maybe-info-libgui:
+.PHONY: maybe-info-libcpp info-libcpp
+maybe-info-libcpp:
+@if libcpp
+maybe-info-libcpp: info-libcpp
  
-info-libgui: \
-    configure-libgui 
-       @[ -f ./libgui/Makefile ] || exit 0; \
+info-libcpp: \
+    configure-libcpp 
+       @[ -f ./libcpp/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in libgui" ; \
-       (cd libgui && \
+       echo "Doing info in libcpp" ; \
+       (cd libcpp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -10293,21 +12344,25 @@ info-libgui: \
                   info) \
           || exit 1
  
+@endif libcpp
  
-.PHONY: maybe-dvi-libgui dvi-libgui
-maybe-dvi-libgui:
+.PHONY: maybe-dvi-libcpp dvi-libcpp
+maybe-dvi-libcpp:
+@if libcpp
+maybe-dvi-libcpp: dvi-libcpp
  
-dvi-libgui: \
-    configure-libgui 
-       @[ -f ./libgui/Makefile ] || exit 0; \
+dvi-libcpp: \
+    configure-libcpp 
+       @[ -f ./libcpp/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in libgui" ; \
-       (cd libgui && \
+       echo "Doing dvi in libcpp" ; \
+       (cd libcpp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -10315,21 +12370,25 @@ dvi-libgui: \
                   dvi) \
           || exit 1
  
+@endif libcpp
  
-.PHONY: maybe-TAGS-libgui TAGS-libgui
-maybe-TAGS-libgui:
+.PHONY: maybe-TAGS-libcpp TAGS-libcpp
+maybe-TAGS-libcpp:
+@if libcpp
+maybe-TAGS-libcpp: TAGS-libcpp
  
-TAGS-libgui: \
-    configure-libgui 
-       @[ -f ./libgui/Makefile ] || exit 0; \
+TAGS-libcpp: \
+    configure-libcpp 
+       @[ -f ./libcpp/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in libgui" ; \
-       (cd libgui && \
+       echo "Doing TAGS in libcpp" ; \
+       (cd libcpp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -10337,22 +12396,26 @@ TAGS-libgui: \
                   TAGS) \
           || exit 1
  
+@endif libcpp
  
-.PHONY: maybe-install-info-libgui install-info-libgui
-maybe-install-info-libgui:
+.PHONY: maybe-install-info-libcpp install-info-libcpp
+maybe-install-info-libcpp:
+@if libcpp
+maybe-install-info-libcpp: install-info-libcpp
  
-install-info-libgui: \
-    configure-libgui \
-    info-libgui 
-       @[ -f ./libgui/Makefile ] || exit 0; \
+install-info-libcpp: \
+    configure-libcpp \
+    info-libcpp 
+       @[ -f ./libcpp/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in libgui" ; \
-       (cd libgui && \
+       echo "Doing install-info in libcpp" ; \
+       (cd libcpp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -10360,21 +12423,25 @@ install-info-libgui: \
                   install-info) \
           || exit 1
  
+@endif libcpp
  
-.PHONY: maybe-installcheck-libgui installcheck-libgui
-maybe-installcheck-libgui:
+.PHONY: maybe-installcheck-libcpp installcheck-libcpp
+maybe-installcheck-libcpp:
+@if libcpp
+maybe-installcheck-libcpp: installcheck-libcpp
  
-installcheck-libgui: \
-    configure-libgui 
-       @[ -f ./libgui/Makefile ] || exit 0; \
+installcheck-libcpp: \
+    configure-libcpp 
+       @[ -f ./libcpp/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in libgui" ; \
-       (cd libgui && \
+       echo "Doing installcheck in libcpp" ; \
+       (cd libcpp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -10382,20 +12449,24 @@ installcheck-libgui: \
                   installcheck) \
           || exit 1
  
+@endif libcpp
  
-.PHONY: maybe-mostlyclean-libgui mostlyclean-libgui
-maybe-mostlyclean-libgui:
+.PHONY: maybe-mostlyclean-libcpp mostlyclean-libcpp
+maybe-mostlyclean-libcpp:
+@if libcpp
+maybe-mostlyclean-libcpp: mostlyclean-libcpp
  
-mostlyclean-libgui: 
-       @[ -f ./libgui/Makefile ] || exit 0; \
+mostlyclean-libcpp: 
+       @[ -f ./libcpp/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in libgui" ; \
-       (cd libgui && \
+       echo "Doing mostlyclean in libcpp" ; \
+       (cd libcpp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -10403,20 +12474,24 @@ mostlyclean-libgui:
                   mostlyclean) \
           || exit 1
  
+@endif libcpp
  
-.PHONY: maybe-clean-libgui clean-libgui
-maybe-clean-libgui:
+.PHONY: maybe-clean-libcpp clean-libcpp
+maybe-clean-libcpp:
+@if libcpp
+maybe-clean-libcpp: clean-libcpp
  
-clean-libgui: 
-       @[ -f ./libgui/Makefile ] || exit 0; \
+clean-libcpp: 
+       @[ -f ./libcpp/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in libgui" ; \
-       (cd libgui && \
+       echo "Doing clean in libcpp" ; \
+       (cd libcpp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -10424,20 +12499,24 @@ clean-libgui:
                   clean) \
           || exit 1
  
+@endif libcpp
  
-.PHONY: maybe-distclean-libgui distclean-libgui
-maybe-distclean-libgui:
+.PHONY: maybe-distclean-libcpp distclean-libcpp
+maybe-distclean-libcpp:
+@if libcpp
+maybe-distclean-libcpp: distclean-libcpp
  
-distclean-libgui: 
-       @[ -f ./libgui/Makefile ] || exit 0; \
+distclean-libcpp: 
+       @[ -f ./libcpp/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in libgui" ; \
-       (cd libgui && \
+       echo "Doing distclean in libcpp" ; \
+       (cd libcpp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -10445,20 +12524,24 @@ distclean-libgui:
                   distclean) \
           || exit 1
  
+@endif libcpp
  
-.PHONY: maybe-maintainer-clean-libgui maintainer-clean-libgui
-maybe-maintainer-clean-libgui:
+.PHONY: maybe-maintainer-clean-libcpp maintainer-clean-libcpp
+maybe-maintainer-clean-libcpp:
+@if libcpp
+maybe-maintainer-clean-libcpp: maintainer-clean-libcpp
  
-maintainer-clean-libgui: 
-       @[ -f ./libgui/Makefile ] || exit 0; \
+maintainer-clean-libcpp: 
+       @[ -f ./libcpp/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in libgui" ; \
-       (cd libgui && \
+       echo "Doing maintainer-clean in libcpp" ; \
+       (cd libcpp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -10466,92 +12549,98 @@ maintainer-clean-libgui:
                   maintainer-clean) \
           || exit 1
  
+@endif libcpp
  
  
-.PHONY: configure-libiberty maybe-configure-libiberty
-maybe-configure-libiberty:
-configure-libiberty:
-       @test ! -f libiberty/Makefile || exit 0; \
-       [ -d libiberty ] || mkdir libiberty; \
+.PHONY: configure-libgui maybe-configure-libgui
+maybe-configure-libgui:
+@if libgui
+maybe-configure-libgui: configure-libgui
+configure-libgui:
+       @test ! -f libgui/Makefile || exit 0; \
+       [ -d libgui ] || mkdir libgui; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in libiberty; \
-       cd libiberty || exit 1; \
+       $(HOST_EXPORTS) \
+       echo Configuring in libgui; \
+       cd libgui || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/libiberty"; \
-           libsrcdir="$$s/libiberty";; \
+           srcdiroption="--srcdir=$(srcdir)/libgui"; \
+           libsrcdir="$$s/libgui";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/libiberty"; \
-           libsrcdir="$$s/libiberty";; \
+           srcdiroption="--srcdir=../$(srcdir)/libgui"; \
+           libsrcdir="$$s/libgui";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif libgui
  
-.PHONY: all-libiberty maybe-all-libiberty
-maybe-all-libiberty:
-all-libiberty: configure-libiberty
+.PHONY: all-libgui maybe-all-libgui
+maybe-all-libgui:
+@if libgui
+TARGET-libgui=all
+maybe-all-libgui: all-libgui
+all-libgui: configure-libgui
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd libiberty && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd libgui && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-libgui))
+@endif libgui
  
-.PHONY: check-libiberty maybe-check-libiberty
-maybe-check-libiberty:
+.PHONY: check-libgui maybe-check-libgui
+maybe-check-libgui:
+@if libgui
+maybe-check-libgui: check-libgui
  
-check-libiberty:
+check-libgui:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd libiberty && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(HOST_EXPORTS) \
+       (cd libgui && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif libgui
  
-.PHONY: install-libiberty maybe-install-libiberty
-maybe-install-libiberty:
+.PHONY: install-libgui maybe-install-libgui
+maybe-install-libgui:
+@if libgui
+maybe-install-libgui: install-libgui
  
-install-libiberty: installdirs
+install-libgui: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd libiberty && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(HOST_EXPORTS) \
+       (cd libgui && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif libgui
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-libiberty info-libiberty
-maybe-info-libiberty:
+.PHONY: maybe-info-libgui info-libgui
+maybe-info-libgui:
+@if libgui
+maybe-info-libgui: info-libgui
  
-info-libiberty: \
-    configure-libiberty 
-       @[ -f ./libiberty/Makefile ] || exit 0; \
+info-libgui: \
+    configure-libgui 
+       @[ -f ./libgui/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in libiberty" ; \
-       (cd libiberty && \
+       echo "Doing info in libgui" ; \
+       (cd libgui && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -10559,21 +12648,25 @@ info-libiberty: \
                   info) \
           || exit 1
  
+@endif libgui
  
-.PHONY: maybe-dvi-libiberty dvi-libiberty
-maybe-dvi-libiberty:
+.PHONY: maybe-dvi-libgui dvi-libgui
+maybe-dvi-libgui:
+@if libgui
+maybe-dvi-libgui: dvi-libgui
  
-dvi-libiberty: \
-    configure-libiberty 
-       @[ -f ./libiberty/Makefile ] || exit 0; \
+dvi-libgui: \
+    configure-libgui 
+       @[ -f ./libgui/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in libiberty" ; \
-       (cd libiberty && \
+       echo "Doing dvi in libgui" ; \
+       (cd libgui && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -10581,21 +12674,25 @@ dvi-libiberty: \
                   dvi) \
           || exit 1
  
+@endif libgui
  
-.PHONY: maybe-TAGS-libiberty TAGS-libiberty
-maybe-TAGS-libiberty:
+.PHONY: maybe-TAGS-libgui TAGS-libgui
+maybe-TAGS-libgui:
+@if libgui
+maybe-TAGS-libgui: TAGS-libgui
  
-TAGS-libiberty: \
-    configure-libiberty 
-       @[ -f ./libiberty/Makefile ] || exit 0; \
+TAGS-libgui: \
+    configure-libgui 
+       @[ -f ./libgui/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in libiberty" ; \
-       (cd libiberty && \
+       echo "Doing TAGS in libgui" ; \
+       (cd libgui && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -10603,22 +12700,26 @@ TAGS-libiberty: \
                   TAGS) \
           || exit 1
  
+@endif libgui
  
-.PHONY: maybe-install-info-libiberty install-info-libiberty
-maybe-install-info-libiberty:
+.PHONY: maybe-install-info-libgui install-info-libgui
+maybe-install-info-libgui:
+@if libgui
+maybe-install-info-libgui: install-info-libgui
  
-install-info-libiberty: \
-    configure-libiberty \
-    info-libiberty 
-       @[ -f ./libiberty/Makefile ] || exit 0; \
+install-info-libgui: \
+    configure-libgui \
+    info-libgui 
+       @[ -f ./libgui/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in libiberty" ; \
-       (cd libiberty && \
+       echo "Doing install-info in libgui" ; \
+       (cd libgui && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -10626,21 +12727,25 @@ install-info-libiberty: \
                   install-info) \
           || exit 1
  
+@endif libgui
  
-.PHONY: maybe-installcheck-libiberty installcheck-libiberty
-maybe-installcheck-libiberty:
+.PHONY: maybe-installcheck-libgui installcheck-libgui
+maybe-installcheck-libgui:
+@if libgui
+maybe-installcheck-libgui: installcheck-libgui
  
-installcheck-libiberty: \
-    configure-libiberty 
-       @[ -f ./libiberty/Makefile ] || exit 0; \
+installcheck-libgui: \
+    configure-libgui 
+       @[ -f ./libgui/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in libiberty" ; \
-       (cd libiberty && \
+       echo "Doing installcheck in libgui" ; \
+       (cd libgui && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -10648,20 +12753,24 @@ installcheck-libiberty: \
                   installcheck) \
           || exit 1
  
+@endif libgui
  
-.PHONY: maybe-mostlyclean-libiberty mostlyclean-libiberty
-maybe-mostlyclean-libiberty:
+.PHONY: maybe-mostlyclean-libgui mostlyclean-libgui
+maybe-mostlyclean-libgui:
+@if libgui
+maybe-mostlyclean-libgui: mostlyclean-libgui
  
-mostlyclean-libiberty: 
-       @[ -f ./libiberty/Makefile ] || exit 0; \
+mostlyclean-libgui: 
+       @[ -f ./libgui/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in libiberty" ; \
-       (cd libiberty && \
+       echo "Doing mostlyclean in libgui" ; \
+       (cd libgui && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -10669,20 +12778,24 @@ mostlyclean-libiberty:
                   mostlyclean) \
           || exit 1
  
+@endif libgui
  
-.PHONY: maybe-clean-libiberty clean-libiberty
-maybe-clean-libiberty:
+.PHONY: maybe-clean-libgui clean-libgui
+maybe-clean-libgui:
+@if libgui
+maybe-clean-libgui: clean-libgui
  
-clean-libiberty: 
-       @[ -f ./libiberty/Makefile ] || exit 0; \
+clean-libgui: 
+       @[ -f ./libgui/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in libiberty" ; \
-       (cd libiberty && \
+       echo "Doing clean in libgui" ; \
+       (cd libgui && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -10690,20 +12803,24 @@ clean-libiberty:
                   clean) \
           || exit 1
  
+@endif libgui
  
-.PHONY: maybe-distclean-libiberty distclean-libiberty
-maybe-distclean-libiberty:
+.PHONY: maybe-distclean-libgui distclean-libgui
+maybe-distclean-libgui:
+@if libgui
+maybe-distclean-libgui: distclean-libgui
  
-distclean-libiberty: 
-       @[ -f ./libiberty/Makefile ] || exit 0; \
+distclean-libgui: 
+       @[ -f ./libgui/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in libiberty" ; \
-       (cd libiberty && \
+       echo "Doing distclean in libgui" ; \
+       (cd libgui && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -10711,20 +12828,24 @@ distclean-libiberty:
                   distclean) \
           || exit 1
  
+@endif libgui
  
-.PHONY: maybe-maintainer-clean-libiberty maintainer-clean-libiberty
-maybe-maintainer-clean-libiberty:
+.PHONY: maybe-maintainer-clean-libgui maintainer-clean-libgui
+maybe-maintainer-clean-libgui:
+@if libgui
+maybe-maintainer-clean-libgui: maintainer-clean-libgui
  
-maintainer-clean-libiberty: 
-       @[ -f ./libiberty/Makefile ] || exit 0; \
+maintainer-clean-libgui: 
+       @[ -f ./libgui/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in libiberty" ; \
-       (cd libiberty && \
+       echo "Doing maintainer-clean in libgui" ; \
+       (cd libgui && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -10732,92 +12853,100 @@ maintainer-clean-libiberty:
                   maintainer-clean) \
           || exit 1
  
+@endif libgui
  
  
-.PHONY: configure-libtool maybe-configure-libtool
-maybe-configure-libtool:
-configure-libtool:
-       @test ! -f libtool/Makefile || exit 0; \
-       [ -d libtool ] || mkdir libtool; \
+.PHONY: configure-libiberty maybe-configure-libiberty
+maybe-configure-libiberty:
+@if libiberty
+maybe-configure-libiberty: configure-libiberty
+configure-libiberty:
+       @test -f stage_last && exit 0; \
+       test ! -f libiberty/Makefile || exit 0; \
+       [ -d libiberty ] || mkdir libiberty; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in libtool; \
-       cd libtool || exit 1; \
+       $(HOST_EXPORTS) \
+       echo Configuring in libiberty; \
+       cd libiberty || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/libtool"; \
-           libsrcdir="$$s/libtool";; \
+           srcdiroption="--srcdir=$(srcdir)/libiberty"; \
+           libsrcdir="$$s/libiberty";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/libtool"; \
-           libsrcdir="$$s/libtool";; \
+           srcdiroption="--srcdir=../$(srcdir)/libiberty"; \
+           libsrcdir="$$s/libiberty";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif libiberty
  
-.PHONY: all-libtool maybe-all-libtool
-maybe-all-libtool:
-all-libtool: configure-libtool
-       @r=`${PWD_COMMAND}`; export r; \
+.PHONY: all-libiberty maybe-all-libiberty
+maybe-all-libiberty:
+@if libiberty
+TARGET-libiberty=all
+maybe-all-libiberty: all-libiberty
+all-libiberty: configure-libiberty
+       @test -f stage_last && exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd libtool && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd libiberty && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-libiberty))
+@endif libiberty
  
-.PHONY: check-libtool maybe-check-libtool
-maybe-check-libtool:
+.PHONY: check-libiberty maybe-check-libiberty
+maybe-check-libiberty:
+@if libiberty
+maybe-check-libiberty: check-libiberty
  
-check-libtool:
+check-libiberty:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd libtool && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(HOST_EXPORTS) \
+       (cd libiberty && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif libiberty
  
-.PHONY: install-libtool maybe-install-libtool
-maybe-install-libtool:
+.PHONY: install-libiberty maybe-install-libiberty
+maybe-install-libiberty:
+@if libiberty
+maybe-install-libiberty: install-libiberty
  
-install-libtool: installdirs
+install-libiberty: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd libtool && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(HOST_EXPORTS) \
+       (cd libiberty && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif libiberty
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-libtool info-libtool
-maybe-info-libtool:
+.PHONY: maybe-info-libiberty info-libiberty
+maybe-info-libiberty:
+@if libiberty
+maybe-info-libiberty: info-libiberty
  
-info-libtool: \
-    configure-libtool 
-       @[ -f ./libtool/Makefile ] || exit 0; \
+info-libiberty: \
+    configure-libiberty 
+       @[ -f ./libiberty/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in libtool" ; \
-       (cd libtool && \
+       echo "Doing info in libiberty" ; \
+       (cd libiberty && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -10825,21 +12954,25 @@ info-libtool: \
                   info) \
           || exit 1
  
+@endif libiberty
  
-.PHONY: maybe-dvi-libtool dvi-libtool
-maybe-dvi-libtool:
+.PHONY: maybe-dvi-libiberty dvi-libiberty
+maybe-dvi-libiberty:
+@if libiberty
+maybe-dvi-libiberty: dvi-libiberty
  
-dvi-libtool: \
-    configure-libtool 
-       @[ -f ./libtool/Makefile ] || exit 0; \
+dvi-libiberty: \
+    configure-libiberty 
+       @[ -f ./libiberty/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in libtool" ; \
-       (cd libtool && \
+       echo "Doing dvi in libiberty" ; \
+       (cd libiberty && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -10847,21 +12980,25 @@ dvi-libtool: \
                   dvi) \
           || exit 1
  
+@endif libiberty
  
-.PHONY: maybe-TAGS-libtool TAGS-libtool
-maybe-TAGS-libtool:
+.PHONY: maybe-TAGS-libiberty TAGS-libiberty
+maybe-TAGS-libiberty:
+@if libiberty
+maybe-TAGS-libiberty: TAGS-libiberty
  
-TAGS-libtool: \
-    configure-libtool 
-       @[ -f ./libtool/Makefile ] || exit 0; \
+TAGS-libiberty: \
+    configure-libiberty 
+       @[ -f ./libiberty/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in libtool" ; \
-       (cd libtool && \
+       echo "Doing TAGS in libiberty" ; \
+       (cd libiberty && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -10869,22 +13006,26 @@ TAGS-libtool: \
                   TAGS) \
           || exit 1
  
+@endif libiberty
  
-.PHONY: maybe-install-info-libtool install-info-libtool
-maybe-install-info-libtool:
+.PHONY: maybe-install-info-libiberty install-info-libiberty
+maybe-install-info-libiberty:
+@if libiberty
+maybe-install-info-libiberty: install-info-libiberty
  
-install-info-libtool: \
-    configure-libtool \
-    info-libtool 
-       @[ -f ./libtool/Makefile ] || exit 0; \
+install-info-libiberty: \
+    configure-libiberty \
+    info-libiberty 
+       @[ -f ./libiberty/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in libtool" ; \
-       (cd libtool && \
+       echo "Doing install-info in libiberty" ; \
+       (cd libiberty && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -10892,17 +13033,325 @@ install-info-libtool: \
                   install-info) \
           || exit 1
  
+@endif libiberty
  
-.PHONY: maybe-installcheck-libtool installcheck-libtool
-maybe-installcheck-libtool:
+.PHONY: maybe-installcheck-libiberty installcheck-libiberty
+maybe-installcheck-libiberty:
+@if libiberty
+maybe-installcheck-libiberty: installcheck-libiberty
  
-installcheck-libtool: \
-    configure-libtool 
-       @[ -f ./libtool/Makefile ] || exit 0; \
+installcheck-libiberty: \
+    configure-libiberty 
+       @[ -f ./libiberty/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing installcheck in libiberty" ; \
+       (cd libiberty && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 installcheck) \
+         || exit 1
+
+@endif libiberty
+
+.PHONY: maybe-mostlyclean-libiberty mostlyclean-libiberty
+maybe-mostlyclean-libiberty:
+@if libiberty
+maybe-mostlyclean-libiberty: mostlyclean-libiberty
+
+mostlyclean-libiberty: 
+       @[ -f ./libiberty/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing mostlyclean in libiberty" ; \
+       (cd libiberty && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 mostlyclean) \
+         || exit 1
+
+@endif libiberty
+
+.PHONY: maybe-clean-libiberty clean-libiberty
+maybe-clean-libiberty:
+@if libiberty
+maybe-clean-libiberty: clean-libiberty
+
+clean-libiberty: 
+       @[ -f ./libiberty/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing clean in libiberty" ; \
+       (cd libiberty && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 clean) \
+         || exit 1
+
+@endif libiberty
+
+.PHONY: maybe-distclean-libiberty distclean-libiberty
+maybe-distclean-libiberty:
+@if libiberty
+maybe-distclean-libiberty: distclean-libiberty
+
+distclean-libiberty: 
+       @[ -f ./libiberty/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing distclean in libiberty" ; \
+       (cd libiberty && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 distclean) \
+         || exit 1
+
+@endif libiberty
+
+.PHONY: maybe-maintainer-clean-libiberty maintainer-clean-libiberty
+maybe-maintainer-clean-libiberty:
+@if libiberty
+maybe-maintainer-clean-libiberty: maintainer-clean-libiberty
+
+maintainer-clean-libiberty: 
+       @[ -f ./libiberty/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing maintainer-clean in libiberty" ; \
+       (cd libiberty && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 maintainer-clean) \
+         || exit 1
+
+@endif libiberty
+
+
+.PHONY: configure-libtool maybe-configure-libtool
+maybe-configure-libtool:
+@if libtool
+maybe-configure-libtool: configure-libtool
+configure-libtool:
+       @test ! -f libtool/Makefile || exit 0; \
+       [ -d libtool ] || mkdir libtool; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       echo Configuring in libtool; \
+       cd libtool || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/libtool"; \
+           libsrcdir="$$s/libtool";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/libtool"; \
+           libsrcdir="$$s/libtool";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
+         || exit 1
+@endif libtool
+
+.PHONY: all-libtool maybe-all-libtool
+maybe-all-libtool:
+@if libtool
+TARGET-libtool=all
+maybe-all-libtool: all-libtool
+all-libtool: configure-libtool
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       (cd libtool && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-libtool))
+@endif libtool
+
+.PHONY: check-libtool maybe-check-libtool
+maybe-check-libtool:
+@if libtool
+maybe-check-libtool: check-libtool
+
+check-libtool:
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       (cd libtool && $(MAKE) $(FLAGS_TO_PASS) check)
+
+@endif libtool
+
+.PHONY: install-libtool maybe-install-libtool
+maybe-install-libtool:
+@if libtool
+maybe-install-libtool: install-libtool
+
+install-libtool: installdirs
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       (cd libtool && $(MAKE) $(FLAGS_TO_PASS) install)
+
+@endif libtool
+
+# Other targets (info, dvi, etc.)
+
+.PHONY: maybe-info-libtool info-libtool
+maybe-info-libtool:
+@if libtool
+maybe-info-libtool: info-libtool
+
+info-libtool: \
+    configure-libtool 
+       @[ -f ./libtool/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing info in libtool" ; \
+       (cd libtool && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 info) \
+         || exit 1
+
+@endif libtool
+
+.PHONY: maybe-dvi-libtool dvi-libtool
+maybe-dvi-libtool:
+@if libtool
+maybe-dvi-libtool: dvi-libtool
+
+dvi-libtool: \
+    configure-libtool 
+       @[ -f ./libtool/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing dvi in libtool" ; \
+       (cd libtool && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 dvi) \
+         || exit 1
+
+@endif libtool
+
+.PHONY: maybe-TAGS-libtool TAGS-libtool
+maybe-TAGS-libtool:
+@if libtool
+maybe-TAGS-libtool: TAGS-libtool
+
+TAGS-libtool: \
+    configure-libtool 
+       @[ -f ./libtool/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing TAGS in libtool" ; \
+       (cd libtool && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 TAGS) \
+         || exit 1
+
+@endif libtool
+
+.PHONY: maybe-install-info-libtool install-info-libtool
+maybe-install-info-libtool:
+@if libtool
+maybe-install-info-libtool: install-info-libtool
+
+install-info-libtool: \
+    configure-libtool \
+    info-libtool 
+       @[ -f ./libtool/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing install-info in libtool" ; \
+       (cd libtool && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 install-info) \
+         || exit 1
+
+@endif libtool
+
+.PHONY: maybe-installcheck-libtool installcheck-libtool
+maybe-installcheck-libtool:
+@if libtool
+maybe-installcheck-libtool: installcheck-libtool
+
+installcheck-libtool: \
+    configure-libtool 
+       @[ -f ./libtool/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in libtool" ; \
@@ -10914,16 +13363,20 @@ installcheck-libtool: \
                   installcheck) \
           || exit 1
  
+@endif libtool
  
  .PHONY: maybe-mostlyclean-libtool mostlyclean-libtool
  maybe-mostlyclean-libtool:
+@if libtool
+maybe-mostlyclean-libtool: mostlyclean-libtool
  
  mostlyclean-libtool: 
         @[ -f ./libtool/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in libtool" ; \
@@ -10935,16 +13388,20 @@ mostlyclean-libtool:
                   mostlyclean) \
           || exit 1
  
+@endif libtool
  
  .PHONY: maybe-clean-libtool clean-libtool
  maybe-clean-libtool:
+@if libtool
+maybe-clean-libtool: clean-libtool
  
  clean-libtool: 
         @[ -f ./libtool/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in libtool" ; \
@@ -10956,16 +13413,20 @@ clean-libtool:
                   clean) \
           || exit 1
  
+@endif libtool
  
  .PHONY: maybe-distclean-libtool distclean-libtool
  maybe-distclean-libtool:
+@if libtool
+maybe-distclean-libtool: distclean-libtool
  
  distclean-libtool: 
         @[ -f ./libtool/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in libtool" ; \
@@ -10977,16 +13438,20 @@ distclean-libtool:
                   distclean) \
           || exit 1
  
+@endif libtool
  
  .PHONY: maybe-maintainer-clean-libtool maintainer-clean-libtool
  maybe-maintainer-clean-libtool:
+@if libtool
+maybe-maintainer-clean-libtool: maintainer-clean-libtool
  
  maintainer-clean-libtool: 
         @[ -f ./libtool/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in libtool" ; \
@@ -10998,31 +13463,19 @@ maintainer-clean-libtool:
                   maintainer-clean) \
           || exit 1
  
+@endif libtool
  
  
  .PHONY: configure-m4 maybe-configure-m4
  maybe-configure-m4:
+@if m4
+maybe-configure-m4: configure-m4
  configure-m4:
         @test ! -f m4/Makefile || exit 0; \
         [ -d m4 ] || mkdir m4; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in m4; \
         cd m4 || exit 1; \
         case $(srcdir) in \
@@ -11037,41 +13490,58 @@ configure-m4:
             libsrcdir="$$s/m4";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif m4
  
  .PHONY: all-m4 maybe-all-m4
  maybe-all-m4:
+@if m4
+TARGET-m4=all
+maybe-all-m4: all-m4
  all-m4: configure-m4
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd m4 && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd m4 && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-m4))
+@endif m4
  
  .PHONY: check-m4 maybe-check-m4
  maybe-check-m4:
+@if m4
+maybe-check-m4: check-m4
  
  check-m4:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd m4 && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif m4
  
  .PHONY: install-m4 maybe-install-m4
  maybe-install-m4:
+@if m4
+maybe-install-m4: install-m4
  
  install-m4: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd m4 && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif m4
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-m4 info-m4
  maybe-info-m4:
+@if m4
+maybe-info-m4: info-m4
  
  info-m4: \
      configure-m4 
@@ -11079,7 +13549,8 @@ info-m4: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in m4" ; \
@@ -11091,9 +13562,12 @@ info-m4: \
                   info) \
           || exit 1
  
+@endif m4
  
  .PHONY: maybe-dvi-m4 dvi-m4
  maybe-dvi-m4:
+@if m4
+maybe-dvi-m4: dvi-m4
  
  dvi-m4: \
      configure-m4 
@@ -11101,7 +13575,8 @@ dvi-m4: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in m4" ; \
@@ -11113,9 +13588,12 @@ dvi-m4: \
                   dvi) \
           || exit 1
  
+@endif m4
  
  .PHONY: maybe-TAGS-m4 TAGS-m4
  maybe-TAGS-m4:
+@if m4
+maybe-TAGS-m4: TAGS-m4
  
  TAGS-m4: \
      configure-m4 
@@ -11123,7 +13601,8 @@ TAGS-m4: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in m4" ; \
@@ -11135,9 +13614,12 @@ TAGS-m4: \
                   TAGS) \
           || exit 1
  
+@endif m4
  
  .PHONY: maybe-install-info-m4 install-info-m4
  maybe-install-info-m4:
+@if m4
+maybe-install-info-m4: install-info-m4
  
  install-info-m4: \
      configure-m4 \
@@ -11146,7 +13628,8 @@ install-info-m4: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in m4" ; \
@@ -11158,9 +13641,12 @@ install-info-m4: \
                   install-info) \
           || exit 1
  
+@endif m4
  
  .PHONY: maybe-installcheck-m4 installcheck-m4
  maybe-installcheck-m4:
+@if m4
+maybe-installcheck-m4: installcheck-m4
  
  installcheck-m4: \
      configure-m4 
@@ -11168,7 +13654,8 @@ installcheck-m4: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in m4" ; \
@@ -11180,16 +13667,20 @@ installcheck-m4: \
                   installcheck) \
           || exit 1
  
+@endif m4
  
  .PHONY: maybe-mostlyclean-m4 mostlyclean-m4
  maybe-mostlyclean-m4:
+@if m4
+maybe-mostlyclean-m4: mostlyclean-m4
  
  mostlyclean-m4: 
         @[ -f ./m4/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in m4" ; \
@@ -11201,16 +13692,20 @@ mostlyclean-m4:
                   mostlyclean) \
           || exit 1
  
+@endif m4
  
  .PHONY: maybe-clean-m4 clean-m4
  maybe-clean-m4:
+@if m4
+maybe-clean-m4: clean-m4
  
  clean-m4: 
         @[ -f ./m4/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in m4" ; \
@@ -11222,16 +13717,20 @@ clean-m4:
                   clean) \
           || exit 1
  
+@endif m4
  
  .PHONY: maybe-distclean-m4 distclean-m4
  maybe-distclean-m4:
+@if m4
+maybe-distclean-m4: distclean-m4
  
  distclean-m4: 
         @[ -f ./m4/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in m4" ; \
@@ -11243,16 +13742,20 @@ distclean-m4:
                   distclean) \
           || exit 1
  
+@endif m4
  
  .PHONY: maybe-maintainer-clean-m4 maintainer-clean-m4
  maybe-maintainer-clean-m4:
+@if m4
+maybe-maintainer-clean-m4: maintainer-clean-m4
  
  maintainer-clean-m4: 
         @[ -f ./m4/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in m4" ; \
@@ -11264,31 +13767,19 @@ maintainer-clean-m4:
                   maintainer-clean) \
           || exit 1
  
+@endif m4
  
  
  .PHONY: configure-make maybe-configure-make
  maybe-configure-make:
+@if make
+maybe-configure-make: configure-make
  configure-make:
         @test ! -f make/Makefile || exit 0; \
         [ -d make ] || mkdir make; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in make; \
         cd make || exit 1; \
         case $(srcdir) in \
@@ -11303,41 +13794,58 @@ configure-make:
             libsrcdir="$$s/make";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif make
  
  .PHONY: all-make maybe-all-make
  maybe-all-make:
+@if make
+TARGET-make=all
+maybe-all-make: all-make
  all-make: configure-make
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd make && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd make && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-make))
+@endif make
  
  .PHONY: check-make maybe-check-make
  maybe-check-make:
+@if make
+maybe-check-make: check-make
  
  check-make:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd make && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif make
  
  .PHONY: install-make maybe-install-make
  maybe-install-make:
+@if make
+maybe-install-make: install-make
  
  install-make: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd make && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif make
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-make info-make
  maybe-info-make:
+@if make
+maybe-info-make: info-make
  
  info-make: \
      configure-make 
@@ -11345,7 +13853,8 @@ info-make: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in make" ; \
@@ -11357,9 +13866,12 @@ info-make: \
                   info) \
           || exit 1
  
+@endif make
  
  .PHONY: maybe-dvi-make dvi-make
  maybe-dvi-make:
+@if make
+maybe-dvi-make: dvi-make
  
  dvi-make: \
      configure-make 
@@ -11367,7 +13879,8 @@ dvi-make: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in make" ; \
@@ -11379,9 +13892,12 @@ dvi-make: \
                   dvi) \
           || exit 1
  
+@endif make
  
  .PHONY: maybe-TAGS-make TAGS-make
  maybe-TAGS-make:
+@if make
+maybe-TAGS-make: TAGS-make
  
  TAGS-make: \
      configure-make 
@@ -11389,7 +13905,8 @@ TAGS-make: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in make" ; \
@@ -11401,9 +13918,12 @@ TAGS-make: \
                   TAGS) \
           || exit 1
  
+@endif make
  
  .PHONY: maybe-install-info-make install-info-make
  maybe-install-info-make:
+@if make
+maybe-install-info-make: install-info-make
  
  install-info-make: \
      configure-make \
@@ -11412,7 +13932,8 @@ install-info-make: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in make" ; \
@@ -11424,9 +13945,12 @@ install-info-make: \
                   install-info) \
           || exit 1
  
+@endif make
  
  .PHONY: maybe-installcheck-make installcheck-make
  maybe-installcheck-make:
+@if make
+maybe-installcheck-make: installcheck-make
  
  installcheck-make: \
      configure-make 
@@ -11434,7 +13958,8 @@ installcheck-make: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in make" ; \
@@ -11446,16 +13971,20 @@ installcheck-make: \
                   installcheck) \
           || exit 1
  
+@endif make
  
  .PHONY: maybe-mostlyclean-make mostlyclean-make
  maybe-mostlyclean-make:
+@if make
+maybe-mostlyclean-make: mostlyclean-make
  
  mostlyclean-make: 
         @[ -f ./make/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in make" ; \
@@ -11467,16 +13996,20 @@ mostlyclean-make:
                   mostlyclean) \
           || exit 1
  
+@endif make
  
  .PHONY: maybe-clean-make clean-make
  maybe-clean-make:
+@if make
+maybe-clean-make: clean-make
  
  clean-make: 
         @[ -f ./make/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in make" ; \
@@ -11488,16 +14021,20 @@ clean-make:
                   clean) \
           || exit 1
  
+@endif make
  
  .PHONY: maybe-distclean-make distclean-make
  maybe-distclean-make:
+@if make
+maybe-distclean-make: distclean-make
  
  distclean-make: 
         @[ -f ./make/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in make" ; \
@@ -11509,16 +14046,20 @@ distclean-make:
                   distclean) \
           || exit 1
  
+@endif make
  
  .PHONY: maybe-maintainer-clean-make maintainer-clean-make
  maybe-maintainer-clean-make:
+@if make
+maybe-maintainer-clean-make: maintainer-clean-make
  
  maintainer-clean-make: 
         @[ -f ./make/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in make" ; \
@@ -11530,31 +14071,19 @@ maintainer-clean-make:
                   maintainer-clean) \
           || exit 1
  
+@endif make
  
  
  .PHONY: configure-mmalloc maybe-configure-mmalloc
  maybe-configure-mmalloc:
+@if mmalloc
+maybe-configure-mmalloc: configure-mmalloc
  configure-mmalloc:
         @test ! -f mmalloc/Makefile || exit 0; \
         [ -d mmalloc ] || mkdir mmalloc; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in mmalloc; \
         cd mmalloc || exit 1; \
         case $(srcdir) in \
@@ -11569,37 +14098,53 @@ configure-mmalloc:
             libsrcdir="$$s/mmalloc";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif mmalloc
  
  .PHONY: all-mmalloc maybe-all-mmalloc
  maybe-all-mmalloc:
+@if mmalloc
+TARGET-mmalloc=all
+maybe-all-mmalloc: all-mmalloc
  all-mmalloc: configure-mmalloc
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd mmalloc && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd mmalloc && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-mmalloc))
+@endif mmalloc
  
  .PHONY: check-mmalloc maybe-check-mmalloc
  maybe-check-mmalloc:
+@if mmalloc
+maybe-check-mmalloc: check-mmalloc
  
  check-mmalloc:
  
+@endif mmalloc
  
  .PHONY: install-mmalloc maybe-install-mmalloc
  maybe-install-mmalloc:
+@if mmalloc
+maybe-install-mmalloc: install-mmalloc
  
  install-mmalloc: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd mmalloc && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif mmalloc
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-mmalloc info-mmalloc
  maybe-info-mmalloc:
+@if mmalloc
+maybe-info-mmalloc: info-mmalloc
  
  info-mmalloc: \
      configure-mmalloc 
@@ -11607,7 +14152,8 @@ info-mmalloc: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in mmalloc" ; \
@@ -11619,9 +14165,12 @@ info-mmalloc: \
                   info) \
           || exit 1
  
+@endif mmalloc
  
  .PHONY: maybe-dvi-mmalloc dvi-mmalloc
  maybe-dvi-mmalloc:
+@if mmalloc
+maybe-dvi-mmalloc: dvi-mmalloc
  
  dvi-mmalloc: \
      configure-mmalloc 
@@ -11629,7 +14178,8 @@ dvi-mmalloc: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in mmalloc" ; \
@@ -11641,9 +14191,12 @@ dvi-mmalloc: \
                   dvi) \
           || exit 1
  
+@endif mmalloc
  
  .PHONY: maybe-TAGS-mmalloc TAGS-mmalloc
  maybe-TAGS-mmalloc:
+@if mmalloc
+maybe-TAGS-mmalloc: TAGS-mmalloc
  
  TAGS-mmalloc: \
      configure-mmalloc 
@@ -11651,7 +14204,8 @@ TAGS-mmalloc: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in mmalloc" ; \
@@ -11663,9 +14217,12 @@ TAGS-mmalloc: \
                   TAGS) \
           || exit 1
  
+@endif mmalloc
  
  .PHONY: maybe-install-info-mmalloc install-info-mmalloc
  maybe-install-info-mmalloc:
+@if mmalloc
+maybe-install-info-mmalloc: install-info-mmalloc
  
  install-info-mmalloc: \
      configure-mmalloc \
@@ -11674,7 +14231,8 @@ install-info-mmalloc: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in mmalloc" ; \
@@ -11686,9 +14244,12 @@ install-info-mmalloc: \
                   install-info) \
           || exit 1
  
+@endif mmalloc
  
  .PHONY: maybe-installcheck-mmalloc installcheck-mmalloc
  maybe-installcheck-mmalloc:
+@if mmalloc
+maybe-installcheck-mmalloc: installcheck-mmalloc
  
  installcheck-mmalloc: \
      configure-mmalloc 
@@ -11696,7 +14257,8 @@ installcheck-mmalloc: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in mmalloc" ; \
@@ -11708,16 +14270,20 @@ installcheck-mmalloc: \
                   installcheck) \
           || exit 1
  
+@endif mmalloc
  
  .PHONY: maybe-mostlyclean-mmalloc mostlyclean-mmalloc
  maybe-mostlyclean-mmalloc:
+@if mmalloc
+maybe-mostlyclean-mmalloc: mostlyclean-mmalloc
  
  mostlyclean-mmalloc: 
         @[ -f ./mmalloc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in mmalloc" ; \
@@ -11729,16 +14295,20 @@ mostlyclean-mmalloc:
                   mostlyclean) \
           || exit 1
  
+@endif mmalloc
  
  .PHONY: maybe-clean-mmalloc clean-mmalloc
  maybe-clean-mmalloc:
+@if mmalloc
+maybe-clean-mmalloc: clean-mmalloc
  
  clean-mmalloc: 
         @[ -f ./mmalloc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in mmalloc" ; \
@@ -11750,16 +14320,20 @@ clean-mmalloc:
                   clean) \
           || exit 1
  
+@endif mmalloc
  
  .PHONY: maybe-distclean-mmalloc distclean-mmalloc
  maybe-distclean-mmalloc:
+@if mmalloc
+maybe-distclean-mmalloc: distclean-mmalloc
  
  distclean-mmalloc: 
         @[ -f ./mmalloc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in mmalloc" ; \
@@ -11771,16 +14345,20 @@ distclean-mmalloc:
                   distclean) \
           || exit 1
  
+@endif mmalloc
  
  .PHONY: maybe-maintainer-clean-mmalloc maintainer-clean-mmalloc
  maybe-maintainer-clean-mmalloc:
+@if mmalloc
+maybe-maintainer-clean-mmalloc: maintainer-clean-mmalloc
  
  maintainer-clean-mmalloc: 
         @[ -f ./mmalloc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in mmalloc" ; \
@@ -11792,31 +14370,19 @@ maintainer-clean-mmalloc:
                   maintainer-clean) \
           || exit 1
  
+@endif mmalloc
  
  
  .PHONY: configure-patch maybe-configure-patch
  maybe-configure-patch:
+@if patch
+maybe-configure-patch: configure-patch
  configure-patch:
         @test ! -f patch/Makefile || exit 0; \
         [ -d patch ] || mkdir patch; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in patch; \
         cd patch || exit 1; \
         case $(srcdir) in \
@@ -11831,41 +14397,58 @@ configure-patch:
             libsrcdir="$$s/patch";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif patch
  
  .PHONY: all-patch maybe-all-patch
  maybe-all-patch:
+@if patch
+TARGET-patch=all
+maybe-all-patch: all-patch
  all-patch: configure-patch
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd patch && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd patch && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-patch))
+@endif patch
  
  .PHONY: check-patch maybe-check-patch
  maybe-check-patch:
+@if patch
+maybe-check-patch: check-patch
  
  check-patch:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd patch && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif patch
  
  .PHONY: install-patch maybe-install-patch
  maybe-install-patch:
+@if patch
+maybe-install-patch: install-patch
  
  install-patch: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd patch && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif patch
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-patch info-patch
  maybe-info-patch:
+@if patch
+maybe-info-patch: info-patch
  
  info-patch: \
      configure-patch 
@@ -11873,7 +14456,8 @@ info-patch: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in patch" ; \
@@ -11885,9 +14469,12 @@ info-patch: \
                   info) \
           || exit 1
  
+@endif patch
  
  .PHONY: maybe-dvi-patch dvi-patch
  maybe-dvi-patch:
+@if patch
+maybe-dvi-patch: dvi-patch
  
  dvi-patch: \
      configure-patch 
@@ -11895,7 +14482,8 @@ dvi-patch: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in patch" ; \
@@ -11907,9 +14495,12 @@ dvi-patch: \
                   dvi) \
           || exit 1
  
+@endif patch
  
  .PHONY: maybe-TAGS-patch TAGS-patch
  maybe-TAGS-patch:
+@if patch
+maybe-TAGS-patch: TAGS-patch
  
  TAGS-patch: \
      configure-patch 
@@ -11917,7 +14508,8 @@ TAGS-patch: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in patch" ; \
@@ -11929,9 +14521,12 @@ TAGS-patch: \
                   TAGS) \
           || exit 1
  
+@endif patch
  
  .PHONY: maybe-install-info-patch install-info-patch
  maybe-install-info-patch:
+@if patch
+maybe-install-info-patch: install-info-patch
  
  install-info-patch: \
      configure-patch \
@@ -11940,7 +14535,8 @@ install-info-patch: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in patch" ; \
@@ -11952,9 +14548,12 @@ install-info-patch: \
                   install-info) \
           || exit 1
  
+@endif patch
  
  .PHONY: maybe-installcheck-patch installcheck-patch
  maybe-installcheck-patch:
+@if patch
+maybe-installcheck-patch: installcheck-patch
  
  installcheck-patch: \
      configure-patch 
@@ -11962,7 +14561,8 @@ installcheck-patch: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in patch" ; \
@@ -11974,16 +14574,20 @@ installcheck-patch: \
                   installcheck) \
           || exit 1
  
+@endif patch
  
  .PHONY: maybe-mostlyclean-patch mostlyclean-patch
  maybe-mostlyclean-patch:
+@if patch
+maybe-mostlyclean-patch: mostlyclean-patch
  
  mostlyclean-patch: 
         @[ -f ./patch/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in patch" ; \
@@ -11995,16 +14599,20 @@ mostlyclean-patch:
                   mostlyclean) \
           || exit 1
  
+@endif patch
  
  .PHONY: maybe-clean-patch clean-patch
  maybe-clean-patch:
+@if patch
+maybe-clean-patch: clean-patch
  
  clean-patch: 
         @[ -f ./patch/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in patch" ; \
@@ -12016,16 +14624,20 @@ clean-patch:
                   clean) \
           || exit 1
  
+@endif patch
  
  .PHONY: maybe-distclean-patch distclean-patch
  maybe-distclean-patch:
+@if patch
+maybe-distclean-patch: distclean-patch
  
  distclean-patch: 
         @[ -f ./patch/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in patch" ; \
@@ -12037,16 +14649,20 @@ distclean-patch:
                   distclean) \
           || exit 1
  
+@endif patch
  
  .PHONY: maybe-maintainer-clean-patch maintainer-clean-patch
  maybe-maintainer-clean-patch:
+@if patch
+maybe-maintainer-clean-patch: maintainer-clean-patch
  
  maintainer-clean-patch: 
         @[ -f ./patch/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in patch" ; \
@@ -12058,31 +14674,19 @@ maintainer-clean-patch:
                   maintainer-clean) \
           || exit 1
  
+@endif patch
  
  
  .PHONY: configure-perl maybe-configure-perl
  maybe-configure-perl:
+@if perl
+maybe-configure-perl: configure-perl
  configure-perl:
         @test ! -f perl/Makefile || exit 0; \
         [ -d perl ] || mkdir perl; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in perl; \
         cd perl || exit 1; \
         case $(srcdir) in \
@@ -12097,41 +14701,58 @@ configure-perl:
             libsrcdir="$$s/perl";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif perl
  
  .PHONY: all-perl maybe-all-perl
  maybe-all-perl:
+@if perl
+TARGET-perl=all
+maybe-all-perl: all-perl
  all-perl: configure-perl
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd perl && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd perl && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-perl))
+@endif perl
  
  .PHONY: check-perl maybe-check-perl
  maybe-check-perl:
+@if perl
+maybe-check-perl: check-perl
  
  check-perl:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd perl && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif perl
  
  .PHONY: install-perl maybe-install-perl
  maybe-install-perl:
+@if perl
+maybe-install-perl: install-perl
  
  install-perl: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd perl && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif perl
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-perl info-perl
  maybe-info-perl:
+@if perl
+maybe-info-perl: info-perl
  
  info-perl: \
      configure-perl 
@@ -12139,7 +14760,8 @@ info-perl: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in perl" ; \
@@ -12151,9 +14773,12 @@ info-perl: \
                   info) \
           || exit 1
  
+@endif perl
  
  .PHONY: maybe-dvi-perl dvi-perl
  maybe-dvi-perl:
+@if perl
+maybe-dvi-perl: dvi-perl
  
  dvi-perl: \
      configure-perl 
@@ -12161,7 +14786,8 @@ dvi-perl: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in perl" ; \
@@ -12173,9 +14799,12 @@ dvi-perl: \
                   dvi) \
           || exit 1
  
+@endif perl
  
  .PHONY: maybe-TAGS-perl TAGS-perl
  maybe-TAGS-perl:
+@if perl
+maybe-TAGS-perl: TAGS-perl
  
  TAGS-perl: \
      configure-perl 
@@ -12183,7 +14812,8 @@ TAGS-perl: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in perl" ; \
@@ -12195,9 +14825,12 @@ TAGS-perl: \
                   TAGS) \
           || exit 1
  
+@endif perl
  
  .PHONY: maybe-install-info-perl install-info-perl
  maybe-install-info-perl:
+@if perl
+maybe-install-info-perl: install-info-perl
  
  install-info-perl: \
      configure-perl \
@@ -12206,7 +14839,8 @@ install-info-perl: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in perl" ; \
@@ -12218,9 +14852,12 @@ install-info-perl: \
                   install-info) \
           || exit 1
  
+@endif perl
  
  .PHONY: maybe-installcheck-perl installcheck-perl
  maybe-installcheck-perl:
+@if perl
+maybe-installcheck-perl: installcheck-perl
  
  installcheck-perl: \
      configure-perl 
@@ -12228,7 +14865,8 @@ installcheck-perl: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in perl" ; \
@@ -12240,16 +14878,20 @@ installcheck-perl: \
                   installcheck) \
           || exit 1
  
+@endif perl
  
  .PHONY: maybe-mostlyclean-perl mostlyclean-perl
  maybe-mostlyclean-perl:
+@if perl
+maybe-mostlyclean-perl: mostlyclean-perl
  
  mostlyclean-perl: 
         @[ -f ./perl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in perl" ; \
@@ -12261,16 +14903,20 @@ mostlyclean-perl:
                   mostlyclean) \
           || exit 1
  
+@endif perl
  
  .PHONY: maybe-clean-perl clean-perl
  maybe-clean-perl:
+@if perl
+maybe-clean-perl: clean-perl
  
  clean-perl: 
         @[ -f ./perl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in perl" ; \
@@ -12282,16 +14928,20 @@ clean-perl:
                   clean) \
           || exit 1
  
+@endif perl
  
  .PHONY: maybe-distclean-perl distclean-perl
  maybe-distclean-perl:
+@if perl
+maybe-distclean-perl: distclean-perl
  
  distclean-perl: 
         @[ -f ./perl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in perl" ; \
@@ -12303,16 +14953,20 @@ distclean-perl:
                   distclean) \
           || exit 1
  
+@endif perl
  
  .PHONY: maybe-maintainer-clean-perl maintainer-clean-perl
  maybe-maintainer-clean-perl:
+@if perl
+maybe-maintainer-clean-perl: maintainer-clean-perl
  
  maintainer-clean-perl: 
         @[ -f ./perl/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in perl" ; \
@@ -12324,31 +14978,19 @@ maintainer-clean-perl:
                   maintainer-clean) \
           || exit 1
  
+@endif perl
  
  
  .PHONY: configure-prms maybe-configure-prms
  maybe-configure-prms:
+@if prms
+maybe-configure-prms: configure-prms
  configure-prms:
         @test ! -f prms/Makefile || exit 0; \
         [ -d prms ] || mkdir prms; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in prms; \
         cd prms || exit 1; \
         case $(srcdir) in \
@@ -12363,41 +15005,58 @@ configure-prms:
             libsrcdir="$$s/prms";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif prms
  
  .PHONY: all-prms maybe-all-prms
  maybe-all-prms:
+@if prms
+TARGET-prms=all
+maybe-all-prms: all-prms
  all-prms: configure-prms
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd prms && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd prms && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-prms))
+@endif prms
  
  .PHONY: check-prms maybe-check-prms
  maybe-check-prms:
+@if prms
+maybe-check-prms: check-prms
  
  check-prms:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd prms && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif prms
  
  .PHONY: install-prms maybe-install-prms
  maybe-install-prms:
+@if prms
+maybe-install-prms: install-prms
  
  install-prms: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd prms && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif prms
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-prms info-prms
  maybe-info-prms:
+@if prms
+maybe-info-prms: info-prms
  
  info-prms: \
      configure-prms 
@@ -12405,7 +15064,8 @@ info-prms: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in prms" ; \
@@ -12417,9 +15077,12 @@ info-prms: \
                   info) \
           || exit 1
  
+@endif prms
  
  .PHONY: maybe-dvi-prms dvi-prms
  maybe-dvi-prms:
+@if prms
+maybe-dvi-prms: dvi-prms
  
  dvi-prms: \
      configure-prms 
@@ -12427,7 +15090,8 @@ dvi-prms: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in prms" ; \
@@ -12439,9 +15103,12 @@ dvi-prms: \
                   dvi) \
           || exit 1
  
+@endif prms
  
  .PHONY: maybe-TAGS-prms TAGS-prms
  maybe-TAGS-prms:
+@if prms
+maybe-TAGS-prms: TAGS-prms
  
  TAGS-prms: \
      configure-prms 
@@ -12449,7 +15116,8 @@ TAGS-prms: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in prms" ; \
@@ -12461,9 +15129,12 @@ TAGS-prms: \
                   TAGS) \
           || exit 1
  
+@endif prms
  
  .PHONY: maybe-install-info-prms install-info-prms
  maybe-install-info-prms:
+@if prms
+maybe-install-info-prms: install-info-prms
  
  install-info-prms: \
      configure-prms \
@@ -12472,7 +15143,8 @@ install-info-prms: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in prms" ; \
@@ -12484,9 +15156,12 @@ install-info-prms: \
                   install-info) \
           || exit 1
  
+@endif prms
  
  .PHONY: maybe-installcheck-prms installcheck-prms
  maybe-installcheck-prms:
+@if prms
+maybe-installcheck-prms: installcheck-prms
  
  installcheck-prms: \
      configure-prms 
@@ -12494,7 +15169,8 @@ installcheck-prms: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in prms" ; \
@@ -12506,16 +15182,20 @@ installcheck-prms: \
                   installcheck) \
           || exit 1
  
+@endif prms
  
  .PHONY: maybe-mostlyclean-prms mostlyclean-prms
  maybe-mostlyclean-prms:
+@if prms
+maybe-mostlyclean-prms: mostlyclean-prms
  
  mostlyclean-prms: 
         @[ -f ./prms/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in prms" ; \
@@ -12527,16 +15207,20 @@ mostlyclean-prms:
                   mostlyclean) \
           || exit 1
  
+@endif prms
  
  .PHONY: maybe-clean-prms clean-prms
  maybe-clean-prms:
+@if prms
+maybe-clean-prms: clean-prms
  
  clean-prms: 
         @[ -f ./prms/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in prms" ; \
@@ -12548,16 +15232,20 @@ clean-prms:
                   clean) \
           || exit 1
  
+@endif prms
  
  .PHONY: maybe-distclean-prms distclean-prms
  maybe-distclean-prms:
+@if prms
+maybe-distclean-prms: distclean-prms
  
  distclean-prms: 
         @[ -f ./prms/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in prms" ; \
@@ -12569,16 +15257,20 @@ distclean-prms:
                   distclean) \
           || exit 1
  
+@endif prms
  
  .PHONY: maybe-maintainer-clean-prms maintainer-clean-prms
  maybe-maintainer-clean-prms:
+@if prms
+maybe-maintainer-clean-prms: maintainer-clean-prms
  
  maintainer-clean-prms: 
         @[ -f ./prms/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in prms" ; \
@@ -12590,31 +15282,19 @@ maintainer-clean-prms:
                   maintainer-clean) \
           || exit 1
  
+@endif prms
  
  
  .PHONY: configure-rcs maybe-configure-rcs
  maybe-configure-rcs:
+@if rcs
+maybe-configure-rcs: configure-rcs
  configure-rcs:
         @test ! -f rcs/Makefile || exit 0; \
         [ -d rcs ] || mkdir rcs; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in rcs; \
         cd rcs || exit 1; \
         case $(srcdir) in \
@@ -12629,41 +15309,58 @@ configure-rcs:
             libsrcdir="$$s/rcs";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif rcs
  
  .PHONY: all-rcs maybe-all-rcs
  maybe-all-rcs:
+@if rcs
+TARGET-rcs=all
+maybe-all-rcs: all-rcs
  all-rcs: configure-rcs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd rcs && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd rcs && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-rcs))
+@endif rcs
  
  .PHONY: check-rcs maybe-check-rcs
  maybe-check-rcs:
+@if rcs
+maybe-check-rcs: check-rcs
  
  check-rcs:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd rcs && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif rcs
  
  .PHONY: install-rcs maybe-install-rcs
  maybe-install-rcs:
+@if rcs
+maybe-install-rcs: install-rcs
  
  install-rcs: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd rcs && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif rcs
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-rcs info-rcs
  maybe-info-rcs:
+@if rcs
+maybe-info-rcs: info-rcs
  
  info-rcs: \
      configure-rcs 
@@ -12671,7 +15368,8 @@ info-rcs: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in rcs" ; \
@@ -12683,9 +15381,12 @@ info-rcs: \
                   info) \
           || exit 1
  
+@endif rcs
  
  .PHONY: maybe-dvi-rcs dvi-rcs
  maybe-dvi-rcs:
+@if rcs
+maybe-dvi-rcs: dvi-rcs
  
  dvi-rcs: \
      configure-rcs 
@@ -12693,7 +15394,8 @@ dvi-rcs: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in rcs" ; \
@@ -12705,9 +15407,12 @@ dvi-rcs: \
                   dvi) \
           || exit 1
  
+@endif rcs
  
  .PHONY: maybe-TAGS-rcs TAGS-rcs
  maybe-TAGS-rcs:
+@if rcs
+maybe-TAGS-rcs: TAGS-rcs
  
  TAGS-rcs: \
      configure-rcs 
@@ -12715,7 +15420,8 @@ TAGS-rcs: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in rcs" ; \
@@ -12727,9 +15433,12 @@ TAGS-rcs: \
                   TAGS) \
           || exit 1
  
+@endif rcs
  
  .PHONY: maybe-install-info-rcs install-info-rcs
  maybe-install-info-rcs:
+@if rcs
+maybe-install-info-rcs: install-info-rcs
  
  install-info-rcs: \
      configure-rcs \
@@ -12738,7 +15447,8 @@ install-info-rcs: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in rcs" ; \
@@ -12750,9 +15460,12 @@ install-info-rcs: \
                   install-info) \
           || exit 1
  
+@endif rcs
  
  .PHONY: maybe-installcheck-rcs installcheck-rcs
  maybe-installcheck-rcs:
+@if rcs
+maybe-installcheck-rcs: installcheck-rcs
  
  installcheck-rcs: \
      configure-rcs 
@@ -12760,7 +15473,8 @@ installcheck-rcs: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in rcs" ; \
@@ -12772,16 +15486,20 @@ installcheck-rcs: \
                   installcheck) \
           || exit 1
  
+@endif rcs
  
  .PHONY: maybe-mostlyclean-rcs mostlyclean-rcs
  maybe-mostlyclean-rcs:
+@if rcs
+maybe-mostlyclean-rcs: mostlyclean-rcs
  
  mostlyclean-rcs: 
         @[ -f ./rcs/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in rcs" ; \
@@ -12793,16 +15511,20 @@ mostlyclean-rcs:
                   mostlyclean) \
           || exit 1
  
+@endif rcs
  
  .PHONY: maybe-clean-rcs clean-rcs
  maybe-clean-rcs:
+@if rcs
+maybe-clean-rcs: clean-rcs
  
  clean-rcs: 
         @[ -f ./rcs/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in rcs" ; \
@@ -12814,16 +15536,20 @@ clean-rcs:
                   clean) \
           || exit 1
  
+@endif rcs
  
  .PHONY: maybe-distclean-rcs distclean-rcs
  maybe-distclean-rcs:
+@if rcs
+maybe-distclean-rcs: distclean-rcs
  
  distclean-rcs: 
         @[ -f ./rcs/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in rcs" ; \
@@ -12835,16 +15561,20 @@ distclean-rcs:
                   distclean) \
           || exit 1
  
+@endif rcs
  
  .PHONY: maybe-maintainer-clean-rcs maintainer-clean-rcs
  maybe-maintainer-clean-rcs:
+@if rcs
+maybe-maintainer-clean-rcs: maintainer-clean-rcs
  
  maintainer-clean-rcs: 
         @[ -f ./rcs/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in rcs" ; \
@@ -12856,31 +15586,19 @@ maintainer-clean-rcs:
                   maintainer-clean) \
           || exit 1
  
+@endif rcs
  
  
  .PHONY: configure-readline maybe-configure-readline
  maybe-configure-readline:
+@if readline
+maybe-configure-readline: configure-readline
  configure-readline:
         @test ! -f readline/Makefile || exit 0; \
         [ -d readline ] || mkdir readline; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in readline; \
         cd readline || exit 1; \
         case $(srcdir) in \
@@ -12895,41 +15613,58 @@ configure-readline:
             libsrcdir="$$s/readline";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif readline
  
  .PHONY: all-readline maybe-all-readline
  maybe-all-readline:
+@if readline
+TARGET-readline=all
+maybe-all-readline: all-readline
  all-readline: configure-readline
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd readline && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd readline && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-readline))
+@endif readline
  
  .PHONY: check-readline maybe-check-readline
  maybe-check-readline:
+@if readline
+maybe-check-readline: check-readline
  
  check-readline:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd readline && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif readline
  
  .PHONY: install-readline maybe-install-readline
  maybe-install-readline:
+@if readline
+maybe-install-readline: install-readline
  
  install-readline: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd readline && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif readline
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-readline info-readline
  maybe-info-readline:
+@if readline
+maybe-info-readline: info-readline
  
  info-readline: \
      configure-readline 
@@ -12937,7 +15672,8 @@ info-readline: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in readline" ; \
@@ -12949,9 +15685,12 @@ info-readline: \
                   info) \
           || exit 1
  
+@endif readline
  
  .PHONY: maybe-dvi-readline dvi-readline
  maybe-dvi-readline:
+@if readline
+maybe-dvi-readline: dvi-readline
  
  dvi-readline: \
      configure-readline 
@@ -12959,7 +15698,8 @@ dvi-readline: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in readline" ; \
@@ -12971,9 +15711,12 @@ dvi-readline: \
                   dvi) \
           || exit 1
  
+@endif readline
  
  .PHONY: maybe-TAGS-readline TAGS-readline
  maybe-TAGS-readline:
+@if readline
+maybe-TAGS-readline: TAGS-readline
  
  TAGS-readline: \
      configure-readline 
@@ -12981,7 +15724,8 @@ TAGS-readline: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in readline" ; \
@@ -12993,9 +15737,12 @@ TAGS-readline: \
                   TAGS) \
           || exit 1
  
+@endif readline
  
  .PHONY: maybe-install-info-readline install-info-readline
  maybe-install-info-readline:
+@if readline
+maybe-install-info-readline: install-info-readline
  
  install-info-readline: \
      configure-readline \
@@ -13004,7 +15751,8 @@ install-info-readline: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in readline" ; \
@@ -13016,9 +15764,12 @@ install-info-readline: \
                   install-info) \
           || exit 1
  
+@endif readline
  
  .PHONY: maybe-installcheck-readline installcheck-readline
  maybe-installcheck-readline:
+@if readline
+maybe-installcheck-readline: installcheck-readline
  
  installcheck-readline: \
      configure-readline 
@@ -13026,7 +15777,8 @@ installcheck-readline: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in readline" ; \
@@ -13038,16 +15790,20 @@ installcheck-readline: \
                   installcheck) \
           || exit 1
  
+@endif readline
  
  .PHONY: maybe-mostlyclean-readline mostlyclean-readline
  maybe-mostlyclean-readline:
+@if readline
+maybe-mostlyclean-readline: mostlyclean-readline
  
  mostlyclean-readline: 
         @[ -f ./readline/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in readline" ; \
@@ -13059,16 +15815,20 @@ mostlyclean-readline:
                   mostlyclean) \
           || exit 1
  
+@endif readline
  
  .PHONY: maybe-clean-readline clean-readline
  maybe-clean-readline:
+@if readline
+maybe-clean-readline: clean-readline
  
  clean-readline: 
         @[ -f ./readline/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in readline" ; \
@@ -13080,16 +15840,20 @@ clean-readline:
                   clean) \
           || exit 1
  
+@endif readline
  
  .PHONY: maybe-distclean-readline distclean-readline
  maybe-distclean-readline:
+@if readline
+maybe-distclean-readline: distclean-readline
  
  distclean-readline: 
         @[ -f ./readline/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in readline" ; \
@@ -13101,16 +15865,20 @@ distclean-readline:
                   distclean) \
           || exit 1
  
+@endif readline
  
  .PHONY: maybe-maintainer-clean-readline maintainer-clean-readline
  maybe-maintainer-clean-readline:
+@if readline
+maybe-maintainer-clean-readline: maintainer-clean-readline
  
  maintainer-clean-readline: 
         @[ -f ./readline/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in readline" ; \
@@ -13122,31 +15890,19 @@ maintainer-clean-readline:
                   maintainer-clean) \
           || exit 1
  
+@endif readline
  
  
  .PHONY: configure-release maybe-configure-release
  maybe-configure-release:
+@if release
+maybe-configure-release: configure-release
  configure-release:
         @test ! -f release/Makefile || exit 0; \
         [ -d release ] || mkdir release; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in release; \
         cd release || exit 1; \
         case $(srcdir) in \
@@ -13161,33 +15917,48 @@ configure-release:
             libsrcdir="$$s/release";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif release
  
  .PHONY: all-release maybe-all-release
  maybe-all-release:
+@if release
+TARGET-release=all
+maybe-all-release: all-release
  all-release: configure-release
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd release && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd release && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-release))
+@endif release
  
  .PHONY: check-release maybe-check-release
  maybe-check-release:
+@if release
+maybe-check-release: check-release
  
  check-release:
  
+@endif release
  
  .PHONY: install-release maybe-install-release
  maybe-install-release:
+@if release
+maybe-install-release: install-release
  
  install-release:
  
+@endif release
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-release info-release
  maybe-info-release:
+@if release
+maybe-info-release: info-release
  
  info-release: \
      configure-release 
@@ -13195,7 +15966,8 @@ info-release: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in release" ; \
@@ -13207,9 +15979,12 @@ info-release: \
                   info) \
           || exit 1
  
+@endif release
  
  .PHONY: maybe-dvi-release dvi-release
  maybe-dvi-release:
+@if release
+maybe-dvi-release: dvi-release
  
  dvi-release: \
      configure-release 
@@ -13217,7 +15992,8 @@ dvi-release: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in release" ; \
@@ -13229,9 +16005,12 @@ dvi-release: \
                   dvi) \
           || exit 1
  
+@endif release
  
  .PHONY: maybe-TAGS-release TAGS-release
  maybe-TAGS-release:
+@if release
+maybe-TAGS-release: TAGS-release
  
  TAGS-release: \
      configure-release 
@@ -13239,7 +16018,8 @@ TAGS-release: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in release" ; \
@@ -13251,9 +16031,12 @@ TAGS-release: \
                   TAGS) \
           || exit 1
  
+@endif release
  
  .PHONY: maybe-install-info-release install-info-release
  maybe-install-info-release:
+@if release
+maybe-install-info-release: install-info-release
  
  install-info-release: \
      configure-release \
@@ -13262,7 +16045,8 @@ install-info-release: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in release" ; \
@@ -13274,9 +16058,12 @@ install-info-release: \
                   install-info) \
           || exit 1
  
+@endif release
  
  .PHONY: maybe-installcheck-release installcheck-release
  maybe-installcheck-release:
+@if release
+maybe-installcheck-release: installcheck-release
  
  installcheck-release: \
      configure-release 
@@ -13284,7 +16071,8 @@ installcheck-release: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in release" ; \
@@ -13296,16 +16084,20 @@ installcheck-release: \
                   installcheck) \
           || exit 1
  
+@endif release
  
  .PHONY: maybe-mostlyclean-release mostlyclean-release
  maybe-mostlyclean-release:
+@if release
+maybe-mostlyclean-release: mostlyclean-release
  
  mostlyclean-release: 
         @[ -f ./release/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in release" ; \
@@ -13317,16 +16109,20 @@ mostlyclean-release:
                   mostlyclean) \
           || exit 1
  
+@endif release
  
  .PHONY: maybe-clean-release clean-release
  maybe-clean-release:
+@if release
+maybe-clean-release: clean-release
  
  clean-release: 
         @[ -f ./release/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in release" ; \
@@ -13338,16 +16134,20 @@ clean-release:
                   clean) \
           || exit 1
  
+@endif release
  
  .PHONY: maybe-distclean-release distclean-release
  maybe-distclean-release:
+@if release
+maybe-distclean-release: distclean-release
  
  distclean-release: 
         @[ -f ./release/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in release" ; \
@@ -13359,16 +16159,20 @@ distclean-release:
                   distclean) \
           || exit 1
  
+@endif release
  
  .PHONY: maybe-maintainer-clean-release maintainer-clean-release
  maybe-maintainer-clean-release:
+@if release
+maybe-maintainer-clean-release: maintainer-clean-release
  
  maintainer-clean-release: 
         @[ -f ./release/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in release" ; \
@@ -13380,31 +16184,19 @@ maintainer-clean-release:
                   maintainer-clean) \
           || exit 1
  
+@endif release
  
  
  .PHONY: configure-recode maybe-configure-recode
  maybe-configure-recode:
+@if recode
+maybe-configure-recode: configure-recode
  configure-recode:
         @test ! -f recode/Makefile || exit 0; \
         [ -d recode ] || mkdir recode; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in recode; \
         cd recode || exit 1; \
         case $(srcdir) in \
@@ -13419,41 +16211,58 @@ configure-recode:
             libsrcdir="$$s/recode";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif recode
  
  .PHONY: all-recode maybe-all-recode
  maybe-all-recode:
+@if recode
+TARGET-recode=all
+maybe-all-recode: all-recode
  all-recode: configure-recode
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd recode && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd recode && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-recode))
+@endif recode
  
  .PHONY: check-recode maybe-check-recode
  maybe-check-recode:
+@if recode
+maybe-check-recode: check-recode
  
  check-recode:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd recode && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif recode
  
  .PHONY: install-recode maybe-install-recode
  maybe-install-recode:
+@if recode
+maybe-install-recode: install-recode
  
  install-recode: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd recode && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif recode
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-recode info-recode
  maybe-info-recode:
+@if recode
+maybe-info-recode: info-recode
  
  info-recode: \
      configure-recode 
@@ -13461,7 +16270,8 @@ info-recode: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in recode" ; \
@@ -13473,9 +16283,12 @@ info-recode: \
                   info) \
           || exit 1
  
+@endif recode
  
  .PHONY: maybe-dvi-recode dvi-recode
  maybe-dvi-recode:
+@if recode
+maybe-dvi-recode: dvi-recode
  
  dvi-recode: \
      configure-recode 
@@ -13483,7 +16296,8 @@ dvi-recode: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in recode" ; \
@@ -13495,9 +16309,12 @@ dvi-recode: \
                   dvi) \
           || exit 1
  
+@endif recode
  
  .PHONY: maybe-TAGS-recode TAGS-recode
  maybe-TAGS-recode:
+@if recode
+maybe-TAGS-recode: TAGS-recode
  
  TAGS-recode: \
      configure-recode 
@@ -13505,7 +16322,8 @@ TAGS-recode: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in recode" ; \
@@ -13517,9 +16335,12 @@ TAGS-recode: \
                   TAGS) \
           || exit 1
  
+@endif recode
  
  .PHONY: maybe-install-info-recode install-info-recode
  maybe-install-info-recode:
+@if recode
+maybe-install-info-recode: install-info-recode
  
  install-info-recode: \
      configure-recode \
@@ -13528,7 +16349,8 @@ install-info-recode: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in recode" ; \
@@ -13540,9 +16362,12 @@ install-info-recode: \
                   install-info) \
           || exit 1
  
+@endif recode
  
  .PHONY: maybe-installcheck-recode installcheck-recode
  maybe-installcheck-recode:
+@if recode
+maybe-installcheck-recode: installcheck-recode
  
  installcheck-recode: \
      configure-recode 
@@ -13550,7 +16375,8 @@ installcheck-recode: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in recode" ; \
@@ -13562,16 +16388,20 @@ installcheck-recode: \
                   installcheck) \
           || exit 1
  
+@endif recode
  
  .PHONY: maybe-mostlyclean-recode mostlyclean-recode
  maybe-mostlyclean-recode:
+@if recode
+maybe-mostlyclean-recode: mostlyclean-recode
  
  mostlyclean-recode: 
         @[ -f ./recode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in recode" ; \
@@ -13583,16 +16413,20 @@ mostlyclean-recode:
                   mostlyclean) \
           || exit 1
  
+@endif recode
  
  .PHONY: maybe-clean-recode clean-recode
  maybe-clean-recode:
+@if recode
+maybe-clean-recode: clean-recode
  
  clean-recode: 
         @[ -f ./recode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in recode" ; \
@@ -13604,16 +16438,20 @@ clean-recode:
                   clean) \
           || exit 1
  
+@endif recode
  
  .PHONY: maybe-distclean-recode distclean-recode
  maybe-distclean-recode:
+@if recode
+maybe-distclean-recode: distclean-recode
  
  distclean-recode: 
         @[ -f ./recode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in recode" ; \
@@ -13625,16 +16463,20 @@ distclean-recode:
                   distclean) \
           || exit 1
  
+@endif recode
  
  .PHONY: maybe-maintainer-clean-recode maintainer-clean-recode
  maybe-maintainer-clean-recode:
+@if recode
+maybe-maintainer-clean-recode: maintainer-clean-recode
  
  maintainer-clean-recode: 
         @[ -f ./recode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in recode" ; \
@@ -13646,31 +16488,19 @@ maintainer-clean-recode:
                   maintainer-clean) \
           || exit 1
  
+@endif recode
  
  
  .PHONY: configure-sed maybe-configure-sed
  maybe-configure-sed:
+@if sed
+maybe-configure-sed: configure-sed
  configure-sed:
         @test ! -f sed/Makefile || exit 0; \
         [ -d sed ] || mkdir sed; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in sed; \
         cd sed || exit 1; \
         case $(srcdir) in \
@@ -13685,41 +16515,58 @@ configure-sed:
             libsrcdir="$$s/sed";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif sed
  
  .PHONY: all-sed maybe-all-sed
  maybe-all-sed:
+@if sed
+TARGET-sed=all
+maybe-all-sed: all-sed
  all-sed: configure-sed
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd sed && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd sed && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-sed))
+@endif sed
  
  .PHONY: check-sed maybe-check-sed
  maybe-check-sed:
+@if sed
+maybe-check-sed: check-sed
  
  check-sed:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd sed && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif sed
  
  .PHONY: install-sed maybe-install-sed
  maybe-install-sed:
+@if sed
+maybe-install-sed: install-sed
  
  install-sed: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd sed && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif sed
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-sed info-sed
  maybe-info-sed:
+@if sed
+maybe-info-sed: info-sed
  
  info-sed: \
      configure-sed 
@@ -13727,7 +16574,8 @@ info-sed: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in sed" ; \
@@ -13739,9 +16587,12 @@ info-sed: \
                   info) \
           || exit 1
  
+@endif sed
  
  .PHONY: maybe-dvi-sed dvi-sed
  maybe-dvi-sed:
+@if sed
+maybe-dvi-sed: dvi-sed
  
  dvi-sed: \
      configure-sed 
@@ -13749,7 +16600,8 @@ dvi-sed: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in sed" ; \
@@ -13761,9 +16613,12 @@ dvi-sed: \
                   dvi) \
           || exit 1
  
+@endif sed
  
  .PHONY: maybe-TAGS-sed TAGS-sed
  maybe-TAGS-sed:
+@if sed
+maybe-TAGS-sed: TAGS-sed
  
  TAGS-sed: \
      configure-sed 
@@ -13771,7 +16626,8 @@ TAGS-sed: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in sed" ; \
@@ -13783,9 +16639,12 @@ TAGS-sed: \
                   TAGS) \
           || exit 1
  
+@endif sed
  
  .PHONY: maybe-install-info-sed install-info-sed
  maybe-install-info-sed:
+@if sed
+maybe-install-info-sed: install-info-sed
  
  install-info-sed: \
      configure-sed \
@@ -13794,7 +16653,8 @@ install-info-sed: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in sed" ; \
@@ -13806,9 +16666,12 @@ install-info-sed: \
                   install-info) \
           || exit 1
  
+@endif sed
  
  .PHONY: maybe-installcheck-sed installcheck-sed
  maybe-installcheck-sed:
+@if sed
+maybe-installcheck-sed: installcheck-sed
  
  installcheck-sed: \
      configure-sed 
@@ -13816,7 +16679,8 @@ installcheck-sed: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in sed" ; \
@@ -13828,16 +16692,20 @@ installcheck-sed: \
                   installcheck) \
           || exit 1
  
+@endif sed
  
  .PHONY: maybe-mostlyclean-sed mostlyclean-sed
  maybe-mostlyclean-sed:
+@if sed
+maybe-mostlyclean-sed: mostlyclean-sed
  
  mostlyclean-sed: 
         @[ -f ./sed/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in sed" ; \
@@ -13849,16 +16717,20 @@ mostlyclean-sed:
                   mostlyclean) \
           || exit 1
  
+@endif sed
  
  .PHONY: maybe-clean-sed clean-sed
  maybe-clean-sed:
+@if sed
+maybe-clean-sed: clean-sed
  
  clean-sed: 
         @[ -f ./sed/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in sed" ; \
@@ -13870,16 +16742,20 @@ clean-sed:
                   clean) \
           || exit 1
  
+@endif sed
  
  .PHONY: maybe-distclean-sed distclean-sed
  maybe-distclean-sed:
+@if sed
+maybe-distclean-sed: distclean-sed
  
  distclean-sed: 
         @[ -f ./sed/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in sed" ; \
@@ -13891,16 +16767,20 @@ distclean-sed:
                   distclean) \
           || exit 1
  
+@endif sed
  
  .PHONY: maybe-maintainer-clean-sed maintainer-clean-sed
  maybe-maintainer-clean-sed:
+@if sed
+maybe-maintainer-clean-sed: maintainer-clean-sed
  
  maintainer-clean-sed: 
         @[ -f ./sed/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in sed" ; \
@@ -13912,31 +16792,19 @@ maintainer-clean-sed:
                   maintainer-clean) \
           || exit 1
  
+@endif sed
  
  
  .PHONY: configure-send-pr maybe-configure-send-pr
  maybe-configure-send-pr:
+@if send-pr
+maybe-configure-send-pr: configure-send-pr
  configure-send-pr:
         @test ! -f send-pr/Makefile || exit 0; \
         [ -d send-pr ] || mkdir send-pr; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in send-pr; \
         cd send-pr || exit 1; \
         case $(srcdir) in \
@@ -13951,41 +16819,58 @@ configure-send-pr:
             libsrcdir="$$s/send-pr";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif send-pr
  
  .PHONY: all-send-pr maybe-all-send-pr
  maybe-all-send-pr:
+@if send-pr
+TARGET-send-pr=all
+maybe-all-send-pr: all-send-pr
  all-send-pr: configure-send-pr
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd send-pr && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd send-pr && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-send-pr))
+@endif send-pr
  
  .PHONY: check-send-pr maybe-check-send-pr
  maybe-check-send-pr:
+@if send-pr
+maybe-check-send-pr: check-send-pr
  
  check-send-pr:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd send-pr && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif send-pr
  
  .PHONY: install-send-pr maybe-install-send-pr
  maybe-install-send-pr:
+@if send-pr
+maybe-install-send-pr: install-send-pr
  
  install-send-pr: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd send-pr && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif send-pr
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-send-pr info-send-pr
  maybe-info-send-pr:
+@if send-pr
+maybe-info-send-pr: info-send-pr
  
  info-send-pr: \
      configure-send-pr 
@@ -13993,7 +16878,8 @@ info-send-pr: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in send-pr" ; \
@@ -14005,9 +16891,12 @@ info-send-pr: \
                   info) \
           || exit 1
  
+@endif send-pr
  
  .PHONY: maybe-dvi-send-pr dvi-send-pr
  maybe-dvi-send-pr:
+@if send-pr
+maybe-dvi-send-pr: dvi-send-pr
  
  dvi-send-pr: \
      configure-send-pr 
@@ -14015,7 +16904,8 @@ dvi-send-pr: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in send-pr" ; \
@@ -14027,9 +16917,12 @@ dvi-send-pr: \
                   dvi) \
           || exit 1
  
+@endif send-pr
  
  .PHONY: maybe-TAGS-send-pr TAGS-send-pr
  maybe-TAGS-send-pr:
+@if send-pr
+maybe-TAGS-send-pr: TAGS-send-pr
  
  TAGS-send-pr: \
      configure-send-pr 
@@ -14037,7 +16930,8 @@ TAGS-send-pr: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in send-pr" ; \
@@ -14049,9 +16943,12 @@ TAGS-send-pr: \
                   TAGS) \
           || exit 1
  
+@endif send-pr
  
  .PHONY: maybe-install-info-send-pr install-info-send-pr
  maybe-install-info-send-pr:
+@if send-pr
+maybe-install-info-send-pr: install-info-send-pr
  
  install-info-send-pr: \
      configure-send-pr \
@@ -14060,7 +16957,8 @@ install-info-send-pr: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in send-pr" ; \
@@ -14072,9 +16970,12 @@ install-info-send-pr: \
                   install-info) \
           || exit 1
  
+@endif send-pr
  
  .PHONY: maybe-installcheck-send-pr installcheck-send-pr
  maybe-installcheck-send-pr:
+@if send-pr
+maybe-installcheck-send-pr: installcheck-send-pr
  
  installcheck-send-pr: \
      configure-send-pr 
@@ -14082,7 +16983,8 @@ installcheck-send-pr: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in send-pr" ; \
@@ -14094,16 +16996,20 @@ installcheck-send-pr: \
                   installcheck) \
           || exit 1
  
+@endif send-pr
  
  .PHONY: maybe-mostlyclean-send-pr mostlyclean-send-pr
  maybe-mostlyclean-send-pr:
+@if send-pr
+maybe-mostlyclean-send-pr: mostlyclean-send-pr
  
  mostlyclean-send-pr: 
         @[ -f ./send-pr/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in send-pr" ; \
@@ -14115,16 +17021,20 @@ mostlyclean-send-pr:
                   mostlyclean) \
           || exit 1
  
+@endif send-pr
  
  .PHONY: maybe-clean-send-pr clean-send-pr
  maybe-clean-send-pr:
+@if send-pr
+maybe-clean-send-pr: clean-send-pr
  
  clean-send-pr: 
         @[ -f ./send-pr/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in send-pr" ; \
@@ -14136,16 +17046,20 @@ clean-send-pr:
                   clean) \
           || exit 1
  
+@endif send-pr
  
  .PHONY: maybe-distclean-send-pr distclean-send-pr
  maybe-distclean-send-pr:
+@if send-pr
+maybe-distclean-send-pr: distclean-send-pr
  
  distclean-send-pr: 
         @[ -f ./send-pr/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in send-pr" ; \
@@ -14157,16 +17071,20 @@ distclean-send-pr:
                   distclean) \
           || exit 1
  
+@endif send-pr
  
  .PHONY: maybe-maintainer-clean-send-pr maintainer-clean-send-pr
  maybe-maintainer-clean-send-pr:
+@if send-pr
+maybe-maintainer-clean-send-pr: maintainer-clean-send-pr
  
  maintainer-clean-send-pr: 
         @[ -f ./send-pr/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in send-pr" ; \
@@ -14178,31 +17096,19 @@ maintainer-clean-send-pr:
                   maintainer-clean) \
           || exit 1
  
+@endif send-pr
  
  
  .PHONY: configure-shellutils maybe-configure-shellutils
  maybe-configure-shellutils:
+@if shellutils
+maybe-configure-shellutils: configure-shellutils
  configure-shellutils:
         @test ! -f shellutils/Makefile || exit 0; \
         [ -d shellutils ] || mkdir shellutils; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in shellutils; \
         cd shellutils || exit 1; \
         case $(srcdir) in \
@@ -14217,41 +17123,58 @@ configure-shellutils:
             libsrcdir="$$s/shellutils";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif shellutils
  
  .PHONY: all-shellutils maybe-all-shellutils
  maybe-all-shellutils:
+@if shellutils
+TARGET-shellutils=all
+maybe-all-shellutils: all-shellutils
  all-shellutils: configure-shellutils
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd shellutils && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd shellutils && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-shellutils))
+@endif shellutils
  
  .PHONY: check-shellutils maybe-check-shellutils
  maybe-check-shellutils:
+@if shellutils
+maybe-check-shellutils: check-shellutils
  
  check-shellutils:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd shellutils && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif shellutils
  
  .PHONY: install-shellutils maybe-install-shellutils
  maybe-install-shellutils:
+@if shellutils
+maybe-install-shellutils: install-shellutils
  
  install-shellutils: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd shellutils && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif shellutils
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-shellutils info-shellutils
  maybe-info-shellutils:
+@if shellutils
+maybe-info-shellutils: info-shellutils
  
  info-shellutils: \
      configure-shellutils 
@@ -14259,7 +17182,8 @@ info-shellutils: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in shellutils" ; \
@@ -14271,9 +17195,12 @@ info-shellutils: \
                   info) \
           || exit 1
  
+@endif shellutils
  
  .PHONY: maybe-dvi-shellutils dvi-shellutils
  maybe-dvi-shellutils:
+@if shellutils
+maybe-dvi-shellutils: dvi-shellutils
  
  dvi-shellutils: \
      configure-shellutils 
@@ -14281,7 +17208,8 @@ dvi-shellutils: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in shellutils" ; \
@@ -14293,9 +17221,12 @@ dvi-shellutils: \
                   dvi) \
           || exit 1
  
+@endif shellutils
  
  .PHONY: maybe-TAGS-shellutils TAGS-shellutils
  maybe-TAGS-shellutils:
+@if shellutils
+maybe-TAGS-shellutils: TAGS-shellutils
  
  TAGS-shellutils: \
      configure-shellutils 
@@ -14303,7 +17234,8 @@ TAGS-shellutils: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in shellutils" ; \
@@ -14315,9 +17247,12 @@ TAGS-shellutils: \
                   TAGS) \
           || exit 1
  
+@endif shellutils
  
  .PHONY: maybe-install-info-shellutils install-info-shellutils
  maybe-install-info-shellutils:
+@if shellutils
+maybe-install-info-shellutils: install-info-shellutils
  
  install-info-shellutils: \
      configure-shellutils \
@@ -14326,7 +17261,8 @@ install-info-shellutils: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in shellutils" ; \
@@ -14338,9 +17274,12 @@ install-info-shellutils: \
                   install-info) \
           || exit 1
  
+@endif shellutils
  
  .PHONY: maybe-installcheck-shellutils installcheck-shellutils
  maybe-installcheck-shellutils:
+@if shellutils
+maybe-installcheck-shellutils: installcheck-shellutils
  
  installcheck-shellutils: \
      configure-shellutils 
@@ -14348,7 +17287,8 @@ installcheck-shellutils: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in shellutils" ; \
@@ -14360,16 +17300,20 @@ installcheck-shellutils: \
                   installcheck) \
           || exit 1
  
+@endif shellutils
  
  .PHONY: maybe-mostlyclean-shellutils mostlyclean-shellutils
  maybe-mostlyclean-shellutils:
+@if shellutils
+maybe-mostlyclean-shellutils: mostlyclean-shellutils
  
  mostlyclean-shellutils: 
         @[ -f ./shellutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in shellutils" ; \
@@ -14381,16 +17325,20 @@ mostlyclean-shellutils:
                   mostlyclean) \
           || exit 1
  
+@endif shellutils
  
  .PHONY: maybe-clean-shellutils clean-shellutils
  maybe-clean-shellutils:
+@if shellutils
+maybe-clean-shellutils: clean-shellutils
  
  clean-shellutils: 
         @[ -f ./shellutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in shellutils" ; \
@@ -14402,16 +17350,20 @@ clean-shellutils:
                   clean) \
           || exit 1
  
+@endif shellutils
  
  .PHONY: maybe-distclean-shellutils distclean-shellutils
  maybe-distclean-shellutils:
+@if shellutils
+maybe-distclean-shellutils: distclean-shellutils
  
  distclean-shellutils: 
         @[ -f ./shellutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in shellutils" ; \
@@ -14423,16 +17375,20 @@ distclean-shellutils:
                   distclean) \
           || exit 1
  
+@endif shellutils
  
  .PHONY: maybe-maintainer-clean-shellutils maintainer-clean-shellutils
  maybe-maintainer-clean-shellutils:
+@if shellutils
+maybe-maintainer-clean-shellutils: maintainer-clean-shellutils
  
  maintainer-clean-shellutils: 
         @[ -f ./shellutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in shellutils" ; \
@@ -14444,31 +17400,19 @@ maintainer-clean-shellutils:
                   maintainer-clean) \
           || exit 1
  
+@endif shellutils
  
  
  .PHONY: configure-sid maybe-configure-sid
  maybe-configure-sid:
+@if sid
+maybe-configure-sid: configure-sid
  configure-sid:
         @test ! -f sid/Makefile || exit 0; \
         [ -d sid ] || mkdir sid; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in sid; \
         cd sid || exit 1; \
         case $(srcdir) in \
@@ -14483,41 +17427,58 @@ configure-sid:
             libsrcdir="$$s/sid";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif sid
  
  .PHONY: all-sid maybe-all-sid
  maybe-all-sid:
+@if sid
+TARGET-sid=all
+maybe-all-sid: all-sid
  all-sid: configure-sid
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd sid && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd sid && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-sid))
+@endif sid
  
  .PHONY: check-sid maybe-check-sid
  maybe-check-sid:
+@if sid
+maybe-check-sid: check-sid
  
  check-sid:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd sid && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif sid
  
  .PHONY: install-sid maybe-install-sid
  maybe-install-sid:
+@if sid
+maybe-install-sid: install-sid
  
  install-sid: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd sid && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif sid
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-sid info-sid
  maybe-info-sid:
+@if sid
+maybe-info-sid: info-sid
  
  info-sid: \
      configure-sid 
@@ -14525,7 +17486,8 @@ info-sid: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in sid" ; \
@@ -14537,9 +17499,12 @@ info-sid: \
                   info) \
           || exit 1
  
+@endif sid
  
  .PHONY: maybe-dvi-sid dvi-sid
  maybe-dvi-sid:
+@if sid
+maybe-dvi-sid: dvi-sid
  
  dvi-sid: \
      configure-sid 
@@ -14547,7 +17512,8 @@ dvi-sid: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in sid" ; \
@@ -14559,9 +17525,12 @@ dvi-sid: \
                   dvi) \
           || exit 1
  
+@endif sid
  
  .PHONY: maybe-TAGS-sid TAGS-sid
  maybe-TAGS-sid:
+@if sid
+maybe-TAGS-sid: TAGS-sid
  
  TAGS-sid: \
      configure-sid 
@@ -14569,7 +17538,8 @@ TAGS-sid: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in sid" ; \
@@ -14581,9 +17551,12 @@ TAGS-sid: \
                   TAGS) \
           || exit 1
  
+@endif sid
  
  .PHONY: maybe-install-info-sid install-info-sid
  maybe-install-info-sid:
+@if sid
+maybe-install-info-sid: install-info-sid
  
  install-info-sid: \
      configure-sid \
@@ -14592,7 +17565,8 @@ install-info-sid: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in sid" ; \
@@ -14604,9 +17578,12 @@ install-info-sid: \
                   install-info) \
           || exit 1
  
+@endif sid
  
  .PHONY: maybe-installcheck-sid installcheck-sid
  maybe-installcheck-sid:
+@if sid
+maybe-installcheck-sid: installcheck-sid
  
  installcheck-sid: \
      configure-sid 
@@ -14614,7 +17591,8 @@ installcheck-sid: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in sid" ; \
@@ -14626,16 +17604,20 @@ installcheck-sid: \
                   installcheck) \
           || exit 1
  
+@endif sid
  
  .PHONY: maybe-mostlyclean-sid mostlyclean-sid
  maybe-mostlyclean-sid:
+@if sid
+maybe-mostlyclean-sid: mostlyclean-sid
  
  mostlyclean-sid: 
         @[ -f ./sid/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in sid" ; \
@@ -14647,16 +17629,20 @@ mostlyclean-sid:
                   mostlyclean) \
           || exit 1
  
+@endif sid
  
  .PHONY: maybe-clean-sid clean-sid
  maybe-clean-sid:
+@if sid
+maybe-clean-sid: clean-sid
  
  clean-sid: 
         @[ -f ./sid/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in sid" ; \
@@ -14668,16 +17654,20 @@ clean-sid:
                   clean) \
           || exit 1
  
+@endif sid
  
  .PHONY: maybe-distclean-sid distclean-sid
  maybe-distclean-sid:
+@if sid
+maybe-distclean-sid: distclean-sid
  
  distclean-sid: 
         @[ -f ./sid/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in sid" ; \
@@ -14689,16 +17679,20 @@ distclean-sid:
                   distclean) \
           || exit 1
  
+@endif sid
  
  .PHONY: maybe-maintainer-clean-sid maintainer-clean-sid
  maybe-maintainer-clean-sid:
+@if sid
+maybe-maintainer-clean-sid: maintainer-clean-sid
  
  maintainer-clean-sid: 
         @[ -f ./sid/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in sid" ; \
@@ -14710,31 +17704,19 @@ maintainer-clean-sid:
                   maintainer-clean) \
           || exit 1
  
+@endif sid
  
  
  .PHONY: configure-sim maybe-configure-sim
  maybe-configure-sim:
+@if sim
+maybe-configure-sim: configure-sim
  configure-sim:
         @test ! -f sim/Makefile || exit 0; \
         [ -d sim ] || mkdir sim; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in sim; \
         cd sim || exit 1; \
         case $(srcdir) in \
@@ -14749,41 +17731,58 @@ configure-sim:
             libsrcdir="$$s/sim";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif sim
  
  .PHONY: all-sim maybe-all-sim
  maybe-all-sim:
+@if sim
+TARGET-sim=all
+maybe-all-sim: all-sim
  all-sim: configure-sim
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd sim && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd sim && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-sim))
+@endif sim
  
  .PHONY: check-sim maybe-check-sim
  maybe-check-sim:
+@if sim
+maybe-check-sim: check-sim
  
  check-sim:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd sim && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif sim
  
  .PHONY: install-sim maybe-install-sim
  maybe-install-sim:
+@if sim
+maybe-install-sim: install-sim
  
  install-sim: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd sim && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif sim
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-sim info-sim
  maybe-info-sim:
+@if sim
+maybe-info-sim: info-sim
  
  info-sim: \
      configure-sim 
@@ -14791,7 +17790,8 @@ info-sim: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in sim" ; \
@@ -14803,9 +17803,12 @@ info-sim: \
                   info) \
           || exit 1
  
+@endif sim
  
  .PHONY: maybe-dvi-sim dvi-sim
  maybe-dvi-sim:
+@if sim
+maybe-dvi-sim: dvi-sim
  
  dvi-sim: \
      configure-sim 
@@ -14813,7 +17816,8 @@ dvi-sim: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in sim" ; \
@@ -14825,9 +17829,12 @@ dvi-sim: \
                   dvi) \
           || exit 1
  
+@endif sim
  
  .PHONY: maybe-TAGS-sim TAGS-sim
  maybe-TAGS-sim:
+@if sim
+maybe-TAGS-sim: TAGS-sim
  
  TAGS-sim: \
      configure-sim 
@@ -14835,7 +17842,8 @@ TAGS-sim: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in sim" ; \
@@ -14847,9 +17855,12 @@ TAGS-sim: \
                   TAGS) \
           || exit 1
  
+@endif sim
  
  .PHONY: maybe-install-info-sim install-info-sim
  maybe-install-info-sim:
+@if sim
+maybe-install-info-sim: install-info-sim
  
  install-info-sim: \
      configure-sim \
@@ -14858,7 +17869,8 @@ install-info-sim: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in sim" ; \
@@ -14870,9 +17882,12 @@ install-info-sim: \
                   install-info) \
           || exit 1
  
+@endif sim
  
  .PHONY: maybe-installcheck-sim installcheck-sim
  maybe-installcheck-sim:
+@if sim
+maybe-installcheck-sim: installcheck-sim
  
  installcheck-sim: \
      configure-sim 
@@ -14880,7 +17895,8 @@ installcheck-sim: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in sim" ; \
@@ -14892,16 +17908,20 @@ installcheck-sim: \
                   installcheck) \
           || exit 1
  
+@endif sim
  
  .PHONY: maybe-mostlyclean-sim mostlyclean-sim
  maybe-mostlyclean-sim:
+@if sim
+maybe-mostlyclean-sim: mostlyclean-sim
  
  mostlyclean-sim: 
         @[ -f ./sim/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in sim" ; \
@@ -14913,16 +17933,20 @@ mostlyclean-sim:
                   mostlyclean) \
           || exit 1
  
+@endif sim
  
  .PHONY: maybe-clean-sim clean-sim
  maybe-clean-sim:
+@if sim
+maybe-clean-sim: clean-sim
  
  clean-sim: 
         @[ -f ./sim/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in sim" ; \
@@ -14934,16 +17958,20 @@ clean-sim:
                   clean) \
           || exit 1
  
+@endif sim
  
  .PHONY: maybe-distclean-sim distclean-sim
  maybe-distclean-sim:
+@if sim
+maybe-distclean-sim: distclean-sim
  
  distclean-sim: 
         @[ -f ./sim/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in sim" ; \
@@ -14955,16 +17983,20 @@ distclean-sim:
                   distclean) \
           || exit 1
  
+@endif sim
  
  .PHONY: maybe-maintainer-clean-sim maintainer-clean-sim
  maybe-maintainer-clean-sim:
+@if sim
+maybe-maintainer-clean-sim: maintainer-clean-sim
  
  maintainer-clean-sim: 
         @[ -f ./sim/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in sim" ; \
@@ -14976,31 +18008,19 @@ maintainer-clean-sim:
                   maintainer-clean) \
           || exit 1
  
+@endif sim
  
  
  .PHONY: configure-tar maybe-configure-tar
  maybe-configure-tar:
+@if tar
+maybe-configure-tar: configure-tar
  configure-tar:
         @test ! -f tar/Makefile || exit 0; \
         [ -d tar ] || mkdir tar; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in tar; \
         cd tar || exit 1; \
         case $(srcdir) in \
@@ -15015,41 +18035,58 @@ configure-tar:
             libsrcdir="$$s/tar";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif tar
  
  .PHONY: all-tar maybe-all-tar
  maybe-all-tar:
+@if tar
+TARGET-tar=all
+maybe-all-tar: all-tar
  all-tar: configure-tar
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd tar && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd tar && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-tar))
+@endif tar
  
  .PHONY: check-tar maybe-check-tar
  maybe-check-tar:
+@if tar
+maybe-check-tar: check-tar
  
  check-tar:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd tar && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif tar
  
  .PHONY: install-tar maybe-install-tar
  maybe-install-tar:
+@if tar
+maybe-install-tar: install-tar
  
  install-tar: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd tar && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif tar
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-tar info-tar
  maybe-info-tar:
+@if tar
+maybe-info-tar: info-tar
  
  info-tar: \
      configure-tar 
@@ -15057,7 +18094,8 @@ info-tar: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in tar" ; \
@@ -15069,9 +18107,12 @@ info-tar: \
                   info) \
           || exit 1
  
+@endif tar
  
  .PHONY: maybe-dvi-tar dvi-tar
  maybe-dvi-tar:
+@if tar
+maybe-dvi-tar: dvi-tar
  
  dvi-tar: \
      configure-tar 
@@ -15079,7 +18120,8 @@ dvi-tar: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in tar" ; \
@@ -15091,9 +18133,12 @@ dvi-tar: \
                   dvi) \
           || exit 1
  
+@endif tar
  
  .PHONY: maybe-TAGS-tar TAGS-tar
  maybe-TAGS-tar:
+@if tar
+maybe-TAGS-tar: TAGS-tar
  
  TAGS-tar: \
      configure-tar 
@@ -15101,7 +18146,8 @@ TAGS-tar: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in tar" ; \
@@ -15113,9 +18159,12 @@ TAGS-tar: \
                   TAGS) \
           || exit 1
  
+@endif tar
  
  .PHONY: maybe-install-info-tar install-info-tar
  maybe-install-info-tar:
+@if tar
+maybe-install-info-tar: install-info-tar
  
  install-info-tar: \
      configure-tar \
@@ -15124,7 +18173,8 @@ install-info-tar: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in tar" ; \
@@ -15136,9 +18186,12 @@ install-info-tar: \
                   install-info) \
           || exit 1
  
+@endif tar
  
  .PHONY: maybe-installcheck-tar installcheck-tar
  maybe-installcheck-tar:
+@if tar
+maybe-installcheck-tar: installcheck-tar
  
  installcheck-tar: \
      configure-tar 
@@ -15146,7 +18199,8 @@ installcheck-tar: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in tar" ; \
@@ -15158,16 +18212,20 @@ installcheck-tar: \
                   installcheck) \
           || exit 1
  
+@endif tar
  
  .PHONY: maybe-mostlyclean-tar mostlyclean-tar
  maybe-mostlyclean-tar:
+@if tar
+maybe-mostlyclean-tar: mostlyclean-tar
  
  mostlyclean-tar: 
         @[ -f ./tar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in tar" ; \
@@ -15179,16 +18237,20 @@ mostlyclean-tar:
                   mostlyclean) \
           || exit 1
  
+@endif tar
  
  .PHONY: maybe-clean-tar clean-tar
  maybe-clean-tar:
+@if tar
+maybe-clean-tar: clean-tar
  
  clean-tar: 
         @[ -f ./tar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in tar" ; \
@@ -15200,16 +18262,20 @@ clean-tar:
                   clean) \
           || exit 1
  
+@endif tar
  
  .PHONY: maybe-distclean-tar distclean-tar
  maybe-distclean-tar:
+@if tar
+maybe-distclean-tar: distclean-tar
  
  distclean-tar: 
         @[ -f ./tar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in tar" ; \
@@ -15221,16 +18287,20 @@ distclean-tar:
                   distclean) \
           || exit 1
  
+@endif tar
  
  .PHONY: maybe-maintainer-clean-tar maintainer-clean-tar
  maybe-maintainer-clean-tar:
+@if tar
+maybe-maintainer-clean-tar: maintainer-clean-tar
  
  maintainer-clean-tar: 
         @[ -f ./tar/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in tar" ; \
@@ -15242,31 +18312,19 @@ maintainer-clean-tar:
                   maintainer-clean) \
           || exit 1
  
+@endif tar
  
  
  .PHONY: configure-texinfo maybe-configure-texinfo
  maybe-configure-texinfo:
+@if texinfo
+maybe-configure-texinfo: configure-texinfo
  configure-texinfo:
         @test ! -f texinfo/Makefile || exit 0; \
         [ -d texinfo ] || mkdir texinfo; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in texinfo; \
         cd texinfo || exit 1; \
         case $(srcdir) in \
@@ -15281,37 +18339,53 @@ configure-texinfo:
             libsrcdir="$$s/texinfo";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif texinfo
  
  .PHONY: all-texinfo maybe-all-texinfo
  maybe-all-texinfo:
+@if texinfo
+TARGET-texinfo=all
+maybe-all-texinfo: all-texinfo
  all-texinfo: configure-texinfo
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd texinfo && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd texinfo && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-texinfo))
+@endif texinfo
  
  .PHONY: check-texinfo maybe-check-texinfo
  maybe-check-texinfo:
+@if texinfo
+maybe-check-texinfo: check-texinfo
  
  check-texinfo:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd texinfo && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif texinfo
  
  .PHONY: install-texinfo maybe-install-texinfo
  maybe-install-texinfo:
+@if texinfo
+maybe-install-texinfo: install-texinfo
  
  install-texinfo:
  
+@endif texinfo
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-texinfo info-texinfo
  maybe-info-texinfo:
+@if texinfo
+maybe-info-texinfo: info-texinfo
  
  info-texinfo: \
      configure-texinfo 
@@ -15319,7 +18393,8 @@ info-texinfo: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in texinfo" ; \
@@ -15331,9 +18406,12 @@ info-texinfo: \
                   info) \
           || exit 1
  
+@endif texinfo
  
  .PHONY: maybe-dvi-texinfo dvi-texinfo
  maybe-dvi-texinfo:
+@if texinfo
+maybe-dvi-texinfo: dvi-texinfo
  
  dvi-texinfo: \
      configure-texinfo 
@@ -15341,7 +18419,8 @@ dvi-texinfo: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in texinfo" ; \
@@ -15353,9 +18432,12 @@ dvi-texinfo: \
                   dvi) \
           || exit 1
  
+@endif texinfo
  
  .PHONY: maybe-TAGS-texinfo TAGS-texinfo
  maybe-TAGS-texinfo:
+@if texinfo
+maybe-TAGS-texinfo: TAGS-texinfo
  
  TAGS-texinfo: \
      configure-texinfo 
@@ -15363,7 +18445,8 @@ TAGS-texinfo: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in texinfo" ; \
@@ -15375,9 +18458,12 @@ TAGS-texinfo: \
                   TAGS) \
           || exit 1
  
+@endif texinfo
  
  .PHONY: maybe-install-info-texinfo install-info-texinfo
  maybe-install-info-texinfo:
+@if texinfo
+maybe-install-info-texinfo: install-info-texinfo
  
  install-info-texinfo: \
      configure-texinfo \
@@ -15386,7 +18472,8 @@ install-info-texinfo: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in texinfo" ; \
@@ -15398,9 +18485,12 @@ install-info-texinfo: \
                   install-info) \
           || exit 1
  
+@endif texinfo
  
  .PHONY: maybe-installcheck-texinfo installcheck-texinfo
  maybe-installcheck-texinfo:
+@if texinfo
+maybe-installcheck-texinfo: installcheck-texinfo
  
  installcheck-texinfo: \
      configure-texinfo 
@@ -15408,7 +18498,8 @@ installcheck-texinfo: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in texinfo" ; \
@@ -15420,16 +18511,20 @@ installcheck-texinfo: \
                   installcheck) \
           || exit 1
  
+@endif texinfo
  
  .PHONY: maybe-mostlyclean-texinfo mostlyclean-texinfo
  maybe-mostlyclean-texinfo:
+@if texinfo
+maybe-mostlyclean-texinfo: mostlyclean-texinfo
  
  mostlyclean-texinfo: 
         @[ -f ./texinfo/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in texinfo" ; \
@@ -15441,16 +18536,20 @@ mostlyclean-texinfo:
                   mostlyclean) \
           || exit 1
  
+@endif texinfo
  
  .PHONY: maybe-clean-texinfo clean-texinfo
  maybe-clean-texinfo:
+@if texinfo
+maybe-clean-texinfo: clean-texinfo
  
  clean-texinfo: 
         @[ -f ./texinfo/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in texinfo" ; \
@@ -15462,16 +18561,20 @@ clean-texinfo:
                   clean) \
           || exit 1
  
+@endif texinfo
  
  .PHONY: maybe-distclean-texinfo distclean-texinfo
  maybe-distclean-texinfo:
+@if texinfo
+maybe-distclean-texinfo: distclean-texinfo
  
  distclean-texinfo: 
         @[ -f ./texinfo/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in texinfo" ; \
@@ -15483,16 +18586,20 @@ distclean-texinfo:
                   distclean) \
           || exit 1
  
+@endif texinfo
  
  .PHONY: maybe-maintainer-clean-texinfo maintainer-clean-texinfo
  maybe-maintainer-clean-texinfo:
+@if texinfo
+maybe-maintainer-clean-texinfo: maintainer-clean-texinfo
  
  maintainer-clean-texinfo: 
         @[ -f ./texinfo/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in texinfo" ; \
@@ -15504,31 +18611,19 @@ maintainer-clean-texinfo:
                   maintainer-clean) \
           || exit 1
  
+@endif texinfo
  
  
  .PHONY: configure-textutils maybe-configure-textutils
  maybe-configure-textutils:
+@if textutils
+maybe-configure-textutils: configure-textutils
  configure-textutils:
         @test ! -f textutils/Makefile || exit 0; \
         [ -d textutils ] || mkdir textutils; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in textutils; \
         cd textutils || exit 1; \
         case $(srcdir) in \
@@ -15543,41 +18638,58 @@ configure-textutils:
             libsrcdir="$$s/textutils";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif textutils
  
  .PHONY: all-textutils maybe-all-textutils
  maybe-all-textutils:
+@if textutils
+TARGET-textutils=all
+maybe-all-textutils: all-textutils
  all-textutils: configure-textutils
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd textutils && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd textutils && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-textutils))
+@endif textutils
  
  .PHONY: check-textutils maybe-check-textutils
  maybe-check-textutils:
+@if textutils
+maybe-check-textutils: check-textutils
  
  check-textutils:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd textutils && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif textutils
  
  .PHONY: install-textutils maybe-install-textutils
  maybe-install-textutils:
+@if textutils
+maybe-install-textutils: install-textutils
  
  install-textutils: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd textutils && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif textutils
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-textutils info-textutils
  maybe-info-textutils:
+@if textutils
+maybe-info-textutils: info-textutils
  
  info-textutils: \
      configure-textutils 
@@ -15585,7 +18697,8 @@ info-textutils: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in textutils" ; \
@@ -15597,9 +18710,12 @@ info-textutils: \
                   info) \
           || exit 1
  
+@endif textutils
  
  .PHONY: maybe-dvi-textutils dvi-textutils
  maybe-dvi-textutils:
+@if textutils
+maybe-dvi-textutils: dvi-textutils
  
  dvi-textutils: \
      configure-textutils 
@@ -15607,7 +18723,8 @@ dvi-textutils: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in textutils" ; \
@@ -15619,9 +18736,12 @@ dvi-textutils: \
                   dvi) \
           || exit 1
  
+@endif textutils
  
  .PHONY: maybe-TAGS-textutils TAGS-textutils
  maybe-TAGS-textutils:
+@if textutils
+maybe-TAGS-textutils: TAGS-textutils
  
  TAGS-textutils: \
      configure-textutils 
@@ -15629,7 +18749,8 @@ TAGS-textutils: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in textutils" ; \
@@ -15641,9 +18762,12 @@ TAGS-textutils: \
                   TAGS) \
           || exit 1
  
+@endif textutils
  
  .PHONY: maybe-install-info-textutils install-info-textutils
  maybe-install-info-textutils:
+@if textutils
+maybe-install-info-textutils: install-info-textutils
  
  install-info-textutils: \
      configure-textutils \
@@ -15652,7 +18776,8 @@ install-info-textutils: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in textutils" ; \
@@ -15664,9 +18789,12 @@ install-info-textutils: \
                   install-info) \
           || exit 1
  
+@endif textutils
  
  .PHONY: maybe-installcheck-textutils installcheck-textutils
  maybe-installcheck-textutils:
+@if textutils
+maybe-installcheck-textutils: installcheck-textutils
  
  installcheck-textutils: \
      configure-textutils 
@@ -15674,7 +18802,8 @@ installcheck-textutils: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in textutils" ; \
@@ -15686,16 +18815,20 @@ installcheck-textutils: \
                   installcheck) \
           || exit 1
  
+@endif textutils
  
  .PHONY: maybe-mostlyclean-textutils mostlyclean-textutils
  maybe-mostlyclean-textutils:
+@if textutils
+maybe-mostlyclean-textutils: mostlyclean-textutils
  
  mostlyclean-textutils: 
         @[ -f ./textutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in textutils" ; \
@@ -15707,16 +18840,20 @@ mostlyclean-textutils:
                   mostlyclean) \
           || exit 1
  
+@endif textutils
  
  .PHONY: maybe-clean-textutils clean-textutils
  maybe-clean-textutils:
+@if textutils
+maybe-clean-textutils: clean-textutils
  
  clean-textutils: 
         @[ -f ./textutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in textutils" ; \
@@ -15728,16 +18865,20 @@ clean-textutils:
                   clean) \
           || exit 1
  
+@endif textutils
  
  .PHONY: maybe-distclean-textutils distclean-textutils
  maybe-distclean-textutils:
+@if textutils
+maybe-distclean-textutils: distclean-textutils
  
  distclean-textutils: 
         @[ -f ./textutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in textutils" ; \
@@ -15749,16 +18890,20 @@ distclean-textutils:
                   distclean) \
           || exit 1
  
+@endif textutils
  
  .PHONY: maybe-maintainer-clean-textutils maintainer-clean-textutils
  maybe-maintainer-clean-textutils:
+@if textutils
+maybe-maintainer-clean-textutils: maintainer-clean-textutils
  
  maintainer-clean-textutils: 
         @[ -f ./textutils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in textutils" ; \
@@ -15770,31 +18915,19 @@ maintainer-clean-textutils:
                   maintainer-clean) \
           || exit 1
  
+@endif textutils
  
  
  .PHONY: configure-time maybe-configure-time
  maybe-configure-time:
+@if time
+maybe-configure-time: configure-time
  configure-time:
         @test ! -f time/Makefile || exit 0; \
         [ -d time ] || mkdir time; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in time; \
         cd time || exit 1; \
         case $(srcdir) in \
@@ -15809,41 +18942,58 @@ configure-time:
             libsrcdir="$$s/time";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif time
  
  .PHONY: all-time maybe-all-time
  maybe-all-time:
+@if time
+TARGET-time=all
+maybe-all-time: all-time
  all-time: configure-time
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd time && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd time && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-time))
+@endif time
  
  .PHONY: check-time maybe-check-time
  maybe-check-time:
+@if time
+maybe-check-time: check-time
  
  check-time:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd time && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif time
  
  .PHONY: install-time maybe-install-time
  maybe-install-time:
+@if time
+maybe-install-time: install-time
  
  install-time: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd time && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif time
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-time info-time
  maybe-info-time:
+@if time
+maybe-info-time: info-time
  
  info-time: \
      configure-time 
@@ -15851,7 +19001,8 @@ info-time: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in time" ; \
@@ -15863,9 +19014,12 @@ info-time: \
                   info) \
           || exit 1
  
+@endif time
  
  .PHONY: maybe-dvi-time dvi-time
  maybe-dvi-time:
+@if time
+maybe-dvi-time: dvi-time
  
  dvi-time: \
      configure-time 
@@ -15873,7 +19027,8 @@ dvi-time: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in time" ; \
@@ -15885,9 +19040,12 @@ dvi-time: \
                   dvi) \
           || exit 1
  
+@endif time
  
  .PHONY: maybe-TAGS-time TAGS-time
  maybe-TAGS-time:
+@if time
+maybe-TAGS-time: TAGS-time
  
  TAGS-time: \
      configure-time 
@@ -15895,7 +19053,8 @@ TAGS-time: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in time" ; \
@@ -15907,9 +19066,12 @@ TAGS-time: \
                   TAGS) \
           || exit 1
  
+@endif time
  
  .PHONY: maybe-install-info-time install-info-time
  maybe-install-info-time:
+@if time
+maybe-install-info-time: install-info-time
  
  install-info-time: \
      configure-time \
@@ -15918,7 +19080,8 @@ install-info-time: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in time" ; \
@@ -15930,9 +19093,12 @@ install-info-time: \
                   install-info) \
           || exit 1
  
+@endif time
  
  .PHONY: maybe-installcheck-time installcheck-time
  maybe-installcheck-time:
+@if time
+maybe-installcheck-time: installcheck-time
  
  installcheck-time: \
      configure-time 
@@ -15940,7 +19106,8 @@ installcheck-time: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in time" ; \
@@ -15952,16 +19119,20 @@ installcheck-time: \
                   installcheck) \
           || exit 1
  
+@endif time
  
  .PHONY: maybe-mostlyclean-time mostlyclean-time
  maybe-mostlyclean-time:
+@if time
+maybe-mostlyclean-time: mostlyclean-time
  
  mostlyclean-time: 
         @[ -f ./time/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in time" ; \
@@ -15973,16 +19144,20 @@ mostlyclean-time:
                   mostlyclean) \
           || exit 1
  
+@endif time
  
  .PHONY: maybe-clean-time clean-time
  maybe-clean-time:
+@if time
+maybe-clean-time: clean-time
  
  clean-time: 
         @[ -f ./time/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in time" ; \
@@ -15994,16 +19169,20 @@ clean-time:
                   clean) \
           || exit 1
  
+@endif time
  
  .PHONY: maybe-distclean-time distclean-time
  maybe-distclean-time:
+@if time
+maybe-distclean-time: distclean-time
  
  distclean-time: 
         @[ -f ./time/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in time" ; \
@@ -16015,16 +19194,20 @@ distclean-time:
                   distclean) \
           || exit 1
  
+@endif time
  
  .PHONY: maybe-maintainer-clean-time maintainer-clean-time
  maybe-maintainer-clean-time:
+@if time
+maybe-maintainer-clean-time: maintainer-clean-time
  
  maintainer-clean-time: 
         @[ -f ./time/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in time" ; \
@@ -16036,31 +19219,19 @@ maintainer-clean-time:
                   maintainer-clean) \
           || exit 1
  
+@endif time
  
  
  .PHONY: configure-uudecode maybe-configure-uudecode
  maybe-configure-uudecode:
+@if uudecode
+maybe-configure-uudecode: configure-uudecode
  configure-uudecode:
         @test ! -f uudecode/Makefile || exit 0; \
         [ -d uudecode ] || mkdir uudecode; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in uudecode; \
         cd uudecode || exit 1; \
         case $(srcdir) in \
@@ -16075,41 +19246,58 @@ configure-uudecode:
             libsrcdir="$$s/uudecode";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif uudecode
  
  .PHONY: all-uudecode maybe-all-uudecode
  maybe-all-uudecode:
+@if uudecode
+TARGET-uudecode=all
+maybe-all-uudecode: all-uudecode
  all-uudecode: configure-uudecode
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd uudecode && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd uudecode && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-uudecode))
+@endif uudecode
  
  .PHONY: check-uudecode maybe-check-uudecode
  maybe-check-uudecode:
+@if uudecode
+maybe-check-uudecode: check-uudecode
  
  check-uudecode:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd uudecode && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif uudecode
  
  .PHONY: install-uudecode maybe-install-uudecode
  maybe-install-uudecode:
+@if uudecode
+maybe-install-uudecode: install-uudecode
  
  install-uudecode: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd uudecode && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif uudecode
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-uudecode info-uudecode
  maybe-info-uudecode:
+@if uudecode
+maybe-info-uudecode: info-uudecode
  
  info-uudecode: \
      configure-uudecode 
@@ -16117,7 +19305,8 @@ info-uudecode: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in uudecode" ; \
@@ -16129,9 +19318,12 @@ info-uudecode: \
                   info) \
           || exit 1
  
+@endif uudecode
  
  .PHONY: maybe-dvi-uudecode dvi-uudecode
  maybe-dvi-uudecode:
+@if uudecode
+maybe-dvi-uudecode: dvi-uudecode
  
  dvi-uudecode: \
      configure-uudecode 
@@ -16139,7 +19331,8 @@ dvi-uudecode: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in uudecode" ; \
@@ -16151,9 +19344,12 @@ dvi-uudecode: \
                   dvi) \
           || exit 1
  
+@endif uudecode
  
  .PHONY: maybe-TAGS-uudecode TAGS-uudecode
  maybe-TAGS-uudecode:
+@if uudecode
+maybe-TAGS-uudecode: TAGS-uudecode
  
  TAGS-uudecode: \
      configure-uudecode 
@@ -16161,7 +19357,8 @@ TAGS-uudecode: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in uudecode" ; \
@@ -16173,9 +19370,12 @@ TAGS-uudecode: \
                   TAGS) \
           || exit 1
  
+@endif uudecode
  
  .PHONY: maybe-install-info-uudecode install-info-uudecode
  maybe-install-info-uudecode:
+@if uudecode
+maybe-install-info-uudecode: install-info-uudecode
  
  install-info-uudecode: \
      configure-uudecode \
@@ -16184,7 +19384,8 @@ install-info-uudecode: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in uudecode" ; \
@@ -16196,9 +19397,12 @@ install-info-uudecode: \
                   install-info) \
           || exit 1
  
+@endif uudecode
  
  .PHONY: maybe-installcheck-uudecode installcheck-uudecode
  maybe-installcheck-uudecode:
+@if uudecode
+maybe-installcheck-uudecode: installcheck-uudecode
  
  installcheck-uudecode: \
      configure-uudecode 
@@ -16206,7 +19410,8 @@ installcheck-uudecode: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in uudecode" ; \
@@ -16218,16 +19423,20 @@ installcheck-uudecode: \
                   installcheck) \
           || exit 1
  
+@endif uudecode
  
  .PHONY: maybe-mostlyclean-uudecode mostlyclean-uudecode
  maybe-mostlyclean-uudecode:
+@if uudecode
+maybe-mostlyclean-uudecode: mostlyclean-uudecode
  
  mostlyclean-uudecode: 
         @[ -f ./uudecode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in uudecode" ; \
@@ -16239,16 +19448,20 @@ mostlyclean-uudecode:
                   mostlyclean) \
           || exit 1
  
+@endif uudecode
  
  .PHONY: maybe-clean-uudecode clean-uudecode
  maybe-clean-uudecode:
+@if uudecode
+maybe-clean-uudecode: clean-uudecode
  
  clean-uudecode: 
         @[ -f ./uudecode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in uudecode" ; \
@@ -16260,16 +19473,20 @@ clean-uudecode:
                   clean) \
           || exit 1
  
+@endif uudecode
  
  .PHONY: maybe-distclean-uudecode distclean-uudecode
  maybe-distclean-uudecode:
+@if uudecode
+maybe-distclean-uudecode: distclean-uudecode
  
  distclean-uudecode: 
         @[ -f ./uudecode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in uudecode" ; \
@@ -16281,16 +19498,20 @@ distclean-uudecode:
                   distclean) \
           || exit 1
  
+@endif uudecode
  
  .PHONY: maybe-maintainer-clean-uudecode maintainer-clean-uudecode
  maybe-maintainer-clean-uudecode:
+@if uudecode
+maybe-maintainer-clean-uudecode: maintainer-clean-uudecode
  
  maintainer-clean-uudecode: 
         @[ -f ./uudecode/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in uudecode" ; \
@@ -16302,31 +19523,19 @@ maintainer-clean-uudecode:
                   maintainer-clean) \
           || exit 1
  
+@endif uudecode
  
  
  .PHONY: configure-wdiff maybe-configure-wdiff
  maybe-configure-wdiff:
+@if wdiff
+maybe-configure-wdiff: configure-wdiff
  configure-wdiff:
         @test ! -f wdiff/Makefile || exit 0; \
         [ -d wdiff ] || mkdir wdiff; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in wdiff; \
         cd wdiff || exit 1; \
         case $(srcdir) in \
@@ -16341,41 +19550,58 @@ configure-wdiff:
             libsrcdir="$$s/wdiff";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif wdiff
  
  .PHONY: all-wdiff maybe-all-wdiff
  maybe-all-wdiff:
+@if wdiff
+TARGET-wdiff=all
+maybe-all-wdiff: all-wdiff
  all-wdiff: configure-wdiff
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd wdiff && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd wdiff && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-wdiff))
+@endif wdiff
  
  .PHONY: check-wdiff maybe-check-wdiff
  maybe-check-wdiff:
+@if wdiff
+maybe-check-wdiff: check-wdiff
  
  check-wdiff:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd wdiff && $(MAKE) $(FLAGS_TO_PASS) check)
  
+@endif wdiff
  
  .PHONY: install-wdiff maybe-install-wdiff
  maybe-install-wdiff:
+@if wdiff
+maybe-install-wdiff: install-wdiff
  
  install-wdiff: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd wdiff && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif wdiff
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-wdiff info-wdiff
  maybe-info-wdiff:
+@if wdiff
+maybe-info-wdiff: info-wdiff
  
  info-wdiff: \
      configure-wdiff 
@@ -16383,7 +19609,8 @@ info-wdiff: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in wdiff" ; \
@@ -16395,9 +19622,12 @@ info-wdiff: \
                   info) \
           || exit 1
  
+@endif wdiff
  
  .PHONY: maybe-dvi-wdiff dvi-wdiff
  maybe-dvi-wdiff:
+@if wdiff
+maybe-dvi-wdiff: dvi-wdiff
  
  dvi-wdiff: \
      configure-wdiff 
@@ -16405,7 +19635,8 @@ dvi-wdiff: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in wdiff" ; \
@@ -16417,9 +19648,12 @@ dvi-wdiff: \
                   dvi) \
           || exit 1
  
+@endif wdiff
  
  .PHONY: maybe-TAGS-wdiff TAGS-wdiff
  maybe-TAGS-wdiff:
+@if wdiff
+maybe-TAGS-wdiff: TAGS-wdiff
  
  TAGS-wdiff: \
      configure-wdiff 
@@ -16427,7 +19661,8 @@ TAGS-wdiff: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in wdiff" ; \
@@ -16439,9 +19674,12 @@ TAGS-wdiff: \
                   TAGS) \
           || exit 1
  
+@endif wdiff
  
  .PHONY: maybe-install-info-wdiff install-info-wdiff
  maybe-install-info-wdiff:
+@if wdiff
+maybe-install-info-wdiff: install-info-wdiff
  
  install-info-wdiff: \
      configure-wdiff \
@@ -16450,7 +19688,8 @@ install-info-wdiff: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in wdiff" ; \
@@ -16462,9 +19701,12 @@ install-info-wdiff: \
                   install-info) \
           || exit 1
  
+@endif wdiff
  
  .PHONY: maybe-installcheck-wdiff installcheck-wdiff
  maybe-installcheck-wdiff:
+@if wdiff
+maybe-installcheck-wdiff: installcheck-wdiff
  
  installcheck-wdiff: \
      configure-wdiff 
@@ -16472,7 +19714,8 @@ installcheck-wdiff: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in wdiff" ; \
@@ -16484,16 +19727,20 @@ installcheck-wdiff: \
                   installcheck) \
           || exit 1
  
+@endif wdiff
  
  .PHONY: maybe-mostlyclean-wdiff mostlyclean-wdiff
  maybe-mostlyclean-wdiff:
+@if wdiff
+maybe-mostlyclean-wdiff: mostlyclean-wdiff
  
  mostlyclean-wdiff: 
         @[ -f ./wdiff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in wdiff" ; \
@@ -16505,16 +19752,20 @@ mostlyclean-wdiff:
                   mostlyclean) \
           || exit 1
  
+@endif wdiff
  
  .PHONY: maybe-clean-wdiff clean-wdiff
  maybe-clean-wdiff:
+@if wdiff
+maybe-clean-wdiff: clean-wdiff
  
  clean-wdiff: 
         @[ -f ./wdiff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in wdiff" ; \
@@ -16526,16 +19777,20 @@ clean-wdiff:
                   clean) \
           || exit 1
  
+@endif wdiff
  
  .PHONY: maybe-distclean-wdiff distclean-wdiff
  maybe-distclean-wdiff:
+@if wdiff
+maybe-distclean-wdiff: distclean-wdiff
  
  distclean-wdiff: 
         @[ -f ./wdiff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in wdiff" ; \
@@ -16547,16 +19802,20 @@ distclean-wdiff:
                   distclean) \
           || exit 1
  
+@endif wdiff
  
  .PHONY: maybe-maintainer-clean-wdiff maintainer-clean-wdiff
  maybe-maintainer-clean-wdiff:
+@if wdiff
+maybe-maintainer-clean-wdiff: maintainer-clean-wdiff
  
  maintainer-clean-wdiff: 
         @[ -f ./wdiff/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in wdiff" ; \
@@ -16568,31 +19827,19 @@ maintainer-clean-wdiff:
                   maintainer-clean) \
           || exit 1
  
+@endif wdiff
  
  
  .PHONY: configure-zip maybe-configure-zip
  maybe-configure-zip:
+@if zip
+maybe-configure-zip: configure-zip
  configure-zip:
         @test ! -f zip/Makefile || exit 0; \
         [ -d zip ] || mkdir zip; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in zip; \
         cd zip || exit 1; \
         case $(srcdir) in \
@@ -16607,19 +19854,28 @@ configure-zip:
             libsrcdir="$$s/zip";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif zip
  
  .PHONY: all-zip maybe-all-zip
  maybe-all-zip:
+@if zip
+TARGET-zip=all
+maybe-all-zip: all-zip
  all-zip: configure-zip
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd zip && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd zip && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-zip))
+@endif zip
  
  .PHONY: check-zip maybe-check-zip
  maybe-check-zip:
+@if zip
+maybe-check-zip: check-zip
  
  # This module is only tested in a native toolchain.
  check-zip:
@@ -16627,24 +19883,32 @@ check-zip:
           r=`${PWD_COMMAND}`; export r; \
           s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
           $(SET_LIB_PATH) \
-         (cd zip && $(MAKE) $(FLAGS_TO_PASS) check); \
+         $(HOST_EXPORTS) \
+         (cd zip && $(MAKE) $(FLAGS_TO_PASS)  check); \
         fi
  
+@endif zip
  
  .PHONY: install-zip maybe-install-zip
  maybe-install-zip:
+@if zip
+maybe-install-zip: install-zip
  
  install-zip: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd zip && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif zip
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-zip info-zip
  maybe-info-zip:
+@if zip
+maybe-info-zip: info-zip
  
  info-zip: \
      configure-zip 
@@ -16652,7 +19916,8 @@ info-zip: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in zip" ; \
@@ -16664,9 +19929,12 @@ info-zip: \
                   info) \
           || exit 1
  
+@endif zip
  
  .PHONY: maybe-dvi-zip dvi-zip
  maybe-dvi-zip:
+@if zip
+maybe-dvi-zip: dvi-zip
  
  dvi-zip: \
      configure-zip 
@@ -16674,7 +19942,8 @@ dvi-zip: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in zip" ; \
@@ -16686,9 +19955,12 @@ dvi-zip: \
                   dvi) \
           || exit 1
  
+@endif zip
  
  .PHONY: maybe-TAGS-zip TAGS-zip
  maybe-TAGS-zip:
+@if zip
+maybe-TAGS-zip: TAGS-zip
  
  TAGS-zip: \
      configure-zip 
@@ -16696,7 +19968,8 @@ TAGS-zip: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in zip" ; \
@@ -16708,9 +19981,12 @@ TAGS-zip: \
                   TAGS) \
           || exit 1
  
+@endif zip
  
  .PHONY: maybe-install-info-zip install-info-zip
  maybe-install-info-zip:
+@if zip
+maybe-install-info-zip: install-info-zip
  
  install-info-zip: \
      configure-zip \
@@ -16719,7 +19995,8 @@ install-info-zip: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in zip" ; \
@@ -16731,9 +20008,12 @@ install-info-zip: \
                   install-info) \
           || exit 1
  
+@endif zip
  
  .PHONY: maybe-installcheck-zip installcheck-zip
  maybe-installcheck-zip:
+@if zip
+maybe-installcheck-zip: installcheck-zip
  
  installcheck-zip: \
      configure-zip 
@@ -16741,7 +20021,8 @@ installcheck-zip: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in zip" ; \
@@ -16753,16 +20034,20 @@ installcheck-zip: \
                   installcheck) \
           || exit 1
  
+@endif zip
  
  .PHONY: maybe-mostlyclean-zip mostlyclean-zip
  maybe-mostlyclean-zip:
+@if zip
+maybe-mostlyclean-zip: mostlyclean-zip
  
  mostlyclean-zip: 
         @[ -f ./zip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in zip" ; \
@@ -16774,16 +20059,20 @@ mostlyclean-zip:
                   mostlyclean) \
           || exit 1
  
+@endif zip
  
  .PHONY: maybe-clean-zip clean-zip
  maybe-clean-zip:
+@if zip
+maybe-clean-zip: clean-zip
  
  clean-zip: 
         @[ -f ./zip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in zip" ; \
@@ -16795,16 +20084,20 @@ clean-zip:
                   clean) \
           || exit 1
  
+@endif zip
  
  .PHONY: maybe-distclean-zip distclean-zip
  maybe-distclean-zip:
+@if zip
+maybe-distclean-zip: distclean-zip
  
  distclean-zip: 
         @[ -f ./zip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in zip" ; \
@@ -16816,16 +20109,20 @@ distclean-zip:
                   distclean) \
           || exit 1
  
+@endif zip
  
  .PHONY: maybe-maintainer-clean-zip maintainer-clean-zip
  maybe-maintainer-clean-zip:
+@if zip
+maybe-maintainer-clean-zip: maintainer-clean-zip
  
  maintainer-clean-zip: 
         @[ -f ./zip/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in zip" ; \
@@ -16837,31 +20134,20 @@ maintainer-clean-zip:
                   maintainer-clean) \
           || exit 1
  
+@endif zip
  
  
  .PHONY: configure-zlib maybe-configure-zlib
  maybe-configure-zlib:
+@if zlib
+maybe-configure-zlib: configure-zlib
  configure-zlib:
-       @test ! -f zlib/Makefile || exit 0; \
+       @test -f stage_last && exit 0; \
+       test ! -f zlib/Makefile || exit 0; \
         [ -d zlib ] || mkdir zlib; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in zlib; \
         cd zlib || exit 1; \
         case $(srcdir) in \
@@ -16876,33 +20162,49 @@ configure-zlib:
             libsrcdir="$$s/zlib";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif zlib
  
  .PHONY: all-zlib maybe-all-zlib
  maybe-all-zlib:
+@if zlib
+TARGET-zlib=all
+maybe-all-zlib: all-zlib
  all-zlib: configure-zlib
-       @r=`${PWD_COMMAND}`; export r; \
+       @test -f stage_last && exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd zlib && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd zlib && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-zlib))
+@endif zlib
  
  .PHONY: check-zlib maybe-check-zlib
  maybe-check-zlib:
+@if zlib
+maybe-check-zlib: check-zlib
  
  check-zlib:
  
+@endif zlib
  
  .PHONY: install-zlib maybe-install-zlib
  maybe-install-zlib:
+@if zlib
+maybe-install-zlib: install-zlib
  
  install-zlib:
  
+@endif zlib
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-zlib info-zlib
  maybe-info-zlib:
+@if zlib
+maybe-info-zlib: info-zlib
  
  info-zlib: \
      configure-zlib 
@@ -16910,7 +20212,8 @@ info-zlib: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in zlib" ; \
@@ -16922,9 +20225,12 @@ info-zlib: \
                   info) \
           || exit 1
  
+@endif zlib
  
  .PHONY: maybe-dvi-zlib dvi-zlib
  maybe-dvi-zlib:
+@if zlib
+maybe-dvi-zlib: dvi-zlib
  
  dvi-zlib: \
      configure-zlib 
@@ -16932,7 +20238,8 @@ dvi-zlib: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in zlib" ; \
@@ -16944,9 +20251,12 @@ dvi-zlib: \
                   dvi) \
           || exit 1
  
+@endif zlib
  
  .PHONY: maybe-TAGS-zlib TAGS-zlib
  maybe-TAGS-zlib:
+@if zlib
+maybe-TAGS-zlib: TAGS-zlib
  
  TAGS-zlib: \
      configure-zlib 
@@ -16954,7 +20264,8 @@ TAGS-zlib: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in zlib" ; \
@@ -16966,9 +20277,12 @@ TAGS-zlib: \
                   TAGS) \
           || exit 1
  
+@endif zlib
  
  .PHONY: maybe-install-info-zlib install-info-zlib
  maybe-install-info-zlib:
+@if zlib
+maybe-install-info-zlib: install-info-zlib
  
  install-info-zlib: \
      configure-zlib \
@@ -16977,7 +20291,8 @@ install-info-zlib: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in zlib" ; \
@@ -16989,9 +20304,12 @@ install-info-zlib: \
                   install-info) \
           || exit 1
  
+@endif zlib
  
  .PHONY: maybe-installcheck-zlib installcheck-zlib
  maybe-installcheck-zlib:
+@if zlib
+maybe-installcheck-zlib: installcheck-zlib
  
  installcheck-zlib: \
      configure-zlib 
@@ -16999,7 +20317,8 @@ installcheck-zlib: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in zlib" ; \
@@ -17011,16 +20330,20 @@ installcheck-zlib: \
                   installcheck) \
           || exit 1
  
+@endif zlib
  
  .PHONY: maybe-mostlyclean-zlib mostlyclean-zlib
  maybe-mostlyclean-zlib:
+@if zlib
+maybe-mostlyclean-zlib: mostlyclean-zlib
  
  mostlyclean-zlib: 
         @[ -f ./zlib/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in zlib" ; \
@@ -17032,16 +20355,20 @@ mostlyclean-zlib:
                   mostlyclean) \
           || exit 1
  
+@endif zlib
  
  .PHONY: maybe-clean-zlib clean-zlib
  maybe-clean-zlib:
+@if zlib
+maybe-clean-zlib: clean-zlib
  
  clean-zlib: 
         @[ -f ./zlib/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in zlib" ; \
@@ -17053,16 +20380,20 @@ clean-zlib:
                   clean) \
           || exit 1
  
+@endif zlib
  
  .PHONY: maybe-distclean-zlib distclean-zlib
  maybe-distclean-zlib:
+@if zlib
+maybe-distclean-zlib: distclean-zlib
  
  distclean-zlib: 
         @[ -f ./zlib/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in zlib" ; \
@@ -17074,16 +20405,20 @@ distclean-zlib:
                   distclean) \
           || exit 1
  
+@endif zlib
  
  .PHONY: maybe-maintainer-clean-zlib maintainer-clean-zlib
  maybe-maintainer-clean-zlib:
+@if zlib
+maybe-maintainer-clean-zlib: maintainer-clean-zlib
  
  maintainer-clean-zlib: 
         @[ -f ./zlib/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in zlib" ; \
@@ -17095,31 +20430,19 @@ maintainer-clean-zlib:
                   maintainer-clean) \
           || exit 1
  
+@endif zlib
  
  
  .PHONY: configure-gdb maybe-configure-gdb
  maybe-configure-gdb:
+@if gdb
+maybe-configure-gdb: configure-gdb
  configure-gdb:
         @test ! -f gdb/Makefile || exit 0; \
         [ -d gdb ] || mkdir gdb; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in gdb; \
         cd gdb || exit 1; \
         case $(srcdir) in \
@@ -17134,41 +20457,58 @@ configure-gdb:
             libsrcdir="$$s/gdb";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif gdb
  
  .PHONY: all-gdb maybe-all-gdb
  maybe-all-gdb:
+@if gdb
+TARGET-gdb=all
+maybe-all-gdb: all-gdb
  all-gdb: configure-gdb
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) \
+         $(TARGET-gdb))
+@endif gdb
  
  .PHONY: check-gdb maybe-check-gdb
  maybe-check-gdb:
+@if gdb
+maybe-check-gdb: check-gdb
  
  check-gdb:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+       $(HOST_EXPORTS) \
+       (cd gdb && $(MAKE) $(FLAGS_TO_PASS)$(X11_FLAGS_TO_PASS) check)
  
+@endif gdb
  
  .PHONY: install-gdb maybe-install-gdb
  maybe-install-gdb:
+@if gdb
+maybe-install-gdb: install-gdb
  
  install-gdb: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
+       $(HOST_EXPORTS) \
+       (cd gdb && $(MAKE) $(FLAGS_TO_PASS)$(X11_FLAGS_TO_PASS) install)
  
+@endif gdb
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-gdb info-gdb
  maybe-info-gdb:
+@if gdb
+maybe-info-gdb: info-gdb
  
  info-gdb: \
      configure-gdb 
@@ -17176,7 +20516,8 @@ info-gdb: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in gdb" ; \
@@ -17188,9 +20529,12 @@ info-gdb: \
                   info) \
           || exit 1
  
+@endif gdb
  
  .PHONY: maybe-dvi-gdb dvi-gdb
  maybe-dvi-gdb:
+@if gdb
+maybe-dvi-gdb: dvi-gdb
  
  dvi-gdb: \
      configure-gdb 
@@ -17198,7 +20542,8 @@ dvi-gdb: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in gdb" ; \
@@ -17210,9 +20555,12 @@ dvi-gdb: \
                   dvi) \
           || exit 1
  
+@endif gdb
  
  .PHONY: maybe-TAGS-gdb TAGS-gdb
  maybe-TAGS-gdb:
+@if gdb
+maybe-TAGS-gdb: TAGS-gdb
  
  TAGS-gdb: \
      configure-gdb 
@@ -17220,7 +20568,8 @@ TAGS-gdb: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in gdb" ; \
@@ -17232,9 +20581,12 @@ TAGS-gdb: \
                   TAGS) \
           || exit 1
  
+@endif gdb
  
  .PHONY: maybe-install-info-gdb install-info-gdb
  maybe-install-info-gdb:
+@if gdb
+maybe-install-info-gdb: install-info-gdb
  
  install-info-gdb: \
      configure-gdb \
@@ -17243,7 +20595,8 @@ install-info-gdb: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in gdb" ; \
@@ -17255,9 +20608,12 @@ install-info-gdb: \
                   install-info) \
           || exit 1
  
+@endif gdb
  
  .PHONY: maybe-installcheck-gdb installcheck-gdb
  maybe-installcheck-gdb:
+@if gdb
+maybe-installcheck-gdb: installcheck-gdb
  
  installcheck-gdb: \
      configure-gdb 
@@ -17265,7 +20621,8 @@ installcheck-gdb: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in gdb" ; \
@@ -17277,16 +20634,20 @@ installcheck-gdb: \
                   installcheck) \
           || exit 1
  
+@endif gdb
  
  .PHONY: maybe-mostlyclean-gdb mostlyclean-gdb
  maybe-mostlyclean-gdb:
+@if gdb
+maybe-mostlyclean-gdb: mostlyclean-gdb
  
  mostlyclean-gdb: 
         @[ -f ./gdb/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in gdb" ; \
@@ -17298,16 +20659,20 @@ mostlyclean-gdb:
                   mostlyclean) \
           || exit 1
  
+@endif gdb
  
  .PHONY: maybe-clean-gdb clean-gdb
  maybe-clean-gdb:
+@if gdb
+maybe-clean-gdb: clean-gdb
  
  clean-gdb: 
         @[ -f ./gdb/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in gdb" ; \
@@ -17319,16 +20684,20 @@ clean-gdb:
                   clean) \
           || exit 1
  
+@endif gdb
  
  .PHONY: maybe-distclean-gdb distclean-gdb
  maybe-distclean-gdb:
+@if gdb
+maybe-distclean-gdb: distclean-gdb
  
  distclean-gdb: 
         @[ -f ./gdb/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in gdb" ; \
@@ -17340,16 +20709,20 @@ distclean-gdb:
                   distclean) \
           || exit 1
  
+@endif gdb
  
  .PHONY: maybe-maintainer-clean-gdb maintainer-clean-gdb
  maybe-maintainer-clean-gdb:
+@if gdb
+maybe-maintainer-clean-gdb: maintainer-clean-gdb
  
  maintainer-clean-gdb: 
         @[ -f ./gdb/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in gdb" ; \
@@ -17361,31 +20734,19 @@ maintainer-clean-gdb:
                   maintainer-clean) \
           || exit 1
  
+@endif gdb
  
  
  .PHONY: configure-expect maybe-configure-expect
  maybe-configure-expect:
+@if expect
+maybe-configure-expect: configure-expect
  configure-expect:
         @test ! -f expect/Makefile || exit 0; \
         [ -d expect ] || mkdir expect; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in expect; \
         cd expect || exit 1; \
         case $(srcdir) in \
@@ -17400,41 +20761,58 @@ configure-expect:
             libsrcdir="$$s/expect";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif expect
  
  .PHONY: all-expect maybe-all-expect
  maybe-all-expect:
+@if expect
+TARGET-expect=all
+maybe-all-expect: all-expect
  all-expect: configure-expect
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) \
+         $(TARGET-expect))
+@endif expect
  
  .PHONY: check-expect maybe-check-expect
  maybe-check-expect:
+@if expect
+maybe-check-expect: check-expect
  
  check-expect:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+       $(HOST_EXPORTS) \
+       (cd expect && $(MAKE) $(FLAGS_TO_PASS)$(X11_FLAGS_TO_PASS) check)
  
+@endif expect
  
  .PHONY: install-expect maybe-install-expect
  maybe-install-expect:
+@if expect
+maybe-install-expect: install-expect
  
  install-expect: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
+       $(HOST_EXPORTS) \
+       (cd expect && $(MAKE) $(FLAGS_TO_PASS)$(X11_FLAGS_TO_PASS) install)
  
+@endif expect
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-expect info-expect
  maybe-info-expect:
+@if expect
+maybe-info-expect: info-expect
  
  info-expect: \
      configure-expect 
@@ -17442,7 +20820,8 @@ info-expect: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in expect" ; \
@@ -17454,9 +20833,12 @@ info-expect: \
                   info) \
           || exit 1
  
+@endif expect
  
  .PHONY: maybe-dvi-expect dvi-expect
  maybe-dvi-expect:
+@if expect
+maybe-dvi-expect: dvi-expect
  
  dvi-expect: \
      configure-expect 
@@ -17464,7 +20846,8 @@ dvi-expect: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in expect" ; \
@@ -17476,9 +20859,12 @@ dvi-expect: \
                   dvi) \
           || exit 1
  
+@endif expect
  
  .PHONY: maybe-TAGS-expect TAGS-expect
  maybe-TAGS-expect:
+@if expect
+maybe-TAGS-expect: TAGS-expect
  
  TAGS-expect: \
      configure-expect 
@@ -17486,7 +20872,8 @@ TAGS-expect: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in expect" ; \
@@ -17498,9 +20885,12 @@ TAGS-expect: \
                   TAGS) \
           || exit 1
  
+@endif expect
  
  .PHONY: maybe-install-info-expect install-info-expect
  maybe-install-info-expect:
+@if expect
+maybe-install-info-expect: install-info-expect
  
  install-info-expect: \
      configure-expect \
@@ -17509,7 +20899,8 @@ install-info-expect: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in expect" ; \
@@ -17521,9 +20912,12 @@ install-info-expect: \
                   install-info) \
           || exit 1
  
+@endif expect
  
  .PHONY: maybe-installcheck-expect installcheck-expect
  maybe-installcheck-expect:
+@if expect
+maybe-installcheck-expect: installcheck-expect
  
  installcheck-expect: \
      configure-expect 
@@ -17531,7 +20925,8 @@ installcheck-expect: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in expect" ; \
@@ -17543,16 +20938,20 @@ installcheck-expect: \
                   installcheck) \
           || exit 1
  
+@endif expect
  
  .PHONY: maybe-mostlyclean-expect mostlyclean-expect
  maybe-mostlyclean-expect:
+@if expect
+maybe-mostlyclean-expect: mostlyclean-expect
  
  mostlyclean-expect: 
         @[ -f ./expect/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in expect" ; \
@@ -17564,16 +20963,20 @@ mostlyclean-expect:
                   mostlyclean) \
           || exit 1
  
+@endif expect
  
  .PHONY: maybe-clean-expect clean-expect
  maybe-clean-expect:
+@if expect
+maybe-clean-expect: clean-expect
  
  clean-expect: 
         @[ -f ./expect/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in expect" ; \
@@ -17585,16 +20988,20 @@ clean-expect:
                   clean) \
           || exit 1
  
+@endif expect
  
  .PHONY: maybe-distclean-expect distclean-expect
  maybe-distclean-expect:
+@if expect
+maybe-distclean-expect: distclean-expect
  
  distclean-expect: 
         @[ -f ./expect/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in expect" ; \
@@ -17606,16 +21013,20 @@ distclean-expect:
                   distclean) \
           || exit 1
  
+@endif expect
  
  .PHONY: maybe-maintainer-clean-expect maintainer-clean-expect
  maybe-maintainer-clean-expect:
+@if expect
+maybe-maintainer-clean-expect: maintainer-clean-expect
  
  maintainer-clean-expect: 
         @[ -f ./expect/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in expect" ; \
@@ -17627,31 +21038,19 @@ maintainer-clean-expect:
                   maintainer-clean) \
           || exit 1
  
+@endif expect
  
  
  .PHONY: configure-guile maybe-configure-guile
  maybe-configure-guile:
+@if guile
+maybe-configure-guile: configure-guile
  configure-guile:
         @test ! -f guile/Makefile || exit 0; \
         [ -d guile ] || mkdir guile; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in guile; \
         cd guile || exit 1; \
         case $(srcdir) in \
@@ -17666,41 +21065,58 @@ configure-guile:
             libsrcdir="$$s/guile";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif guile
  
  .PHONY: all-guile maybe-all-guile
  maybe-all-guile:
+@if guile
+TARGET-guile=all
+maybe-all-guile: all-guile
  all-guile: configure-guile
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) \
+         $(TARGET-guile))
+@endif guile
  
  .PHONY: check-guile maybe-check-guile
  maybe-check-guile:
+@if guile
+maybe-check-guile: check-guile
  
  check-guile:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+       $(HOST_EXPORTS) \
+       (cd guile && $(MAKE) $(FLAGS_TO_PASS)$(X11_FLAGS_TO_PASS) check)
  
+@endif guile
  
  .PHONY: install-guile maybe-install-guile
  maybe-install-guile:
+@if guile
+maybe-install-guile: install-guile
  
  install-guile: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
+       $(HOST_EXPORTS) \
+       (cd guile && $(MAKE) $(FLAGS_TO_PASS)$(X11_FLAGS_TO_PASS) install)
  
+@endif guile
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-guile info-guile
  maybe-info-guile:
+@if guile
+maybe-info-guile: info-guile
  
  info-guile: \
      configure-guile 
@@ -17708,7 +21124,8 @@ info-guile: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in guile" ; \
@@ -17720,9 +21137,12 @@ info-guile: \
                   info) \
           || exit 1
  
+@endif guile
  
  .PHONY: maybe-dvi-guile dvi-guile
  maybe-dvi-guile:
+@if guile
+maybe-dvi-guile: dvi-guile
  
  dvi-guile: \
      configure-guile 
@@ -17730,7 +21150,8 @@ dvi-guile: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in guile" ; \
@@ -17742,9 +21163,12 @@ dvi-guile: \
                   dvi) \
           || exit 1
  
+@endif guile
  
  .PHONY: maybe-TAGS-guile TAGS-guile
  maybe-TAGS-guile:
+@if guile
+maybe-TAGS-guile: TAGS-guile
  
  TAGS-guile: \
      configure-guile 
@@ -17752,7 +21176,8 @@ TAGS-guile: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in guile" ; \
@@ -17764,9 +21189,12 @@ TAGS-guile: \
                   TAGS) \
           || exit 1
  
+@endif guile
  
  .PHONY: maybe-install-info-guile install-info-guile
  maybe-install-info-guile:
+@if guile
+maybe-install-info-guile: install-info-guile
  
  install-info-guile: \
      configure-guile \
@@ -17775,7 +21203,8 @@ install-info-guile: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in guile" ; \
@@ -17787,9 +21216,12 @@ install-info-guile: \
                   install-info) \
           || exit 1
  
+@endif guile
  
  .PHONY: maybe-installcheck-guile installcheck-guile
  maybe-installcheck-guile:
+@if guile
+maybe-installcheck-guile: installcheck-guile
  
  installcheck-guile: \
      configure-guile 
@@ -17797,7 +21229,8 @@ installcheck-guile: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in guile" ; \
@@ -17809,16 +21242,20 @@ installcheck-guile: \
                   installcheck) \
           || exit 1
  
+@endif guile
  
  .PHONY: maybe-mostlyclean-guile mostlyclean-guile
  maybe-mostlyclean-guile:
+@if guile
+maybe-mostlyclean-guile: mostlyclean-guile
  
  mostlyclean-guile: 
         @[ -f ./guile/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in guile" ; \
@@ -17830,16 +21267,20 @@ mostlyclean-guile:
                   mostlyclean) \
           || exit 1
  
+@endif guile
  
  .PHONY: maybe-clean-guile clean-guile
  maybe-clean-guile:
+@if guile
+maybe-clean-guile: clean-guile
  
  clean-guile: 
         @[ -f ./guile/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in guile" ; \
@@ -17851,16 +21292,20 @@ clean-guile:
                   clean) \
           || exit 1
  
+@endif guile
  
  .PHONY: maybe-distclean-guile distclean-guile
  maybe-distclean-guile:
+@if guile
+maybe-distclean-guile: distclean-guile
  
  distclean-guile: 
         @[ -f ./guile/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in guile" ; \
@@ -17872,16 +21317,20 @@ distclean-guile:
                   distclean) \
           || exit 1
  
+@endif guile
  
  .PHONY: maybe-maintainer-clean-guile maintainer-clean-guile
  maybe-maintainer-clean-guile:
+@if guile
+maybe-maintainer-clean-guile: maintainer-clean-guile
  
  maintainer-clean-guile: 
         @[ -f ./guile/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in guile" ; \
@@ -17893,31 +21342,19 @@ maintainer-clean-guile:
                   maintainer-clean) \
           || exit 1
  
+@endif guile
  
  
  .PHONY: configure-tk maybe-configure-tk
  maybe-configure-tk:
+@if tk
+maybe-configure-tk: configure-tk
  configure-tk:
         @test ! -f tk/Makefile || exit 0; \
         [ -d tk ] || mkdir tk; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in tk; \
         cd tk || exit 1; \
         case $(srcdir) in \
@@ -17932,41 +21369,58 @@ configure-tk:
             libsrcdir="$$s/tk";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif tk
  
  .PHONY: all-tk maybe-all-tk
  maybe-all-tk:
+@if tk
+TARGET-tk=all
+maybe-all-tk: all-tk
  all-tk: configure-tk
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) \
+         $(TARGET-tk))
+@endif tk
  
  .PHONY: check-tk maybe-check-tk
  maybe-check-tk:
+@if tk
+maybe-check-tk: check-tk
  
  check-tk:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+       $(HOST_EXPORTS) \
+       (cd tk && $(MAKE) $(FLAGS_TO_PASS)$(X11_FLAGS_TO_PASS) check)
  
+@endif tk
  
  .PHONY: install-tk maybe-install-tk
  maybe-install-tk:
+@if tk
+maybe-install-tk: install-tk
  
  install-tk: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
+       $(HOST_EXPORTS) \
+       (cd tk && $(MAKE) $(FLAGS_TO_PASS)$(X11_FLAGS_TO_PASS) install)
  
+@endif tk
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-tk info-tk
  maybe-info-tk:
+@if tk
+maybe-info-tk: info-tk
  
  info-tk: \
      configure-tk 
@@ -17974,7 +21428,8 @@ info-tk: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in tk" ; \
@@ -17986,9 +21441,12 @@ info-tk: \
                   info) \
           || exit 1
  
+@endif tk
  
  .PHONY: maybe-dvi-tk dvi-tk
  maybe-dvi-tk:
+@if tk
+maybe-dvi-tk: dvi-tk
  
  dvi-tk: \
      configure-tk 
@@ -17996,7 +21454,8 @@ dvi-tk: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in tk" ; \
@@ -18008,9 +21467,12 @@ dvi-tk: \
                   dvi) \
           || exit 1
  
+@endif tk
  
  .PHONY: maybe-TAGS-tk TAGS-tk
  maybe-TAGS-tk:
+@if tk
+maybe-TAGS-tk: TAGS-tk
  
  TAGS-tk: \
      configure-tk 
@@ -18018,7 +21480,8 @@ TAGS-tk: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in tk" ; \
@@ -18030,9 +21493,12 @@ TAGS-tk: \
                   TAGS) \
           || exit 1
  
+@endif tk
  
  .PHONY: maybe-install-info-tk install-info-tk
  maybe-install-info-tk:
+@if tk
+maybe-install-info-tk: install-info-tk
  
  install-info-tk: \
      configure-tk \
@@ -18041,7 +21507,8 @@ install-info-tk: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in tk" ; \
@@ -18053,9 +21520,12 @@ install-info-tk: \
                   install-info) \
           || exit 1
  
+@endif tk
  
  .PHONY: maybe-installcheck-tk installcheck-tk
  maybe-installcheck-tk:
+@if tk
+maybe-installcheck-tk: installcheck-tk
  
  installcheck-tk: \
      configure-tk 
@@ -18063,7 +21533,8 @@ installcheck-tk: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in tk" ; \
@@ -18075,16 +21546,20 @@ installcheck-tk: \
                   installcheck) \
           || exit 1
  
+@endif tk
  
  .PHONY: maybe-mostlyclean-tk mostlyclean-tk
  maybe-mostlyclean-tk:
+@if tk
+maybe-mostlyclean-tk: mostlyclean-tk
  
  mostlyclean-tk: 
         @[ -f ./tk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in tk" ; \
@@ -18096,16 +21571,20 @@ mostlyclean-tk:
                   mostlyclean) \
           || exit 1
  
+@endif tk
  
  .PHONY: maybe-clean-tk clean-tk
  maybe-clean-tk:
+@if tk
+maybe-clean-tk: clean-tk
  
  clean-tk: 
         @[ -f ./tk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in tk" ; \
@@ -18117,16 +21596,20 @@ clean-tk:
                   clean) \
           || exit 1
  
+@endif tk
  
  .PHONY: maybe-distclean-tk distclean-tk
  maybe-distclean-tk:
+@if tk
+maybe-distclean-tk: distclean-tk
  
  distclean-tk: 
         @[ -f ./tk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in tk" ; \
@@ -18138,16 +21621,20 @@ distclean-tk:
                   distclean) \
           || exit 1
  
+@endif tk
  
  .PHONY: maybe-maintainer-clean-tk maintainer-clean-tk
  maybe-maintainer-clean-tk:
+@if tk
+maybe-maintainer-clean-tk: maintainer-clean-tk
  
  maintainer-clean-tk: 
         @[ -f ./tk/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in tk" ; \
@@ -18159,92 +21646,93 @@ maintainer-clean-tk:
                   maintainer-clean) \
           || exit 1
  
+@endif tk
  
  
-.PHONY: configure-tix maybe-configure-tix
-maybe-configure-tix:
-configure-tix:
-       @test ! -f tix/Makefile || exit 0; \
-       [ -d tix ] || mkdir tix; \
+.PHONY: configure-libtermcap maybe-configure-libtermcap
+maybe-configure-libtermcap:
+@if libtermcap
+maybe-configure-libtermcap: configure-libtermcap
+configure-libtermcap:
+       @test ! -f libtermcap/Makefile || exit 0; \
+       [ -d libtermcap ] || mkdir libtermcap; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in tix; \
-       cd tix || exit 1; \
+       $(HOST_EXPORTS) \
+       echo Configuring in libtermcap; \
+       cd libtermcap || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/tix"; \
-           libsrcdir="$$s/tix";; \
+           srcdiroption="--srcdir=$(srcdir)/libtermcap"; \
+           libsrcdir="$$s/libtermcap";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/tix"; \
-           libsrcdir="$$s/tix";; \
+           srcdiroption="--srcdir=../$(srcdir)/libtermcap"; \
+           libsrcdir="$$s/libtermcap";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif libtermcap
  
-.PHONY: all-tix maybe-all-tix
-maybe-all-tix:
-all-tix: configure-tix
+.PHONY: all-libtermcap maybe-all-libtermcap
+maybe-all-libtermcap:
+@if libtermcap
+TARGET-libtermcap=all
+maybe-all-libtermcap: all-libtermcap
+all-libtermcap: configure-libtermcap
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd libtermcap && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-libtermcap))
+@endif libtermcap
  
-.PHONY: check-tix maybe-check-tix
-maybe-check-tix:
+.PHONY: check-libtermcap maybe-check-libtermcap
+maybe-check-libtermcap:
+@if libtermcap
+maybe-check-libtermcap: check-libtermcap
  
-check-tix:
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+check-libtermcap:
  
+@endif libtermcap
  
-.PHONY: install-tix maybe-install-tix
-maybe-install-tix:
+.PHONY: install-libtermcap maybe-install-libtermcap
+maybe-install-libtermcap:
+@if libtermcap
+maybe-install-libtermcap: install-libtermcap
  
-install-tix: installdirs
+install-libtermcap: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
+       $(HOST_EXPORTS) \
+       (cd libtermcap && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif libtermcap
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-tix info-tix
-maybe-info-tix:
+.PHONY: maybe-info-libtermcap info-libtermcap
+maybe-info-libtermcap:
+@if libtermcap
+maybe-info-libtermcap: info-libtermcap
  
-info-tix: \
-    configure-tix 
-       @[ -f ./tix/Makefile ] || exit 0; \
+info-libtermcap: \
+    configure-libtermcap 
+       @[ -f ./libtermcap/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in tix" ; \
-       (cd tix && \
+       echo "Doing info in libtermcap" ; \
+       (cd libtermcap && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -18252,21 +21740,25 @@ info-tix: \
                   info) \
           || exit 1
  
+@endif libtermcap
  
-.PHONY: maybe-dvi-tix dvi-tix
-maybe-dvi-tix:
+.PHONY: maybe-dvi-libtermcap dvi-libtermcap
+maybe-dvi-libtermcap:
+@if libtermcap
+maybe-dvi-libtermcap: dvi-libtermcap
  
-dvi-tix: \
-    configure-tix 
-       @[ -f ./tix/Makefile ] || exit 0; \
+dvi-libtermcap: \
+    configure-libtermcap 
+       @[ -f ./libtermcap/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in tix" ; \
-       (cd tix && \
+       echo "Doing dvi in libtermcap" ; \
+       (cd libtermcap && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -18274,21 +21766,25 @@ dvi-tix: \
                   dvi) \
           || exit 1
  
+@endif libtermcap
  
-.PHONY: maybe-TAGS-tix TAGS-tix
-maybe-TAGS-tix:
+.PHONY: maybe-TAGS-libtermcap TAGS-libtermcap
+maybe-TAGS-libtermcap:
+@if libtermcap
+maybe-TAGS-libtermcap: TAGS-libtermcap
  
-TAGS-tix: \
-    configure-tix 
-       @[ -f ./tix/Makefile ] || exit 0; \
+TAGS-libtermcap: \
+    configure-libtermcap 
+       @[ -f ./libtermcap/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in tix" ; \
-       (cd tix && \
+       echo "Doing TAGS in libtermcap" ; \
+       (cd libtermcap && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -18296,280 +21792,22 @@ TAGS-tix: \
                   TAGS) \
           || exit 1
  
+@endif libtermcap
  
-.PHONY: maybe-install-info-tix install-info-tix
-maybe-install-info-tix:
+.PHONY: maybe-install-info-libtermcap install-info-libtermcap
+maybe-install-info-libtermcap:
+@if libtermcap
+maybe-install-info-libtermcap: install-info-libtermcap
  
-install-info-tix: \
-    configure-tix \
-    info-tix 
-       @[ -f ./tix/Makefile ] || exit 0; \
+install-info-libtermcap: \
+    configure-libtermcap \
+    info-libtermcap 
+       @[ -f ./libtermcap/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing install-info in tix" ; \
-       (cd tix && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
-         || exit 1
-
-
-.PHONY: maybe-installcheck-tix installcheck-tix
-maybe-installcheck-tix:
-
-installcheck-tix: \
-    configure-tix 
-       @[ -f ./tix/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing installcheck in tix" ; \
-       (cd tix && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
-         || exit 1
-
-
-.PHONY: maybe-mostlyclean-tix mostlyclean-tix
-maybe-mostlyclean-tix:
-
-mostlyclean-tix: 
-       @[ -f ./tix/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing mostlyclean in tix" ; \
-       (cd tix && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
-         || exit 1
-
-
-.PHONY: maybe-clean-tix clean-tix
-maybe-clean-tix:
-
-clean-tix: 
-       @[ -f ./tix/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing clean in tix" ; \
-       (cd tix && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
-         || exit 1
-
-
-.PHONY: maybe-distclean-tix distclean-tix
-maybe-distclean-tix:
-
-distclean-tix: 
-       @[ -f ./tix/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing distclean in tix" ; \
-       (cd tix && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
-         || exit 1
-
-
-.PHONY: maybe-maintainer-clean-tix maintainer-clean-tix
-maybe-maintainer-clean-tix:
-
-maintainer-clean-tix: 
-       @[ -f ./tix/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing maintainer-clean in tix" ; \
-       (cd tix && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
-         || exit 1
-
-
-
-.PHONY: configure-libtermcap maybe-configure-libtermcap
-maybe-configure-libtermcap:
-configure-libtermcap:
-       @test ! -f libtermcap/Makefile || exit 0; \
-       [ -d libtermcap ] || mkdir libtermcap; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in libtermcap; \
-       cd libtermcap || exit 1; \
-       case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/libtermcap"; \
-           libsrcdir="$$s/libtermcap";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/libtermcap"; \
-           libsrcdir="$$s/libtermcap";; \
-       esac; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         || exit 1
-
-.PHONY: all-libtermcap maybe-all-libtermcap
-maybe-all-libtermcap:
-all-libtermcap: configure-libtermcap
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       (cd libtermcap && $(MAKE) $(FLAGS_TO_PASS) all)
-
-.PHONY: check-libtermcap maybe-check-libtermcap
-maybe-check-libtermcap:
-
-check-libtermcap:
-
-
-.PHONY: install-libtermcap maybe-install-libtermcap
-maybe-install-libtermcap:
-
-install-libtermcap: installdirs
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       (cd libtermcap && $(MAKE) $(FLAGS_TO_PASS) install)
-
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-libtermcap info-libtermcap
-maybe-info-libtermcap:
-
-info-libtermcap: \
-    configure-libtermcap 
-       @[ -f ./libtermcap/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing info in libtermcap" ; \
-       (cd libtermcap && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
-         || exit 1
-
-
-.PHONY: maybe-dvi-libtermcap dvi-libtermcap
-maybe-dvi-libtermcap:
-
-dvi-libtermcap: \
-    configure-libtermcap 
-       @[ -f ./libtermcap/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing dvi in libtermcap" ; \
-       (cd libtermcap && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
-         || exit 1
-
-
-.PHONY: maybe-TAGS-libtermcap TAGS-libtermcap
-maybe-TAGS-libtermcap:
-
-TAGS-libtermcap: \
-    configure-libtermcap 
-       @[ -f ./libtermcap/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing TAGS in libtermcap" ; \
-       (cd libtermcap && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
-         || exit 1
-
-
-.PHONY: maybe-install-info-libtermcap install-info-libtermcap
-maybe-install-info-libtermcap:
-
-install-info-libtermcap: \
-    configure-libtermcap \
-    info-libtermcap 
-       @[ -f ./libtermcap/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in libtermcap" ; \
@@ -18581,9 +21819,12 @@ install-info-libtermcap: \
                   install-info) \
           || exit 1
  
+@endif libtermcap
  
  .PHONY: maybe-installcheck-libtermcap installcheck-libtermcap
  maybe-installcheck-libtermcap:
+@if libtermcap
+maybe-installcheck-libtermcap: installcheck-libtermcap
  
  installcheck-libtermcap: \
      configure-libtermcap 
@@ -18591,7 +21832,8 @@ installcheck-libtermcap: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in libtermcap" ; \
@@ -18603,59 +21845,59 @@ installcheck-libtermcap: \
                   installcheck) \
           || exit 1
  
+@endif libtermcap
  
  .PHONY: maybe-mostlyclean-libtermcap mostlyclean-libtermcap
  maybe-mostlyclean-libtermcap:
+@if libtermcap
+maybe-mostlyclean-libtermcap: mostlyclean-libtermcap
  
  # libtermcap doesn't support mostlyclean.
  mostlyclean-libtermcap:
  
+@endif libtermcap
  
  .PHONY: maybe-clean-libtermcap clean-libtermcap
  maybe-clean-libtermcap:
+@if libtermcap
+maybe-clean-libtermcap: clean-libtermcap
  
  # libtermcap doesn't support clean.
  clean-libtermcap:
  
+@endif libtermcap
  
  .PHONY: maybe-distclean-libtermcap distclean-libtermcap
  maybe-distclean-libtermcap:
+@if libtermcap
+maybe-distclean-libtermcap: distclean-libtermcap
  
  # libtermcap doesn't support distclean.
  distclean-libtermcap:
  
+@endif libtermcap
  
  .PHONY: maybe-maintainer-clean-libtermcap maintainer-clean-libtermcap
  maybe-maintainer-clean-libtermcap:
+@if libtermcap
+maybe-maintainer-clean-libtermcap: maintainer-clean-libtermcap
  
  # libtermcap doesn't support maintainer-clean.
  maintainer-clean-libtermcap:
  
+@endif libtermcap
  
  
  .PHONY: configure-utils maybe-configure-utils
  maybe-configure-utils:
+@if utils
+maybe-configure-utils: configure-utils
  configure-utils:
         @test ! -f utils/Makefile || exit 0; \
         [ -d utils ] || mkdir utils; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       $(HOST_EXPORTS) \
         echo Configuring in utils; \
         cd utils || exit 1; \
         case $(srcdir) in \
@@ -18670,37 +21912,53 @@ configure-utils:
             libsrcdir="$$s/utils";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif utils
  
  .PHONY: all-utils maybe-all-utils
  maybe-all-utils:
+@if utils
+TARGET-utils=all
+maybe-all-utils: all-utils
  all-utils: configure-utils
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd utils && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd utils && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-utils))
+@endif utils
  
  .PHONY: check-utils maybe-check-utils
  maybe-check-utils:
+@if utils
+maybe-check-utils: check-utils
  
  check-utils:
  
+@endif utils
  
  .PHONY: install-utils maybe-install-utils
  maybe-install-utils:
+@if utils
+maybe-install-utils: install-utils
  
  install-utils: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         (cd utils && $(MAKE) $(FLAGS_TO_PASS) install)
  
+@endif utils
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-utils info-utils
  maybe-info-utils:
+@if utils
+maybe-info-utils: info-utils
  
  info-utils: \
      configure-utils 
@@ -18708,7 +21966,8 @@ info-utils: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in utils" ; \
@@ -18720,9 +21979,12 @@ info-utils: \
                   info) \
           || exit 1
  
+@endif utils
  
  .PHONY: maybe-dvi-utils dvi-utils
  maybe-dvi-utils:
+@if utils
+maybe-dvi-utils: dvi-utils
  
  dvi-utils: \
      configure-utils 
@@ -18730,7 +21992,8 @@ dvi-utils: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in utils" ; \
@@ -18742,9 +22005,12 @@ dvi-utils: \
                   dvi) \
           || exit 1
  
+@endif utils
  
  .PHONY: maybe-TAGS-utils TAGS-utils
  maybe-TAGS-utils:
+@if utils
+maybe-TAGS-utils: TAGS-utils
  
  TAGS-utils: \
      configure-utils 
@@ -18752,7 +22018,8 @@ TAGS-utils: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in utils" ; \
@@ -18764,9 +22031,12 @@ TAGS-utils: \
                   TAGS) \
           || exit 1
  
+@endif utils
  
  .PHONY: maybe-install-info-utils install-info-utils
  maybe-install-info-utils:
+@if utils
+maybe-install-info-utils: install-info-utils
  
  install-info-utils: \
      configure-utils \
@@ -18775,7 +22045,8 @@ install-info-utils: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in utils" ; \
@@ -18787,9 +22058,12 @@ install-info-utils: \
                   install-info) \
           || exit 1
  
+@endif utils
  
  .PHONY: maybe-installcheck-utils installcheck-utils
  maybe-installcheck-utils:
+@if utils
+maybe-installcheck-utils: installcheck-utils
  
  installcheck-utils: \
      configure-utils 
@@ -18797,7 +22071,8 @@ installcheck-utils: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in utils" ; \
@@ -18809,16 +22084,20 @@ installcheck-utils: \
                   installcheck) \
           || exit 1
  
+@endif utils
  
  .PHONY: maybe-mostlyclean-utils mostlyclean-utils
  maybe-mostlyclean-utils:
+@if utils
+maybe-mostlyclean-utils: mostlyclean-utils
  
  mostlyclean-utils: 
         @[ -f ./utils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in utils" ; \
@@ -18830,16 +22109,20 @@ mostlyclean-utils:
                   mostlyclean) \
           || exit 1
  
+@endif utils
  
  .PHONY: maybe-clean-utils clean-utils
  maybe-clean-utils:
+@if utils
+maybe-clean-utils: clean-utils
  
  clean-utils: 
         @[ -f ./utils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in utils" ; \
@@ -18851,16 +22134,20 @@ clean-utils:
                   clean) \
           || exit 1
  
+@endif utils
  
  .PHONY: maybe-distclean-utils distclean-utils
  maybe-distclean-utils:
+@if utils
+maybe-distclean-utils: distclean-utils
  
  distclean-utils: 
         @[ -f ./utils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in utils" ; \
@@ -18872,16 +22159,20 @@ distclean-utils:
                   distclean) \
           || exit 1
  
+@endif utils
  
  .PHONY: maybe-maintainer-clean-utils maintainer-clean-utils
  maybe-maintainer-clean-utils:
+@if utils
+maybe-maintainer-clean-utils: maintainer-clean-utils
  
  maintainer-clean-utils: 
         @[ -f ./utils/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in utils" ; \
@@ -18893,6 +22184,7 @@ maintainer-clean-utils:
                   maintainer-clean) \
           || exit 1
  
+@endif utils
  
  
  
@@ -18902,6 +22194,8 @@ maintainer-clean-utils:
  
  .PHONY: configure-target-libstdc++-v3 maybe-configure-target-libstdc++-v3
  maybe-configure-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-configure-target-libstdc++-v3: 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
@@ -18915,22 +22209,7 @@ configure-target-libstdc++-v3: $(TARGET_SUBDIR)/libstdc++-v3/multilib.out
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; 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; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       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; \
+       $(RAW_CXX_TARGET_EXPORTS) \
         echo Configuring in $(TARGET_SUBDIR)/libstdc++-v3; \
         cd "$(TARGET_SUBDIR)/libstdc++-v3" || exit 1; \
         case $(srcdir) in \
@@ -18947,44 +22226,60 @@ configure-target-libstdc++-v3: $(TARGET_SUBDIR)/libstdc++-v3/multilib.out
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
           $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
           || exit 1
+@endif target-libstdc++-v3
  
  .PHONY: all-target-libstdc++-v3 maybe-all-target-libstdc++-v3
  maybe-all-target-libstdc++-v3:
+@if target-libstdc++-v3
+TARGET-target-libstdc++-v3=all
+maybe-all-target-libstdc++-v3: all-target-libstdc++-v3
  all-target-libstdc++-v3: configure-target-libstdc++-v3
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(RAW_CXX_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   $(TARGET-target-libstdc++-v3))
+@endif target-libstdc++-v3
  
  .PHONY: check-target-libstdc++-v3 maybe-check-target-libstdc++-v3
  maybe-check-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-check-target-libstdc++-v3: check-target-libstdc++-v3
  
  check-target-libstdc++-v3:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(RAW_CXX_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  check)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   check)
  
+@endif target-libstdc++-v3
  
  .PHONY: install-target-libstdc++-v3 maybe-install-target-libstdc++-v3
  maybe-install-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-install-target-libstdc++-v3: install-target-libstdc++-v3
  
  install-target-libstdc++-v3: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(RAW_CXX_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
+@endif target-libstdc++-v3
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-target-libstdc++-v3 info-target-libstdc++-v3
  maybe-info-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-info-target-libstdc++-v3: info-target-libstdc++-v3
  
  info-target-libstdc++-v3: \
      configure-target-libstdc++-v3 
@@ -18992,6 +22287,7 @@ info-target-libstdc++-v3: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing info in $(TARGET_SUBDIR)/libstdc++-v3" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19001,12 +22297,15 @@ info-target-libstdc++-v3: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
+@endif target-libstdc++-v3
  
  .PHONY: maybe-dvi-target-libstdc++-v3 dvi-target-libstdc++-v3
  maybe-dvi-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-dvi-target-libstdc++-v3: dvi-target-libstdc++-v3
  
  dvi-target-libstdc++-v3: \
      configure-target-libstdc++-v3 
@@ -19014,6 +22313,7 @@ dvi-target-libstdc++-v3: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing dvi in $(TARGET_SUBDIR)/libstdc++-v3" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19023,12 +22323,15 @@ dvi-target-libstdc++-v3: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
           || exit 1
  
+@endif target-libstdc++-v3
  
  .PHONY: maybe-TAGS-target-libstdc++-v3 TAGS-target-libstdc++-v3
  maybe-TAGS-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-TAGS-target-libstdc++-v3: TAGS-target-libstdc++-v3
  
  TAGS-target-libstdc++-v3: \
      configure-target-libstdc++-v3 
@@ -19036,6 +22339,7 @@ TAGS-target-libstdc++-v3: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing TAGS in $(TARGET_SUBDIR)/libstdc++-v3" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19045,12 +22349,15 @@ TAGS-target-libstdc++-v3: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
+@endif target-libstdc++-v3
  
  .PHONY: maybe-install-info-target-libstdc++-v3 install-info-target-libstdc++-v3
  maybe-install-info-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-install-info-target-libstdc++-v3: install-info-target-libstdc++-v3
  
  install-info-target-libstdc++-v3: \
      configure-target-libstdc++-v3 \
@@ -19059,6 +22366,7 @@ install-info-target-libstdc++-v3: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing install-info in $(TARGET_SUBDIR)/libstdc++-v3" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19068,12 +22376,15 @@ install-info-target-libstdc++-v3: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
+@endif target-libstdc++-v3
  
  .PHONY: maybe-installcheck-target-libstdc++-v3 installcheck-target-libstdc++-v3
  maybe-installcheck-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-installcheck-target-libstdc++-v3: installcheck-target-libstdc++-v3
  
  installcheck-target-libstdc++-v3: \
      configure-target-libstdc++-v3 
@@ -19081,6 +22392,7 @@ installcheck-target-libstdc++-v3: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing installcheck in $(TARGET_SUBDIR)/libstdc++-v3" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19090,18 +22402,22 @@ installcheck-target-libstdc++-v3: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
+@endif target-libstdc++-v3
  
  .PHONY: maybe-mostlyclean-target-libstdc++-v3 mostlyclean-target-libstdc++-v3
  maybe-mostlyclean-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-mostlyclean-target-libstdc++-v3: mostlyclean-target-libstdc++-v3
  
  mostlyclean-target-libstdc++-v3: 
         @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing mostlyclean in $(TARGET_SUBDIR)/libstdc++-v3" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19111,18 +22427,22 @@ mostlyclean-target-libstdc++-v3:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
+@endif target-libstdc++-v3
  
  .PHONY: maybe-clean-target-libstdc++-v3 clean-target-libstdc++-v3
  maybe-clean-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-clean-target-libstdc++-v3: clean-target-libstdc++-v3
  
  clean-target-libstdc++-v3: 
         @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing clean in $(TARGET_SUBDIR)/libstdc++-v3" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19132,18 +22452,22 @@ clean-target-libstdc++-v3:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
           || exit 1
  
+@endif target-libstdc++-v3
  
  .PHONY: maybe-distclean-target-libstdc++-v3 distclean-target-libstdc++-v3
  maybe-distclean-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-distclean-target-libstdc++-v3: distclean-target-libstdc++-v3
  
  distclean-target-libstdc++-v3: 
         @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing distclean in $(TARGET_SUBDIR)/libstdc++-v3" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19153,18 +22477,22 @@ distclean-target-libstdc++-v3:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
+@endif target-libstdc++-v3
  
  .PHONY: maybe-maintainer-clean-target-libstdc++-v3 maintainer-clean-target-libstdc++-v3
  maybe-maintainer-clean-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-maintainer-clean-target-libstdc++-v3: maintainer-clean-target-libstdc++-v3
  
  maintainer-clean-target-libstdc++-v3: 
         @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libstdc++-v3" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19174,13 +22502,332 @@ maintainer-clean-target-libstdc++-v3:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
+         || exit 1
+
+@endif target-libstdc++-v3
+
+
+.PHONY: configure-target-libmudflap maybe-configure-target-libmudflap
+maybe-configure-target-libmudflap:
+@if target-libmudflap
+maybe-configure-target-libmudflap: configure-target-libmudflap
+
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/libmudflap/multilib.out: multilib.out
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmudflap ; \
+       rm -f $(TARGET_SUBDIR)/libmudflap/Makefile || : ; \
+       cp multilib.out $(TARGET_SUBDIR)/libmudflap/multilib.out
+
+configure-target-libmudflap: $(TARGET_SUBDIR)/libmudflap/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/libmudflap/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmudflap ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo Configuring in $(TARGET_SUBDIR)/libmudflap; \
+       cd "$(TARGET_SUBDIR)/libmudflap" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) \
+           topdir=$(srcdir) ;; \
+         *) \
+           case "$(TARGET_SUBDIR)" in \
+             .) topdir="../$(srcdir)" ;; \
+             *) topdir="../../$(srcdir)" ;; \
+           esac ;; \
+       esac; \
+         srcdiroption="--srcdir=$${topdir}/libmudflap"; \
+         libsrcdir="$$s/libmudflap"; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
+         || exit 1
+@endif target-libmudflap
+
+.PHONY: all-target-libmudflap maybe-all-target-libmudflap
+maybe-all-target-libmudflap:
+@if target-libmudflap
+TARGET-target-libmudflap=all
+maybe-all-target-libmudflap: all-target-libmudflap
+all-target-libmudflap: configure-target-libmudflap
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libmudflap && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libmudflap))
+@endif target-libmudflap
+
+.PHONY: check-target-libmudflap maybe-check-target-libmudflap
+maybe-check-target-libmudflap:
+@if target-libmudflap
+maybe-check-target-libmudflap: check-target-libmudflap
+
+check-target-libmudflap:
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libmudflap && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
+
+@endif target-libmudflap
+
+.PHONY: install-target-libmudflap maybe-install-target-libmudflap
+maybe-install-target-libmudflap:
+@if target-libmudflap
+maybe-install-target-libmudflap: install-target-libmudflap
+
+install-target-libmudflap: installdirs
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libmudflap && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+
+@endif target-libmudflap
+
+# Other targets (info, dvi, etc.)
+
+.PHONY: maybe-info-target-libmudflap info-target-libmudflap
+maybe-info-target-libmudflap:
+@if target-libmudflap
+maybe-info-target-libmudflap: info-target-libmudflap
+
+info-target-libmudflap: \
+    configure-target-libmudflap 
+       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing info in $(TARGET_SUBDIR)/libmudflap" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libmudflap && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  info) \
+         || exit 1
+
+@endif target-libmudflap
+
+.PHONY: maybe-dvi-target-libmudflap dvi-target-libmudflap
+maybe-dvi-target-libmudflap:
+@if target-libmudflap
+maybe-dvi-target-libmudflap: dvi-target-libmudflap
+
+dvi-target-libmudflap: \
+    configure-target-libmudflap 
+       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libmudflap" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libmudflap && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  dvi) \
+         || exit 1
+
+@endif target-libmudflap
+
+.PHONY: maybe-TAGS-target-libmudflap TAGS-target-libmudflap
+maybe-TAGS-target-libmudflap:
+@if target-libmudflap
+maybe-TAGS-target-libmudflap: TAGS-target-libmudflap
+
+TAGS-target-libmudflap: \
+    configure-target-libmudflap 
+       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libmudflap" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libmudflap && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  TAGS) \
+         || exit 1
+
+@endif target-libmudflap
+
+.PHONY: maybe-install-info-target-libmudflap install-info-target-libmudflap
+maybe-install-info-target-libmudflap:
+@if target-libmudflap
+maybe-install-info-target-libmudflap: install-info-target-libmudflap
+
+install-info-target-libmudflap: \
+    configure-target-libmudflap \
+    info-target-libmudflap 
+       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libmudflap" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libmudflap && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  install-info) \
+         || exit 1
+
+@endif target-libmudflap
+
+.PHONY: maybe-installcheck-target-libmudflap installcheck-target-libmudflap
+maybe-installcheck-target-libmudflap:
+@if target-libmudflap
+maybe-installcheck-target-libmudflap: installcheck-target-libmudflap
+
+installcheck-target-libmudflap: \
+    configure-target-libmudflap 
+       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libmudflap" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libmudflap && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  installcheck) \
+         || exit 1
+
+@endif target-libmudflap
+
+.PHONY: maybe-mostlyclean-target-libmudflap mostlyclean-target-libmudflap
+maybe-mostlyclean-target-libmudflap:
+@if target-libmudflap
+maybe-mostlyclean-target-libmudflap: mostlyclean-target-libmudflap
+
+mostlyclean-target-libmudflap: 
+       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libmudflap" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libmudflap && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  mostlyclean) \
+         || exit 1
+
+@endif target-libmudflap
+
+.PHONY: maybe-clean-target-libmudflap clean-target-libmudflap
+maybe-clean-target-libmudflap:
+@if target-libmudflap
+maybe-clean-target-libmudflap: clean-target-libmudflap
+
+clean-target-libmudflap: 
+       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing clean in $(TARGET_SUBDIR)/libmudflap" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libmudflap && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  clean) \
+         || exit 1
+
+@endif target-libmudflap
+
+.PHONY: maybe-distclean-target-libmudflap distclean-target-libmudflap
+maybe-distclean-target-libmudflap:
+@if target-libmudflap
+maybe-distclean-target-libmudflap: distclean-target-libmudflap
+
+distclean-target-libmudflap: 
+       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libmudflap" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libmudflap && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  distclean) \
+         || exit 1
+
+@endif target-libmudflap
+
+.PHONY: maybe-maintainer-clean-target-libmudflap maintainer-clean-target-libmudflap
+maybe-maintainer-clean-target-libmudflap:
+@if target-libmudflap
+maybe-maintainer-clean-target-libmudflap: maintainer-clean-target-libmudflap
+
+maintainer-clean-target-libmudflap: 
+       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libmudflap" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libmudflap && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  maintainer-clean) \
           || exit 1
  
+@endif target-libmudflap
  
  
  .PHONY: configure-target-newlib maybe-configure-target-newlib
  maybe-configure-target-newlib:
+@if target-newlib
+maybe-configure-target-newlib: configure-target-newlib
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/newlib/multilib.out: multilib.out
@@ -19194,21 +22841,7 @@ configure-target-newlib: $(TARGET_SUBDIR)/newlib/multilib.out
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; 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; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       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; \
+       $(NORMAL_TARGET_EXPORTS) \
         echo Configuring in $(TARGET_SUBDIR)/newlib; \
         cd "$(TARGET_SUBDIR)/newlib" || exit 1; \
         case $(srcdir) in \
@@ -19225,44 +22858,60 @@ configure-target-newlib: $(TARGET_SUBDIR)/newlib/multilib.out
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
           $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
           || exit 1
+@endif target-newlib
  
  .PHONY: all-target-newlib maybe-all-target-newlib
  maybe-all-target-newlib:
+@if target-newlib
+TARGET-target-newlib=all
+maybe-all-target-newlib: all-target-newlib
  all-target-newlib: configure-target-newlib
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/newlib && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-newlib))
+@endif target-newlib
  
  .PHONY: check-target-newlib maybe-check-target-newlib
  maybe-check-target-newlib:
+@if target-newlib
+maybe-check-target-newlib: check-target-newlib
  
  check-target-newlib:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/newlib && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
  
+@endif target-newlib
  
  .PHONY: install-target-newlib maybe-install-target-newlib
  maybe-install-target-newlib:
+@if target-newlib
+maybe-install-target-newlib: install-target-newlib
  
  install-target-newlib: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/newlib && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
+@endif target-newlib
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-target-newlib info-target-newlib
  maybe-info-target-newlib:
+@if target-newlib
+maybe-info-target-newlib: info-target-newlib
  
  info-target-newlib: \
      configure-target-newlib 
@@ -19270,6 +22919,7 @@ info-target-newlib: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing info in $(TARGET_SUBDIR)/newlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19279,12 +22929,15 @@ info-target-newlib: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
+@endif target-newlib
  
  .PHONY: maybe-dvi-target-newlib dvi-target-newlib
  maybe-dvi-target-newlib:
+@if target-newlib
+maybe-dvi-target-newlib: dvi-target-newlib
  
  dvi-target-newlib: \
      configure-target-newlib 
@@ -19292,6 +22945,7 @@ dvi-target-newlib: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing dvi in $(TARGET_SUBDIR)/newlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19301,12 +22955,15 @@ dvi-target-newlib: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
           || exit 1
  
+@endif target-newlib
  
  .PHONY: maybe-TAGS-target-newlib TAGS-target-newlib
  maybe-TAGS-target-newlib:
+@if target-newlib
+maybe-TAGS-target-newlib: TAGS-target-newlib
  
  TAGS-target-newlib: \
      configure-target-newlib 
@@ -19314,6 +22971,7 @@ TAGS-target-newlib: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing TAGS in $(TARGET_SUBDIR)/newlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19323,12 +22981,15 @@ TAGS-target-newlib: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
+@endif target-newlib
  
  .PHONY: maybe-install-info-target-newlib install-info-target-newlib
  maybe-install-info-target-newlib:
+@if target-newlib
+maybe-install-info-target-newlib: install-info-target-newlib
  
  install-info-target-newlib: \
      configure-target-newlib \
@@ -19337,6 +22998,7 @@ install-info-target-newlib: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing install-info in $(TARGET_SUBDIR)/newlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19346,12 +23008,15 @@ install-info-target-newlib: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
+@endif target-newlib
  
  .PHONY: maybe-installcheck-target-newlib installcheck-target-newlib
  maybe-installcheck-target-newlib:
+@if target-newlib
+maybe-installcheck-target-newlib: installcheck-target-newlib
  
  installcheck-target-newlib: \
      configure-target-newlib 
@@ -19359,6 +23024,7 @@ installcheck-target-newlib: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing installcheck in $(TARGET_SUBDIR)/newlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19368,18 +23034,22 @@ installcheck-target-newlib: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
+@endif target-newlib
  
  .PHONY: maybe-mostlyclean-target-newlib mostlyclean-target-newlib
  maybe-mostlyclean-target-newlib:
+@if target-newlib
+maybe-mostlyclean-target-newlib: mostlyclean-target-newlib
  
  mostlyclean-target-newlib: 
         @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing mostlyclean in $(TARGET_SUBDIR)/newlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19389,18 +23059,22 @@ mostlyclean-target-newlib:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
+@endif target-newlib
  
  .PHONY: maybe-clean-target-newlib clean-target-newlib
  maybe-clean-target-newlib:
+@if target-newlib
+maybe-clean-target-newlib: clean-target-newlib
  
  clean-target-newlib: 
         @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing clean in $(TARGET_SUBDIR)/newlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19410,18 +23084,22 @@ clean-target-newlib:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
           || exit 1
  
+@endif target-newlib
  
  .PHONY: maybe-distclean-target-newlib distclean-target-newlib
  maybe-distclean-target-newlib:
+@if target-newlib
+maybe-distclean-target-newlib: distclean-target-newlib
  
  distclean-target-newlib: 
         @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing distclean in $(TARGET_SUBDIR)/newlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19431,18 +23109,22 @@ distclean-target-newlib:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
+@endif target-newlib
  
  .PHONY: maybe-maintainer-clean-target-newlib maintainer-clean-target-newlib
  maybe-maintainer-clean-target-newlib:
+@if target-newlib
+maybe-maintainer-clean-target-newlib: maintainer-clean-target-newlib
  
  maintainer-clean-target-newlib: 
         @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing maintainer-clean in $(TARGET_SUBDIR)/newlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19452,43 +23134,32 @@ maintainer-clean-target-newlib:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
+@endif target-newlib
  
  
-.PHONY: configure-target-libf2c maybe-configure-target-libf2c
-maybe-configure-target-libf2c:
+.PHONY: configure-target-libgfortran maybe-configure-target-libgfortran
+maybe-configure-target-libgfortran:
+@if target-libgfortran
+maybe-configure-target-libgfortran: configure-target-libgfortran
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
-$(TARGET_SUBDIR)/libf2c/multilib.out: multilib.out
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libf2c ; \
-       rm -f $(TARGET_SUBDIR)/libf2c/Makefile || : ; \
-       cp multilib.out $(TARGET_SUBDIR)/libf2c/multilib.out
+$(TARGET_SUBDIR)/libgfortran/multilib.out: multilib.out
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran ; \
+       rm -f $(TARGET_SUBDIR)/libgfortran/Makefile || : ; \
+       cp multilib.out $(TARGET_SUBDIR)/libgfortran/multilib.out
  
-configure-target-libf2c: $(TARGET_SUBDIR)/libf2c/multilib.out
-       @test ! -f $(TARGET_SUBDIR)/libf2c/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libf2c ; \
+configure-target-libgfortran: $(TARGET_SUBDIR)/libgfortran/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/libgfortran/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; 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; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       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; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo Configuring in $(TARGET_SUBDIR)/libgfortran; \
+       cd "$(TARGET_SUBDIR)/libgfortran" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) \
             topdir=$(srcdir) ;; \
@@ -19498,245 +23169,297 @@ configure-target-libf2c: $(TARGET_SUBDIR)/libf2c/multilib.out
               *) topdir="../../$(srcdir)" ;; \
             esac ;; \
         esac; \
-         srcdiroption="--srcdir=$${topdir}/libf2c"; \
-         libsrcdir="$$s/libf2c"; \
+         srcdiroption="--srcdir=$${topdir}/libgfortran"; \
+         libsrcdir="$$s/libgfortran"; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
           $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
           || exit 1
+@endif target-libgfortran
  
-.PHONY: all-target-libf2c maybe-all-target-libf2c
-maybe-all-target-libf2c:
-all-target-libf2c: configure-target-libf2c
+.PHONY: all-target-libgfortran maybe-all-target-libgfortran
+maybe-all-target-libgfortran:
+@if target-libgfortran
+TARGET-target-libgfortran=all
+maybe-all-target-libgfortran: all-target-libgfortran
+all-target-libgfortran: configure-target-libgfortran
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd $(TARGET_SUBDIR)/libf2c && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libgfortran))
+@endif target-libgfortran
  
-.PHONY: check-target-libf2c maybe-check-target-libf2c
-maybe-check-target-libf2c:
+.PHONY: check-target-libgfortran maybe-check-target-libgfortran
+maybe-check-target-libgfortran:
+@if target-libgfortran
+maybe-check-target-libgfortran: check-target-libgfortran
  
-check-target-libf2c:
+check-target-libgfortran:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd $(TARGET_SUBDIR)/libf2c && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
  
+@endif target-libgfortran
  
-.PHONY: install-target-libf2c maybe-install-target-libf2c
-maybe-install-target-libf2c:
+.PHONY: install-target-libgfortran maybe-install-target-libgfortran
+maybe-install-target-libgfortran:
+@if target-libgfortran
+maybe-install-target-libgfortran: install-target-libgfortran
  
-install-target-libf2c: installdirs
+install-target-libgfortran: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd $(TARGET_SUBDIR)/libf2c && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
+@endif target-libgfortran
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-target-libf2c info-target-libf2c
-maybe-info-target-libf2c:
+.PHONY: maybe-info-target-libgfortran info-target-libgfortran
+maybe-info-target-libgfortran:
+@if target-libgfortran
+maybe-info-target-libgfortran: info-target-libgfortran
  
-info-target-libf2c: \
-    configure-target-libf2c 
-       @[ -f $(TARGET_SUBDIR)/libf2c/Makefile ] || exit 0 ; \
+info-target-libgfortran: \
+    configure-target-libgfortran 
+       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       echo "Doing info in $(TARGET_SUBDIR)/libf2c" ; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing info in $(TARGET_SUBDIR)/libgfortran" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libf2c && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
+@endif target-libgfortran
  
-.PHONY: maybe-dvi-target-libf2c dvi-target-libf2c
-maybe-dvi-target-libf2c:
+.PHONY: maybe-dvi-target-libgfortran dvi-target-libgfortran
+maybe-dvi-target-libgfortran:
+@if target-libgfortran
+maybe-dvi-target-libgfortran: dvi-target-libgfortran
  
-dvi-target-libf2c: \
-    configure-target-libf2c 
-       @[ -f $(TARGET_SUBDIR)/libf2c/Makefile ] || exit 0 ; \
+dvi-target-libgfortran: \
+    configure-target-libgfortran 
+       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/libf2c" ; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libgfortran" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libf2c && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
           || exit 1
  
+@endif target-libgfortran
  
-.PHONY: maybe-TAGS-target-libf2c TAGS-target-libf2c
-maybe-TAGS-target-libf2c:
+.PHONY: maybe-TAGS-target-libgfortran TAGS-target-libgfortran
+maybe-TAGS-target-libgfortran:
+@if target-libgfortran
+maybe-TAGS-target-libgfortran: TAGS-target-libgfortran
  
-TAGS-target-libf2c: \
-    configure-target-libf2c 
-       @[ -f $(TARGET_SUBDIR)/libf2c/Makefile ] || exit 0 ; \
+TAGS-target-libgfortran: \
+    configure-target-libgfortran 
+       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/libf2c" ; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libgfortran" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libf2c && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
+@endif target-libgfortran
  
-.PHONY: maybe-install-info-target-libf2c install-info-target-libf2c
-maybe-install-info-target-libf2c:
+.PHONY: maybe-install-info-target-libgfortran install-info-target-libgfortran
+maybe-install-info-target-libgfortran:
+@if target-libgfortran
+maybe-install-info-target-libgfortran: install-info-target-libgfortran
  
-install-info-target-libf2c: \
-    configure-target-libf2c \
-    info-target-libf2c 
-       @[ -f $(TARGET_SUBDIR)/libf2c/Makefile ] || exit 0 ; \
+install-info-target-libgfortran: \
+    configure-target-libgfortran \
+    info-target-libgfortran 
+       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       echo "Doing install-info in $(TARGET_SUBDIR)/libf2c" ; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libgfortran" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libf2c && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
+@endif target-libgfortran
  
-.PHONY: maybe-installcheck-target-libf2c installcheck-target-libf2c
-maybe-installcheck-target-libf2c:
+.PHONY: maybe-installcheck-target-libgfortran installcheck-target-libgfortran
+maybe-installcheck-target-libgfortran:
+@if target-libgfortran
+maybe-installcheck-target-libgfortran: installcheck-target-libgfortran
  
-installcheck-target-libf2c: \
-    configure-target-libf2c 
-       @[ -f $(TARGET_SUBDIR)/libf2c/Makefile ] || exit 0 ; \
+installcheck-target-libgfortran: \
+    configure-target-libgfortran 
+       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/libf2c" ; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libgfortran" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libf2c && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
+@endif target-libgfortran
  
-.PHONY: maybe-mostlyclean-target-libf2c mostlyclean-target-libf2c
-maybe-mostlyclean-target-libf2c:
+.PHONY: maybe-mostlyclean-target-libgfortran mostlyclean-target-libgfortran
+maybe-mostlyclean-target-libgfortran:
+@if target-libgfortran
+maybe-mostlyclean-target-libgfortran: mostlyclean-target-libgfortran
  
-mostlyclean-target-libf2c: 
-       @[ -f $(TARGET_SUBDIR)/libf2c/Makefile ] || exit 0 ; \
+mostlyclean-target-libgfortran: 
+       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libf2c" ; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgfortran" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libf2c && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
+@endif target-libgfortran
  
-.PHONY: maybe-clean-target-libf2c clean-target-libf2c
-maybe-clean-target-libf2c:
+.PHONY: maybe-clean-target-libgfortran clean-target-libgfortran
+maybe-clean-target-libgfortran:
+@if target-libgfortran
+maybe-clean-target-libgfortran: clean-target-libgfortran
  
-clean-target-libf2c: 
-       @[ -f $(TARGET_SUBDIR)/libf2c/Makefile ] || exit 0 ; \
+clean-target-libgfortran: 
+       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       echo "Doing clean in $(TARGET_SUBDIR)/libf2c" ; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing clean in $(TARGET_SUBDIR)/libgfortran" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libf2c && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
           || exit 1
  
+@endif target-libgfortran
  
-.PHONY: maybe-distclean-target-libf2c distclean-target-libf2c
-maybe-distclean-target-libf2c:
+.PHONY: maybe-distclean-target-libgfortran distclean-target-libgfortran
+maybe-distclean-target-libgfortran:
+@if target-libgfortran
+maybe-distclean-target-libgfortran: distclean-target-libgfortran
  
-distclean-target-libf2c: 
-       @[ -f $(TARGET_SUBDIR)/libf2c/Makefile ] || exit 0 ; \
+distclean-target-libgfortran: 
+       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/libf2c" ; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libgfortran" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libf2c && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
+@endif target-libgfortran
  
-.PHONY: maybe-maintainer-clean-target-libf2c maintainer-clean-target-libf2c
-maybe-maintainer-clean-target-libf2c:
+.PHONY: maybe-maintainer-clean-target-libgfortran maintainer-clean-target-libgfortran
+maybe-maintainer-clean-target-libgfortran:
+@if target-libgfortran
+maybe-maintainer-clean-target-libgfortran: maintainer-clean-target-libgfortran
  
-maintainer-clean-target-libf2c: 
-       @[ -f $(TARGET_SUBDIR)/libf2c/Makefile ] || exit 0 ; \
+maintainer-clean-target-libgfortran: 
+       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libf2c" ; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgfortran" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libf2c && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
+@endif target-libgfortran
  
  
  .PHONY: configure-target-libobjc maybe-configure-target-libobjc
  maybe-configure-target-libobjc:
+@if target-libobjc
+maybe-configure-target-libobjc: configure-target-libobjc
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/libobjc/multilib.out: multilib.out
@@ -19750,21 +23473,7 @@ configure-target-libobjc: $(TARGET_SUBDIR)/libobjc/multilib.out
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; 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; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       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; \
+       $(NORMAL_TARGET_EXPORTS) \
         echo Configuring in $(TARGET_SUBDIR)/libobjc; \
         cd "$(TARGET_SUBDIR)/libobjc" || exit 1; \
         case $(srcdir) in \
@@ -19781,44 +23490,60 @@ configure-target-libobjc: $(TARGET_SUBDIR)/libobjc/multilib.out
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
           $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
           || exit 1
+@endif target-libobjc
  
  .PHONY: all-target-libobjc maybe-all-target-libobjc
  maybe-all-target-libobjc:
+@if target-libobjc
+TARGET-target-libobjc=all
+maybe-all-target-libobjc: all-target-libobjc
  all-target-libobjc: configure-target-libobjc
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libobjc && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libobjc))
+@endif target-libobjc
  
  .PHONY: check-target-libobjc maybe-check-target-libobjc
  maybe-check-target-libobjc:
+@if target-libobjc
+maybe-check-target-libobjc: check-target-libobjc
  
  check-target-libobjc:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libobjc && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
  
+@endif target-libobjc
  
  .PHONY: install-target-libobjc maybe-install-target-libobjc
  maybe-install-target-libobjc:
+@if target-libobjc
+maybe-install-target-libobjc: install-target-libobjc
  
  install-target-libobjc: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libobjc && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
+@endif target-libobjc
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-target-libobjc info-target-libobjc
  maybe-info-target-libobjc:
+@if target-libobjc
+maybe-info-target-libobjc: info-target-libobjc
  
  info-target-libobjc: \
      configure-target-libobjc 
@@ -19826,6 +23551,7 @@ info-target-libobjc: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing info in $(TARGET_SUBDIR)/libobjc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19835,12 +23561,15 @@ info-target-libobjc: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
+@endif target-libobjc
  
  .PHONY: maybe-dvi-target-libobjc dvi-target-libobjc
  maybe-dvi-target-libobjc:
+@if target-libobjc
+maybe-dvi-target-libobjc: dvi-target-libobjc
  
  dvi-target-libobjc: \
      configure-target-libobjc 
@@ -19848,6 +23577,7 @@ dvi-target-libobjc: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing dvi in $(TARGET_SUBDIR)/libobjc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19857,12 +23587,15 @@ dvi-target-libobjc: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
           || exit 1
  
+@endif target-libobjc
  
  .PHONY: maybe-TAGS-target-libobjc TAGS-target-libobjc
  maybe-TAGS-target-libobjc:
+@if target-libobjc
+maybe-TAGS-target-libobjc: TAGS-target-libobjc
  
  TAGS-target-libobjc: \
      configure-target-libobjc 
@@ -19870,6 +23603,7 @@ TAGS-target-libobjc: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing TAGS in $(TARGET_SUBDIR)/libobjc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19879,12 +23613,15 @@ TAGS-target-libobjc: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
+@endif target-libobjc
  
  .PHONY: maybe-install-info-target-libobjc install-info-target-libobjc
  maybe-install-info-target-libobjc:
+@if target-libobjc
+maybe-install-info-target-libobjc: install-info-target-libobjc
  
  install-info-target-libobjc: \
      configure-target-libobjc \
@@ -19893,6 +23630,7 @@ install-info-target-libobjc: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing install-info in $(TARGET_SUBDIR)/libobjc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19902,12 +23640,15 @@ install-info-target-libobjc: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
+@endif target-libobjc
  
  .PHONY: maybe-installcheck-target-libobjc installcheck-target-libobjc
  maybe-installcheck-target-libobjc:
+@if target-libobjc
+maybe-installcheck-target-libobjc: installcheck-target-libobjc
  
  installcheck-target-libobjc: \
      configure-target-libobjc 
@@ -19915,6 +23656,7 @@ installcheck-target-libobjc: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing installcheck in $(TARGET_SUBDIR)/libobjc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19924,18 +23666,22 @@ installcheck-target-libobjc: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
+@endif target-libobjc
  
  .PHONY: maybe-mostlyclean-target-libobjc mostlyclean-target-libobjc
  maybe-mostlyclean-target-libobjc:
+@if target-libobjc
+maybe-mostlyclean-target-libobjc: mostlyclean-target-libobjc
  
  mostlyclean-target-libobjc: 
         @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing mostlyclean in $(TARGET_SUBDIR)/libobjc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19945,18 +23691,22 @@ mostlyclean-target-libobjc:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
+@endif target-libobjc
  
  .PHONY: maybe-clean-target-libobjc clean-target-libobjc
  maybe-clean-target-libobjc:
+@if target-libobjc
+maybe-clean-target-libobjc: clean-target-libobjc
  
  clean-target-libobjc: 
         @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing clean in $(TARGET_SUBDIR)/libobjc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19966,18 +23716,22 @@ clean-target-libobjc:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
           || exit 1
  
+@endif target-libobjc
  
  .PHONY: maybe-distclean-target-libobjc distclean-target-libobjc
  maybe-distclean-target-libobjc:
+@if target-libobjc
+maybe-distclean-target-libobjc: distclean-target-libobjc
  
  distclean-target-libobjc: 
         @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing distclean in $(TARGET_SUBDIR)/libobjc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -19987,18 +23741,22 @@ distclean-target-libobjc:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
+@endif target-libobjc
  
  .PHONY: maybe-maintainer-clean-target-libobjc maintainer-clean-target-libobjc
  maybe-maintainer-clean-target-libobjc:
+@if target-libobjc
+maybe-maintainer-clean-target-libobjc: maintainer-clean-target-libobjc
  
  maintainer-clean-target-libobjc: 
         @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libobjc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20008,13 +23766,16 @@ maintainer-clean-target-libobjc:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
+@endif target-libobjc
  
  
  .PHONY: configure-target-libtermcap maybe-configure-target-libtermcap
  maybe-configure-target-libtermcap:
+@if target-libtermcap
+maybe-configure-target-libtermcap: configure-target-libtermcap
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/libtermcap/multilib.out: multilib.out
@@ -20028,21 +23789,7 @@ configure-target-libtermcap: $(TARGET_SUBDIR)/libtermcap/multilib.out
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; 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; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       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; \
+       $(NORMAL_TARGET_EXPORTS) \
         echo Configuring in $(TARGET_SUBDIR)/libtermcap; \
         cd "$(TARGET_SUBDIR)/libtermcap" || exit 1; \
         case $(srcdir) in \
@@ -20081,40 +23828,55 @@ configure-target-libtermcap: $(TARGET_SUBDIR)/libtermcap/multilib.out
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
           $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
           || exit 1
+@endif target-libtermcap
  
  .PHONY: all-target-libtermcap maybe-all-target-libtermcap
  maybe-all-target-libtermcap:
+@if target-libtermcap
+TARGET-target-libtermcap=all
+maybe-all-target-libtermcap: all-target-libtermcap
  all-target-libtermcap: configure-target-libtermcap
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libtermcap && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libtermcap))
+@endif target-libtermcap
  
  .PHONY: check-target-libtermcap maybe-check-target-libtermcap
  maybe-check-target-libtermcap:
+@if target-libtermcap
+maybe-check-target-libtermcap: check-target-libtermcap
  
  # Dummy target for uncheckable module.
  check-target-libtermcap:
  
+@endif target-libtermcap
  
  .PHONY: install-target-libtermcap maybe-install-target-libtermcap
  maybe-install-target-libtermcap:
+@if target-libtermcap
+maybe-install-target-libtermcap: install-target-libtermcap
  
  install-target-libtermcap: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libtermcap && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
+@endif target-libtermcap
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-target-libtermcap info-target-libtermcap
  maybe-info-target-libtermcap:
+@if target-libtermcap
+maybe-info-target-libtermcap: info-target-libtermcap
  
  info-target-libtermcap: \
      configure-target-libtermcap 
@@ -20122,6 +23884,7 @@ info-target-libtermcap: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing info in $(TARGET_SUBDIR)/libtermcap" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20131,12 +23894,15 @@ info-target-libtermcap: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
+@endif target-libtermcap
  
  .PHONY: maybe-dvi-target-libtermcap dvi-target-libtermcap
  maybe-dvi-target-libtermcap:
+@if target-libtermcap
+maybe-dvi-target-libtermcap: dvi-target-libtermcap
  
  dvi-target-libtermcap: \
      configure-target-libtermcap 
@@ -20144,6 +23910,7 @@ dvi-target-libtermcap: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing dvi in $(TARGET_SUBDIR)/libtermcap" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20153,12 +23920,15 @@ dvi-target-libtermcap: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
           || exit 1
  
+@endif target-libtermcap
  
  .PHONY: maybe-TAGS-target-libtermcap TAGS-target-libtermcap
  maybe-TAGS-target-libtermcap:
+@if target-libtermcap
+maybe-TAGS-target-libtermcap: TAGS-target-libtermcap
  
  TAGS-target-libtermcap: \
      configure-target-libtermcap 
@@ -20166,6 +23936,7 @@ TAGS-target-libtermcap: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing TAGS in $(TARGET_SUBDIR)/libtermcap" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20175,12 +23946,15 @@ TAGS-target-libtermcap: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
+@endif target-libtermcap
  
  .PHONY: maybe-install-info-target-libtermcap install-info-target-libtermcap
  maybe-install-info-target-libtermcap:
+@if target-libtermcap
+maybe-install-info-target-libtermcap: install-info-target-libtermcap
  
  install-info-target-libtermcap: \
      configure-target-libtermcap \
@@ -20189,6 +23963,7 @@ install-info-target-libtermcap: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing install-info in $(TARGET_SUBDIR)/libtermcap" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20198,12 +23973,15 @@ install-info-target-libtermcap: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
+@endif target-libtermcap
  
  .PHONY: maybe-installcheck-target-libtermcap installcheck-target-libtermcap
  maybe-installcheck-target-libtermcap:
+@if target-libtermcap
+maybe-installcheck-target-libtermcap: installcheck-target-libtermcap
  
  installcheck-target-libtermcap: \
      configure-target-libtermcap 
@@ -20211,6 +23989,7 @@ installcheck-target-libtermcap: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing installcheck in $(TARGET_SUBDIR)/libtermcap" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20220,41 +23999,56 @@ installcheck-target-libtermcap: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
+@endif target-libtermcap
  
  .PHONY: maybe-mostlyclean-target-libtermcap mostlyclean-target-libtermcap
  maybe-mostlyclean-target-libtermcap:
+@if target-libtermcap
+maybe-mostlyclean-target-libtermcap: mostlyclean-target-libtermcap
  
  # libtermcap doesn't support mostlyclean.
  mostlyclean-target-libtermcap:
  
+@endif target-libtermcap
  
  .PHONY: maybe-clean-target-libtermcap clean-target-libtermcap
  maybe-clean-target-libtermcap:
+@if target-libtermcap
+maybe-clean-target-libtermcap: clean-target-libtermcap
  
  # libtermcap doesn't support clean.
  clean-target-libtermcap:
  
+@endif target-libtermcap
  
  .PHONY: maybe-distclean-target-libtermcap distclean-target-libtermcap
  maybe-distclean-target-libtermcap:
+@if target-libtermcap
+maybe-distclean-target-libtermcap: distclean-target-libtermcap
  
  # libtermcap doesn't support distclean.
  distclean-target-libtermcap:
  
+@endif target-libtermcap
  
  .PHONY: maybe-maintainer-clean-target-libtermcap maintainer-clean-target-libtermcap
  maybe-maintainer-clean-target-libtermcap:
+@if target-libtermcap
+maybe-maintainer-clean-target-libtermcap: maintainer-clean-target-libtermcap
  
  # libtermcap doesn't support maintainer-clean.
  maintainer-clean-target-libtermcap:
  
+@endif target-libtermcap
  
  
  .PHONY: configure-target-winsup maybe-configure-target-winsup
  maybe-configure-target-winsup:
+@if target-winsup
+maybe-configure-target-winsup: configure-target-winsup
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/winsup/multilib.out: multilib.out
@@ -20268,21 +24062,7 @@ configure-target-winsup: $(TARGET_SUBDIR)/winsup/multilib.out
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; 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; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       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; \
+       $(NORMAL_TARGET_EXPORTS) \
         echo Configuring in $(TARGET_SUBDIR)/winsup; \
         cd "$(TARGET_SUBDIR)/winsup" || exit 1; \
         case $(srcdir) in \
@@ -20299,44 +24079,60 @@ configure-target-winsup: $(TARGET_SUBDIR)/winsup/multilib.out
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
           $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
           || exit 1
+@endif target-winsup
  
  .PHONY: all-target-winsup maybe-all-target-winsup
  maybe-all-target-winsup:
+@if target-winsup
+TARGET-target-winsup=all
+maybe-all-target-winsup: all-target-winsup
  all-target-winsup: configure-target-winsup
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/winsup && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-winsup))
+@endif target-winsup
  
  .PHONY: check-target-winsup maybe-check-target-winsup
  maybe-check-target-winsup:
+@if target-winsup
+maybe-check-target-winsup: check-target-winsup
  
  check-target-winsup:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/winsup && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
  
+@endif target-winsup
  
  .PHONY: install-target-winsup maybe-install-target-winsup
  maybe-install-target-winsup:
+@if target-winsup
+maybe-install-target-winsup: install-target-winsup
  
  install-target-winsup: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/winsup && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
+@endif target-winsup
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-target-winsup info-target-winsup
  maybe-info-target-winsup:
+@if target-winsup
+maybe-info-target-winsup: info-target-winsup
  
  info-target-winsup: \
      configure-target-winsup 
@@ -20344,6 +24140,7 @@ info-target-winsup: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing info in $(TARGET_SUBDIR)/winsup" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20353,12 +24150,15 @@ info-target-winsup: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
+@endif target-winsup
  
  .PHONY: maybe-dvi-target-winsup dvi-target-winsup
  maybe-dvi-target-winsup:
+@if target-winsup
+maybe-dvi-target-winsup: dvi-target-winsup
  
  dvi-target-winsup: \
      configure-target-winsup 
@@ -20366,6 +24166,7 @@ dvi-target-winsup: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing dvi in $(TARGET_SUBDIR)/winsup" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20375,12 +24176,15 @@ dvi-target-winsup: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
           || exit 1
  
+@endif target-winsup
  
  .PHONY: maybe-TAGS-target-winsup TAGS-target-winsup
  maybe-TAGS-target-winsup:
+@if target-winsup
+maybe-TAGS-target-winsup: TAGS-target-winsup
  
  TAGS-target-winsup: \
      configure-target-winsup 
@@ -20388,6 +24192,7 @@ TAGS-target-winsup: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing TAGS in $(TARGET_SUBDIR)/winsup" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20397,12 +24202,15 @@ TAGS-target-winsup: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
+@endif target-winsup
  
  .PHONY: maybe-install-info-target-winsup install-info-target-winsup
  maybe-install-info-target-winsup:
+@if target-winsup
+maybe-install-info-target-winsup: install-info-target-winsup
  
  install-info-target-winsup: \
      configure-target-winsup \
@@ -20411,6 +24219,7 @@ install-info-target-winsup: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing install-info in $(TARGET_SUBDIR)/winsup" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20420,12 +24229,15 @@ install-info-target-winsup: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
+@endif target-winsup
  
  .PHONY: maybe-installcheck-target-winsup installcheck-target-winsup
  maybe-installcheck-target-winsup:
+@if target-winsup
+maybe-installcheck-target-winsup: installcheck-target-winsup
  
  installcheck-target-winsup: \
      configure-target-winsup 
@@ -20433,6 +24245,7 @@ installcheck-target-winsup: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing installcheck in $(TARGET_SUBDIR)/winsup" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20442,18 +24255,22 @@ installcheck-target-winsup: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
+@endif target-winsup
  
  .PHONY: maybe-mostlyclean-target-winsup mostlyclean-target-winsup
  maybe-mostlyclean-target-winsup:
+@if target-winsup
+maybe-mostlyclean-target-winsup: mostlyclean-target-winsup
  
  mostlyclean-target-winsup: 
         @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing mostlyclean in $(TARGET_SUBDIR)/winsup" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20463,18 +24280,22 @@ mostlyclean-target-winsup:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
+@endif target-winsup
  
  .PHONY: maybe-clean-target-winsup clean-target-winsup
  maybe-clean-target-winsup:
+@if target-winsup
+maybe-clean-target-winsup: clean-target-winsup
  
  clean-target-winsup: 
         @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing clean in $(TARGET_SUBDIR)/winsup" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20484,18 +24305,22 @@ clean-target-winsup:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
           || exit 1
  
+@endif target-winsup
  
  .PHONY: maybe-distclean-target-winsup distclean-target-winsup
  maybe-distclean-target-winsup:
+@if target-winsup
+maybe-distclean-target-winsup: distclean-target-winsup
  
  distclean-target-winsup: 
         @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing distclean in $(TARGET_SUBDIR)/winsup" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20505,18 +24330,22 @@ distclean-target-winsup:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
+@endif target-winsup
  
  .PHONY: maybe-maintainer-clean-target-winsup maintainer-clean-target-winsup
  maybe-maintainer-clean-target-winsup:
+@if target-winsup
+maybe-maintainer-clean-target-winsup: maintainer-clean-target-winsup
  
  maintainer-clean-target-winsup: 
         @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing maintainer-clean in $(TARGET_SUBDIR)/winsup" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20526,13 +24355,16 @@ maintainer-clean-target-winsup:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
+@endif target-winsup
  
  
  .PHONY: configure-target-libgloss maybe-configure-target-libgloss
  maybe-configure-target-libgloss:
+@if target-libgloss
+maybe-configure-target-libgloss: configure-target-libgloss
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/libgloss/multilib.out: multilib.out
@@ -20546,21 +24378,7 @@ configure-target-libgloss: $(TARGET_SUBDIR)/libgloss/multilib.out
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; 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; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       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; \
+       $(NORMAL_TARGET_EXPORTS) \
         echo Configuring in $(TARGET_SUBDIR)/libgloss; \
         cd "$(TARGET_SUBDIR)/libgloss" || exit 1; \
         case $(srcdir) in \
@@ -20577,40 +24395,55 @@ configure-target-libgloss: $(TARGET_SUBDIR)/libgloss/multilib.out
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
           $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
           || exit 1
+@endif target-libgloss
  
  .PHONY: all-target-libgloss maybe-all-target-libgloss
  maybe-all-target-libgloss:
+@if target-libgloss
+TARGET-target-libgloss=all
+maybe-all-target-libgloss: all-target-libgloss
  all-target-libgloss: configure-target-libgloss
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libgloss && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libgloss))
+@endif target-libgloss
  
  .PHONY: check-target-libgloss maybe-check-target-libgloss
  maybe-check-target-libgloss:
+@if target-libgloss
+maybe-check-target-libgloss: check-target-libgloss
  
  # Dummy target for uncheckable module.
  check-target-libgloss:
  
+@endif target-libgloss
  
  .PHONY: install-target-libgloss maybe-install-target-libgloss
  maybe-install-target-libgloss:
+@if target-libgloss
+maybe-install-target-libgloss: install-target-libgloss
  
  install-target-libgloss: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libgloss && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
+@endif target-libgloss
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-target-libgloss info-target-libgloss
  maybe-info-target-libgloss:
+@if target-libgloss
+maybe-info-target-libgloss: info-target-libgloss
  
  info-target-libgloss: \
      configure-target-libgloss 
@@ -20618,6 +24451,7 @@ info-target-libgloss: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing info in $(TARGET_SUBDIR)/libgloss" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20627,12 +24461,15 @@ info-target-libgloss: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
+@endif target-libgloss
  
  .PHONY: maybe-dvi-target-libgloss dvi-target-libgloss
  maybe-dvi-target-libgloss:
+@if target-libgloss
+maybe-dvi-target-libgloss: dvi-target-libgloss
  
  dvi-target-libgloss: \
      configure-target-libgloss 
@@ -20640,6 +24477,7 @@ dvi-target-libgloss: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing dvi in $(TARGET_SUBDIR)/libgloss" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20649,12 +24487,15 @@ dvi-target-libgloss: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
           || exit 1
  
+@endif target-libgloss
  
  .PHONY: maybe-TAGS-target-libgloss TAGS-target-libgloss
  maybe-TAGS-target-libgloss:
+@if target-libgloss
+maybe-TAGS-target-libgloss: TAGS-target-libgloss
  
  TAGS-target-libgloss: \
      configure-target-libgloss 
@@ -20662,6 +24503,7 @@ TAGS-target-libgloss: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing TAGS in $(TARGET_SUBDIR)/libgloss" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20671,12 +24513,15 @@ TAGS-target-libgloss: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
+@endif target-libgloss
  
  .PHONY: maybe-install-info-target-libgloss install-info-target-libgloss
  maybe-install-info-target-libgloss:
+@if target-libgloss
+maybe-install-info-target-libgloss: install-info-target-libgloss
  
  install-info-target-libgloss: \
      configure-target-libgloss \
@@ -20685,6 +24530,7 @@ install-info-target-libgloss: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing install-info in $(TARGET_SUBDIR)/libgloss" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20694,12 +24540,15 @@ install-info-target-libgloss: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
+@endif target-libgloss
  
  .PHONY: maybe-installcheck-target-libgloss installcheck-target-libgloss
  maybe-installcheck-target-libgloss:
+@if target-libgloss
+maybe-installcheck-target-libgloss: installcheck-target-libgloss
  
  installcheck-target-libgloss: \
      configure-target-libgloss 
@@ -20707,6 +24556,7 @@ installcheck-target-libgloss: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing installcheck in $(TARGET_SUBDIR)/libgloss" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20716,18 +24566,22 @@ installcheck-target-libgloss: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
+@endif target-libgloss
  
  .PHONY: maybe-mostlyclean-target-libgloss mostlyclean-target-libgloss
  maybe-mostlyclean-target-libgloss:
+@if target-libgloss
+maybe-mostlyclean-target-libgloss: mostlyclean-target-libgloss
  
  mostlyclean-target-libgloss: 
         @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgloss" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20737,18 +24591,22 @@ mostlyclean-target-libgloss:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
+@endif target-libgloss
  
  .PHONY: maybe-clean-target-libgloss clean-target-libgloss
  maybe-clean-target-libgloss:
+@if target-libgloss
+maybe-clean-target-libgloss: clean-target-libgloss
  
  clean-target-libgloss: 
         @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing clean in $(TARGET_SUBDIR)/libgloss" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20758,18 +24616,22 @@ clean-target-libgloss:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
           || exit 1
  
+@endif target-libgloss
  
  .PHONY: maybe-distclean-target-libgloss distclean-target-libgloss
  maybe-distclean-target-libgloss:
+@if target-libgloss
+maybe-distclean-target-libgloss: distclean-target-libgloss
  
  distclean-target-libgloss: 
         @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing distclean in $(TARGET_SUBDIR)/libgloss" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20779,18 +24641,22 @@ distclean-target-libgloss:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
+@endif target-libgloss
  
  .PHONY: maybe-maintainer-clean-target-libgloss maintainer-clean-target-libgloss
  maybe-maintainer-clean-target-libgloss:
+@if target-libgloss
+maybe-maintainer-clean-target-libgloss: maintainer-clean-target-libgloss
  
  maintainer-clean-target-libgloss: 
         @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgloss" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20800,13 +24666,16 @@ maintainer-clean-target-libgloss:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
+@endif target-libgloss
  
  
  .PHONY: configure-target-libiberty maybe-configure-target-libiberty
  maybe-configure-target-libiberty:
+@if target-libiberty
+maybe-configure-target-libiberty: configure-target-libiberty
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/libiberty/multilib.out: multilib.out
@@ -20820,21 +24689,7 @@ configure-target-libiberty: $(TARGET_SUBDIR)/libiberty/multilib.out
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; 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; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       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; \
+       $(NORMAL_TARGET_EXPORTS) \
         echo Configuring in $(TARGET_SUBDIR)/libiberty; \
         cd "$(TARGET_SUBDIR)/libiberty" || exit 1; \
         case $(srcdir) in \
@@ -20851,44 +24706,60 @@ configure-target-libiberty: $(TARGET_SUBDIR)/libiberty/multilib.out
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
           $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
           || exit 1
+@endif target-libiberty
  
  .PHONY: all-target-libiberty maybe-all-target-libiberty
  maybe-all-target-libiberty:
+@if target-libiberty
+TARGET-target-libiberty=all
+maybe-all-target-libiberty: all-target-libiberty
  all-target-libiberty: configure-target-libiberty
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libiberty && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libiberty))
+@endif target-libiberty
  
  .PHONY: check-target-libiberty maybe-check-target-libiberty
  maybe-check-target-libiberty:
+@if target-libiberty
+maybe-check-target-libiberty: check-target-libiberty
  
  check-target-libiberty:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libiberty && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
  
+@endif target-libiberty
  
  .PHONY: install-target-libiberty maybe-install-target-libiberty
  maybe-install-target-libiberty:
+@if target-libiberty
+maybe-install-target-libiberty: install-target-libiberty
  
  install-target-libiberty: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libiberty && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
+@endif target-libiberty
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-target-libiberty info-target-libiberty
  maybe-info-target-libiberty:
+@if target-libiberty
+maybe-info-target-libiberty: info-target-libiberty
  
  info-target-libiberty: \
      configure-target-libiberty 
@@ -20896,6 +24767,7 @@ info-target-libiberty: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing info in $(TARGET_SUBDIR)/libiberty" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20905,12 +24777,15 @@ info-target-libiberty: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
+@endif target-libiberty
  
  .PHONY: maybe-dvi-target-libiberty dvi-target-libiberty
  maybe-dvi-target-libiberty:
+@if target-libiberty
+maybe-dvi-target-libiberty: dvi-target-libiberty
  
  dvi-target-libiberty: \
      configure-target-libiberty 
@@ -20918,6 +24793,7 @@ dvi-target-libiberty: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing dvi in $(TARGET_SUBDIR)/libiberty" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20927,12 +24803,15 @@ dvi-target-libiberty: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
           || exit 1
  
+@endif target-libiberty
  
  .PHONY: maybe-TAGS-target-libiberty TAGS-target-libiberty
  maybe-TAGS-target-libiberty:
+@if target-libiberty
+maybe-TAGS-target-libiberty: TAGS-target-libiberty
  
  TAGS-target-libiberty: \
      configure-target-libiberty 
@@ -20940,6 +24819,7 @@ TAGS-target-libiberty: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing TAGS in $(TARGET_SUBDIR)/libiberty" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20949,12 +24829,15 @@ TAGS-target-libiberty: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
+@endif target-libiberty
  
  .PHONY: maybe-install-info-target-libiberty install-info-target-libiberty
  maybe-install-info-target-libiberty:
+@if target-libiberty
+maybe-install-info-target-libiberty: install-info-target-libiberty
  
  install-info-target-libiberty: \
      configure-target-libiberty \
@@ -20963,6 +24846,7 @@ install-info-target-libiberty: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing install-info in $(TARGET_SUBDIR)/libiberty" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20972,12 +24856,15 @@ install-info-target-libiberty: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
+@endif target-libiberty
  
  .PHONY: maybe-installcheck-target-libiberty installcheck-target-libiberty
  maybe-installcheck-target-libiberty:
+@if target-libiberty
+maybe-installcheck-target-libiberty: installcheck-target-libiberty
  
  installcheck-target-libiberty: \
      configure-target-libiberty 
@@ -20985,6 +24872,7 @@ installcheck-target-libiberty: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing installcheck in $(TARGET_SUBDIR)/libiberty" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -20994,18 +24882,22 @@ installcheck-target-libiberty: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
+@endif target-libiberty
  
  .PHONY: maybe-mostlyclean-target-libiberty mostlyclean-target-libiberty
  maybe-mostlyclean-target-libiberty:
+@if target-libiberty
+maybe-mostlyclean-target-libiberty: mostlyclean-target-libiberty
  
  mostlyclean-target-libiberty: 
         @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing mostlyclean in $(TARGET_SUBDIR)/libiberty" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21015,18 +24907,22 @@ mostlyclean-target-libiberty:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
+@endif target-libiberty
  
  .PHONY: maybe-clean-target-libiberty clean-target-libiberty
  maybe-clean-target-libiberty:
+@if target-libiberty
+maybe-clean-target-libiberty: clean-target-libiberty
  
  clean-target-libiberty: 
         @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing clean in $(TARGET_SUBDIR)/libiberty" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21036,18 +24932,22 @@ clean-target-libiberty:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
           || exit 1
  
+@endif target-libiberty
  
  .PHONY: maybe-distclean-target-libiberty distclean-target-libiberty
  maybe-distclean-target-libiberty:
+@if target-libiberty
+maybe-distclean-target-libiberty: distclean-target-libiberty
  
  distclean-target-libiberty: 
         @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing distclean in $(TARGET_SUBDIR)/libiberty" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21057,18 +24957,22 @@ distclean-target-libiberty:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
+@endif target-libiberty
  
  .PHONY: maybe-maintainer-clean-target-libiberty maintainer-clean-target-libiberty
  maybe-maintainer-clean-target-libiberty:
+@if target-libiberty
+maybe-maintainer-clean-target-libiberty: maintainer-clean-target-libiberty
  
  maintainer-clean-target-libiberty: 
         @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libiberty" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21078,13 +24982,16 @@ maintainer-clean-target-libiberty:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
+@endif target-libiberty
  
  
  .PHONY: configure-target-gperf maybe-configure-target-gperf
  maybe-configure-target-gperf:
+@if target-gperf
+maybe-configure-target-gperf: configure-target-gperf
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/gperf/multilib.out: multilib.out
@@ -21098,21 +25005,7 @@ configure-target-gperf: $(TARGET_SUBDIR)/gperf/multilib.out
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; 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; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       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; \
+       $(NORMAL_TARGET_EXPORTS) \
         echo Configuring in $(TARGET_SUBDIR)/gperf; \
         cd "$(TARGET_SUBDIR)/gperf" || exit 1; \
         case $(srcdir) in \
@@ -21129,44 +25022,60 @@ configure-target-gperf: $(TARGET_SUBDIR)/gperf/multilib.out
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
           $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
           || exit 1
+@endif target-gperf
  
  .PHONY: all-target-gperf maybe-all-target-gperf
  maybe-all-target-gperf:
+@if target-gperf
+TARGET-target-gperf=all
+maybe-all-target-gperf: all-target-gperf
  all-target-gperf: configure-target-gperf
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/gperf && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-gperf))
+@endif target-gperf
  
  .PHONY: check-target-gperf maybe-check-target-gperf
  maybe-check-target-gperf:
+@if target-gperf
+maybe-check-target-gperf: check-target-gperf
  
  check-target-gperf:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/gperf && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
  
+@endif target-gperf
  
  .PHONY: install-target-gperf maybe-install-target-gperf
  maybe-install-target-gperf:
+@if target-gperf
+maybe-install-target-gperf: install-target-gperf
  
  install-target-gperf: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/gperf && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
+@endif target-gperf
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-target-gperf info-target-gperf
  maybe-info-target-gperf:
+@if target-gperf
+maybe-info-target-gperf: info-target-gperf
  
  info-target-gperf: \
      configure-target-gperf 
@@ -21174,6 +25083,7 @@ info-target-gperf: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing info in $(TARGET_SUBDIR)/gperf" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21183,12 +25093,15 @@ info-target-gperf: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
+@endif target-gperf
  
  .PHONY: maybe-dvi-target-gperf dvi-target-gperf
  maybe-dvi-target-gperf:
+@if target-gperf
+maybe-dvi-target-gperf: dvi-target-gperf
  
  dvi-target-gperf: \
      configure-target-gperf 
@@ -21196,6 +25109,7 @@ dvi-target-gperf: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing dvi in $(TARGET_SUBDIR)/gperf" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21205,12 +25119,15 @@ dvi-target-gperf: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
           || exit 1
  
+@endif target-gperf
  
  .PHONY: maybe-TAGS-target-gperf TAGS-target-gperf
  maybe-TAGS-target-gperf:
+@if target-gperf
+maybe-TAGS-target-gperf: TAGS-target-gperf
  
  TAGS-target-gperf: \
      configure-target-gperf 
@@ -21218,6 +25135,7 @@ TAGS-target-gperf: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing TAGS in $(TARGET_SUBDIR)/gperf" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21227,12 +25145,15 @@ TAGS-target-gperf: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
+@endif target-gperf
  
  .PHONY: maybe-install-info-target-gperf install-info-target-gperf
  maybe-install-info-target-gperf:
+@if target-gperf
+maybe-install-info-target-gperf: install-info-target-gperf
  
  install-info-target-gperf: \
      configure-target-gperf \
@@ -21241,6 +25162,7 @@ install-info-target-gperf: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing install-info in $(TARGET_SUBDIR)/gperf" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21250,12 +25172,15 @@ install-info-target-gperf: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
+@endif target-gperf
  
  .PHONY: maybe-installcheck-target-gperf installcheck-target-gperf
  maybe-installcheck-target-gperf:
+@if target-gperf
+maybe-installcheck-target-gperf: installcheck-target-gperf
  
  installcheck-target-gperf: \
      configure-target-gperf 
@@ -21263,6 +25188,7 @@ installcheck-target-gperf: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing installcheck in $(TARGET_SUBDIR)/gperf" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21272,18 +25198,22 @@ installcheck-target-gperf: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
+@endif target-gperf
  
  .PHONY: maybe-mostlyclean-target-gperf mostlyclean-target-gperf
  maybe-mostlyclean-target-gperf:
+@if target-gperf
+maybe-mostlyclean-target-gperf: mostlyclean-target-gperf
  
  mostlyclean-target-gperf: 
         @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing mostlyclean in $(TARGET_SUBDIR)/gperf" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21293,18 +25223,22 @@ mostlyclean-target-gperf:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
+@endif target-gperf
  
  .PHONY: maybe-clean-target-gperf clean-target-gperf
  maybe-clean-target-gperf:
+@if target-gperf
+maybe-clean-target-gperf: clean-target-gperf
  
  clean-target-gperf: 
         @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing clean in $(TARGET_SUBDIR)/gperf" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21314,18 +25248,22 @@ clean-target-gperf:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
           || exit 1
  
+@endif target-gperf
  
  .PHONY: maybe-distclean-target-gperf distclean-target-gperf
  maybe-distclean-target-gperf:
+@if target-gperf
+maybe-distclean-target-gperf: distclean-target-gperf
  
  distclean-target-gperf: 
         @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing distclean in $(TARGET_SUBDIR)/gperf" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21335,18 +25273,22 @@ distclean-target-gperf:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
+@endif target-gperf
  
  .PHONY: maybe-maintainer-clean-target-gperf maintainer-clean-target-gperf
  maybe-maintainer-clean-target-gperf:
+@if target-gperf
+maybe-maintainer-clean-target-gperf: maintainer-clean-target-gperf
  
  maintainer-clean-target-gperf: 
         @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing maintainer-clean in $(TARGET_SUBDIR)/gperf" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21356,13 +25298,16 @@ maintainer-clean-target-gperf:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
+@endif target-gperf
  
  
  .PHONY: configure-target-examples maybe-configure-target-examples
  maybe-configure-target-examples:
+@if target-examples
+maybe-configure-target-examples: configure-target-examples
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/examples/multilib.out: multilib.out
@@ -21376,21 +25321,7 @@ configure-target-examples: $(TARGET_SUBDIR)/examples/multilib.out
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; 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; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       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; \
+       $(NORMAL_TARGET_EXPORTS) \
         echo Configuring in $(TARGET_SUBDIR)/examples; \
         cd "$(TARGET_SUBDIR)/examples" || exit 1; \
         case $(srcdir) in \
@@ -21407,36 +25338,50 @@ configure-target-examples: $(TARGET_SUBDIR)/examples/multilib.out
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
           $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
           || exit 1
+@endif target-examples
  
  .PHONY: all-target-examples maybe-all-target-examples
  maybe-all-target-examples:
+@if target-examples
+TARGET-target-examples=all
+maybe-all-target-examples: all-target-examples
  all-target-examples: configure-target-examples
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/examples && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-examples))
+@endif target-examples
  
  .PHONY: check-target-examples maybe-check-target-examples
  maybe-check-target-examples:
+@if target-examples
+maybe-check-target-examples: check-target-examples
  
  # Dummy target for uncheckable module.
  check-target-examples:
  
+@endif target-examples
  
  .PHONY: install-target-examples maybe-install-target-examples
  maybe-install-target-examples:
+@if target-examples
+maybe-install-target-examples: install-target-examples
  
  # Dummy target for uninstallable.
  install-target-examples:
  
+@endif target-examples
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-target-examples info-target-examples
  maybe-info-target-examples:
+@if target-examples
+maybe-info-target-examples: info-target-examples
  
  info-target-examples: \
      configure-target-examples 
@@ -21444,6 +25389,7 @@ info-target-examples: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing info in $(TARGET_SUBDIR)/examples" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21453,12 +25399,15 @@ info-target-examples: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
+@endif target-examples
  
  .PHONY: maybe-dvi-target-examples dvi-target-examples
  maybe-dvi-target-examples:
+@if target-examples
+maybe-dvi-target-examples: dvi-target-examples
  
  dvi-target-examples: \
      configure-target-examples 
@@ -21466,6 +25415,7 @@ dvi-target-examples: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing dvi in $(TARGET_SUBDIR)/examples" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21475,12 +25425,15 @@ dvi-target-examples: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
           || exit 1
  
+@endif target-examples
  
  .PHONY: maybe-TAGS-target-examples TAGS-target-examples
  maybe-TAGS-target-examples:
+@if target-examples
+maybe-TAGS-target-examples: TAGS-target-examples
  
  TAGS-target-examples: \
      configure-target-examples 
@@ -21488,6 +25441,7 @@ TAGS-target-examples: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing TAGS in $(TARGET_SUBDIR)/examples" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21497,12 +25451,15 @@ TAGS-target-examples: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
+@endif target-examples
  
  .PHONY: maybe-install-info-target-examples install-info-target-examples
  maybe-install-info-target-examples:
+@if target-examples
+maybe-install-info-target-examples: install-info-target-examples
  
  install-info-target-examples: \
      configure-target-examples \
@@ -21511,6 +25468,7 @@ install-info-target-examples: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing install-info in $(TARGET_SUBDIR)/examples" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21520,12 +25478,15 @@ install-info-target-examples: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
+@endif target-examples
  
  .PHONY: maybe-installcheck-target-examples installcheck-target-examples
  maybe-installcheck-target-examples:
+@if target-examples
+maybe-installcheck-target-examples: installcheck-target-examples
  
  installcheck-target-examples: \
      configure-target-examples 
@@ -21533,6 +25494,7 @@ installcheck-target-examples: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing installcheck in $(TARGET_SUBDIR)/examples" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21542,18 +25504,22 @@ installcheck-target-examples: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
+@endif target-examples
  
  .PHONY: maybe-mostlyclean-target-examples mostlyclean-target-examples
  maybe-mostlyclean-target-examples:
+@if target-examples
+maybe-mostlyclean-target-examples: mostlyclean-target-examples
  
  mostlyclean-target-examples: 
         @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing mostlyclean in $(TARGET_SUBDIR)/examples" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21563,18 +25529,22 @@ mostlyclean-target-examples:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
+@endif target-examples
  
  .PHONY: maybe-clean-target-examples clean-target-examples
  maybe-clean-target-examples:
+@if target-examples
+maybe-clean-target-examples: clean-target-examples
  
  clean-target-examples: 
         @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing clean in $(TARGET_SUBDIR)/examples" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21584,18 +25554,22 @@ clean-target-examples:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
           || exit 1
  
+@endif target-examples
  
  .PHONY: maybe-distclean-target-examples distclean-target-examples
  maybe-distclean-target-examples:
+@if target-examples
+maybe-distclean-target-examples: distclean-target-examples
  
  distclean-target-examples: 
         @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing distclean in $(TARGET_SUBDIR)/examples" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21605,18 +25579,22 @@ distclean-target-examples:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
+@endif target-examples
  
  .PHONY: maybe-maintainer-clean-target-examples maintainer-clean-target-examples
  maybe-maintainer-clean-target-examples:
+@if target-examples
+maybe-maintainer-clean-target-examples: maintainer-clean-target-examples
  
  maintainer-clean-target-examples: 
         @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing maintainer-clean in $(TARGET_SUBDIR)/examples" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21626,13 +25604,16 @@ maintainer-clean-target-examples:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
+@endif target-examples
  
  
  .PHONY: configure-target-libffi maybe-configure-target-libffi
  maybe-configure-target-libffi:
+@if target-libffi
+maybe-configure-target-libffi: configure-target-libffi
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/libffi/multilib.out: multilib.out
@@ -21646,21 +25627,7 @@ configure-target-libffi: $(TARGET_SUBDIR)/libffi/multilib.out
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; 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; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       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; \
+       $(NORMAL_TARGET_EXPORTS) \
         echo Configuring in $(TARGET_SUBDIR)/libffi; \
         cd "$(TARGET_SUBDIR)/libffi" || exit 1; \
         case $(srcdir) in \
@@ -21677,44 +25644,60 @@ configure-target-libffi: $(TARGET_SUBDIR)/libffi/multilib.out
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
           $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
           || exit 1
+@endif target-libffi
  
  .PHONY: all-target-libffi maybe-all-target-libffi
  maybe-all-target-libffi:
+@if target-libffi
+TARGET-target-libffi=all
+maybe-all-target-libffi: all-target-libffi
  all-target-libffi: configure-target-libffi
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libffi && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libffi))
+@endif target-libffi
  
  .PHONY: check-target-libffi maybe-check-target-libffi
  maybe-check-target-libffi:
+@if target-libffi
+maybe-check-target-libffi: check-target-libffi
  
  check-target-libffi:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libffi && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
  
+@endif target-libffi
  
  .PHONY: install-target-libffi maybe-install-target-libffi
  maybe-install-target-libffi:
+@if target-libffi
+maybe-install-target-libffi: install-target-libffi
  
  install-target-libffi: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libffi && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
+@endif target-libffi
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-target-libffi info-target-libffi
  maybe-info-target-libffi:
+@if target-libffi
+maybe-info-target-libffi: info-target-libffi
  
  info-target-libffi: \
      configure-target-libffi 
@@ -21722,6 +25705,7 @@ info-target-libffi: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing info in $(TARGET_SUBDIR)/libffi" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21731,12 +25715,15 @@ info-target-libffi: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
+@endif target-libffi
  
  .PHONY: maybe-dvi-target-libffi dvi-target-libffi
  maybe-dvi-target-libffi:
+@if target-libffi
+maybe-dvi-target-libffi: dvi-target-libffi
  
  dvi-target-libffi: \
      configure-target-libffi 
@@ -21744,6 +25731,7 @@ dvi-target-libffi: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing dvi in $(TARGET_SUBDIR)/libffi" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21753,12 +25741,15 @@ dvi-target-libffi: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
           || exit 1
  
+@endif target-libffi
  
  .PHONY: maybe-TAGS-target-libffi TAGS-target-libffi
  maybe-TAGS-target-libffi:
+@if target-libffi
+maybe-TAGS-target-libffi: TAGS-target-libffi
  
  TAGS-target-libffi: \
      configure-target-libffi 
@@ -21766,6 +25757,7 @@ TAGS-target-libffi: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing TAGS in $(TARGET_SUBDIR)/libffi" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21775,12 +25767,15 @@ TAGS-target-libffi: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
+@endif target-libffi
  
  .PHONY: maybe-install-info-target-libffi install-info-target-libffi
  maybe-install-info-target-libffi:
+@if target-libffi
+maybe-install-info-target-libffi: install-info-target-libffi
  
  install-info-target-libffi: \
      configure-target-libffi \
@@ -21789,6 +25784,7 @@ install-info-target-libffi: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing install-info in $(TARGET_SUBDIR)/libffi" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21798,12 +25794,15 @@ install-info-target-libffi: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
+@endif target-libffi
  
  .PHONY: maybe-installcheck-target-libffi installcheck-target-libffi
  maybe-installcheck-target-libffi:
+@if target-libffi
+maybe-installcheck-target-libffi: installcheck-target-libffi
  
  installcheck-target-libffi: \
      configure-target-libffi 
@@ -21811,6 +25810,7 @@ installcheck-target-libffi: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing installcheck in $(TARGET_SUBDIR)/libffi" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21820,18 +25820,22 @@ installcheck-target-libffi: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
+@endif target-libffi
  
  .PHONY: maybe-mostlyclean-target-libffi mostlyclean-target-libffi
  maybe-mostlyclean-target-libffi:
+@if target-libffi
+maybe-mostlyclean-target-libffi: mostlyclean-target-libffi
  
  mostlyclean-target-libffi: 
         @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing mostlyclean in $(TARGET_SUBDIR)/libffi" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21841,18 +25845,22 @@ mostlyclean-target-libffi:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
+@endif target-libffi
  
  .PHONY: maybe-clean-target-libffi clean-target-libffi
  maybe-clean-target-libffi:
+@if target-libffi
+maybe-clean-target-libffi: clean-target-libffi
  
  clean-target-libffi: 
         @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing clean in $(TARGET_SUBDIR)/libffi" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21862,18 +25870,22 @@ clean-target-libffi:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
           || exit 1
  
+@endif target-libffi
  
  .PHONY: maybe-distclean-target-libffi distclean-target-libffi
  maybe-distclean-target-libffi:
+@if target-libffi
+maybe-distclean-target-libffi: distclean-target-libffi
  
  distclean-target-libffi: 
         @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing distclean in $(TARGET_SUBDIR)/libffi" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21883,18 +25895,22 @@ distclean-target-libffi:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
+@endif target-libffi
  
  .PHONY: maybe-maintainer-clean-target-libffi maintainer-clean-target-libffi
  maybe-maintainer-clean-target-libffi:
+@if target-libffi
+maybe-maintainer-clean-target-libffi: maintainer-clean-target-libffi
  
  maintainer-clean-target-libffi: 
         @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libffi" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -21904,13 +25920,16 @@ maintainer-clean-target-libffi:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
+@endif target-libffi
  
  
  .PHONY: configure-target-libjava maybe-configure-target-libjava
  maybe-configure-target-libjava:
+@if target-libjava
+maybe-configure-target-libjava: configure-target-libjava
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/libjava/multilib.out: multilib.out
@@ -21924,22 +25943,7 @@ configure-target-libjava: $(TARGET_SUBDIR)/libjava/multilib.out
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; 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; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       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; \
+       $(RAW_CXX_TARGET_EXPORTS) \
         echo Configuring in $(TARGET_SUBDIR)/libjava; \
         cd "$(TARGET_SUBDIR)/libjava" || exit 1; \
         case $(srcdir) in \
@@ -21956,44 +25960,60 @@ configure-target-libjava: $(TARGET_SUBDIR)/libjava/multilib.out
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
           $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
           || exit 1
+@endif target-libjava
  
  .PHONY: all-target-libjava maybe-all-target-libjava
  maybe-all-target-libjava:
+@if target-libjava
+TARGET-target-libjava=all
+maybe-all-target-libjava: all-target-libjava
  all-target-libjava: configure-target-libjava
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(RAW_CXX_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libjava && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   $(TARGET-target-libjava))
+@endif target-libjava
  
  .PHONY: check-target-libjava maybe-check-target-libjava
  maybe-check-target-libjava:
+@if target-libjava
+maybe-check-target-libjava: check-target-libjava
  
  check-target-libjava:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(RAW_CXX_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libjava && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  check)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   check)
  
+@endif target-libjava
  
  .PHONY: install-target-libjava maybe-install-target-libjava
  maybe-install-target-libjava:
+@if target-libjava
+maybe-install-target-libjava: install-target-libjava
  
  install-target-libjava: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(RAW_CXX_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libjava && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
+@endif target-libjava
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-target-libjava info-target-libjava
  maybe-info-target-libjava:
+@if target-libjava
+maybe-info-target-libjava: info-target-libjava
  
  info-target-libjava: \
      configure-target-libjava 
@@ -22001,6 +26021,7 @@ info-target-libjava: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing info in $(TARGET_SUBDIR)/libjava" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22010,12 +26031,15 @@ info-target-libjava: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
+@endif target-libjava
  
  .PHONY: maybe-dvi-target-libjava dvi-target-libjava
  maybe-dvi-target-libjava:
+@if target-libjava
+maybe-dvi-target-libjava: dvi-target-libjava
  
  dvi-target-libjava: \
      configure-target-libjava 
@@ -22023,6 +26047,7 @@ dvi-target-libjava: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing dvi in $(TARGET_SUBDIR)/libjava" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22032,12 +26057,15 @@ dvi-target-libjava: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
           || exit 1
  
+@endif target-libjava
  
  .PHONY: maybe-TAGS-target-libjava TAGS-target-libjava
  maybe-TAGS-target-libjava:
+@if target-libjava
+maybe-TAGS-target-libjava: TAGS-target-libjava
  
  TAGS-target-libjava: \
      configure-target-libjava 
@@ -22045,6 +26073,7 @@ TAGS-target-libjava: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing TAGS in $(TARGET_SUBDIR)/libjava" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22054,12 +26083,15 @@ TAGS-target-libjava: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
+@endif target-libjava
  
  .PHONY: maybe-install-info-target-libjava install-info-target-libjava
  maybe-install-info-target-libjava:
+@if target-libjava
+maybe-install-info-target-libjava: install-info-target-libjava
  
  install-info-target-libjava: \
      configure-target-libjava \
@@ -22068,6 +26100,7 @@ install-info-target-libjava: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing install-info in $(TARGET_SUBDIR)/libjava" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22077,12 +26110,15 @@ install-info-target-libjava: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
+@endif target-libjava
  
  .PHONY: maybe-installcheck-target-libjava installcheck-target-libjava
  maybe-installcheck-target-libjava:
+@if target-libjava
+maybe-installcheck-target-libjava: installcheck-target-libjava
  
  installcheck-target-libjava: \
      configure-target-libjava 
@@ -22090,6 +26126,7 @@ installcheck-target-libjava: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing installcheck in $(TARGET_SUBDIR)/libjava" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22099,18 +26136,22 @@ installcheck-target-libjava: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
+@endif target-libjava
  
  .PHONY: maybe-mostlyclean-target-libjava mostlyclean-target-libjava
  maybe-mostlyclean-target-libjava:
+@if target-libjava
+maybe-mostlyclean-target-libjava: mostlyclean-target-libjava
  
  mostlyclean-target-libjava: 
         @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing mostlyclean in $(TARGET_SUBDIR)/libjava" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22120,18 +26161,22 @@ mostlyclean-target-libjava:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
+@endif target-libjava
  
  .PHONY: maybe-clean-target-libjava clean-target-libjava
  maybe-clean-target-libjava:
+@if target-libjava
+maybe-clean-target-libjava: clean-target-libjava
  
  clean-target-libjava: 
         @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing clean in $(TARGET_SUBDIR)/libjava" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22141,18 +26186,22 @@ clean-target-libjava:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
           || exit 1
  
+@endif target-libjava
  
  .PHONY: maybe-distclean-target-libjava distclean-target-libjava
  maybe-distclean-target-libjava:
+@if target-libjava
+maybe-distclean-target-libjava: distclean-target-libjava
  
  distclean-target-libjava: 
         @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing distclean in $(TARGET_SUBDIR)/libjava" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22162,18 +26211,22 @@ distclean-target-libjava:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
+@endif target-libjava
  
  .PHONY: maybe-maintainer-clean-target-libjava maintainer-clean-target-libjava
  maybe-maintainer-clean-target-libjava:
+@if target-libjava
+maybe-maintainer-clean-target-libjava: maintainer-clean-target-libjava
  
  maintainer-clean-target-libjava: 
         @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(RAW_CXX_TARGET_EXPORTS) \
         echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libjava" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22183,13 +26236,16 @@ maintainer-clean-target-libjava:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
+@endif target-libjava
  
  
  .PHONY: configure-target-zlib maybe-configure-target-zlib
  maybe-configure-target-zlib:
+@if target-zlib
+maybe-configure-target-zlib: configure-target-zlib
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/zlib/multilib.out: multilib.out
@@ -22203,21 +26259,7 @@ configure-target-zlib: $(TARGET_SUBDIR)/zlib/multilib.out
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; 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; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       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; \
+       $(NORMAL_TARGET_EXPORTS) \
         echo Configuring in $(TARGET_SUBDIR)/zlib; \
         cd "$(TARGET_SUBDIR)/zlib" || exit 1; \
         case $(srcdir) in \
@@ -22256,44 +26298,60 @@ configure-target-zlib: $(TARGET_SUBDIR)/zlib/multilib.out
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
           $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
           || exit 1
+@endif target-zlib
  
  .PHONY: all-target-zlib maybe-all-target-zlib
  maybe-all-target-zlib:
+@if target-zlib
+TARGET-target-zlib=all
+maybe-all-target-zlib: all-target-zlib
  all-target-zlib: configure-target-zlib
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/zlib && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-zlib))
+@endif target-zlib
  
  .PHONY: check-target-zlib maybe-check-target-zlib
  maybe-check-target-zlib:
+@if target-zlib
+maybe-check-target-zlib: check-target-zlib
  
  check-target-zlib:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/zlib && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
  
+@endif target-zlib
  
  .PHONY: install-target-zlib maybe-install-target-zlib
  maybe-install-target-zlib:
+@if target-zlib
+maybe-install-target-zlib: install-target-zlib
  
  install-target-zlib: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/zlib && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
+@endif target-zlib
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-target-zlib info-target-zlib
  maybe-info-target-zlib:
+@if target-zlib
+maybe-info-target-zlib: info-target-zlib
  
  info-target-zlib: \
      configure-target-zlib 
@@ -22301,6 +26359,7 @@ info-target-zlib: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing info in $(TARGET_SUBDIR)/zlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22310,12 +26369,15 @@ info-target-zlib: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
+@endif target-zlib
  
  .PHONY: maybe-dvi-target-zlib dvi-target-zlib
  maybe-dvi-target-zlib:
+@if target-zlib
+maybe-dvi-target-zlib: dvi-target-zlib
  
  dvi-target-zlib: \
      configure-target-zlib 
@@ -22323,6 +26385,7 @@ dvi-target-zlib: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing dvi in $(TARGET_SUBDIR)/zlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22332,12 +26395,15 @@ dvi-target-zlib: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
           || exit 1
  
+@endif target-zlib
  
  .PHONY: maybe-TAGS-target-zlib TAGS-target-zlib
  maybe-TAGS-target-zlib:
+@if target-zlib
+maybe-TAGS-target-zlib: TAGS-target-zlib
  
  TAGS-target-zlib: \
      configure-target-zlib 
@@ -22345,6 +26411,7 @@ TAGS-target-zlib: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing TAGS in $(TARGET_SUBDIR)/zlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22354,12 +26421,15 @@ TAGS-target-zlib: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
+@endif target-zlib
  
  .PHONY: maybe-install-info-target-zlib install-info-target-zlib
  maybe-install-info-target-zlib:
+@if target-zlib
+maybe-install-info-target-zlib: install-info-target-zlib
  
  install-info-target-zlib: \
      configure-target-zlib \
@@ -22368,6 +26438,7 @@ install-info-target-zlib: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing install-info in $(TARGET_SUBDIR)/zlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22377,12 +26448,15 @@ install-info-target-zlib: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
+@endif target-zlib
  
  .PHONY: maybe-installcheck-target-zlib installcheck-target-zlib
  maybe-installcheck-target-zlib:
+@if target-zlib
+maybe-installcheck-target-zlib: installcheck-target-zlib
  
  installcheck-target-zlib: \
      configure-target-zlib 
@@ -22390,6 +26464,7 @@ installcheck-target-zlib: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing installcheck in $(TARGET_SUBDIR)/zlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22399,18 +26474,22 @@ installcheck-target-zlib: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
+@endif target-zlib
  
  .PHONY: maybe-mostlyclean-target-zlib mostlyclean-target-zlib
  maybe-mostlyclean-target-zlib:
+@if target-zlib
+maybe-mostlyclean-target-zlib: mostlyclean-target-zlib
  
  mostlyclean-target-zlib: 
         @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing mostlyclean in $(TARGET_SUBDIR)/zlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22420,18 +26499,22 @@ mostlyclean-target-zlib:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
+@endif target-zlib
  
  .PHONY: maybe-clean-target-zlib clean-target-zlib
  maybe-clean-target-zlib:
+@if target-zlib
+maybe-clean-target-zlib: clean-target-zlib
  
  clean-target-zlib: 
         @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing clean in $(TARGET_SUBDIR)/zlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22441,18 +26524,22 @@ clean-target-zlib:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
           || exit 1
  
+@endif target-zlib
  
  .PHONY: maybe-distclean-target-zlib distclean-target-zlib
  maybe-distclean-target-zlib:
+@if target-zlib
+maybe-distclean-target-zlib: distclean-target-zlib
  
  distclean-target-zlib: 
         @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing distclean in $(TARGET_SUBDIR)/zlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22462,18 +26549,22 @@ distclean-target-zlib:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
+@endif target-zlib
  
  .PHONY: maybe-maintainer-clean-target-zlib maintainer-clean-target-zlib
  maybe-maintainer-clean-target-zlib:
+@if target-zlib
+maybe-maintainer-clean-target-zlib: maintainer-clean-target-zlib
  
  maintainer-clean-target-zlib: 
         @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing maintainer-clean in $(TARGET_SUBDIR)/zlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22483,13 +26574,16 @@ maintainer-clean-target-zlib:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
+@endif target-zlib
  
  
  .PHONY: configure-target-boehm-gc maybe-configure-target-boehm-gc
  maybe-configure-target-boehm-gc:
+@if target-boehm-gc
+maybe-configure-target-boehm-gc: 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
@@ -22503,21 +26597,7 @@ configure-target-boehm-gc: $(TARGET_SUBDIR)/boehm-gc/multilib.out
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; 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; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       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; \
+       $(NORMAL_TARGET_EXPORTS) \
         echo Configuring in $(TARGET_SUBDIR)/boehm-gc; \
         cd "$(TARGET_SUBDIR)/boehm-gc" || exit 1; \
         case $(srcdir) in \
@@ -22534,44 +26614,60 @@ configure-target-boehm-gc: $(TARGET_SUBDIR)/boehm-gc/multilib.out
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
           $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
           || exit 1
+@endif target-boehm-gc
  
  .PHONY: all-target-boehm-gc maybe-all-target-boehm-gc
  maybe-all-target-boehm-gc:
+@if target-boehm-gc
+TARGET-target-boehm-gc=all
+maybe-all-target-boehm-gc: all-target-boehm-gc
  all-target-boehm-gc: configure-target-boehm-gc
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/boehm-gc && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-boehm-gc))
+@endif target-boehm-gc
  
  .PHONY: check-target-boehm-gc maybe-check-target-boehm-gc
  maybe-check-target-boehm-gc:
+@if target-boehm-gc
+maybe-check-target-boehm-gc: check-target-boehm-gc
  
  check-target-boehm-gc:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/boehm-gc && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
  
+@endif target-boehm-gc
  
  .PHONY: install-target-boehm-gc maybe-install-target-boehm-gc
  maybe-install-target-boehm-gc:
+@if target-boehm-gc
+maybe-install-target-boehm-gc: install-target-boehm-gc
  
  install-target-boehm-gc: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/boehm-gc && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
+@endif target-boehm-gc
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-target-boehm-gc info-target-boehm-gc
  maybe-info-target-boehm-gc:
+@if target-boehm-gc
+maybe-info-target-boehm-gc: info-target-boehm-gc
  
  info-target-boehm-gc: \
      configure-target-boehm-gc 
@@ -22579,6 +26675,7 @@ info-target-boehm-gc: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing info in $(TARGET_SUBDIR)/boehm-gc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22588,12 +26685,15 @@ info-target-boehm-gc: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
+@endif target-boehm-gc
  
  .PHONY: maybe-dvi-target-boehm-gc dvi-target-boehm-gc
  maybe-dvi-target-boehm-gc:
+@if target-boehm-gc
+maybe-dvi-target-boehm-gc: dvi-target-boehm-gc
  
  dvi-target-boehm-gc: \
      configure-target-boehm-gc 
@@ -22601,6 +26701,7 @@ dvi-target-boehm-gc: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing dvi in $(TARGET_SUBDIR)/boehm-gc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22610,12 +26711,15 @@ dvi-target-boehm-gc: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
           || exit 1
  
+@endif target-boehm-gc
  
  .PHONY: maybe-TAGS-target-boehm-gc TAGS-target-boehm-gc
  maybe-TAGS-target-boehm-gc:
+@if target-boehm-gc
+maybe-TAGS-target-boehm-gc: TAGS-target-boehm-gc
  
  TAGS-target-boehm-gc: \
      configure-target-boehm-gc 
@@ -22623,6 +26727,7 @@ TAGS-target-boehm-gc: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing TAGS in $(TARGET_SUBDIR)/boehm-gc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22632,12 +26737,15 @@ TAGS-target-boehm-gc: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
+@endif target-boehm-gc
  
  .PHONY: maybe-install-info-target-boehm-gc install-info-target-boehm-gc
  maybe-install-info-target-boehm-gc:
+@if target-boehm-gc
+maybe-install-info-target-boehm-gc: install-info-target-boehm-gc
  
  install-info-target-boehm-gc: \
      configure-target-boehm-gc \
@@ -22646,6 +26754,7 @@ install-info-target-boehm-gc: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing install-info in $(TARGET_SUBDIR)/boehm-gc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22655,12 +26764,15 @@ install-info-target-boehm-gc: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
+@endif target-boehm-gc
  
  .PHONY: maybe-installcheck-target-boehm-gc installcheck-target-boehm-gc
  maybe-installcheck-target-boehm-gc:
+@if target-boehm-gc
+maybe-installcheck-target-boehm-gc: installcheck-target-boehm-gc
  
  installcheck-target-boehm-gc: \
      configure-target-boehm-gc 
@@ -22668,6 +26780,7 @@ installcheck-target-boehm-gc: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing installcheck in $(TARGET_SUBDIR)/boehm-gc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22677,18 +26790,22 @@ installcheck-target-boehm-gc: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
+@endif target-boehm-gc
  
  .PHONY: maybe-mostlyclean-target-boehm-gc mostlyclean-target-boehm-gc
  maybe-mostlyclean-target-boehm-gc:
+@if target-boehm-gc
+maybe-mostlyclean-target-boehm-gc: mostlyclean-target-boehm-gc
  
  mostlyclean-target-boehm-gc: 
         @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing mostlyclean in $(TARGET_SUBDIR)/boehm-gc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22698,18 +26815,22 @@ mostlyclean-target-boehm-gc:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
+@endif target-boehm-gc
  
  .PHONY: maybe-clean-target-boehm-gc clean-target-boehm-gc
  maybe-clean-target-boehm-gc:
+@if target-boehm-gc
+maybe-clean-target-boehm-gc: clean-target-boehm-gc
  
  clean-target-boehm-gc: 
         @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing clean in $(TARGET_SUBDIR)/boehm-gc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22719,18 +26840,22 @@ clean-target-boehm-gc:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
           || exit 1
  
+@endif target-boehm-gc
  
  .PHONY: maybe-distclean-target-boehm-gc distclean-target-boehm-gc
  maybe-distclean-target-boehm-gc:
+@if target-boehm-gc
+maybe-distclean-target-boehm-gc: distclean-target-boehm-gc
  
  distclean-target-boehm-gc: 
         @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing distclean in $(TARGET_SUBDIR)/boehm-gc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22740,18 +26865,22 @@ distclean-target-boehm-gc:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
+@endif target-boehm-gc
  
  .PHONY: maybe-maintainer-clean-target-boehm-gc maintainer-clean-target-boehm-gc
  maybe-maintainer-clean-target-boehm-gc:
+@if target-boehm-gc
+maybe-maintainer-clean-target-boehm-gc: maintainer-clean-target-boehm-gc
  
  maintainer-clean-target-boehm-gc: 
         @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing maintainer-clean in $(TARGET_SUBDIR)/boehm-gc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22761,13 +26890,16 @@ maintainer-clean-target-boehm-gc:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
+@endif target-boehm-gc
  
  
  .PHONY: configure-target-qthreads maybe-configure-target-qthreads
  maybe-configure-target-qthreads:
+@if target-qthreads
+maybe-configure-target-qthreads: configure-target-qthreads
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/qthreads/multilib.out: multilib.out
@@ -22781,21 +26913,7 @@ configure-target-qthreads: $(TARGET_SUBDIR)/qthreads/multilib.out
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; 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; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       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; \
+       $(NORMAL_TARGET_EXPORTS) \
         echo Configuring in $(TARGET_SUBDIR)/qthreads; \
         cd "$(TARGET_SUBDIR)/qthreads" || exit 1; \
         case $(srcdir) in \
@@ -22812,44 +26930,60 @@ configure-target-qthreads: $(TARGET_SUBDIR)/qthreads/multilib.out
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
           $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
           || exit 1
+@endif target-qthreads
  
  .PHONY: all-target-qthreads maybe-all-target-qthreads
  maybe-all-target-qthreads:
+@if target-qthreads
+TARGET-target-qthreads=all
+maybe-all-target-qthreads: all-target-qthreads
  all-target-qthreads: configure-target-qthreads
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/qthreads && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-qthreads))
+@endif target-qthreads
  
  .PHONY: check-target-qthreads maybe-check-target-qthreads
  maybe-check-target-qthreads:
+@if target-qthreads
+maybe-check-target-qthreads: check-target-qthreads
  
  check-target-qthreads:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/qthreads && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
  
+@endif target-qthreads
  
  .PHONY: install-target-qthreads maybe-install-target-qthreads
  maybe-install-target-qthreads:
+@if target-qthreads
+maybe-install-target-qthreads: install-target-qthreads
  
  install-target-qthreads: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/qthreads && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
+@endif target-qthreads
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-target-qthreads info-target-qthreads
  maybe-info-target-qthreads:
+@if target-qthreads
+maybe-info-target-qthreads: info-target-qthreads
  
  info-target-qthreads: \
      configure-target-qthreads 
@@ -22857,6 +26991,7 @@ info-target-qthreads: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing info in $(TARGET_SUBDIR)/qthreads" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22866,12 +27001,15 @@ info-target-qthreads: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
+@endif target-qthreads
  
  .PHONY: maybe-dvi-target-qthreads dvi-target-qthreads
  maybe-dvi-target-qthreads:
+@if target-qthreads
+maybe-dvi-target-qthreads: dvi-target-qthreads
  
  dvi-target-qthreads: \
      configure-target-qthreads 
@@ -22879,6 +27017,7 @@ dvi-target-qthreads: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing dvi in $(TARGET_SUBDIR)/qthreads" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22888,12 +27027,15 @@ dvi-target-qthreads: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
           || exit 1
  
+@endif target-qthreads
  
  .PHONY: maybe-TAGS-target-qthreads TAGS-target-qthreads
  maybe-TAGS-target-qthreads:
+@if target-qthreads
+maybe-TAGS-target-qthreads: TAGS-target-qthreads
  
  TAGS-target-qthreads: \
      configure-target-qthreads 
@@ -22901,6 +27043,7 @@ TAGS-target-qthreads: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing TAGS in $(TARGET_SUBDIR)/qthreads" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22910,12 +27053,15 @@ TAGS-target-qthreads: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
+@endif target-qthreads
  
  .PHONY: maybe-install-info-target-qthreads install-info-target-qthreads
  maybe-install-info-target-qthreads:
+@if target-qthreads
+maybe-install-info-target-qthreads: install-info-target-qthreads
  
  install-info-target-qthreads: \
      configure-target-qthreads \
@@ -22924,6 +27070,7 @@ install-info-target-qthreads: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing install-info in $(TARGET_SUBDIR)/qthreads" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22933,12 +27080,15 @@ install-info-target-qthreads: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
+@endif target-qthreads
  
  .PHONY: maybe-installcheck-target-qthreads installcheck-target-qthreads
  maybe-installcheck-target-qthreads:
+@if target-qthreads
+maybe-installcheck-target-qthreads: installcheck-target-qthreads
  
  installcheck-target-qthreads: \
      configure-target-qthreads 
@@ -22946,6 +27096,7 @@ installcheck-target-qthreads: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing installcheck in $(TARGET_SUBDIR)/qthreads" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22955,18 +27106,22 @@ installcheck-target-qthreads: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
+@endif target-qthreads
  
  .PHONY: maybe-mostlyclean-target-qthreads mostlyclean-target-qthreads
  maybe-mostlyclean-target-qthreads:
+@if target-qthreads
+maybe-mostlyclean-target-qthreads: mostlyclean-target-qthreads
  
  mostlyclean-target-qthreads: 
         @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing mostlyclean in $(TARGET_SUBDIR)/qthreads" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22976,18 +27131,22 @@ mostlyclean-target-qthreads:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
+@endif target-qthreads
  
  .PHONY: maybe-clean-target-qthreads clean-target-qthreads
  maybe-clean-target-qthreads:
+@if target-qthreads
+maybe-clean-target-qthreads: clean-target-qthreads
  
  clean-target-qthreads: 
         @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing clean in $(TARGET_SUBDIR)/qthreads" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -22997,18 +27156,22 @@ clean-target-qthreads:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
           || exit 1
  
+@endif target-qthreads
  
  .PHONY: maybe-distclean-target-qthreads distclean-target-qthreads
  maybe-distclean-target-qthreads:
+@if target-qthreads
+maybe-distclean-target-qthreads: distclean-target-qthreads
  
  distclean-target-qthreads: 
         @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing distclean in $(TARGET_SUBDIR)/qthreads" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23018,18 +27181,22 @@ distclean-target-qthreads:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
+@endif target-qthreads
  
  .PHONY: maybe-maintainer-clean-target-qthreads maintainer-clean-target-qthreads
  maybe-maintainer-clean-target-qthreads:
+@if target-qthreads
+maybe-maintainer-clean-target-qthreads: maintainer-clean-target-qthreads
  
  maintainer-clean-target-qthreads: 
         @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing maintainer-clean in $(TARGET_SUBDIR)/qthreads" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23039,13 +27206,16 @@ maintainer-clean-target-qthreads:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
+@endif target-qthreads
  
  
  .PHONY: configure-target-rda maybe-configure-target-rda
  maybe-configure-target-rda:
+@if target-rda
+maybe-configure-target-rda: configure-target-rda
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/rda/multilib.out: multilib.out
@@ -23059,21 +27229,7 @@ configure-target-rda: $(TARGET_SUBDIR)/rda/multilib.out
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; 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; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       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; \
+       $(NORMAL_TARGET_EXPORTS) \
         echo Configuring in $(TARGET_SUBDIR)/rda; \
         cd "$(TARGET_SUBDIR)/rda" || exit 1; \
         case $(srcdir) in \
@@ -23090,44 +27246,60 @@ configure-target-rda: $(TARGET_SUBDIR)/rda/multilib.out
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
           $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
           || exit 1
+@endif target-rda
  
  .PHONY: all-target-rda maybe-all-target-rda
  maybe-all-target-rda:
+@if target-rda
+TARGET-target-rda=all
+maybe-all-target-rda: all-target-rda
  all-target-rda: configure-target-rda
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/rda && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-rda))
+@endif target-rda
  
  .PHONY: check-target-rda maybe-check-target-rda
  maybe-check-target-rda:
+@if target-rda
+maybe-check-target-rda: check-target-rda
  
  check-target-rda:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/rda && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
  
+@endif target-rda
  
  .PHONY: install-target-rda maybe-install-target-rda
  maybe-install-target-rda:
+@if target-rda
+maybe-install-target-rda: install-target-rda
  
  install-target-rda: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/rda && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
+@endif target-rda
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-target-rda info-target-rda
  maybe-info-target-rda:
+@if target-rda
+maybe-info-target-rda: info-target-rda
  
  info-target-rda: \
      configure-target-rda 
@@ -23135,6 +27307,7 @@ info-target-rda: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing info in $(TARGET_SUBDIR)/rda" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23144,12 +27317,15 @@ info-target-rda: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
+@endif target-rda
  
  .PHONY: maybe-dvi-target-rda dvi-target-rda
  maybe-dvi-target-rda:
+@if target-rda
+maybe-dvi-target-rda: dvi-target-rda
  
  dvi-target-rda: \
      configure-target-rda 
@@ -23157,6 +27333,7 @@ dvi-target-rda: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing dvi in $(TARGET_SUBDIR)/rda" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23166,12 +27343,15 @@ dvi-target-rda: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
           || exit 1
  
+@endif target-rda
  
  .PHONY: maybe-TAGS-target-rda TAGS-target-rda
  maybe-TAGS-target-rda:
+@if target-rda
+maybe-TAGS-target-rda: TAGS-target-rda
  
  TAGS-target-rda: \
      configure-target-rda 
@@ -23179,6 +27359,7 @@ TAGS-target-rda: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing TAGS in $(TARGET_SUBDIR)/rda" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23188,12 +27369,15 @@ TAGS-target-rda: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
+@endif target-rda
  
  .PHONY: maybe-install-info-target-rda install-info-target-rda
  maybe-install-info-target-rda:
+@if target-rda
+maybe-install-info-target-rda: install-info-target-rda
  
  install-info-target-rda: \
      configure-target-rda \
@@ -23202,6 +27386,7 @@ install-info-target-rda: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing install-info in $(TARGET_SUBDIR)/rda" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23211,12 +27396,15 @@ install-info-target-rda: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
+@endif target-rda
  
  .PHONY: maybe-installcheck-target-rda installcheck-target-rda
  maybe-installcheck-target-rda:
+@if target-rda
+maybe-installcheck-target-rda: installcheck-target-rda
  
  installcheck-target-rda: \
      configure-target-rda 
@@ -23224,6 +27412,7 @@ installcheck-target-rda: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing installcheck in $(TARGET_SUBDIR)/rda" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23233,18 +27422,22 @@ installcheck-target-rda: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
+@endif target-rda
  
  .PHONY: maybe-mostlyclean-target-rda mostlyclean-target-rda
  maybe-mostlyclean-target-rda:
+@if target-rda
+maybe-mostlyclean-target-rda: mostlyclean-target-rda
  
  mostlyclean-target-rda: 
         @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing mostlyclean in $(TARGET_SUBDIR)/rda" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23254,18 +27447,22 @@ mostlyclean-target-rda:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
+@endif target-rda
  
  .PHONY: maybe-clean-target-rda clean-target-rda
  maybe-clean-target-rda:
+@if target-rda
+maybe-clean-target-rda: clean-target-rda
  
  clean-target-rda: 
         @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing clean in $(TARGET_SUBDIR)/rda" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23275,18 +27472,22 @@ clean-target-rda:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
           || exit 1
  
+@endif target-rda
  
  .PHONY: maybe-distclean-target-rda distclean-target-rda
  maybe-distclean-target-rda:
+@if target-rda
+maybe-distclean-target-rda: distclean-target-rda
  
  distclean-target-rda: 
         @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing distclean in $(TARGET_SUBDIR)/rda" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23296,18 +27497,22 @@ distclean-target-rda:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
+@endif target-rda
  
  .PHONY: maybe-maintainer-clean-target-rda maintainer-clean-target-rda
  maybe-maintainer-clean-target-rda:
+@if target-rda
+maybe-maintainer-clean-target-rda: maintainer-clean-target-rda
  
  maintainer-clean-target-rda: 
         @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing maintainer-clean in $(TARGET_SUBDIR)/rda" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23317,13 +27522,16 @@ maintainer-clean-target-rda:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
+@endif target-rda
  
  
  .PHONY: configure-target-libada maybe-configure-target-libada
  maybe-configure-target-libada:
+@if target-libada
+maybe-configure-target-libada: configure-target-libada
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/libada/multilib.out: multilib.out
@@ -23337,21 +27545,7 @@ configure-target-libada: $(TARGET_SUBDIR)/libada/multilib.out
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; 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; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       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; \
+       $(NORMAL_TARGET_EXPORTS) \
         echo Configuring in $(TARGET_SUBDIR)/libada; \
         cd "$(TARGET_SUBDIR)/libada" || exit 1; \
         case $(srcdir) in \
@@ -23368,44 +27562,60 @@ configure-target-libada: $(TARGET_SUBDIR)/libada/multilib.out
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
           $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
           || exit 1
+@endif target-libada
  
  .PHONY: all-target-libada maybe-all-target-libada
  maybe-all-target-libada:
+@if target-libada
+TARGET-target-libada=all
+maybe-all-target-libada: all-target-libada
  all-target-libada: configure-target-libada
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libada && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libada))
+@endif target-libada
  
  .PHONY: check-target-libada maybe-check-target-libada
  maybe-check-target-libada:
+@if target-libada
+maybe-check-target-libada: check-target-libada
  
  check-target-libada:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libada && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
  
+@endif target-libada
  
  .PHONY: install-target-libada maybe-install-target-libada
  maybe-install-target-libada:
+@if target-libada
+maybe-install-target-libada: install-target-libada
  
  install-target-libada: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         (cd $(TARGET_SUBDIR)/libada && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
+@endif target-libada
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-target-libada info-target-libada
  maybe-info-target-libada:
+@if target-libada
+maybe-info-target-libada: info-target-libada
  
  info-target-libada: \
      configure-target-libada 
@@ -23413,6 +27623,7 @@ info-target-libada: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing info in $(TARGET_SUBDIR)/libada" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23422,12 +27633,15 @@ info-target-libada: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
+@endif target-libada
  
  .PHONY: maybe-dvi-target-libada dvi-target-libada
  maybe-dvi-target-libada:
+@if target-libada
+maybe-dvi-target-libada: dvi-target-libada
  
  dvi-target-libada: \
      configure-target-libada 
@@ -23435,6 +27649,7 @@ dvi-target-libada: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing dvi in $(TARGET_SUBDIR)/libada" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23444,12 +27659,15 @@ dvi-target-libada: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
           || exit 1
  
+@endif target-libada
  
  .PHONY: maybe-TAGS-target-libada TAGS-target-libada
  maybe-TAGS-target-libada:
+@if target-libada
+maybe-TAGS-target-libada: TAGS-target-libada
  
  TAGS-target-libada: \
      configure-target-libada 
@@ -23457,6 +27675,7 @@ TAGS-target-libada: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing TAGS in $(TARGET_SUBDIR)/libada" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23466,12 +27685,15 @@ TAGS-target-libada: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
+@endif target-libada
  
  .PHONY: maybe-install-info-target-libada install-info-target-libada
  maybe-install-info-target-libada:
+@if target-libada
+maybe-install-info-target-libada: install-info-target-libada
  
  install-info-target-libada: \
      configure-target-libada \
@@ -23480,6 +27702,7 @@ install-info-target-libada: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing install-info in $(TARGET_SUBDIR)/libada" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23489,12 +27712,15 @@ install-info-target-libada: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
+@endif target-libada
  
  .PHONY: maybe-installcheck-target-libada installcheck-target-libada
  maybe-installcheck-target-libada:
+@if target-libada
+maybe-installcheck-target-libada: installcheck-target-libada
  
  installcheck-target-libada: \
      configure-target-libada 
@@ -23502,6 +27728,7 @@ installcheck-target-libada: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing installcheck in $(TARGET_SUBDIR)/libada" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23511,18 +27738,22 @@ installcheck-target-libada: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
+@endif target-libada
  
  .PHONY: maybe-mostlyclean-target-libada mostlyclean-target-libada
  maybe-mostlyclean-target-libada:
+@if target-libada
+maybe-mostlyclean-target-libada: mostlyclean-target-libada
  
  mostlyclean-target-libada: 
         @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing mostlyclean in $(TARGET_SUBDIR)/libada" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23532,18 +27763,22 @@ mostlyclean-target-libada:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
+@endif target-libada
  
  .PHONY: maybe-clean-target-libada clean-target-libada
  maybe-clean-target-libada:
+@if target-libada
+maybe-clean-target-libada: clean-target-libada
  
  clean-target-libada: 
         @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing clean in $(TARGET_SUBDIR)/libada" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23553,18 +27788,22 @@ clean-target-libada:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
           || exit 1
  
+@endif target-libada
  
  .PHONY: maybe-distclean-target-libada distclean-target-libada
  maybe-distclean-target-libada:
+@if target-libada
+maybe-distclean-target-libada: distclean-target-libada
  
  distclean-target-libada: 
         @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing distclean in $(TARGET_SUBDIR)/libada" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23574,18 +27813,22 @@ distclean-target-libada:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
+@endif target-libada
  
  .PHONY: maybe-maintainer-clean-target-libada maintainer-clean-target-libada
  maybe-maintainer-clean-target-libada:
+@if target-libada
+maybe-maintainer-clean-target-libada: maintainer-clean-target-libada
  
  maintainer-clean-target-libada: 
         @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libada" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -23595,9 +27838,10 @@ maintainer-clean-target-libada:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
+@endif target-libada
  
  
  
@@ -23605,92 +27849,18 @@ maintainer-clean-target-libada:
  # GCC module
  # ----------
  
-# Unfortunately, while gcc _should_ be a host module,
-# libgcc is a target module, and gen* programs are
-# build modules.  So GCC is a sort of hybrid.
-
-# gcc is the only module which uses GCC_FLAGS_TO_PASS.
-# Don't use shared host config.cache, as it will confuse later
-# directories; GCC wants slightly different values for some
-# precious variables.  *sigh*
-
-# We must skip configuring if toplevel bootstrap is going.
-.PHONY: configure-gcc maybe-configure-gcc
-maybe-configure-gcc:
-configure-gcc:
-       @test ! -f gcc/Makefile || exit 0; \
-       [ -f stage_last ] && exit 0; \
-       [ -d gcc ] || mkdir gcc; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in gcc; \
-       cd gcc || exit 1; \
-       case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/gcc"; \
-           libsrcdir="$$s/gcc";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/gcc"; \
-           libsrcdir="$$s/gcc";; \
-       esac; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         || exit 1
-
-# Don't 'make all' in gcc if it's already been made by 'bootstrap'; that
-# causes trouble.  This wart will be fixed eventually by moving
-# the bootstrap behavior to this file.
-.PHONY: all-gcc maybe-all-gcc
-maybe-all-gcc:
-all-gcc: configure-gcc
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       if [ -f stage_last ] ; then \
-         true ; \
-       elif [ -f gcc/stage_last ] ; then \
-         $(SET_LIB_PATH) \
-         (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) quickstrap); \
-       else \
-         $(SET_LIB_PATH) \
-         (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) all); \
-       fi
+@if gcc-no-bootstrap
+# GCC has some more recursive targets, which trigger the old
+# (but still current, until the toplevel bootstrap project
+# is finished) compiler bootstrapping rules.
  
-# Building GCC uses some tools for rebuilding "source" files
-# like texinfo, bison/byacc, etc.  So we must depend on those.
-#
-# While building GCC, it may be necessary to run various target
-# programs like the assembler, linker, etc.  So we depend on
-# those too.
-#
-# In theory, on an SMP all those dependencies can be resolved
-# in parallel.
-#
  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
+$(GCC_STRAP_TARGETS): all-prebootstrap configure-gcc
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         echo "Bootstrapping the compiler"; \
         cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $@
         @r=`${PWD_COMMAND}`; export r; \
@@ -23710,63 +27880,57 @@ $(GCC_STRAP_TARGETS): all-bootstrap configure-gcc
             compare=compare ;; \
         esac; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         echo "$$msg"; \
         cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $$compare
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
         $(SET_LIB_PATH) \
         echo "Building runtime libraries"; \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) all
  
-profiledbootstrap: all-bootstrap configure-gcc
+profiledbootstrap: all-prebootstrap configure-gcc
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       echo "Bootstrapping the compiler"; \
+       $(HOST_EXPORTS) \
+       echo "Bootstrapping training compiler"; \
         cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stageprofile_build
         @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
-       $(SET_LIB_PATH) \
-       echo "Building runtime libraries and training compiler"; \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all
-       @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         echo "Building feedback based compiler"; \
         cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stagefeedback_build
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
+       $(SET_LIB_PATH) \
+       echo "Building runtime libraries"; \
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) all
  
  .PHONY: cross
-cross: all-texinfo all-bison all-byacc all-binutils all-gas all-ld
+cross: all-build all-gas all-ld
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
         echo "Building the C and C++ compiler"; \
         cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c c++"
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
         $(SET_LIB_PATH) \
         echo "Building runtime libraries"; \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) \
-         LANGUAGES="c c++" all
-
-.PHONY: check-gcc maybe-check-gcc
-maybe-check-gcc:
-check-gcc:
-       @if [ -f ./gcc/Makefile ] ; then \
-         r=`${PWD_COMMAND}`; export r; \
-         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check); \
-       else \
-         true; \
-       fi
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) LANGUAGES="c c++" all
+@endif gcc-no-bootstrap
  
+@if gcc
  .PHONY: check-gcc-c++
  check-gcc-c++:
         @if [ -f ./gcc/Makefile ] ; then \
           r=`${PWD_COMMAND}`; export r; \
           s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
           $(SET_LIB_PATH) \
+         $(HOST_EXPORTS) \
           (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); \
         else \
           true; \
@@ -23775,18 +27939,6 @@ check-gcc-c++:
  .PHONY: check-c++
  check-c++: check-target-libstdc++-v3 check-gcc-c++
  
-.PHONY: install-gcc maybe-install-gcc
-maybe-install-gcc:
-install-gcc:
-       @if [ -f ./gcc/Makefile ] ; then \
-         r=`${PWD_COMMAND}`; export r; \
-         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
-       else \
-         true; \
-       fi
-
  # Install the gcc headers files, but not the fixed include files,
  # which Cygnus is not allowed to distribute.  This rule is very
  # dependent on the workings of the gcc Makefile.in.
@@ -23802,268 +27954,4082 @@ gcc-no-fixedincludes:
           r=`${PWD_COMMAND}`; export r; \
           s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
           $(SET_LIB_PATH) \
+         $(HOST_EXPORTS) \
           (cd ./gcc && \
            $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
           rm -rf gcc/include; \
           mv gcc/tmp-include gcc/include 2>/dev/null; \
         else true; fi
+@endif gcc
  
-# Other targets (dvi, info, etc.)
+# ---------------------
+# GCC bootstrap support
+# ---------------------
  
-.PHONY: maybe-info-gcc info-gcc
-maybe-info-gcc:
-info-gcc: \
-    configure-gcc 
-       @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       for flag in $(EXTRA_GCC_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing info in gcc" ; \
-       (cd gcc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
-         || exit 1
+# We track the current stage (the one in 'gcc') in the stage_current file.
+# stage_last instead tracks the stage that was built last.  These targets
+# are dummy when toplevel bootstrap is not active.
  
+.PHONY: unstage
+unstage:
+@if gcc-bootstrap
+       @[ -f stage_current ] || $(MAKE) `cat stage_last`-start
+@endif gcc-bootstrap
  
-.PHONY: maybe-dvi-gcc dvi-gcc
-maybe-dvi-gcc:
-dvi-gcc: \
-    configure-gcc 
-       @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       for flag in $(EXTRA_GCC_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing dvi in gcc" ; \
-       (cd gcc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
-         || exit 1
+.PHONY: stage
+stage:
+@if gcc-bootstrap
+       @$(MAKE) `cat stage_current`-end
+@endif gcc-bootstrap
  
+# We name the build directories for the various stages "stage1-gcc",
+# "stage2-gcc","stage3-gcc", etc.
  
-.PHONY: maybe-TAGS-gcc TAGS-gcc
-maybe-TAGS-gcc:
-TAGS-gcc: \
-    configure-gcc 
-       @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       for flag in $(EXTRA_GCC_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing TAGS in gcc" ; \
-       (cd gcc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
-         || exit 1
+# Since the 'compare' process will fail (on debugging information) if any
+# directory names are different, we need to link the gcc directory for
+# the previous stage to a constant name ('gcc-prev'), and to make the name of
+# the build directories constant as well. For the latter, we use naked names
+# like 'gcc', because the scripts in that directory assume it.  We use
+# mv on platforms where symlinks to directories do not work or are not
+# reliable.
  
+# At the end of the bootstrap, a symlink to 'stage3-gcc' named 'gcc' must
+# be kept, so that libraries can find it.  Ick!
  
-.PHONY: maybe-install-info-gcc install-info-gcc
-maybe-install-info-gcc:
-install-info-gcc: \
-    configure-gcc \
-    info-gcc 
-       @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       for flag in $(EXTRA_GCC_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing install-info in gcc" ; \
-       (cd gcc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
-         || exit 1
+# It would be best to preinstall gcc into a staging area (and in the
+# future, gather there all prebootstrap packages).  This would allow
+# assemblers and linkers can be bootstrapped as well as the compiler
+# (both in a combined tree, or separately).  This however requires some
+# change to the gcc driver, again in order to avoid comparison failures.
  
+# Bugs: This is crippled when doing parallel make, the `make all-host'
+# and `make all-target' phases can be parallelized.
  
-.PHONY: maybe-installcheck-gcc installcheck-gcc
-maybe-installcheck-gcc:
-installcheck-gcc: \
-    configure-gcc 
-       @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       for flag in $(EXTRA_GCC_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing installcheck in gcc" ; \
-       (cd gcc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
-         || exit 1
  
+# 'touch' doesn't work right on some platforms.
+STAMP = echo timestamp > 
  
-.PHONY: maybe-mostlyclean-gcc mostlyclean-gcc
-maybe-mostlyclean-gcc:
-mostlyclean-gcc: 
-       @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       for flag in $(EXTRA_GCC_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing mostlyclean in gcc" ; \
-       (cd gcc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
-         || exit 1
+# Only build the C compiler for stage1, because that is the only one that
+# we can guarantee will build with the native compiler, and also it is the
+# only thing useful for building stage2. STAGE1_CFLAGS (via CFLAGS),
+# MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them
+# overrideable (for a bootstrap build stage1 also builds gcc.info).
  
+STAGE1_CFLAGS=@stage1_cflags@
+STAGE1_LANGUAGES=@stage1_languages@
  
-.PHONY: maybe-clean-gcc clean-gcc
-maybe-clean-gcc:
-clean-gcc: 
-       @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       for flag in $(EXTRA_GCC_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing clean in gcc" ; \
-       (cd gcc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
-         || exit 1
+# We only want to compare .o files, so set this!
+objext = .o
  
+# Flags to pass to stage2 and later makes.
+POSTSTAGE1_FLAGS_TO_PASS = \
+       CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \
+       STAGE_PREFIX=$$r/stage-gcc/ \
+       CFLAGS="$(BOOT_CFLAGS)" \
+       ADAC="\$$(CC)"
  
-.PHONY: maybe-distclean-gcc distclean-gcc
-maybe-distclean-gcc:
-distclean-gcc: 
-       @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       for flag in $(EXTRA_GCC_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing distclean in gcc" ; \
-       (cd gcc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
-         || exit 1
+# For stage 1:
+# * We force-disable intermodule optimizations, even if
+#   --enable-intermodule was passed, since the installed compiler probably
+#   can't handle them.  Luckily, autoconf always respects
+#   the last argument when conflicting --enable arguments are passed.
+# * Likewise, we force-disable coverage flags, since the installed compiler
+#   probably has never heard of them.
+# * We build only C (and possibly Ada).
  
  
-.PHONY: maybe-maintainer-clean-gcc maintainer-clean-gcc
-maybe-maintainer-clean-gcc:
-maintainer-clean-gcc: 
-       @[ -f ./gcc/Makefile ] || exit 0; \
+.PHONY: stage1-start stage1-end
+
+stage1-start::
+       @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
+       echo stage1 > stage_current ; \
+       echo stage1 > stage_last
+@if bfd
+       @[ -d stage1-bfd ] || mkdir stage1-bfd; \
+       set stage1-bfd bfd ; @CREATE_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @[ -d stage1-opcodes ] || mkdir stage1-opcodes; \
+       set stage1-opcodes opcodes ; @CREATE_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @[ -d stage1-binutils ] || mkdir stage1-binutils; \
+       set stage1-binutils binutils ; @CREATE_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @[ -d stage1-gas ] || mkdir stage1-gas; \
+       set stage1-gas gas ; @CREATE_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @[ -d stage1-gcc ] || mkdir stage1-gcc; \
+       set stage1-gcc gcc ; @CREATE_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @[ -d stage1-intl ] || mkdir stage1-intl; \
+       set stage1-intl intl ; @CREATE_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @[ -d stage1-ld ] || mkdir stage1-ld; \
+       set stage1-ld ld ; @CREATE_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @[ -d stage1-libcpp ] || mkdir stage1-libcpp; \
+       set stage1-libcpp libcpp ; @CREATE_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @[ -d stage1-libiberty ] || mkdir stage1-libiberty; \
+       set stage1-libiberty libiberty ; @CREATE_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @[ -d stage1-zlib ] || mkdir stage1-zlib; \
+       set stage1-zlib zlib ; @CREATE_LINK_TO_DIR@ 
+@endif zlib
+
+stage1-end::
+       @rm -f stage_current
+@if bfd
+       @set bfd stage1-bfd ; @UNDO_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @set opcodes stage1-opcodes ; @UNDO_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @set binutils stage1-binutils ; @UNDO_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @set gas stage1-gas ; @UNDO_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @set gcc stage1-gcc ; @UNDO_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @set intl stage1-intl ; @UNDO_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @set ld stage1-ld ; @UNDO_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @set libcpp stage1-libcpp ; @UNDO_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @set libiberty stage1-libiberty ; @UNDO_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @set zlib stage1-zlib ; @UNDO_LINK_TO_DIR@ 
+@endif zlib
+
+# Bubble a bugfix through all the stages up to stage 1.  They
+# are remade, but not reconfigured.  The next stage (if any) will not
+# be reconfigured as well.
+.PHONY: stage1-bubble
+stage1-bubble:: 
+       @if test -f stage1-lean  ; then \
+         echo Skipping rebuild of stage1 ; \
+       else \
+         $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage1; \
+       fi
+
+.PHONY: all-stage1 clean-stage1
+all-stage1:     \
+  maybe-all-stage1-bfd \
+  maybe-all-stage1-opcodes \
+  maybe-all-stage1-binutils             \
+  maybe-all-stage1-gas \
+  maybe-all-stage1-gcc        \
+  maybe-all-stage1-intl   \
+  maybe-all-stage1-ld \
+  maybe-all-stage1-libcpp  \
+  maybe-all-stage1-libiberty                        \
+  maybe-all-stage1-zlib       
+
+do-clean: clean-stage1
+clean-stage1:     \
+  maybe-clean-stage1-bfd \
+  maybe-clean-stage1-opcodes \
+  maybe-clean-stage1-binutils             \
+  maybe-clean-stage1-gas \
+  maybe-clean-stage1-gcc        \
+  maybe-clean-stage1-intl   \
+  maybe-clean-stage1-ld \
+  maybe-clean-stage1-libcpp  \
+  maybe-clean-stage1-libiberty                        \
+  maybe-clean-stage1-zlib       
+
+
+.PHONY: configure-stage1-bfd maybe-configure-stage1-bfd
+.PHONY: all-stage1-bfd maybe-all-stage1-bfd
+.PHONY: clean-stage1-bfd maybe-clean-stage1-bfd
+
+maybe-configure-stage1-bfd:
+maybe-all-stage1-bfd:
+maybe-clean-stage1-bfd:
+
+@if bfd-bootstrap
+maybe-configure-stage1-bfd: configure-stage1-bfd
+configure-stage1-bfd:
+       @$(MAKE) stage1-start
+       @[ -f bfd/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       echo Configuring stage 1 in bfd ; \
+       cd bfd || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/bfd"; \
+           libsrcdir="$$s/bfd";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/bfd"; \
+           libsrcdir="$$s/bfd";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+
+maybe-all-stage1-bfd: all-stage1-bfd
+all-stage1-bfd: configure-stage1-bfd
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       cd bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-bfd: clean-stage1-bfd
+clean-stage1-bfd:
+       @[ -f bfd/Makefile ] || [ -f stage1-bfd/Makefile ] \
+         || exit 0 ; \
+       [ -f bfd/Makefile ] || $(MAKE) stage1-start ; \
+       cd bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif bfd-bootstrap
+
+
+.PHONY: configure-stage1-opcodes maybe-configure-stage1-opcodes
+.PHONY: all-stage1-opcodes maybe-all-stage1-opcodes
+.PHONY: clean-stage1-opcodes maybe-clean-stage1-opcodes
+
+maybe-configure-stage1-opcodes:
+maybe-all-stage1-opcodes:
+maybe-clean-stage1-opcodes:
+
+@if opcodes-bootstrap
+maybe-configure-stage1-opcodes: configure-stage1-opcodes
+configure-stage1-opcodes:
+       @$(MAKE) stage1-start
+       @[ -f opcodes/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       echo Configuring stage 1 in opcodes ; \
+       cd opcodes || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/opcodes"; \
+           libsrcdir="$$s/opcodes";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/opcodes"; \
+           libsrcdir="$$s/opcodes";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+
+maybe-all-stage1-opcodes: all-stage1-opcodes
+all-stage1-opcodes: configure-stage1-opcodes
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       cd opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-opcodes: clean-stage1-opcodes
+clean-stage1-opcodes:
+       @[ -f opcodes/Makefile ] || [ -f stage1-opcodes/Makefile ] \
+         || exit 0 ; \
+       [ -f opcodes/Makefile ] || $(MAKE) stage1-start ; \
+       cd opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif opcodes-bootstrap
+
+
+.PHONY: configure-stage1-binutils maybe-configure-stage1-binutils
+.PHONY: all-stage1-binutils maybe-all-stage1-binutils
+.PHONY: clean-stage1-binutils maybe-clean-stage1-binutils
+
+maybe-configure-stage1-binutils:
+maybe-all-stage1-binutils:
+maybe-clean-stage1-binutils:
+
+@if binutils-bootstrap
+maybe-configure-stage1-binutils: configure-stage1-binutils
+configure-stage1-binutils:
+       @$(MAKE) stage1-start
+       @[ -f binutils/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       echo Configuring stage 1 in binutils ; \
+       cd binutils || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/binutils"; \
+           libsrcdir="$$s/binutils";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/binutils"; \
+           libsrcdir="$$s/binutils";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+
+maybe-all-stage1-binutils: all-stage1-binutils
+all-stage1-binutils: configure-stage1-binutils
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       cd binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-binutils: clean-stage1-binutils
+clean-stage1-binutils:
+       @[ -f binutils/Makefile ] || [ -f stage1-binutils/Makefile ] \
+         || exit 0 ; \
+       [ -f binutils/Makefile ] || $(MAKE) stage1-start ; \
+       cd binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif binutils-bootstrap
+
+
+.PHONY: configure-stage1-gas maybe-configure-stage1-gas
+.PHONY: all-stage1-gas maybe-all-stage1-gas
+.PHONY: clean-stage1-gas maybe-clean-stage1-gas
+
+maybe-configure-stage1-gas:
+maybe-all-stage1-gas:
+maybe-clean-stage1-gas:
+
+@if gas-bootstrap
+maybe-configure-stage1-gas: configure-stage1-gas
+configure-stage1-gas:
+       @$(MAKE) stage1-start
+       @[ -f gas/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       echo Configuring stage 1 in gas ; \
+       cd gas || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/gas"; \
+           libsrcdir="$$s/gas";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/gas"; \
+           libsrcdir="$$s/gas";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+
+maybe-all-stage1-gas: all-stage1-gas
+all-stage1-gas: configure-stage1-gas
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       cd gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-gas: clean-stage1-gas
+clean-stage1-gas:
+       @[ -f gas/Makefile ] || [ -f stage1-gas/Makefile ] \
+         || exit 0 ; \
+       [ -f gas/Makefile ] || $(MAKE) stage1-start ; \
+       cd gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif gas-bootstrap
+
+
+.PHONY: configure-stage1-gcc maybe-configure-stage1-gcc
+.PHONY: all-stage1-gcc maybe-all-stage1-gcc
+.PHONY: clean-stage1-gcc maybe-clean-stage1-gcc
+
+maybe-configure-stage1-gcc:
+maybe-all-stage1-gcc:
+maybe-clean-stage1-gcc:
+
+@if gcc-bootstrap
+maybe-configure-stage1-gcc: configure-stage1-gcc
+configure-stage1-gcc:
+       @$(MAKE) stage1-start
+       @[ -f gcc/Makefile ] && exit 0 || : ; \
         r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       for flag in $(EXTRA_GCC_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing maintainer-clean in gcc" ; \
-       (cd gcc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
-         || exit 1
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       echo Configuring stage 1 in gcc ; \
+       cd gcc || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/gcc"; \
+           libsrcdir="$$s/gcc";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/gcc"; \
+           libsrcdir="$$s/gcc";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+
+maybe-all-stage1-gcc: all-stage1-gcc
+all-stage1-gcc: configure-stage1-gcc
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       cd gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS)
+
+maybe-clean-stage1-gcc: clean-stage1-gcc
+clean-stage1-gcc:
+       @[ -f gcc/Makefile ] || [ -f stage1-gcc/Makefile ] \
+         || exit 0 ; \
+       [ -f gcc/Makefile ] || $(MAKE) stage1-start ; \
+       cd gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
  
  
+.PHONY: configure-stage1-intl maybe-configure-stage1-intl
+.PHONY: all-stage1-intl maybe-all-stage1-intl
+.PHONY: clean-stage1-intl maybe-clean-stage1-intl
  
-# ---------------------
-# GCC bootstrap support
-# ---------------------
+maybe-configure-stage1-intl:
+maybe-all-stage1-intl:
+maybe-clean-stage1-intl:
  
-# We name the directories for the various stages "stage1-gcc",
-# "stage2-gcc","stage3-gcc", etc.  
-# Unfortunately, the 'compare' process will fail (on debugging information)
-# if any directory names are different!
-# So in the building rule for each stage, we relocate them before and after.
-# The current one is 'gcc', while the previous one is 'prev-gcc'.  (The
-# current one must be 'gcc' for now because the scripts in that directory
-# assume it.)
-# At the end of the bootstrap, 'stage3-gcc' must be moved to 'gcc' so that
-# libraries can find it.  Ick!
+@if intl-bootstrap
+maybe-configure-stage1-intl: configure-stage1-intl
+configure-stage1-intl:
+       @$(MAKE) stage1-start
+       @[ -f intl/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       echo Configuring stage 1 in intl ; \
+       cd intl || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/intl"; \
+           libsrcdir="$$s/intl";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/intl"; \
+           libsrcdir="$$s/intl";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
  
-# Bugs: This is almost certainly not parallel-make safe.
+maybe-all-stage1-intl: all-stage1-intl
+all-stage1-intl: configure-stage1-intl
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       cd intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-intl: clean-stage1-intl
+clean-stage1-intl:
+       @[ -f intl/Makefile ] || [ -f stage1-intl/Makefile ] \
+         || exit 0 ; \
+       [ -f intl/Makefile ] || $(MAKE) stage1-start ; \
+       cd intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif intl-bootstrap
+
+
+.PHONY: configure-stage1-ld maybe-configure-stage1-ld
+.PHONY: all-stage1-ld maybe-all-stage1-ld
+.PHONY: clean-stage1-ld maybe-clean-stage1-ld
+
+maybe-configure-stage1-ld:
+maybe-all-stage1-ld:
+maybe-clean-stage1-ld:
+
+@if ld-bootstrap
+maybe-configure-stage1-ld: configure-stage1-ld
+configure-stage1-ld:
+       @$(MAKE) stage1-start
+       @[ -f ld/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       echo Configuring stage 1 in ld ; \
+       cd ld || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/ld"; \
+           libsrcdir="$$s/ld";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/ld"; \
+           libsrcdir="$$s/ld";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
  
-# 'touch' doesn't work right on some platforms.
-STAMP = echo timestamp > 
+maybe-all-stage1-ld: all-stage1-ld
+all-stage1-ld: configure-stage1-ld
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       cd ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-ld: clean-stage1-ld
+clean-stage1-ld:
+       @[ -f ld/Makefile ] || [ -f stage1-ld/Makefile ] \
+         || exit 0 ; \
+       [ -f ld/Makefile ] || $(MAKE) stage1-start ; \
+       cd ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif ld-bootstrap
+
+
+.PHONY: configure-stage1-libcpp maybe-configure-stage1-libcpp
+.PHONY: all-stage1-libcpp maybe-all-stage1-libcpp
+.PHONY: clean-stage1-libcpp maybe-clean-stage1-libcpp
+
+maybe-configure-stage1-libcpp:
+maybe-all-stage1-libcpp:
+maybe-clean-stage1-libcpp:
+
+@if libcpp-bootstrap
+maybe-configure-stage1-libcpp: configure-stage1-libcpp
+configure-stage1-libcpp:
+       @$(MAKE) stage1-start
+       @[ -f libcpp/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       echo Configuring stage 1 in libcpp ; \
+       cd libcpp || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/libcpp"; \
+           libsrcdir="$$s/libcpp";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/libcpp"; \
+           libsrcdir="$$s/libcpp";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
  
-# Only build the C compiler for stage1, because that is the only one that
-# we can guarantee will build with the native compiler, and also it is the
-# only thing useful for building stage2. STAGE1_CFLAGS (via CFLAGS),
-# MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them
-# overrideable (for a bootstrap build stage1 also builds gcc.info).
+maybe-all-stage1-libcpp: all-stage1-libcpp
+all-stage1-libcpp: configure-stage1-libcpp
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       cd libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-libcpp: clean-stage1-libcpp
+clean-stage1-libcpp:
+       @[ -f libcpp/Makefile ] || [ -f stage1-libcpp/Makefile ] \
+         || exit 0 ; \
+       [ -f libcpp/Makefile ] || $(MAKE) stage1-start ; \
+       cd libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif libcpp-bootstrap
+
+
+.PHONY: configure-stage1-libiberty maybe-configure-stage1-libiberty
+.PHONY: all-stage1-libiberty maybe-all-stage1-libiberty
+.PHONY: clean-stage1-libiberty maybe-clean-stage1-libiberty
+
+maybe-configure-stage1-libiberty:
+maybe-all-stage1-libiberty:
+maybe-clean-stage1-libiberty:
+
+@if libiberty-bootstrap
+maybe-configure-stage1-libiberty: configure-stage1-libiberty
+configure-stage1-libiberty:
+       @$(MAKE) stage1-start
+       @[ -f libiberty/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       echo Configuring stage 1 in libiberty ; \
+       cd libiberty || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/libiberty"; \
+           libsrcdir="$$s/libiberty";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/libiberty"; \
+           libsrcdir="$$s/libiberty";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
  
-STAGE1_CFLAGS=@stage1_cflags@
-STAGE1_LANGUAGES=@stage1_languages@
+maybe-all-stage1-libiberty: all-stage1-libiberty
+all-stage1-libiberty: configure-stage1-libiberty
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       cd libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-libiberty: clean-stage1-libiberty
+clean-stage1-libiberty:
+       @[ -f libiberty/Makefile ] || [ -f stage1-libiberty/Makefile ] \
+         || exit 0 ; \
+       [ -f libiberty/Makefile ] || $(MAKE) stage1-start ; \
+       cd libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif libiberty-bootstrap
+
+
+.PHONY: configure-stage1-zlib maybe-configure-stage1-zlib
+.PHONY: all-stage1-zlib maybe-all-stage1-zlib
+.PHONY: clean-stage1-zlib maybe-clean-stage1-zlib
+
+maybe-configure-stage1-zlib:
+maybe-all-stage1-zlib:
+maybe-clean-stage1-zlib:
+
+@if zlib-bootstrap
+maybe-configure-stage1-zlib: configure-stage1-zlib
+configure-stage1-zlib:
+       @$(MAKE) stage1-start
+       @[ -f zlib/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       echo Configuring stage 1 in zlib ; \
+       cd zlib || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/zlib"; \
+           libsrcdir="$$s/zlib";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/zlib"; \
+           libsrcdir="$$s/zlib";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
  
-# For stage 1:
-# * We force-disable intermodule optimizations, even if
-#   --enable-intermodule was passed, since the installed compiler probably
-#   can't handle them.  Luckily, autoconf always respects
-#   the last argument when conflicting --enable arguments are passed.
-# * Likewise, we force-disable coverage flags, since the installed compiler
-#   probably has never heard of them.
-# * We build only C (and possibly Ada).
-configure-stage1-gcc:
-       echo configure-stage1-gcc > stage_last ; \
-       if [ -f stage1-gcc/Makefile ] ; then \
-         $(STAMP) configure-stage1-gcc ; \
-         exit 0; \
+maybe-all-stage1-zlib: all-stage1-zlib
+all-stage1-zlib: configure-stage1-zlib
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       cd zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-zlib: clean-stage1-zlib
+clean-stage1-zlib:
+       @[ -f zlib/Makefile ] || [ -f stage1-zlib/Makefile ] \
+         || exit 0 ; \
+       [ -f zlib/Makefile ] || $(MAKE) stage1-start ; \
+       cd zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif zlib-bootstrap
+
+
+
+# FIXME: Will not need to be conditional when toplevel bootstrap is the
+# only possibility, but now it conflicts with no-bootstrap rules
+@if gcc-bootstrap
+
+
+
+
+# Rules to wipe a stage and all the following ones, also used for cleanstrap
+
+.PHONY: distclean-stage1
+distclean-stage1::
+       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+       rm -rf stage1-* 
+
+
+@endif gcc-bootstrap
+
+
+.PHONY: stage2-start stage2-end
+
+stage2-start::
+       @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
+       echo stage2 > stage_current ; \
+       echo stage2 > stage_last
+@if bfd
+       @[ -d stage2-bfd ] || mkdir stage2-bfd; \
+       set stage2-bfd bfd ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-bfd prev-bfd ; @CREATE_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @[ -d stage2-opcodes ] || mkdir stage2-opcodes; \
+       set stage2-opcodes opcodes ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-opcodes prev-opcodes ; @CREATE_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @[ -d stage2-binutils ] || mkdir stage2-binutils; \
+       set stage2-binutils binutils ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-binutils prev-binutils ; @CREATE_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @[ -d stage2-gas ] || mkdir stage2-gas; \
+       set stage2-gas gas ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-gas prev-gas ; @CREATE_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @[ -d stage2-gcc ] || mkdir stage2-gcc; \
+       set stage2-gcc gcc ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-gcc prev-gcc ; @CREATE_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @[ -d stage2-intl ] || mkdir stage2-intl; \
+       set stage2-intl intl ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-intl prev-intl ; @CREATE_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @[ -d stage2-ld ] || mkdir stage2-ld; \
+       set stage2-ld ld ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-ld prev-ld ; @CREATE_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @[ -d stage2-libcpp ] || mkdir stage2-libcpp; \
+       set stage2-libcpp libcpp ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-libcpp prev-libcpp ; @CREATE_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @[ -d stage2-libiberty ] || mkdir stage2-libiberty; \
+       set stage2-libiberty libiberty ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-libiberty prev-libiberty ; @CREATE_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @[ -d stage2-zlib ] || mkdir stage2-zlib; \
+       set stage2-zlib zlib ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-zlib prev-zlib ; @CREATE_LINK_TO_DIR@ 
+@endif zlib
+
+stage2-end::
+       @rm -f stage_current
+@if bfd
+       @set bfd stage2-bfd ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-bfd stage1-bfd ; @UNDO_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @set opcodes stage2-opcodes ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-opcodes stage1-opcodes ; @UNDO_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @set binutils stage2-binutils ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-binutils stage1-binutils ; @UNDO_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @set gas stage2-gas ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-gas stage1-gas ; @UNDO_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @set gcc stage2-gcc ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-gcc stage1-gcc ; @UNDO_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @set intl stage2-intl ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-intl stage1-intl ; @UNDO_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @set ld stage2-ld ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-ld stage1-ld ; @UNDO_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @set libcpp stage2-libcpp ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-libcpp stage1-libcpp ; @UNDO_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @set libiberty stage2-libiberty ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-libiberty stage1-libiberty ; @UNDO_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @set zlib stage2-zlib ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-zlib stage1-zlib ; @UNDO_LINK_TO_DIR@ 
+@endif zlib
+
+# Bubble a bugfix through all the stages up to stage 2.  They
+# are remade, but not reconfigured.  The next stage (if any) will not
+# be reconfigured as well.
+.PHONY: stage2-bubble
+stage2-bubble:: stage1-bubble
+       @if test -f stage2-lean || test -f stage1-lean  ; then \
+         echo Skipping rebuild of stage2 ; \
         else \
-         true ; \
-       fi ; \
-       [ -d stage1-gcc ] || mkdir stage1-gcc; \
-       mv stage1-gcc gcc ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       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; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring stage 1 in gcc; \
+         $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage2; \
+       fi
+
+.PHONY: all-stage2 clean-stage2
+all-stage2:     \
+  maybe-all-stage2-bfd \
+  maybe-all-stage2-opcodes \
+  maybe-all-stage2-binutils             \
+  maybe-all-stage2-gas \
+  maybe-all-stage2-gcc        \
+  maybe-all-stage2-intl   \
+  maybe-all-stage2-ld \
+  maybe-all-stage2-libcpp  \
+  maybe-all-stage2-libiberty                        \
+  maybe-all-stage2-zlib       
+
+do-clean: clean-stage2
+clean-stage2:     \
+  maybe-clean-stage2-bfd \
+  maybe-clean-stage2-opcodes \
+  maybe-clean-stage2-binutils             \
+  maybe-clean-stage2-gas \
+  maybe-clean-stage2-gcc        \
+  maybe-clean-stage2-intl   \
+  maybe-clean-stage2-ld \
+  maybe-clean-stage2-libcpp  \
+  maybe-clean-stage2-libiberty                        \
+  maybe-clean-stage2-zlib       
+
+
+.PHONY: configure-stage2-bfd maybe-configure-stage2-bfd
+.PHONY: all-stage2-bfd maybe-all-stage2-bfd
+.PHONY: clean-stage2-bfd maybe-clean-stage2-bfd
+
+maybe-configure-stage2-bfd:
+maybe-all-stage2-bfd:
+maybe-clean-stage2-bfd:
+
+@if bfd-bootstrap
+maybe-configure-stage2-bfd: configure-stage2-bfd
+configure-stage2-bfd:
+       @$(MAKE) stage2-start
+       @[ -f bfd/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 2 in bfd ; \
+       cd bfd || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/bfd"; \
+           libsrcdir="$$s/bfd";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/bfd"; \
+           libsrcdir="$$s/bfd";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage2-bfd: all-stage2-bfd
+all-stage2-bfd: configure-stage2-bfd
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage2-bfd: clean-stage2-bfd
+clean-stage2-bfd:
+       @[ -f bfd/Makefile ] || [ -f stage2-bfd/Makefile ] \
+         || exit 0 ; \
+       [ -f bfd/Makefile ] || $(MAKE) stage2-start ; \
+       cd bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif bfd-bootstrap
+
+
+.PHONY: configure-stage2-opcodes maybe-configure-stage2-opcodes
+.PHONY: all-stage2-opcodes maybe-all-stage2-opcodes
+.PHONY: clean-stage2-opcodes maybe-clean-stage2-opcodes
+
+maybe-configure-stage2-opcodes:
+maybe-all-stage2-opcodes:
+maybe-clean-stage2-opcodes:
+
+@if opcodes-bootstrap
+maybe-configure-stage2-opcodes: configure-stage2-opcodes
+configure-stage2-opcodes:
+       @$(MAKE) stage2-start
+       @[ -f opcodes/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 2 in opcodes ; \
+       cd opcodes || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/opcodes"; \
+           libsrcdir="$$s/opcodes";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/opcodes"; \
+           libsrcdir="$$s/opcodes";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage2-opcodes: all-stage2-opcodes
+all-stage2-opcodes: configure-stage2-opcodes
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage2-opcodes: clean-stage2-opcodes
+clean-stage2-opcodes:
+       @[ -f opcodes/Makefile ] || [ -f stage2-opcodes/Makefile ] \
+         || exit 0 ; \
+       [ -f opcodes/Makefile ] || $(MAKE) stage2-start ; \
+       cd opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif opcodes-bootstrap
+
+
+.PHONY: configure-stage2-binutils maybe-configure-stage2-binutils
+.PHONY: all-stage2-binutils maybe-all-stage2-binutils
+.PHONY: clean-stage2-binutils maybe-clean-stage2-binutils
+
+maybe-configure-stage2-binutils:
+maybe-all-stage2-binutils:
+maybe-clean-stage2-binutils:
+
+@if binutils-bootstrap
+maybe-configure-stage2-binutils: configure-stage2-binutils
+configure-stage2-binutils:
+       @$(MAKE) stage2-start
+       @[ -f binutils/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 2 in binutils ; \
+       cd binutils || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/binutils"; \
+           libsrcdir="$$s/binutils";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/binutils"; \
+           libsrcdir="$$s/binutils";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage2-binutils: all-stage2-binutils
+all-stage2-binutils: configure-stage2-binutils
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage2-binutils: clean-stage2-binutils
+clean-stage2-binutils:
+       @[ -f binutils/Makefile ] || [ -f stage2-binutils/Makefile ] \
+         || exit 0 ; \
+       [ -f binutils/Makefile ] || $(MAKE) stage2-start ; \
+       cd binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif binutils-bootstrap
+
+
+.PHONY: configure-stage2-gas maybe-configure-stage2-gas
+.PHONY: all-stage2-gas maybe-all-stage2-gas
+.PHONY: clean-stage2-gas maybe-clean-stage2-gas
+
+maybe-configure-stage2-gas:
+maybe-all-stage2-gas:
+maybe-clean-stage2-gas:
+
+@if gas-bootstrap
+maybe-configure-stage2-gas: configure-stage2-gas
+configure-stage2-gas:
+       @$(MAKE) stage2-start
+       @[ -f gas/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 2 in gas ; \
+       cd gas || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/gas"; \
+           libsrcdir="$$s/gas";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/gas"; \
+           libsrcdir="$$s/gas";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage2-gas: all-stage2-gas
+all-stage2-gas: configure-stage2-gas
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage2-gas: clean-stage2-gas
+clean-stage2-gas:
+       @[ -f gas/Makefile ] || [ -f stage2-gas/Makefile ] \
+         || exit 0 ; \
+       [ -f gas/Makefile ] || $(MAKE) stage2-start ; \
+       cd gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif gas-bootstrap
+
+
+.PHONY: configure-stage2-gcc maybe-configure-stage2-gcc
+.PHONY: all-stage2-gcc maybe-all-stage2-gcc
+.PHONY: clean-stage2-gcc maybe-clean-stage2-gcc
+
+maybe-configure-stage2-gcc:
+maybe-all-stage2-gcc:
+maybe-clean-stage2-gcc:
+
+@if gcc-bootstrap
+maybe-configure-stage2-gcc: configure-stage2-gcc
+configure-stage2-gcc:
+       @$(MAKE) stage2-start
+       @[ -f gcc/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 2 in gcc ; \
+       cd gcc || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/gcc"; \
+           libsrcdir="$$s/gcc";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/gcc"; \
+           libsrcdir="$$s/gcc";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage2-gcc: all-stage2-gcc
+all-stage2-gcc: configure-stage2-gcc
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                $(EXTRA_GCC_FLAGS)
+
+maybe-clean-stage2-gcc: clean-stage2-gcc
+clean-stage2-gcc:
+       @[ -f gcc/Makefile ] || [ -f stage2-gcc/Makefile ] \
+         || exit 0 ; \
+       [ -f gcc/Makefile ] || $(MAKE) stage2-start ; \
+       cd gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                $(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+.PHONY: configure-stage2-intl maybe-configure-stage2-intl
+.PHONY: all-stage2-intl maybe-all-stage2-intl
+.PHONY: clean-stage2-intl maybe-clean-stage2-intl
+
+maybe-configure-stage2-intl:
+maybe-all-stage2-intl:
+maybe-clean-stage2-intl:
+
+@if intl-bootstrap
+maybe-configure-stage2-intl: configure-stage2-intl
+configure-stage2-intl:
+       @$(MAKE) stage2-start
+       @[ -f intl/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 2 in intl ; \
+       cd intl || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/intl"; \
+           libsrcdir="$$s/intl";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/intl"; \
+           libsrcdir="$$s/intl";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage2-intl: all-stage2-intl
+all-stage2-intl: configure-stage2-intl
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage2-intl: clean-stage2-intl
+clean-stage2-intl:
+       @[ -f intl/Makefile ] || [ -f stage2-intl/Makefile ] \
+         || exit 0 ; \
+       [ -f intl/Makefile ] || $(MAKE) stage2-start ; \
+       cd intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif intl-bootstrap
+
+
+.PHONY: configure-stage2-ld maybe-configure-stage2-ld
+.PHONY: all-stage2-ld maybe-all-stage2-ld
+.PHONY: clean-stage2-ld maybe-clean-stage2-ld
+
+maybe-configure-stage2-ld:
+maybe-all-stage2-ld:
+maybe-clean-stage2-ld:
+
+@if ld-bootstrap
+maybe-configure-stage2-ld: configure-stage2-ld
+configure-stage2-ld:
+       @$(MAKE) stage2-start
+       @[ -f ld/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 2 in ld ; \
+       cd ld || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/ld"; \
+           libsrcdir="$$s/ld";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/ld"; \
+           libsrcdir="$$s/ld";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage2-ld: all-stage2-ld
+all-stage2-ld: configure-stage2-ld
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage2-ld: clean-stage2-ld
+clean-stage2-ld:
+       @[ -f ld/Makefile ] || [ -f stage2-ld/Makefile ] \
+         || exit 0 ; \
+       [ -f ld/Makefile ] || $(MAKE) stage2-start ; \
+       cd ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif ld-bootstrap
+
+
+.PHONY: configure-stage2-libcpp maybe-configure-stage2-libcpp
+.PHONY: all-stage2-libcpp maybe-all-stage2-libcpp
+.PHONY: clean-stage2-libcpp maybe-clean-stage2-libcpp
+
+maybe-configure-stage2-libcpp:
+maybe-all-stage2-libcpp:
+maybe-clean-stage2-libcpp:
+
+@if libcpp-bootstrap
+maybe-configure-stage2-libcpp: configure-stage2-libcpp
+configure-stage2-libcpp:
+       @$(MAKE) stage2-start
+       @[ -f libcpp/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 2 in libcpp ; \
+       cd libcpp || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/libcpp"; \
+           libsrcdir="$$s/libcpp";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/libcpp"; \
+           libsrcdir="$$s/libcpp";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage2-libcpp: all-stage2-libcpp
+all-stage2-libcpp: configure-stage2-libcpp
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage2-libcpp: clean-stage2-libcpp
+clean-stage2-libcpp:
+       @[ -f libcpp/Makefile ] || [ -f stage2-libcpp/Makefile ] \
+         || exit 0 ; \
+       [ -f libcpp/Makefile ] || $(MAKE) stage2-start ; \
+       cd libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif libcpp-bootstrap
+
+
+.PHONY: configure-stage2-libiberty maybe-configure-stage2-libiberty
+.PHONY: all-stage2-libiberty maybe-all-stage2-libiberty
+.PHONY: clean-stage2-libiberty maybe-clean-stage2-libiberty
+
+maybe-configure-stage2-libiberty:
+maybe-all-stage2-libiberty:
+maybe-clean-stage2-libiberty:
+
+@if libiberty-bootstrap
+maybe-configure-stage2-libiberty: configure-stage2-libiberty
+configure-stage2-libiberty:
+       @$(MAKE) stage2-start
+       @[ -f libiberty/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 2 in libiberty ; \
+       cd libiberty || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/libiberty"; \
+           libsrcdir="$$s/libiberty";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/libiberty"; \
+           libsrcdir="$$s/libiberty";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage2-libiberty: all-stage2-libiberty
+all-stage2-libiberty: configure-stage2-libiberty
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage2-libiberty: clean-stage2-libiberty
+clean-stage2-libiberty:
+       @[ -f libiberty/Makefile ] || [ -f stage2-libiberty/Makefile ] \
+         || exit 0 ; \
+       [ -f libiberty/Makefile ] || $(MAKE) stage2-start ; \
+       cd libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif libiberty-bootstrap
+
+
+.PHONY: configure-stage2-zlib maybe-configure-stage2-zlib
+.PHONY: all-stage2-zlib maybe-all-stage2-zlib
+.PHONY: clean-stage2-zlib maybe-clean-stage2-zlib
+
+maybe-configure-stage2-zlib:
+maybe-all-stage2-zlib:
+maybe-clean-stage2-zlib:
+
+@if zlib-bootstrap
+maybe-configure-stage2-zlib: configure-stage2-zlib
+configure-stage2-zlib:
+       @$(MAKE) stage2-start
+       @[ -f zlib/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 2 in zlib ; \
+       cd zlib || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/zlib"; \
+           libsrcdir="$$s/zlib";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/zlib"; \
+           libsrcdir="$$s/zlib";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage2-zlib: all-stage2-zlib
+all-stage2-zlib: configure-stage2-zlib
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage2-zlib: clean-stage2-zlib
+clean-stage2-zlib:
+       @[ -f zlib/Makefile ] || [ -f stage2-zlib/Makefile ] \
+         || exit 0 ; \
+       [ -f zlib/Makefile ] || $(MAKE) stage2-start ; \
+       cd zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif zlib-bootstrap
+
+
+
+# FIXME: Will not need to be conditional when toplevel bootstrap is the
+# only possibility, but now it conflicts with no-bootstrap rules
+@if gcc-bootstrap
+
+
+
+.PHONY: bootstrap2
+bootstrap2: stage2-bubble  all
+
+
+# Rules to wipe a stage and all the following ones, also used for cleanstrap
+distclean-stage1:: distclean-stage2 
+.PHONY: distclean-stage2
+distclean-stage2::
+       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+       rm -rf stage2-* 
+
+
+@endif gcc-bootstrap
+
+
+.PHONY: stage3-start stage3-end
+
+stage3-start::
+       @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
+       echo stage3 > stage_current ; \
+       echo stage3 > stage_last
+@if bfd
+       @[ -d stage3-bfd ] || mkdir stage3-bfd; \
+       set stage3-bfd bfd ; @CREATE_LINK_TO_DIR@  ; \
+       set stage2-bfd prev-bfd ; @CREATE_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @[ -d stage3-opcodes ] || mkdir stage3-opcodes; \
+       set stage3-opcodes opcodes ; @CREATE_LINK_TO_DIR@  ; \
+       set stage2-opcodes prev-opcodes ; @CREATE_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @[ -d stage3-binutils ] || mkdir stage3-binutils; \
+       set stage3-binutils binutils ; @CREATE_LINK_TO_DIR@  ; \
+       set stage2-binutils prev-binutils ; @CREATE_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @[ -d stage3-gas ] || mkdir stage3-gas; \
+       set stage3-gas gas ; @CREATE_LINK_TO_DIR@  ; \
+       set stage2-gas prev-gas ; @CREATE_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @[ -d stage3-gcc ] || mkdir stage3-gcc; \
+       set stage3-gcc gcc ; @CREATE_LINK_TO_DIR@  ; \
+       set stage2-gcc prev-gcc ; @CREATE_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @[ -d stage3-intl ] || mkdir stage3-intl; \
+       set stage3-intl intl ; @CREATE_LINK_TO_DIR@  ; \
+       set stage2-intl prev-intl ; @CREATE_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @[ -d stage3-ld ] || mkdir stage3-ld; \
+       set stage3-ld ld ; @CREATE_LINK_TO_DIR@  ; \
+       set stage2-ld prev-ld ; @CREATE_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @[ -d stage3-libcpp ] || mkdir stage3-libcpp; \
+       set stage3-libcpp libcpp ; @CREATE_LINK_TO_DIR@  ; \
+       set stage2-libcpp prev-libcpp ; @CREATE_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @[ -d stage3-libiberty ] || mkdir stage3-libiberty; \
+       set stage3-libiberty libiberty ; @CREATE_LINK_TO_DIR@  ; \
+       set stage2-libiberty prev-libiberty ; @CREATE_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @[ -d stage3-zlib ] || mkdir stage3-zlib; \
+       set stage3-zlib zlib ; @CREATE_LINK_TO_DIR@  ; \
+       set stage2-zlib prev-zlib ; @CREATE_LINK_TO_DIR@ 
+@endif zlib
+
+stage3-end::
+       @rm -f stage_current
+@if bfd
+       @set bfd stage3-bfd ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-bfd stage2-bfd ; @UNDO_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @set opcodes stage3-opcodes ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-opcodes stage2-opcodes ; @UNDO_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @set binutils stage3-binutils ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-binutils stage2-binutils ; @UNDO_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @set gas stage3-gas ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-gas stage2-gas ; @UNDO_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @set gcc stage3-gcc ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-gcc stage2-gcc ; @UNDO_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @set intl stage3-intl ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-intl stage2-intl ; @UNDO_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @set ld stage3-ld ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-ld stage2-ld ; @UNDO_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @set libcpp stage3-libcpp ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-libcpp stage2-libcpp ; @UNDO_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @set libiberty stage3-libiberty ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-libiberty stage2-libiberty ; @UNDO_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @set zlib stage3-zlib ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-zlib stage2-zlib ; @UNDO_LINK_TO_DIR@ 
+@endif zlib
+
+# Bubble a bugfix through all the stages up to stage 3.  They
+# are remade, but not reconfigured.  The next stage (if any) will not
+# be reconfigured as well.
+.PHONY: stage3-bubble
+stage3-bubble:: stage2-bubble
+       @bootstrap_lean@-rm -rf stage1-* ; $(STAMP) stage1-lean
+       @if test -f stage3-lean || test -f stage2-lean  ; then \
+         echo Skipping rebuild of stage3 ; \
+       else \
+         $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage3; \
+       fi
+
+.PHONY: all-stage3 clean-stage3
+all-stage3:     \
+  maybe-all-stage3-bfd \
+  maybe-all-stage3-opcodes \
+  maybe-all-stage3-binutils             \
+  maybe-all-stage3-gas \
+  maybe-all-stage3-gcc        \
+  maybe-all-stage3-intl   \
+  maybe-all-stage3-ld \
+  maybe-all-stage3-libcpp  \
+  maybe-all-stage3-libiberty                        \
+  maybe-all-stage3-zlib       
+
+do-clean: clean-stage3
+clean-stage3:     \
+  maybe-clean-stage3-bfd \
+  maybe-clean-stage3-opcodes \
+  maybe-clean-stage3-binutils             \
+  maybe-clean-stage3-gas \
+  maybe-clean-stage3-gcc        \
+  maybe-clean-stage3-intl   \
+  maybe-clean-stage3-ld \
+  maybe-clean-stage3-libcpp  \
+  maybe-clean-stage3-libiberty                        \
+  maybe-clean-stage3-zlib       
+
+
+.PHONY: configure-stage3-bfd maybe-configure-stage3-bfd
+.PHONY: all-stage3-bfd maybe-all-stage3-bfd
+.PHONY: clean-stage3-bfd maybe-clean-stage3-bfd
+
+maybe-configure-stage3-bfd:
+maybe-all-stage3-bfd:
+maybe-clean-stage3-bfd:
+
+@if bfd-bootstrap
+maybe-configure-stage3-bfd: configure-stage3-bfd
+configure-stage3-bfd:
+       @$(MAKE) stage3-start
+       @[ -f bfd/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 3 in bfd ; \
+       cd bfd || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/bfd"; \
+           libsrcdir="$$s/bfd";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/bfd"; \
+           libsrcdir="$$s/bfd";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage3-bfd: all-stage3-bfd
+all-stage3-bfd: configure-stage3-bfd
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage3-bfd: clean-stage3-bfd
+clean-stage3-bfd:
+       @[ -f bfd/Makefile ] || [ -f stage3-bfd/Makefile ] \
+         || exit 0 ; \
+       [ -f bfd/Makefile ] || $(MAKE) stage3-start ; \
+       cd bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif bfd-bootstrap
+
+
+.PHONY: configure-stage3-opcodes maybe-configure-stage3-opcodes
+.PHONY: all-stage3-opcodes maybe-all-stage3-opcodes
+.PHONY: clean-stage3-opcodes maybe-clean-stage3-opcodes
+
+maybe-configure-stage3-opcodes:
+maybe-all-stage3-opcodes:
+maybe-clean-stage3-opcodes:
+
+@if opcodes-bootstrap
+maybe-configure-stage3-opcodes: configure-stage3-opcodes
+configure-stage3-opcodes:
+       @$(MAKE) stage3-start
+       @[ -f opcodes/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 3 in opcodes ; \
+       cd opcodes || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/opcodes"; \
+           libsrcdir="$$s/opcodes";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/opcodes"; \
+           libsrcdir="$$s/opcodes";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage3-opcodes: all-stage3-opcodes
+all-stage3-opcodes: configure-stage3-opcodes
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage3-opcodes: clean-stage3-opcodes
+clean-stage3-opcodes:
+       @[ -f opcodes/Makefile ] || [ -f stage3-opcodes/Makefile ] \
+         || exit 0 ; \
+       [ -f opcodes/Makefile ] || $(MAKE) stage3-start ; \
+       cd opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif opcodes-bootstrap
+
+
+.PHONY: configure-stage3-binutils maybe-configure-stage3-binutils
+.PHONY: all-stage3-binutils maybe-all-stage3-binutils
+.PHONY: clean-stage3-binutils maybe-clean-stage3-binutils
+
+maybe-configure-stage3-binutils:
+maybe-all-stage3-binutils:
+maybe-clean-stage3-binutils:
+
+@if binutils-bootstrap
+maybe-configure-stage3-binutils: configure-stage3-binutils
+configure-stage3-binutils:
+       @$(MAKE) stage3-start
+       @[ -f binutils/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 3 in binutils ; \
+       cd binutils || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/binutils"; \
+           libsrcdir="$$s/binutils";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/binutils"; \
+           libsrcdir="$$s/binutils";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage3-binutils: all-stage3-binutils
+all-stage3-binutils: configure-stage3-binutils
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage3-binutils: clean-stage3-binutils
+clean-stage3-binutils:
+       @[ -f binutils/Makefile ] || [ -f stage3-binutils/Makefile ] \
+         || exit 0 ; \
+       [ -f binutils/Makefile ] || $(MAKE) stage3-start ; \
+       cd binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif binutils-bootstrap
+
+
+.PHONY: configure-stage3-gas maybe-configure-stage3-gas
+.PHONY: all-stage3-gas maybe-all-stage3-gas
+.PHONY: clean-stage3-gas maybe-clean-stage3-gas
+
+maybe-configure-stage3-gas:
+maybe-all-stage3-gas:
+maybe-clean-stage3-gas:
+
+@if gas-bootstrap
+maybe-configure-stage3-gas: configure-stage3-gas
+configure-stage3-gas:
+       @$(MAKE) stage3-start
+       @[ -f gas/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 3 in gas ; \
+       cd gas || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/gas"; \
+           libsrcdir="$$s/gas";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/gas"; \
+           libsrcdir="$$s/gas";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage3-gas: all-stage3-gas
+all-stage3-gas: configure-stage3-gas
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage3-gas: clean-stage3-gas
+clean-stage3-gas:
+       @[ -f gas/Makefile ] || [ -f stage3-gas/Makefile ] \
+         || exit 0 ; \
+       [ -f gas/Makefile ] || $(MAKE) stage3-start ; \
+       cd gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif gas-bootstrap
+
+
+.PHONY: configure-stage3-gcc maybe-configure-stage3-gcc
+.PHONY: all-stage3-gcc maybe-all-stage3-gcc
+.PHONY: clean-stage3-gcc maybe-clean-stage3-gcc
+
+maybe-configure-stage3-gcc:
+maybe-all-stage3-gcc:
+maybe-clean-stage3-gcc:
+
+@if gcc-bootstrap
+maybe-configure-stage3-gcc: configure-stage3-gcc
+configure-stage3-gcc:
+       @$(MAKE) stage3-start
+       @[ -f gcc/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 3 in gcc ; \
+       cd gcc || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/gcc"; \
+           libsrcdir="$$s/gcc";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/gcc"; \
+           libsrcdir="$$s/gcc";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage3-gcc: all-stage3-gcc
+all-stage3-gcc: configure-stage3-gcc
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                $(EXTRA_GCC_FLAGS)
+
+maybe-clean-stage3-gcc: clean-stage3-gcc
+clean-stage3-gcc:
+       @[ -f gcc/Makefile ] || [ -f stage3-gcc/Makefile ] \
+         || exit 0 ; \
+       [ -f gcc/Makefile ] || $(MAKE) stage3-start ; \
+       cd gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                $(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+.PHONY: configure-stage3-intl maybe-configure-stage3-intl
+.PHONY: all-stage3-intl maybe-all-stage3-intl
+.PHONY: clean-stage3-intl maybe-clean-stage3-intl
+
+maybe-configure-stage3-intl:
+maybe-all-stage3-intl:
+maybe-clean-stage3-intl:
+
+@if intl-bootstrap
+maybe-configure-stage3-intl: configure-stage3-intl
+configure-stage3-intl:
+       @$(MAKE) stage3-start
+       @[ -f intl/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 3 in intl ; \
+       cd intl || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/intl"; \
+           libsrcdir="$$s/intl";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/intl"; \
+           libsrcdir="$$s/intl";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage3-intl: all-stage3-intl
+all-stage3-intl: configure-stage3-intl
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage3-intl: clean-stage3-intl
+clean-stage3-intl:
+       @[ -f intl/Makefile ] || [ -f stage3-intl/Makefile ] \
+         || exit 0 ; \
+       [ -f intl/Makefile ] || $(MAKE) stage3-start ; \
+       cd intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif intl-bootstrap
+
+
+.PHONY: configure-stage3-ld maybe-configure-stage3-ld
+.PHONY: all-stage3-ld maybe-all-stage3-ld
+.PHONY: clean-stage3-ld maybe-clean-stage3-ld
+
+maybe-configure-stage3-ld:
+maybe-all-stage3-ld:
+maybe-clean-stage3-ld:
+
+@if ld-bootstrap
+maybe-configure-stage3-ld: configure-stage3-ld
+configure-stage3-ld:
+       @$(MAKE) stage3-start
+       @[ -f ld/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 3 in ld ; \
+       cd ld || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/ld"; \
+           libsrcdir="$$s/ld";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/ld"; \
+           libsrcdir="$$s/ld";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage3-ld: all-stage3-ld
+all-stage3-ld: configure-stage3-ld
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage3-ld: clean-stage3-ld
+clean-stage3-ld:
+       @[ -f ld/Makefile ] || [ -f stage3-ld/Makefile ] \
+         || exit 0 ; \
+       [ -f ld/Makefile ] || $(MAKE) stage3-start ; \
+       cd ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif ld-bootstrap
+
+
+.PHONY: configure-stage3-libcpp maybe-configure-stage3-libcpp
+.PHONY: all-stage3-libcpp maybe-all-stage3-libcpp
+.PHONY: clean-stage3-libcpp maybe-clean-stage3-libcpp
+
+maybe-configure-stage3-libcpp:
+maybe-all-stage3-libcpp:
+maybe-clean-stage3-libcpp:
+
+@if libcpp-bootstrap
+maybe-configure-stage3-libcpp: configure-stage3-libcpp
+configure-stage3-libcpp:
+       @$(MAKE) stage3-start
+       @[ -f libcpp/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 3 in libcpp ; \
+       cd libcpp || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/libcpp"; \
+           libsrcdir="$$s/libcpp";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/libcpp"; \
+           libsrcdir="$$s/libcpp";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage3-libcpp: all-stage3-libcpp
+all-stage3-libcpp: configure-stage3-libcpp
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage3-libcpp: clean-stage3-libcpp
+clean-stage3-libcpp:
+       @[ -f libcpp/Makefile ] || [ -f stage3-libcpp/Makefile ] \
+         || exit 0 ; \
+       [ -f libcpp/Makefile ] || $(MAKE) stage3-start ; \
+       cd libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif libcpp-bootstrap
+
+
+.PHONY: configure-stage3-libiberty maybe-configure-stage3-libiberty
+.PHONY: all-stage3-libiberty maybe-all-stage3-libiberty
+.PHONY: clean-stage3-libiberty maybe-clean-stage3-libiberty
+
+maybe-configure-stage3-libiberty:
+maybe-all-stage3-libiberty:
+maybe-clean-stage3-libiberty:
+
+@if libiberty-bootstrap
+maybe-configure-stage3-libiberty: configure-stage3-libiberty
+configure-stage3-libiberty:
+       @$(MAKE) stage3-start
+       @[ -f libiberty/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 3 in libiberty ; \
+       cd libiberty || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/libiberty"; \
+           libsrcdir="$$s/libiberty";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/libiberty"; \
+           libsrcdir="$$s/libiberty";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage3-libiberty: all-stage3-libiberty
+all-stage3-libiberty: configure-stage3-libiberty
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage3-libiberty: clean-stage3-libiberty
+clean-stage3-libiberty:
+       @[ -f libiberty/Makefile ] || [ -f stage3-libiberty/Makefile ] \
+         || exit 0 ; \
+       [ -f libiberty/Makefile ] || $(MAKE) stage3-start ; \
+       cd libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif libiberty-bootstrap
+
+
+.PHONY: configure-stage3-zlib maybe-configure-stage3-zlib
+.PHONY: all-stage3-zlib maybe-all-stage3-zlib
+.PHONY: clean-stage3-zlib maybe-clean-stage3-zlib
+
+maybe-configure-stage3-zlib:
+maybe-all-stage3-zlib:
+maybe-clean-stage3-zlib:
+
+@if zlib-bootstrap
+maybe-configure-stage3-zlib: configure-stage3-zlib
+configure-stage3-zlib:
+       @$(MAKE) stage3-start
+       @[ -f zlib/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 3 in zlib ; \
+       cd zlib || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/zlib"; \
+           libsrcdir="$$s/zlib";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/zlib"; \
+           libsrcdir="$$s/zlib";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage3-zlib: all-stage3-zlib
+all-stage3-zlib: configure-stage3-zlib
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage3-zlib: clean-stage3-zlib
+clean-stage3-zlib:
+       @[ -f zlib/Makefile ] || [ -f stage3-zlib/Makefile ] \
+         || exit 0 ; \
+       [ -f zlib/Makefile ] || $(MAKE) stage3-start ; \
+       cd zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif zlib-bootstrap
+
+
+
+# FIXME: Will not need to be conditional when toplevel bootstrap is the
+# only possibility, but now it conflicts with no-bootstrap rules
+@if gcc-bootstrap
+
+compare:
+       @if test -f stage2-lean; then \
+         echo Cannot compare object files as stage 2 was deleted. ; \
+         exit 0 ; \
+       fi; \
+       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       rm -f .bad_compare ; \
+       cd stage3-gcc; \
+       files=`find . -name "*$(objext)" -print` ; \
+       cd .. ; \
+       for file in $${files} ; do \
+         f1=$$r/stage2-gcc/$$file; f2=$$r/stage3-gcc/$$file; \
+         @do_compare@ > /dev/null 2>&1; \
+         test $$? -eq 1 && echo $$file differs >> .bad_compare || true; \
+       done ; \
+       if [ -f .bad_compare ]; then \
+         echo "Bootstrap comparison failure!"; \
+         cat .bad_compare; \
+         exit 1; \
+       else \
+         true; \
+       fi ; \
+       $(STAMP) compare
+       @bootstrap_lean@-rm -rf stage2-* ; $(STAMP) stage2-lean
+
+
+
+.PHONY: bootstrap
+bootstrap: stage3-bubble compare all
+
+
+# Rules to wipe a stage and all the following ones, also used for cleanstrap
+distclean-stage2:: distclean-stage3 
+.PHONY: distclean-stage3
+distclean-stage3::
+       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+       rm -rf stage3-* compare 
+
+
+.PHONY: cleanstrap
+cleanstrap: distclean bootstrap
+
+@endif gcc-bootstrap
+
+
+.PHONY: stage4-start stage4-end
+
+stage4-start::
+       @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
+       echo stage4 > stage_current ; \
+       echo stage4 > stage_last
+@if bfd
+       @[ -d stage4-bfd ] || mkdir stage4-bfd; \
+       set stage4-bfd bfd ; @CREATE_LINK_TO_DIR@  ; \
+       set stage3-bfd prev-bfd ; @CREATE_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @[ -d stage4-opcodes ] || mkdir stage4-opcodes; \
+       set stage4-opcodes opcodes ; @CREATE_LINK_TO_DIR@  ; \
+       set stage3-opcodes prev-opcodes ; @CREATE_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @[ -d stage4-binutils ] || mkdir stage4-binutils; \
+       set stage4-binutils binutils ; @CREATE_LINK_TO_DIR@  ; \
+       set stage3-binutils prev-binutils ; @CREATE_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @[ -d stage4-gas ] || mkdir stage4-gas; \
+       set stage4-gas gas ; @CREATE_LINK_TO_DIR@  ; \
+       set stage3-gas prev-gas ; @CREATE_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @[ -d stage4-gcc ] || mkdir stage4-gcc; \
+       set stage4-gcc gcc ; @CREATE_LINK_TO_DIR@  ; \
+       set stage3-gcc prev-gcc ; @CREATE_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @[ -d stage4-intl ] || mkdir stage4-intl; \
+       set stage4-intl intl ; @CREATE_LINK_TO_DIR@  ; \
+       set stage3-intl prev-intl ; @CREATE_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @[ -d stage4-ld ] || mkdir stage4-ld; \
+       set stage4-ld ld ; @CREATE_LINK_TO_DIR@  ; \
+       set stage3-ld prev-ld ; @CREATE_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @[ -d stage4-libcpp ] || mkdir stage4-libcpp; \
+       set stage4-libcpp libcpp ; @CREATE_LINK_TO_DIR@  ; \
+       set stage3-libcpp prev-libcpp ; @CREATE_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @[ -d stage4-libiberty ] || mkdir stage4-libiberty; \
+       set stage4-libiberty libiberty ; @CREATE_LINK_TO_DIR@  ; \
+       set stage3-libiberty prev-libiberty ; @CREATE_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @[ -d stage4-zlib ] || mkdir stage4-zlib; \
+       set stage4-zlib zlib ; @CREATE_LINK_TO_DIR@  ; \
+       set stage3-zlib prev-zlib ; @CREATE_LINK_TO_DIR@ 
+@endif zlib
+
+stage4-end::
+       @rm -f stage_current
+@if bfd
+       @set bfd stage4-bfd ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-bfd stage3-bfd ; @UNDO_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @set opcodes stage4-opcodes ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-opcodes stage3-opcodes ; @UNDO_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @set binutils stage4-binutils ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-binutils stage3-binutils ; @UNDO_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @set gas stage4-gas ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-gas stage3-gas ; @UNDO_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @set gcc stage4-gcc ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-gcc stage3-gcc ; @UNDO_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @set intl stage4-intl ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-intl stage3-intl ; @UNDO_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @set ld stage4-ld ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-ld stage3-ld ; @UNDO_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @set libcpp stage4-libcpp ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-libcpp stage3-libcpp ; @UNDO_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @set libiberty stage4-libiberty ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-libiberty stage3-libiberty ; @UNDO_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @set zlib stage4-zlib ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-zlib stage3-zlib ; @UNDO_LINK_TO_DIR@ 
+@endif zlib
+
+# Bubble a bugfix through all the stages up to stage 4.  They
+# are remade, but not reconfigured.  The next stage (if any) will not
+# be reconfigured as well.
+.PHONY: stage4-bubble
+stage4-bubble:: stage3-bubble
+       @bootstrap_lean@-rm -rf stage2-* ; $(STAMP) stage2-lean
+       @if test -f stage4-lean || test -f stage3-lean  ; then \
+         echo Skipping rebuild of stage4 ; \
+       else \
+         $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage4; \
+       fi
+
+.PHONY: all-stage4 clean-stage4
+all-stage4:     \
+  maybe-all-stage4-bfd \
+  maybe-all-stage4-opcodes \
+  maybe-all-stage4-binutils             \
+  maybe-all-stage4-gas \
+  maybe-all-stage4-gcc        \
+  maybe-all-stage4-intl   \
+  maybe-all-stage4-ld \
+  maybe-all-stage4-libcpp  \
+  maybe-all-stage4-libiberty                        \
+  maybe-all-stage4-zlib       
+
+do-clean: clean-stage4
+clean-stage4:     \
+  maybe-clean-stage4-bfd \
+  maybe-clean-stage4-opcodes \
+  maybe-clean-stage4-binutils             \
+  maybe-clean-stage4-gas \
+  maybe-clean-stage4-gcc        \
+  maybe-clean-stage4-intl   \
+  maybe-clean-stage4-ld \
+  maybe-clean-stage4-libcpp  \
+  maybe-clean-stage4-libiberty                        \
+  maybe-clean-stage4-zlib       
+
+
+.PHONY: configure-stage4-bfd maybe-configure-stage4-bfd
+.PHONY: all-stage4-bfd maybe-all-stage4-bfd
+.PHONY: clean-stage4-bfd maybe-clean-stage4-bfd
+
+maybe-configure-stage4-bfd:
+maybe-all-stage4-bfd:
+maybe-clean-stage4-bfd:
+
+@if bfd-bootstrap
+maybe-configure-stage4-bfd: configure-stage4-bfd
+configure-stage4-bfd:
+       @$(MAKE) stage4-start
+       @[ -f bfd/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 4 in bfd ; \
+       cd bfd || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/bfd"; \
+           libsrcdir="$$s/bfd";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/bfd"; \
+           libsrcdir="$$s/bfd";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage4-bfd: all-stage4-bfd
+all-stage4-bfd: configure-stage4-bfd
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage4-bfd: clean-stage4-bfd
+clean-stage4-bfd:
+       @[ -f bfd/Makefile ] || [ -f stage4-bfd/Makefile ] \
+         || exit 0 ; \
+       [ -f bfd/Makefile ] || $(MAKE) stage4-start ; \
+       cd bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif bfd-bootstrap
+
+
+.PHONY: configure-stage4-opcodes maybe-configure-stage4-opcodes
+.PHONY: all-stage4-opcodes maybe-all-stage4-opcodes
+.PHONY: clean-stage4-opcodes maybe-clean-stage4-opcodes
+
+maybe-configure-stage4-opcodes:
+maybe-all-stage4-opcodes:
+maybe-clean-stage4-opcodes:
+
+@if opcodes-bootstrap
+maybe-configure-stage4-opcodes: configure-stage4-opcodes
+configure-stage4-opcodes:
+       @$(MAKE) stage4-start
+       @[ -f opcodes/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 4 in opcodes ; \
+       cd opcodes || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/opcodes"; \
+           libsrcdir="$$s/opcodes";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/opcodes"; \
+           libsrcdir="$$s/opcodes";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage4-opcodes: all-stage4-opcodes
+all-stage4-opcodes: configure-stage4-opcodes
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage4-opcodes: clean-stage4-opcodes
+clean-stage4-opcodes:
+       @[ -f opcodes/Makefile ] || [ -f stage4-opcodes/Makefile ] \
+         || exit 0 ; \
+       [ -f opcodes/Makefile ] || $(MAKE) stage4-start ; \
+       cd opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif opcodes-bootstrap
+
+
+.PHONY: configure-stage4-binutils maybe-configure-stage4-binutils
+.PHONY: all-stage4-binutils maybe-all-stage4-binutils
+.PHONY: clean-stage4-binutils maybe-clean-stage4-binutils
+
+maybe-configure-stage4-binutils:
+maybe-all-stage4-binutils:
+maybe-clean-stage4-binutils:
+
+@if binutils-bootstrap
+maybe-configure-stage4-binutils: configure-stage4-binutils
+configure-stage4-binutils:
+       @$(MAKE) stage4-start
+       @[ -f binutils/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 4 in binutils ; \
+       cd binutils || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/binutils"; \
+           libsrcdir="$$s/binutils";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/binutils"; \
+           libsrcdir="$$s/binutils";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage4-binutils: all-stage4-binutils
+all-stage4-binutils: configure-stage4-binutils
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage4-binutils: clean-stage4-binutils
+clean-stage4-binutils:
+       @[ -f binutils/Makefile ] || [ -f stage4-binutils/Makefile ] \
+         || exit 0 ; \
+       [ -f binutils/Makefile ] || $(MAKE) stage4-start ; \
+       cd binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif binutils-bootstrap
+
+
+.PHONY: configure-stage4-gas maybe-configure-stage4-gas
+.PHONY: all-stage4-gas maybe-all-stage4-gas
+.PHONY: clean-stage4-gas maybe-clean-stage4-gas
+
+maybe-configure-stage4-gas:
+maybe-all-stage4-gas:
+maybe-clean-stage4-gas:
+
+@if gas-bootstrap
+maybe-configure-stage4-gas: configure-stage4-gas
+configure-stage4-gas:
+       @$(MAKE) stage4-start
+       @[ -f gas/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 4 in gas ; \
+       cd gas || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/gas"; \
+           libsrcdir="$$s/gas";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/gas"; \
+           libsrcdir="$$s/gas";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage4-gas: all-stage4-gas
+all-stage4-gas: configure-stage4-gas
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage4-gas: clean-stage4-gas
+clean-stage4-gas:
+       @[ -f gas/Makefile ] || [ -f stage4-gas/Makefile ] \
+         || exit 0 ; \
+       [ -f gas/Makefile ] || $(MAKE) stage4-start ; \
+       cd gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif gas-bootstrap
+
+
+.PHONY: configure-stage4-gcc maybe-configure-stage4-gcc
+.PHONY: all-stage4-gcc maybe-all-stage4-gcc
+.PHONY: clean-stage4-gcc maybe-clean-stage4-gcc
+
+maybe-configure-stage4-gcc:
+maybe-all-stage4-gcc:
+maybe-clean-stage4-gcc:
+
+@if gcc-bootstrap
+maybe-configure-stage4-gcc: configure-stage4-gcc
+configure-stage4-gcc:
+       @$(MAKE) stage4-start
+       @[ -f gcc/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 4 in gcc ; \
+       cd gcc || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/gcc"; \
+           libsrcdir="$$s/gcc";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/gcc"; \
+           libsrcdir="$$s/gcc";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage4-gcc: all-stage4-gcc
+all-stage4-gcc: configure-stage4-gcc
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                $(EXTRA_GCC_FLAGS)
+
+maybe-clean-stage4-gcc: clean-stage4-gcc
+clean-stage4-gcc:
+       @[ -f gcc/Makefile ] || [ -f stage4-gcc/Makefile ] \
+         || exit 0 ; \
+       [ -f gcc/Makefile ] || $(MAKE) stage4-start ; \
+       cd gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                $(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+.PHONY: configure-stage4-intl maybe-configure-stage4-intl
+.PHONY: all-stage4-intl maybe-all-stage4-intl
+.PHONY: clean-stage4-intl maybe-clean-stage4-intl
+
+maybe-configure-stage4-intl:
+maybe-all-stage4-intl:
+maybe-clean-stage4-intl:
+
+@if intl-bootstrap
+maybe-configure-stage4-intl: configure-stage4-intl
+configure-stage4-intl:
+       @$(MAKE) stage4-start
+       @[ -f intl/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 4 in intl ; \
+       cd intl || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/intl"; \
+           libsrcdir="$$s/intl";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/intl"; \
+           libsrcdir="$$s/intl";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage4-intl: all-stage4-intl
+all-stage4-intl: configure-stage4-intl
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage4-intl: clean-stage4-intl
+clean-stage4-intl:
+       @[ -f intl/Makefile ] || [ -f stage4-intl/Makefile ] \
+         || exit 0 ; \
+       [ -f intl/Makefile ] || $(MAKE) stage4-start ; \
+       cd intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif intl-bootstrap
+
+
+.PHONY: configure-stage4-ld maybe-configure-stage4-ld
+.PHONY: all-stage4-ld maybe-all-stage4-ld
+.PHONY: clean-stage4-ld maybe-clean-stage4-ld
+
+maybe-configure-stage4-ld:
+maybe-all-stage4-ld:
+maybe-clean-stage4-ld:
+
+@if ld-bootstrap
+maybe-configure-stage4-ld: configure-stage4-ld
+configure-stage4-ld:
+       @$(MAKE) stage4-start
+       @[ -f ld/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 4 in ld ; \
+       cd ld || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/ld"; \
+           libsrcdir="$$s/ld";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/ld"; \
+           libsrcdir="$$s/ld";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage4-ld: all-stage4-ld
+all-stage4-ld: configure-stage4-ld
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage4-ld: clean-stage4-ld
+clean-stage4-ld:
+       @[ -f ld/Makefile ] || [ -f stage4-ld/Makefile ] \
+         || exit 0 ; \
+       [ -f ld/Makefile ] || $(MAKE) stage4-start ; \
+       cd ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif ld-bootstrap
+
+
+.PHONY: configure-stage4-libcpp maybe-configure-stage4-libcpp
+.PHONY: all-stage4-libcpp maybe-all-stage4-libcpp
+.PHONY: clean-stage4-libcpp maybe-clean-stage4-libcpp
+
+maybe-configure-stage4-libcpp:
+maybe-all-stage4-libcpp:
+maybe-clean-stage4-libcpp:
+
+@if libcpp-bootstrap
+maybe-configure-stage4-libcpp: configure-stage4-libcpp
+configure-stage4-libcpp:
+       @$(MAKE) stage4-start
+       @[ -f libcpp/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 4 in libcpp ; \
+       cd libcpp || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/libcpp"; \
+           libsrcdir="$$s/libcpp";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/libcpp"; \
+           libsrcdir="$$s/libcpp";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage4-libcpp: all-stage4-libcpp
+all-stage4-libcpp: configure-stage4-libcpp
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage4-libcpp: clean-stage4-libcpp
+clean-stage4-libcpp:
+       @[ -f libcpp/Makefile ] || [ -f stage4-libcpp/Makefile ] \
+         || exit 0 ; \
+       [ -f libcpp/Makefile ] || $(MAKE) stage4-start ; \
+       cd libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif libcpp-bootstrap
+
+
+.PHONY: configure-stage4-libiberty maybe-configure-stage4-libiberty
+.PHONY: all-stage4-libiberty maybe-all-stage4-libiberty
+.PHONY: clean-stage4-libiberty maybe-clean-stage4-libiberty
+
+maybe-configure-stage4-libiberty:
+maybe-all-stage4-libiberty:
+maybe-clean-stage4-libiberty:
+
+@if libiberty-bootstrap
+maybe-configure-stage4-libiberty: configure-stage4-libiberty
+configure-stage4-libiberty:
+       @$(MAKE) stage4-start
+       @[ -f libiberty/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 4 in libiberty ; \
+       cd libiberty || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/libiberty"; \
+           libsrcdir="$$s/libiberty";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/libiberty"; \
+           libsrcdir="$$s/libiberty";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage4-libiberty: all-stage4-libiberty
+all-stage4-libiberty: configure-stage4-libiberty
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage4-libiberty: clean-stage4-libiberty
+clean-stage4-libiberty:
+       @[ -f libiberty/Makefile ] || [ -f stage4-libiberty/Makefile ] \
+         || exit 0 ; \
+       [ -f libiberty/Makefile ] || $(MAKE) stage4-start ; \
+       cd libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif libiberty-bootstrap
+
+
+.PHONY: configure-stage4-zlib maybe-configure-stage4-zlib
+.PHONY: all-stage4-zlib maybe-all-stage4-zlib
+.PHONY: clean-stage4-zlib maybe-clean-stage4-zlib
+
+maybe-configure-stage4-zlib:
+maybe-all-stage4-zlib:
+maybe-clean-stage4-zlib:
+
+@if zlib-bootstrap
+maybe-configure-stage4-zlib: configure-stage4-zlib
+configure-stage4-zlib:
+       @$(MAKE) stage4-start
+       @[ -f zlib/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 4 in zlib ; \
+       cd zlib || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/zlib"; \
+           libsrcdir="$$s/zlib";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/zlib"; \
+           libsrcdir="$$s/zlib";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage4-zlib: all-stage4-zlib
+all-stage4-zlib: configure-stage4-zlib
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage4-zlib: clean-stage4-zlib
+clean-stage4-zlib:
+       @[ -f zlib/Makefile ] || [ -f stage4-zlib/Makefile ] \
+         || exit 0 ; \
+       [ -f zlib/Makefile ] || $(MAKE) stage4-start ; \
+       cd zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif zlib-bootstrap
+
+
+
+# FIXME: Will not need to be conditional when toplevel bootstrap is the
+# only possibility, but now it conflicts with no-bootstrap rules
+@if gcc-bootstrap
+
+compare3:
+       @if test -f stage3-lean; then \
+         echo Cannot compare object files as stage 3 was deleted. ; \
+         exit 0 ; \
+       fi; \
+       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       rm -f .bad_compare ; \
+       cd stage4-gcc; \
+       files=`find . -name "*$(objext)" -print` ; \
+       cd .. ; \
+       for file in $${files} ; do \
+         f1=$$r/stage3-gcc/$$file; f2=$$r/stage4-gcc/$$file; \
+         @do_compare@ > /dev/null 2>&1; \
+         test $$? -eq 1 && echo $$file differs >> .bad_compare || true; \
+       done ; \
+       if [ -f .bad_compare ]; then \
+         echo "Bootstrap comparison failure!"; \
+         cat .bad_compare; \
+         exit 1; \
+       else \
+         true; \
+       fi ; \
+       $(STAMP) compare3
+       @bootstrap_lean@-rm -rf stage3-* ; $(STAMP) stage3-lean
+
+
+
+.PHONY: bootstrap4
+bootstrap4: stage4-bubble compare3 all
+
+
+# Rules to wipe a stage and all the following ones, also used for cleanstrap
+distclean-stage3:: distclean-stage4 
+.PHONY: distclean-stage4
+distclean-stage4::
+       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+       rm -rf stage4-* compare3 
+
+
+@endif gcc-bootstrap
+
+
+.PHONY: stageprofile-start stageprofile-end
+
+stageprofile-start::
+       @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
+       echo stageprofile > stage_current ; \
+       echo stageprofile > stage_last
+@if bfd
+       @[ -d stageprofile-bfd ] || mkdir stageprofile-bfd; \
+       set stageprofile-bfd bfd ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-bfd prev-bfd ; @CREATE_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @[ -d stageprofile-opcodes ] || mkdir stageprofile-opcodes; \
+       set stageprofile-opcodes opcodes ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-opcodes prev-opcodes ; @CREATE_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @[ -d stageprofile-binutils ] || mkdir stageprofile-binutils; \
+       set stageprofile-binutils binutils ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-binutils prev-binutils ; @CREATE_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @[ -d stageprofile-gas ] || mkdir stageprofile-gas; \
+       set stageprofile-gas gas ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-gas prev-gas ; @CREATE_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @[ -d stageprofile-gcc ] || mkdir stageprofile-gcc; \
+       set stageprofile-gcc gcc ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-gcc prev-gcc ; @CREATE_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @[ -d stageprofile-intl ] || mkdir stageprofile-intl; \
+       set stageprofile-intl intl ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-intl prev-intl ; @CREATE_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @[ -d stageprofile-ld ] || mkdir stageprofile-ld; \
+       set stageprofile-ld ld ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-ld prev-ld ; @CREATE_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @[ -d stageprofile-libcpp ] || mkdir stageprofile-libcpp; \
+       set stageprofile-libcpp libcpp ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-libcpp prev-libcpp ; @CREATE_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @[ -d stageprofile-libiberty ] || mkdir stageprofile-libiberty; \
+       set stageprofile-libiberty libiberty ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-libiberty prev-libiberty ; @CREATE_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @[ -d stageprofile-zlib ] || mkdir stageprofile-zlib; \
+       set stageprofile-zlib zlib ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-zlib prev-zlib ; @CREATE_LINK_TO_DIR@ 
+@endif zlib
+
+stageprofile-end::
+       @rm -f stage_current
+@if bfd
+       @set bfd stageprofile-bfd ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-bfd stage1-bfd ; @UNDO_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @set opcodes stageprofile-opcodes ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-opcodes stage1-opcodes ; @UNDO_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @set binutils stageprofile-binutils ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-binutils stage1-binutils ; @UNDO_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @set gas stageprofile-gas ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-gas stage1-gas ; @UNDO_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @set gcc stageprofile-gcc ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-gcc stage1-gcc ; @UNDO_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @set intl stageprofile-intl ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-intl stage1-intl ; @UNDO_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @set ld stageprofile-ld ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-ld stage1-ld ; @UNDO_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @set libcpp stageprofile-libcpp ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-libcpp stage1-libcpp ; @UNDO_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @set libiberty stageprofile-libiberty ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-libiberty stage1-libiberty ; @UNDO_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @set zlib stageprofile-zlib ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-zlib stage1-zlib ; @UNDO_LINK_TO_DIR@ 
+@endif zlib
+
+# Bubble a bugfix through all the stages up to stage profile.  They
+# are remade, but not reconfigured.  The next stage (if any) will not
+# be reconfigured as well.
+.PHONY: stageprofile-bubble
+stageprofile-bubble:: stage1-bubble
+       @if test -f stageprofile-lean || test -f stage1-lean  ; then \
+         echo Skipping rebuild of stageprofile ; \
+       else \
+         $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stageprofile; \
+       fi
+
+.PHONY: all-stageprofile clean-stageprofile
+all-stageprofile:     \
+  maybe-all-stageprofile-bfd \
+  maybe-all-stageprofile-opcodes \
+  maybe-all-stageprofile-binutils             \
+  maybe-all-stageprofile-gas \
+  maybe-all-stageprofile-gcc        \
+  maybe-all-stageprofile-intl   \
+  maybe-all-stageprofile-ld \
+  maybe-all-stageprofile-libcpp  \
+  maybe-all-stageprofile-libiberty                        \
+  maybe-all-stageprofile-zlib       
+
+do-clean: clean-stageprofile
+clean-stageprofile:     \
+  maybe-clean-stageprofile-bfd \
+  maybe-clean-stageprofile-opcodes \
+  maybe-clean-stageprofile-binutils             \
+  maybe-clean-stageprofile-gas \
+  maybe-clean-stageprofile-gcc        \
+  maybe-clean-stageprofile-intl   \
+  maybe-clean-stageprofile-ld \
+  maybe-clean-stageprofile-libcpp  \
+  maybe-clean-stageprofile-libiberty                        \
+  maybe-clean-stageprofile-zlib       
+
+
+.PHONY: configure-stageprofile-bfd maybe-configure-stageprofile-bfd
+.PHONY: all-stageprofile-bfd maybe-all-stageprofile-bfd
+.PHONY: clean-stageprofile-bfd maybe-clean-stageprofile-bfd
+
+maybe-configure-stageprofile-bfd:
+maybe-all-stageprofile-bfd:
+maybe-clean-stageprofile-bfd:
+
+@if bfd-bootstrap
+maybe-configure-stageprofile-bfd: configure-stageprofile-bfd
+configure-stageprofile-bfd:
+       @$(MAKE) stageprofile-start
+       @[ -f bfd/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage profile in bfd ; \
+       cd bfd || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/bfd"; \
+           libsrcdir="$$s/bfd";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/bfd"; \
+           libsrcdir="$$s/bfd";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stageprofile-bfd: all-stageprofile-bfd
+all-stageprofile-bfd: configure-stageprofile-bfd
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-bfd: clean-stageprofile-bfd
+clean-stageprofile-bfd:
+       @[ -f bfd/Makefile ] || [ -f stageprofile-bfd/Makefile ] \
+         || exit 0 ; \
+       [ -f bfd/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif bfd-bootstrap
+
+
+.PHONY: configure-stageprofile-opcodes maybe-configure-stageprofile-opcodes
+.PHONY: all-stageprofile-opcodes maybe-all-stageprofile-opcodes
+.PHONY: clean-stageprofile-opcodes maybe-clean-stageprofile-opcodes
+
+maybe-configure-stageprofile-opcodes:
+maybe-all-stageprofile-opcodes:
+maybe-clean-stageprofile-opcodes:
+
+@if opcodes-bootstrap
+maybe-configure-stageprofile-opcodes: configure-stageprofile-opcodes
+configure-stageprofile-opcodes:
+       @$(MAKE) stageprofile-start
+       @[ -f opcodes/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage profile in opcodes ; \
+       cd opcodes || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/opcodes"; \
+           libsrcdir="$$s/opcodes";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/opcodes"; \
+           libsrcdir="$$s/opcodes";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stageprofile-opcodes: all-stageprofile-opcodes
+all-stageprofile-opcodes: configure-stageprofile-opcodes
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-opcodes: clean-stageprofile-opcodes
+clean-stageprofile-opcodes:
+       @[ -f opcodes/Makefile ] || [ -f stageprofile-opcodes/Makefile ] \
+         || exit 0 ; \
+       [ -f opcodes/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif opcodes-bootstrap
+
+
+.PHONY: configure-stageprofile-binutils maybe-configure-stageprofile-binutils
+.PHONY: all-stageprofile-binutils maybe-all-stageprofile-binutils
+.PHONY: clean-stageprofile-binutils maybe-clean-stageprofile-binutils
+
+maybe-configure-stageprofile-binutils:
+maybe-all-stageprofile-binutils:
+maybe-clean-stageprofile-binutils:
+
+@if binutils-bootstrap
+maybe-configure-stageprofile-binutils: configure-stageprofile-binutils
+configure-stageprofile-binutils:
+       @$(MAKE) stageprofile-start
+       @[ -f binutils/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage profile in binutils ; \
+       cd binutils || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/binutils"; \
+           libsrcdir="$$s/binutils";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/binutils"; \
+           libsrcdir="$$s/binutils";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stageprofile-binutils: all-stageprofile-binutils
+all-stageprofile-binutils: configure-stageprofile-binutils
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-binutils: clean-stageprofile-binutils
+clean-stageprofile-binutils:
+       @[ -f binutils/Makefile ] || [ -f stageprofile-binutils/Makefile ] \
+         || exit 0 ; \
+       [ -f binutils/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif binutils-bootstrap
+
+
+.PHONY: configure-stageprofile-gas maybe-configure-stageprofile-gas
+.PHONY: all-stageprofile-gas maybe-all-stageprofile-gas
+.PHONY: clean-stageprofile-gas maybe-clean-stageprofile-gas
+
+maybe-configure-stageprofile-gas:
+maybe-all-stageprofile-gas:
+maybe-clean-stageprofile-gas:
+
+@if gas-bootstrap
+maybe-configure-stageprofile-gas: configure-stageprofile-gas
+configure-stageprofile-gas:
+       @$(MAKE) stageprofile-start
+       @[ -f gas/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage profile in gas ; \
+       cd gas || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/gas"; \
+           libsrcdir="$$s/gas";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/gas"; \
+           libsrcdir="$$s/gas";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stageprofile-gas: all-stageprofile-gas
+all-stageprofile-gas: configure-stageprofile-gas
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-gas: clean-stageprofile-gas
+clean-stageprofile-gas:
+       @[ -f gas/Makefile ] || [ -f stageprofile-gas/Makefile ] \
+         || exit 0 ; \
+       [ -f gas/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif gas-bootstrap
+
+
+.PHONY: configure-stageprofile-gcc maybe-configure-stageprofile-gcc
+.PHONY: all-stageprofile-gcc maybe-all-stageprofile-gcc
+.PHONY: clean-stageprofile-gcc maybe-clean-stageprofile-gcc
+
+maybe-configure-stageprofile-gcc:
+maybe-all-stageprofile-gcc:
+maybe-clean-stageprofile-gcc:
+
+@if gcc-bootstrap
+maybe-configure-stageprofile-gcc: configure-stageprofile-gcc
+configure-stageprofile-gcc:
+       @$(MAKE) stageprofile-start
+       @[ -f gcc/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage profile in gcc ; \
+       cd gcc || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/gcc"; \
+           libsrcdir="$$s/gcc";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/gcc"; \
+           libsrcdir="$$s/gcc";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stageprofile-gcc: all-stageprofile-gcc
+all-stageprofile-gcc: configure-stageprofile-gcc
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" $(EXTRA_GCC_FLAGS)
+
+maybe-clean-stageprofile-gcc: clean-stageprofile-gcc
+clean-stageprofile-gcc:
+       @[ -f gcc/Makefile ] || [ -f stageprofile-gcc/Makefile ] \
+         || exit 0 ; \
+       [ -f gcc/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" $(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+.PHONY: configure-stageprofile-intl maybe-configure-stageprofile-intl
+.PHONY: all-stageprofile-intl maybe-all-stageprofile-intl
+.PHONY: clean-stageprofile-intl maybe-clean-stageprofile-intl
+
+maybe-configure-stageprofile-intl:
+maybe-all-stageprofile-intl:
+maybe-clean-stageprofile-intl:
+
+@if intl-bootstrap
+maybe-configure-stageprofile-intl: configure-stageprofile-intl
+configure-stageprofile-intl:
+       @$(MAKE) stageprofile-start
+       @[ -f intl/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage profile in intl ; \
+       cd intl || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/intl"; \
+           libsrcdir="$$s/intl";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/intl"; \
+           libsrcdir="$$s/intl";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stageprofile-intl: all-stageprofile-intl
+all-stageprofile-intl: configure-stageprofile-intl
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-intl: clean-stageprofile-intl
+clean-stageprofile-intl:
+       @[ -f intl/Makefile ] || [ -f stageprofile-intl/Makefile ] \
+         || exit 0 ; \
+       [ -f intl/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif intl-bootstrap
+
+
+.PHONY: configure-stageprofile-ld maybe-configure-stageprofile-ld
+.PHONY: all-stageprofile-ld maybe-all-stageprofile-ld
+.PHONY: clean-stageprofile-ld maybe-clean-stageprofile-ld
+
+maybe-configure-stageprofile-ld:
+maybe-all-stageprofile-ld:
+maybe-clean-stageprofile-ld:
+
+@if ld-bootstrap
+maybe-configure-stageprofile-ld: configure-stageprofile-ld
+configure-stageprofile-ld:
+       @$(MAKE) stageprofile-start
+       @[ -f ld/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage profile in ld ; \
+       cd ld || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/ld"; \
+           libsrcdir="$$s/ld";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/ld"; \
+           libsrcdir="$$s/ld";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stageprofile-ld: all-stageprofile-ld
+all-stageprofile-ld: configure-stageprofile-ld
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-ld: clean-stageprofile-ld
+clean-stageprofile-ld:
+       @[ -f ld/Makefile ] || [ -f stageprofile-ld/Makefile ] \
+         || exit 0 ; \
+       [ -f ld/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif ld-bootstrap
+
+
+.PHONY: configure-stageprofile-libcpp maybe-configure-stageprofile-libcpp
+.PHONY: all-stageprofile-libcpp maybe-all-stageprofile-libcpp
+.PHONY: clean-stageprofile-libcpp maybe-clean-stageprofile-libcpp
+
+maybe-configure-stageprofile-libcpp:
+maybe-all-stageprofile-libcpp:
+maybe-clean-stageprofile-libcpp:
+
+@if libcpp-bootstrap
+maybe-configure-stageprofile-libcpp: configure-stageprofile-libcpp
+configure-stageprofile-libcpp:
+       @$(MAKE) stageprofile-start
+       @[ -f libcpp/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage profile in libcpp ; \
+       cd libcpp || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/libcpp"; \
+           libsrcdir="$$s/libcpp";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/libcpp"; \
+           libsrcdir="$$s/libcpp";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stageprofile-libcpp: all-stageprofile-libcpp
+all-stageprofile-libcpp: configure-stageprofile-libcpp
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-libcpp: clean-stageprofile-libcpp
+clean-stageprofile-libcpp:
+       @[ -f libcpp/Makefile ] || [ -f stageprofile-libcpp/Makefile ] \
+         || exit 0 ; \
+       [ -f libcpp/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif libcpp-bootstrap
+
+
+.PHONY: configure-stageprofile-libiberty maybe-configure-stageprofile-libiberty
+.PHONY: all-stageprofile-libiberty maybe-all-stageprofile-libiberty
+.PHONY: clean-stageprofile-libiberty maybe-clean-stageprofile-libiberty
+
+maybe-configure-stageprofile-libiberty:
+maybe-all-stageprofile-libiberty:
+maybe-clean-stageprofile-libiberty:
+
+@if libiberty-bootstrap
+maybe-configure-stageprofile-libiberty: configure-stageprofile-libiberty
+configure-stageprofile-libiberty:
+       @$(MAKE) stageprofile-start
+       @[ -f libiberty/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage profile in libiberty ; \
+       cd libiberty || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/libiberty"; \
+           libsrcdir="$$s/libiberty";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/libiberty"; \
+           libsrcdir="$$s/libiberty";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stageprofile-libiberty: all-stageprofile-libiberty
+all-stageprofile-libiberty: configure-stageprofile-libiberty
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-libiberty: clean-stageprofile-libiberty
+clean-stageprofile-libiberty:
+       @[ -f libiberty/Makefile ] || [ -f stageprofile-libiberty/Makefile ] \
+         || exit 0 ; \
+       [ -f libiberty/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif libiberty-bootstrap
+
+
+.PHONY: configure-stageprofile-zlib maybe-configure-stageprofile-zlib
+.PHONY: all-stageprofile-zlib maybe-all-stageprofile-zlib
+.PHONY: clean-stageprofile-zlib maybe-clean-stageprofile-zlib
+
+maybe-configure-stageprofile-zlib:
+maybe-all-stageprofile-zlib:
+maybe-clean-stageprofile-zlib:
+
+@if zlib-bootstrap
+maybe-configure-stageprofile-zlib: configure-stageprofile-zlib
+configure-stageprofile-zlib:
+       @$(MAKE) stageprofile-start
+       @[ -f zlib/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage profile in zlib ; \
+       cd zlib || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/zlib"; \
+           libsrcdir="$$s/zlib";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/zlib"; \
+           libsrcdir="$$s/zlib";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stageprofile-zlib: all-stageprofile-zlib
+all-stageprofile-zlib: configure-stageprofile-zlib
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-zlib: clean-stageprofile-zlib
+clean-stageprofile-zlib:
+       @[ -f zlib/Makefile ] || [ -f stageprofile-zlib/Makefile ] \
+         || exit 0 ; \
+       [ -f zlib/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif zlib-bootstrap
+
+
+
+# FIXME: Will not need to be conditional when toplevel bootstrap is the
+# only possibility, but now it conflicts with no-bootstrap rules
+@if gcc-bootstrap
+
+
+
+
+# Rules to wipe a stage and all the following ones, also used for cleanstrap
+distclean-stage1:: distclean-stageprofile 
+.PHONY: distclean-stageprofile
+distclean-stageprofile::
+       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+       rm -rf stageprofile-* 
+
+
+@endif gcc-bootstrap
+
+
+.PHONY: stagefeedback-start stagefeedback-end
+
+stagefeedback-start::
+       @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
+       echo stagefeedback > stage_current ; \
+       echo stagefeedback > stage_last
+@if bfd
+       @[ -d stagefeedback-bfd ] || mkdir stagefeedback-bfd; \
+       set stagefeedback-bfd bfd ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-bfd prev-bfd ; @CREATE_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @[ -d stagefeedback-opcodes ] || mkdir stagefeedback-opcodes; \
+       set stagefeedback-opcodes opcodes ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-opcodes prev-opcodes ; @CREATE_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @[ -d stagefeedback-binutils ] || mkdir stagefeedback-binutils; \
+       set stagefeedback-binutils binutils ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-binutils prev-binutils ; @CREATE_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @[ -d stagefeedback-gas ] || mkdir stagefeedback-gas; \
+       set stagefeedback-gas gas ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-gas prev-gas ; @CREATE_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @[ -d stagefeedback-gcc ] || mkdir stagefeedback-gcc; \
+       set stagefeedback-gcc gcc ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-gcc prev-gcc ; @CREATE_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @[ -d stagefeedback-intl ] || mkdir stagefeedback-intl; \
+       set stagefeedback-intl intl ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-intl prev-intl ; @CREATE_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @[ -d stagefeedback-ld ] || mkdir stagefeedback-ld; \
+       set stagefeedback-ld ld ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-ld prev-ld ; @CREATE_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @[ -d stagefeedback-libcpp ] || mkdir stagefeedback-libcpp; \
+       set stagefeedback-libcpp libcpp ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-libcpp prev-libcpp ; @CREATE_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @[ -d stagefeedback-libiberty ] || mkdir stagefeedback-libiberty; \
+       set stagefeedback-libiberty libiberty ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-libiberty prev-libiberty ; @CREATE_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @[ -d stagefeedback-zlib ] || mkdir stagefeedback-zlib; \
+       set stagefeedback-zlib zlib ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-zlib prev-zlib ; @CREATE_LINK_TO_DIR@ 
+@endif zlib
+
+stagefeedback-end::
+       @rm -f stage_current
+@if bfd
+       @set bfd stagefeedback-bfd ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-bfd stage1-bfd ; @UNDO_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @set opcodes stagefeedback-opcodes ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-opcodes stage1-opcodes ; @UNDO_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @set binutils stagefeedback-binutils ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-binutils stage1-binutils ; @UNDO_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @set gas stagefeedback-gas ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-gas stage1-gas ; @UNDO_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @set gcc stagefeedback-gcc ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-gcc stage1-gcc ; @UNDO_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @set intl stagefeedback-intl ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-intl stage1-intl ; @UNDO_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @set ld stagefeedback-ld ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-ld stage1-ld ; @UNDO_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @set libcpp stagefeedback-libcpp ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-libcpp stage1-libcpp ; @UNDO_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @set libiberty stagefeedback-libiberty ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-libiberty stage1-libiberty ; @UNDO_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @set zlib stagefeedback-zlib ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-zlib stage1-zlib ; @UNDO_LINK_TO_DIR@ 
+@endif zlib
+
+# Bubble a bugfix through all the stages up to stage feedback.  They
+# are remade, but not reconfigured.  The next stage (if any) will not
+# be reconfigured as well.
+.PHONY: stagefeedback-bubble
+stagefeedback-bubble:: stage1-bubble
+       @if test -f stagefeedback-lean || test -f stage1-lean  ; then \
+         echo Skipping rebuild of stagefeedback ; \
+       else \
+         $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stagefeedback; \
+       fi
+
+.PHONY: all-stagefeedback clean-stagefeedback
+all-stagefeedback:     \
+  maybe-all-stagefeedback-bfd \
+  maybe-all-stagefeedback-opcodes \
+  maybe-all-stagefeedback-binutils             \
+  maybe-all-stagefeedback-gas \
+  maybe-all-stagefeedback-gcc        \
+  maybe-all-stagefeedback-intl   \
+  maybe-all-stagefeedback-ld \
+  maybe-all-stagefeedback-libcpp  \
+  maybe-all-stagefeedback-libiberty                        \
+  maybe-all-stagefeedback-zlib       
+
+do-clean: clean-stagefeedback
+clean-stagefeedback:     \
+  maybe-clean-stagefeedback-bfd \
+  maybe-clean-stagefeedback-opcodes \
+  maybe-clean-stagefeedback-binutils             \
+  maybe-clean-stagefeedback-gas \
+  maybe-clean-stagefeedback-gcc        \
+  maybe-clean-stagefeedback-intl   \
+  maybe-clean-stagefeedback-ld \
+  maybe-clean-stagefeedback-libcpp  \
+  maybe-clean-stagefeedback-libiberty                        \
+  maybe-clean-stagefeedback-zlib       
+
+
+.PHONY: configure-stagefeedback-bfd maybe-configure-stagefeedback-bfd
+.PHONY: all-stagefeedback-bfd maybe-all-stagefeedback-bfd
+.PHONY: clean-stagefeedback-bfd maybe-clean-stagefeedback-bfd
+
+maybe-configure-stagefeedback-bfd:
+maybe-all-stagefeedback-bfd:
+maybe-clean-stagefeedback-bfd:
+
+@if bfd-bootstrap
+maybe-configure-stagefeedback-bfd: configure-stagefeedback-bfd
+configure-stagefeedback-bfd:
+       @$(MAKE) stagefeedback-start
+       @[ -f bfd/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage feedback in bfd ; \
+       cd bfd || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/bfd"; \
+           libsrcdir="$$s/bfd";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/bfd"; \
+           libsrcdir="$$s/bfd";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stagefeedback-bfd: all-stagefeedback-bfd
+all-stagefeedback-bfd: configure-stagefeedback-bfd
+       @$(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-bfd: clean-stagefeedback-bfd
+clean-stagefeedback-bfd:
+       @[ -f bfd/Makefile ] || [ -f stagefeedback-bfd/Makefile ] \
+         || exit 0 ; \
+       [ -f bfd/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif bfd-bootstrap
+
+
+.PHONY: configure-stagefeedback-opcodes maybe-configure-stagefeedback-opcodes
+.PHONY: all-stagefeedback-opcodes maybe-all-stagefeedback-opcodes
+.PHONY: clean-stagefeedback-opcodes maybe-clean-stagefeedback-opcodes
+
+maybe-configure-stagefeedback-opcodes:
+maybe-all-stagefeedback-opcodes:
+maybe-clean-stagefeedback-opcodes:
+
+@if opcodes-bootstrap
+maybe-configure-stagefeedback-opcodes: configure-stagefeedback-opcodes
+configure-stagefeedback-opcodes:
+       @$(MAKE) stagefeedback-start
+       @[ -f opcodes/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage feedback in opcodes ; \
+       cd opcodes || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/opcodes"; \
+           libsrcdir="$$s/opcodes";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/opcodes"; \
+           libsrcdir="$$s/opcodes";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stagefeedback-opcodes: all-stagefeedback-opcodes
+all-stagefeedback-opcodes: configure-stagefeedback-opcodes
+       @$(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-opcodes: clean-stagefeedback-opcodes
+clean-stagefeedback-opcodes:
+       @[ -f opcodes/Makefile ] || [ -f stagefeedback-opcodes/Makefile ] \
+         || exit 0 ; \
+       [ -f opcodes/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif opcodes-bootstrap
+
+
+.PHONY: configure-stagefeedback-binutils maybe-configure-stagefeedback-binutils
+.PHONY: all-stagefeedback-binutils maybe-all-stagefeedback-binutils
+.PHONY: clean-stagefeedback-binutils maybe-clean-stagefeedback-binutils
+
+maybe-configure-stagefeedback-binutils:
+maybe-all-stagefeedback-binutils:
+maybe-clean-stagefeedback-binutils:
+
+@if binutils-bootstrap
+maybe-configure-stagefeedback-binutils: configure-stagefeedback-binutils
+configure-stagefeedback-binutils:
+       @$(MAKE) stagefeedback-start
+       @[ -f binutils/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage feedback in binutils ; \
+       cd binutils || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/binutils"; \
+           libsrcdir="$$s/binutils";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/binutils"; \
+           libsrcdir="$$s/binutils";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stagefeedback-binutils: all-stagefeedback-binutils
+all-stagefeedback-binutils: configure-stagefeedback-binutils
+       @$(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-binutils: clean-stagefeedback-binutils
+clean-stagefeedback-binutils:
+       @[ -f binutils/Makefile ] || [ -f stagefeedback-binutils/Makefile ] \
+         || exit 0 ; \
+       [ -f binutils/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif binutils-bootstrap
+
+
+.PHONY: configure-stagefeedback-gas maybe-configure-stagefeedback-gas
+.PHONY: all-stagefeedback-gas maybe-all-stagefeedback-gas
+.PHONY: clean-stagefeedback-gas maybe-clean-stagefeedback-gas
+
+maybe-configure-stagefeedback-gas:
+maybe-all-stagefeedback-gas:
+maybe-clean-stagefeedback-gas:
+
+@if gas-bootstrap
+maybe-configure-stagefeedback-gas: configure-stagefeedback-gas
+configure-stagefeedback-gas:
+       @$(MAKE) stagefeedback-start
+       @[ -f gas/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage feedback in gas ; \
+       cd gas || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/gas"; \
+           libsrcdir="$$s/gas";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/gas"; \
+           libsrcdir="$$s/gas";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stagefeedback-gas: all-stagefeedback-gas
+all-stagefeedback-gas: configure-stagefeedback-gas
+       @$(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-gas: clean-stagefeedback-gas
+clean-stagefeedback-gas:
+       @[ -f gas/Makefile ] || [ -f stagefeedback-gas/Makefile ] \
+         || exit 0 ; \
+       [ -f gas/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif gas-bootstrap
+
+
+.PHONY: configure-stagefeedback-gcc maybe-configure-stagefeedback-gcc
+.PHONY: all-stagefeedback-gcc maybe-all-stagefeedback-gcc
+.PHONY: clean-stagefeedback-gcc maybe-clean-stagefeedback-gcc
+
+maybe-configure-stagefeedback-gcc:
+maybe-all-stagefeedback-gcc:
+maybe-clean-stagefeedback-gcc:
+
+@if gcc-bootstrap
+maybe-configure-stagefeedback-gcc: configure-stagefeedback-gcc
+configure-stagefeedback-gcc:
+       @$(MAKE) stagefeedback-start
+       @[ -f gcc/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage feedback in gcc ; \
         cd gcc || exit 1; \
         case $(srcdir) in \
           \.) \
@@ -24078,355 +32044,965 @@ configure-stage1-gcc:
         esac; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
-         --disable-intermodule --disable-coverage \
-         --enable-languages="$(STAGE1_LANGUAGES)"; \
-       cd .. ; \
-       mv gcc stage1-gcc ; \
-       $(STAMP) configure-stage1-gcc
-
-# Real targets act phony if they depend on phony targets; this hack
-# prevents gratuitous rebuilding of stage 1.
-prebootstrap:
-       $(MAKE) all-bootstrap
-       $(STAMP) prebootstrap
+         @stage2_werror_flag@ 
  
-all-stage1-gcc: configure-stage1-gcc prebootstrap
-       echo all-stage1-gcc > stage_last ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       mv stage1-gcc gcc ; \
+maybe-all-stagefeedback-gcc: all-stagefeedback-gcc
+all-stagefeedback-gcc: configure-stagefeedback-gcc
+       @$(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
         cd gcc && \
-       $(MAKE) $(GCC_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE1_CFLAGS)" && $(STAMP) ../all-stage1-gcc ; \
-       result=$$? ; \
-       cd .. ; \
-       mv gcc stage1-gcc ; \
-       exit $$result
-
-# TODO: Deal with STAGE_PREFIX (which is only for ada, incidentally)
-# Possibly pass --enable-werror-always (depending on --enable-werror);
-# that's what @stage2_werror_flag@ is for
-configure-stage2-gcc: all-stage1-gcc
-       echo configure-stage2-gcc > stage_last ; \
-       if [ -f stage2-gcc/Makefile ] ; then \
-         $(STAMP) configure-stage2-gcc ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
-       [ -d stage2-gcc ] || mkdir stage2-gcc; \
-       mv stage2-gcc gcc ; \
-       mv stage1-gcc prev-gcc ; \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" $(EXTRA_GCC_FLAGS)
+
+maybe-clean-stagefeedback-gcc: clean-stagefeedback-gcc
+clean-stagefeedback-gcc:
+       @[ -f gcc/Makefile ] || [ -f stagefeedback-gcc/Makefile ] \
+         || exit 0 ; \
+       [ -f gcc/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" $(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+.PHONY: configure-stagefeedback-intl maybe-configure-stagefeedback-intl
+.PHONY: all-stagefeedback-intl maybe-all-stagefeedback-intl
+.PHONY: clean-stagefeedback-intl maybe-clean-stagefeedback-intl
+
+maybe-configure-stagefeedback-intl:
+maybe-all-stagefeedback-intl:
+maybe-clean-stagefeedback-intl:
+
+@if intl-bootstrap
+maybe-configure-stagefeedback-intl: configure-stagefeedback-intl
+configure-stagefeedback-intl:
+       @$(MAKE) stagefeedback-start
+       @[ -f intl/Makefile ] && exit 0 || : ; \
         r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       AR="$(AR)"; export AR; \
-       AS="$(AS)"; export AS; \
-       DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
-       LD="$(LD)"; export LD; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       CC="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/"; export CC; \
-       CC_FOR_BUILD="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/"; export CC_FOR_BUILD; \
-       echo Configuring stage 2 in gcc; \
-       cd gcc || exit 1; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage feedback in intl ; \
+       cd intl || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/gcc"; \
-           libsrcdir="$$s/gcc";; \
+           srcdiroption="--srcdir=$(srcdir)/intl"; \
+           libsrcdir="$$s/intl";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/gcc"; \
-           libsrcdir="$$s/gcc";; \
+           srcdiroption="--srcdir=../$(srcdir)/intl"; \
+           libsrcdir="$$s/intl";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} @stage2_werror_flag@ ; \
-       cd .. ; \
-       mv gcc stage2-gcc ; \
-       mv prev-gcc stage1-gcc ; \
-       $(STAMP) configure-stage2-gcc
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
  
-# Flags to pass to stage2 and later makes.
-BOOT_CFLAGS= -g -O2
-POSTSTAGE1_FLAGS_TO_PASS = \
-       CFLAGS="$(BOOT_CFLAGS)" \
-       ADAC="\$$(CC)"
+maybe-all-stagefeedback-intl: all-stagefeedback-intl
+all-stagefeedback-intl: configure-stagefeedback-intl
+       @$(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-intl: clean-stagefeedback-intl
+clean-stagefeedback-intl:
+       @[ -f intl/Makefile ] || [ -f stagefeedback-intl/Makefile ] \
+         || exit 0 ; \
+       [ -f intl/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif intl-bootstrap
+
+
+.PHONY: configure-stagefeedback-ld maybe-configure-stagefeedback-ld
+.PHONY: all-stagefeedback-ld maybe-all-stagefeedback-ld
+.PHONY: clean-stagefeedback-ld maybe-clean-stagefeedback-ld
+
+maybe-configure-stagefeedback-ld:
+maybe-all-stagefeedback-ld:
+maybe-clean-stagefeedback-ld:
+
+@if ld-bootstrap
+maybe-configure-stagefeedback-ld: configure-stagefeedback-ld
+configure-stagefeedback-ld:
+       @$(MAKE) stagefeedback-start
+       @[ -f ld/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage feedback in ld ; \
+       cd ld || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/ld"; \
+           libsrcdir="$$s/ld";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/ld"; \
+           libsrcdir="$$s/ld";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
  
-all-stage2-gcc: all-stage1-gcc configure-stage2-gcc
-       echo all-stage2-gcc > stage_last ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       mv stage2-gcc gcc ; \
-       mv stage1-gcc prev-gcc ; \
-       cd gcc && \
-       $(MAKE) $(GCC_FLAGS_TO_PASS) \
-               CC="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/" \
-               CC_FOR_BUILD="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/" \
-               STAGE_PREFIX=$$r/prev-gcc/ \
-               $(POSTSTAGE1_FLAGS_TO_PASS) && $(STAMP) ../all-stage2-gcc ; \
-       result=$$? ; \
-       cd .. ; \
-       mv prev-gcc stage1-gcc ; \
-       mv gcc stage2-gcc ; \
-       exit $$result
-
-configure-stage3-gcc: all-stage2-gcc
-       echo configure-stage3-gcc > stage_last ; \
-       if [ -f stage3-gcc/Makefile ] ; then \
-         $(STAMP) configure-stage3-gcc ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
-       [ -d stage3-gcc ] || mkdir stage3-gcc; \
-       mv stage3-gcc gcc ; \
-       mv stage2-gcc prev-gcc ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       AR="$(AR)"; export AR; \
-       AS="$(AS)"; export AS; \
-       DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
-       LD="$(LD)"; export LD; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       CC="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/"; export CC; \
-       CC_FOR_BUILD="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/"; export CC_FOR_BUILD; \
-       echo Configuring stage 3 in gcc; \
-       cd gcc || exit 1; \
+maybe-all-stagefeedback-ld: all-stagefeedback-ld
+all-stagefeedback-ld: configure-stagefeedback-ld
+       @$(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-ld: clean-stagefeedback-ld
+clean-stagefeedback-ld:
+       @[ -f ld/Makefile ] || [ -f stagefeedback-ld/Makefile ] \
+         || exit 0 ; \
+       [ -f ld/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif ld-bootstrap
+
+
+.PHONY: configure-stagefeedback-libcpp maybe-configure-stagefeedback-libcpp
+.PHONY: all-stagefeedback-libcpp maybe-all-stagefeedback-libcpp
+.PHONY: clean-stagefeedback-libcpp maybe-clean-stagefeedback-libcpp
+
+maybe-configure-stagefeedback-libcpp:
+maybe-all-stagefeedback-libcpp:
+maybe-clean-stagefeedback-libcpp:
+
+@if libcpp-bootstrap
+maybe-configure-stagefeedback-libcpp: configure-stagefeedback-libcpp
+configure-stagefeedback-libcpp:
+       @$(MAKE) stagefeedback-start
+       @[ -f libcpp/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage feedback in libcpp ; \
+       cd libcpp || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/gcc"; \
-           libsrcdir="$$s/gcc";; \
+           srcdiroption="--srcdir=$(srcdir)/libcpp"; \
+           libsrcdir="$$s/libcpp";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/gcc"; \
-           libsrcdir="$$s/gcc";; \
+           srcdiroption="--srcdir=../$(srcdir)/libcpp"; \
+           libsrcdir="$$s/libcpp";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} @stage2_werror_flag@ ; \
-       cd .. ; \
-       mv gcc stage3-gcc ; \
-       mv prev-gcc stage2-gcc ; \
-       $(STAMP) configure-stage3-gcc
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
  
-all-stage3-gcc: all-stage2-gcc configure-stage3-gcc
-       echo all-stage3-gcc > stage_last ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       mv stage2-gcc prev-gcc ; \
-       mv stage3-gcc gcc ; \
-       cd gcc && \
-       $(MAKE) $(GCC_FLAGS_TO_PASS) \
-               CC="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/" \
-               CC_FOR_BUILD="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/" \
-               STAGE_PREFIX=$$r/prev-gcc/ \
-               $(POSTSTAGE1_FLAGS_TO_PASS) && $(STAMP) ../all-stage3-gcc \
-       result=$$? ; \
-       cd .. ; \
-       mv prev-gcc stage2-gcc ; \
-       mv gcc stage3-gcc ; \
-       exit $$result
+maybe-all-stagefeedback-libcpp: all-stagefeedback-libcpp
+all-stagefeedback-libcpp: configure-stagefeedback-libcpp
+       @$(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-libcpp: clean-stagefeedback-libcpp
+clean-stagefeedback-libcpp:
+       @[ -f libcpp/Makefile ] || [ -f stagefeedback-libcpp/Makefile ] \
+         || exit 0 ; \
+       [ -f libcpp/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif libcpp-bootstrap
+
+
+.PHONY: configure-stagefeedback-libiberty maybe-configure-stagefeedback-libiberty
+.PHONY: all-stagefeedback-libiberty maybe-all-stagefeedback-libiberty
+.PHONY: clean-stagefeedback-libiberty maybe-clean-stagefeedback-libiberty
+
+maybe-configure-stagefeedback-libiberty:
+maybe-all-stagefeedback-libiberty:
+maybe-clean-stagefeedback-libiberty:
+
+@if libiberty-bootstrap
+maybe-configure-stagefeedback-libiberty: configure-stagefeedback-libiberty
+configure-stagefeedback-libiberty:
+       @$(MAKE) stagefeedback-start
+       @[ -f libiberty/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage feedback in libiberty ; \
+       cd libiberty || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/libiberty"; \
+           libsrcdir="$$s/libiberty";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/libiberty"; \
+           libsrcdir="$$s/libiberty";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
  
-# We only want to compare .o files, so set this!
-objext = .o
+maybe-all-stagefeedback-libiberty: all-stagefeedback-libiberty
+all-stagefeedback-libiberty: configure-stagefeedback-libiberty
+       @$(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-libiberty: clean-stagefeedback-libiberty
+clean-stagefeedback-libiberty:
+       @[ -f libiberty/Makefile ] || [ -f stagefeedback-libiberty/Makefile ] \
+         || exit 0 ; \
+       [ -f libiberty/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif libiberty-bootstrap
+
+
+.PHONY: configure-stagefeedback-zlib maybe-configure-stagefeedback-zlib
+.PHONY: all-stagefeedback-zlib maybe-all-stagefeedback-zlib
+.PHONY: clean-stagefeedback-zlib maybe-clean-stagefeedback-zlib
+
+maybe-configure-stagefeedback-zlib:
+maybe-all-stagefeedback-zlib:
+maybe-clean-stagefeedback-zlib:
+
+@if zlib-bootstrap
+maybe-configure-stagefeedback-zlib: configure-stagefeedback-zlib
+configure-stagefeedback-zlib:
+       @$(MAKE) stagefeedback-start
+       @[ -f zlib/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage feedback in zlib ; \
+       cd zlib || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/zlib"; \
+           libsrcdir="$$s/zlib";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/zlib"; \
+           libsrcdir="$$s/zlib";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
  
-compare: all-stage3-gcc
-       r=`${PWD_COMMAND}`; export r; \
+maybe-all-stagefeedback-zlib: all-stagefeedback-zlib
+all-stagefeedback-zlib: configure-stagefeedback-zlib
+       @$(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-zlib: clean-stagefeedback-zlib
+clean-stagefeedback-zlib:
+       @[ -f zlib/Makefile ] || [ -f stagefeedback-zlib/Makefile ] \
+         || exit 0 ; \
+       [ -f zlib/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif zlib-bootstrap
+
+
+
+# FIXME: Will not need to be conditional when toplevel bootstrap is the
+# only possibility, but now it conflicts with no-bootstrap rules
+@if gcc-bootstrap
+
+
+
+
+# Rules to wipe a stage and all the following ones, also used for cleanstrap
+distclean-stage1:: distclean-stagefeedback 
+.PHONY: distclean-stagefeedback
+distclean-stagefeedback::
+       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+       rm -rf stagefeedback-* 
+
+
+@endif gcc-bootstrap
+
+
+
+stagefeedback-start::
+       @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       rm -f .bad_compare ; \
-       cd stage3-gcc; \
-       files=`find . -name "*$(objext)" -print` ; \
-       cd .. ; \
-       for file in $${files} ; do \
-         f1=$$r/stage2-gcc/$$file; f2=$$r/stage3-gcc/$$file; \
-         @do_compare@ > /dev/null 2>&1; \
-         test $$? -eq 1 && echo $$file differs >> .bad_compare || true; \
-       done ; \
-       if [ -f .bad_compare ]; then \
-         echo "Bootstrap comparison failure!"; \
-         cat .bad_compare; \
-         exit 1; \
-       else \
-         true; \
-       fi ; \
-        $(STAMP) compare
-
-.PHONY: new-bootstrap
-# This target exists so that everything can be made in one pass.
-# 'all-gcc' has to avoid stomping on the bootstrap-generated gcc for
-# this to work.
-new-bootstrap: compare
-       mv stage3-gcc gcc ; \
-       $(MAKE) all ; \
-       mv gcc stage3-gcc
-
-new-cleanstrap:
-       rm -rf configure-stage1-gcc all-stage1-gcc stage1-gcc \
-         configure-stage2-gcc all-stage2-gcc stage2-gcc \
-         configure-stage3-gcc all-stage3-gcc stage3-gcc \
-         compare
-       $(MAKE) new-bootstrap
-
-new-restage1:
-       rm -rf all-stage1-gcc \
-         configure-stage2-gcc all-stage2-gcc stage2-gcc \
-         configure-stage3-gcc all-stage3-gcc stage3-gcc \
-         compare
-       $(MAKE) all-stage1-gcc
-
-new-restage2: all-stage1-gcc
-       rm -rf all-stage2-gcc \
-         configure-stage3-gcc all-stage3-gcc stage3-gcc \
-         compare
-       $(MAKE) all-stage2-gcc
-
-new-restage3: all-stage2-gcc
-       rm -rf all-stage3-gcc compare
-       $(MAKE) compare
+       cd stageprofile-gcc && \
+         { find . -type d | sort | sed 's,.*,$(SHELL) '"$$s"'/mkinstalldirs "../gcc/&",' | $(SHELL); } && \
+         { find . -name '*.*da' | sed 's,.*,$(LN) -f "&" "../gcc/&",' | $(SHELL); }
+
+# FIXME: Will not need to be conditional when toplevel bootstrap is the
+# only possibility, but now it conflicts with no-bootstrap rules
+@if gcc-bootstrap
+profiledbootstrap:
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       echo "Bootstrapping the compiler"; \
+       $(MAKE) stageprofile-bubble distclean-stagefeedback
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
+       $(SET_LIB_PATH) \
+       echo "Building runtime libraries and training compiler"; \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       echo "Building feedback based compiler"; \
+       $(MAKE) stagefeedback-bubble stagefeedback-end
+@endif gcc-bootstrap
+
+@if gcc-bootstrap
+NOTPARALLEL = .NOTPARALLEL
+$(NOTPARALLEL):
+do-distclean: distclean-stage1
+@endif gcc-bootstrap
  
  # --------------------------------------
  # Dependencies between different modules
  # --------------------------------------
  
+# Generic dependencies for target modules on host stuff, especially gcc
+
+configure-target-libstdc++-v3: maybe-all-gcc
+
+configure-target-libmudflap: maybe-all-gcc
+
+configure-target-newlib: maybe-all-gcc
+
+configure-target-libgfortran: maybe-all-gcc
+
+configure-target-libobjc: maybe-all-gcc
+
+configure-target-libtermcap: maybe-all-gcc
+
+configure-target-winsup: maybe-all-gcc
+
+configure-target-libgloss: maybe-all-gcc
+
+configure-target-libiberty: maybe-all-gcc
+
+configure-target-gperf: maybe-all-gcc
+
+configure-target-examples: maybe-all-gcc
+
+configure-target-libffi: maybe-all-gcc
+
+configure-target-libjava: maybe-all-gcc
+
+configure-target-zlib: maybe-all-gcc
+
+configure-target-boehm-gc: maybe-all-gcc
+
+configure-target-qthreads: maybe-all-gcc
+
+configure-target-rda: maybe-all-gcc
+
+configure-target-libada: maybe-all-gcc
+
+
+
+configure-target-boehm-gc: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-gperf: maybe-all-target-newlib maybe-all-target-libgloss
+configure-target-gperf: maybe-all-target-libstdc++-v3
+
+configure-target-libada: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-libgfortran: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-libffi: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-libjava: maybe-all-target-newlib maybe-all-target-libgloss
+configure-target-libjava: maybe-all-target-libstdc++-v3
+
+configure-target-libobjc: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-libstdc++-v3: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-zlib: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-examples: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-libtermcap: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-rda: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-winsup: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-qthreads: maybe-all-target-newlib maybe-all-target-libgloss
+
+
  # There are two types of dependencies here: 'hard' dependencies, where one
  # module simply won't build without the other; and 'soft' dependencies, where
  # if the depended-on module is missing, the depending module will do without
  # or find a substitute somewhere (perhaps installed).  Soft dependencies
-# are specified by depending on a 'maybe-' target.  If you're not sure,
+# are made here to depend on a 'maybe-' target.  If you're not sure,
  # it's safer to use a soft dependency.
  
-# Host modules specific to gcc.
-# GCC needs to identify certain tools.
-# GCC also needs the information exported by the intl configure script.
-configure-gcc: maybe-configure-intl maybe-configure-binutils maybe-configure-gas maybe-configure-ld maybe-configure-bison maybe-configure-flex
-all-gcc: maybe-all-libiberty maybe-all-intl maybe-all-bison maybe-all-byacc maybe-all-binutils maybe-all-gas maybe-all-ld maybe-all-zlib
-# This is a slightly kludgy method of getting dependencies on 
-# all-build-libiberty correct; it would be better to build it every time.
+
+
+
+
+# With all the machinery above in place, it is pretty easy to generate
+# dependencies.  Host dependencies are a bit more complex because we have
+# to check for bootstrap/prebootstrap dependencies.  To resolve
+# prebootstrap dependencies, prebootstrap modules are gathered in
+# a hash table.
+all-build-bison: maybe-all-build-texinfo
+all-build-byacc: maybe-all-build-texinfo
+all-build-flex: maybe-all-build-texinfo
+all-build-flex: maybe-all-build-bison
+all-build-flex: maybe-all-build-byacc
+all-build-flex: maybe-all-build-m4
+all-build-libiberty: maybe-all-build-texinfo
+all-build-m4: maybe-all-build-texinfo
+all-build-fixincludes: maybe-all-build-libiberty
+configure-gcc: maybe-configure-intl
+
+configure-stage1-gcc: maybe-configure-stage1-intl
+configure-stage2-gcc: maybe-configure-stage2-intl
+configure-stage3-gcc: maybe-configure-stage3-intl
+configure-stage4-gcc: maybe-configure-stage4-intl
+configure-stageprofile-gcc: maybe-configure-stageprofile-intl
+configure-stagefeedback-gcc: maybe-configure-stagefeedback-intl
+configure-gcc: maybe-configure-binutils
+
+configure-stage1-gcc: maybe-configure-stage1-binutils
+configure-stage2-gcc: maybe-configure-stage2-binutils
+configure-stage3-gcc: maybe-configure-stage3-binutils
+configure-stage4-gcc: maybe-configure-stage4-binutils
+configure-stageprofile-gcc: maybe-configure-stageprofile-binutils
+configure-stagefeedback-gcc: maybe-configure-stagefeedback-binutils
+configure-gcc: maybe-configure-gas
+
+configure-stage1-gcc: maybe-configure-stage1-gas
+configure-stage2-gcc: maybe-configure-stage2-gas
+configure-stage3-gcc: maybe-configure-stage3-gas
+configure-stage4-gcc: maybe-configure-stage4-gas
+configure-stageprofile-gcc: maybe-configure-stageprofile-gas
+configure-stagefeedback-gcc: maybe-configure-stagefeedback-gas
+configure-gcc: maybe-configure-ld
+
+configure-stage1-gcc: maybe-configure-stage1-ld
+configure-stage2-gcc: maybe-configure-stage2-ld
+configure-stage3-gcc: maybe-configure-stage3-ld
+configure-stage4-gcc: maybe-configure-stage4-ld
+configure-stageprofile-gcc: maybe-configure-stageprofile-ld
+configure-stagefeedback-gcc: maybe-configure-stagefeedback-ld
+all-gcc: all-libiberty
+
+all-stage1-gcc: all-stage1-libiberty
+all-stage2-gcc: all-stage2-libiberty
+all-stage3-gcc: all-stage3-libiberty
+all-stage4-gcc: all-stage4-libiberty
+all-stageprofile-gcc: all-stageprofile-libiberty
+all-stagefeedback-gcc: all-stagefeedback-libiberty
+all-gcc: maybe-all-intl
+
+all-stage1-gcc: maybe-all-stage1-intl
+all-stage2-gcc: maybe-all-stage2-intl
+all-stage3-gcc: maybe-all-stage3-intl
+all-stage4-gcc: maybe-all-stage4-intl
+all-stageprofile-gcc: maybe-all-stageprofile-intl
+all-stagefeedback-gcc: maybe-all-stagefeedback-intl
+all-gcc: maybe-all-build-texinfo
+
+all-stage1-gcc: maybe-all-build-texinfo
+all-stage2-gcc: maybe-all-build-texinfo
+all-stage3-gcc: maybe-all-build-texinfo
+all-stage4-gcc: maybe-all-build-texinfo
+all-stageprofile-gcc: maybe-all-build-texinfo
+all-stagefeedback-gcc: maybe-all-build-texinfo
+all-prebootstrap: maybe-all-build-texinfo
+all-gcc: maybe-all-build-bison
+
+all-stage1-gcc: maybe-all-build-bison
+all-stage2-gcc: maybe-all-build-bison
+all-stage3-gcc: maybe-all-build-bison
+all-stage4-gcc: maybe-all-build-bison
+all-stageprofile-gcc: maybe-all-build-bison
+all-stagefeedback-gcc: maybe-all-build-bison
+all-prebootstrap: maybe-all-build-bison
+all-gcc: maybe-all-build-byacc
+
+all-stage1-gcc: maybe-all-build-byacc
+all-stage2-gcc: maybe-all-build-byacc
+all-stage3-gcc: maybe-all-build-byacc
+all-stage4-gcc: maybe-all-build-byacc
+all-stageprofile-gcc: maybe-all-build-byacc
+all-stagefeedback-gcc: maybe-all-build-byacc
+all-prebootstrap: maybe-all-build-byacc
+all-gcc: maybe-all-build-flex
+
+all-stage1-gcc: maybe-all-build-flex
+all-stage2-gcc: maybe-all-build-flex
+all-stage3-gcc: maybe-all-build-flex
+all-stage4-gcc: maybe-all-build-flex
+all-stageprofile-gcc: maybe-all-build-flex
+all-stagefeedback-gcc: maybe-all-build-flex
+all-prebootstrap: maybe-all-build-flex
  all-gcc: maybe-all-build-libiberty
-all-bootstrap: maybe-all-binutils maybe-all-bison maybe-all-byacc maybe-all-gas maybe-all-intl maybe-all-ld maybe-all-libiberty maybe-all-texinfo maybe-all-zlib 
  
-# Host modules specific to gdb.
-# GDB needs to know that the simulator is being built.
-configure-gdb: maybe-configure-itcl maybe-configure-tcl maybe-configure-tk maybe-configure-sim
-GDB_TK = @GDB_TK@
-all-gdb: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-mmalloc maybe-all-readline maybe-all-bison maybe-all-byacc maybe-all-sim $(gdbnlmrequirements) $(GDB_TK)
-install-gdb: maybe-install-tcl maybe-install-tk maybe-install-itcl maybe-install-tix maybe-install-libgui
-configure-libgui: maybe-configure-tcl maybe-configure-tk
-all-libgui: maybe-all-tcl maybe-all-tk maybe-all-itcl
+all-stage1-gcc: maybe-all-build-libiberty
+all-stage2-gcc: maybe-all-build-libiberty
+all-stage3-gcc: maybe-all-build-libiberty
+all-stage4-gcc: maybe-all-build-libiberty
+all-stageprofile-gcc: maybe-all-build-libiberty
+all-stagefeedback-gcc: maybe-all-build-libiberty
+all-prebootstrap: maybe-all-build-libiberty
+all-gcc: maybe-all-build-fixincludes
+
+all-stage1-gcc: maybe-all-build-fixincludes
+all-stage2-gcc: maybe-all-build-fixincludes
+all-stage3-gcc: maybe-all-build-fixincludes
+all-stage4-gcc: maybe-all-build-fixincludes
+all-stageprofile-gcc: maybe-all-build-fixincludes
+all-stagefeedback-gcc: maybe-all-build-fixincludes
+all-prebootstrap: maybe-all-build-fixincludes
+all-gcc: maybe-all-binutils
+
+all-stage1-gcc: maybe-all-stage1-binutils
+all-stage2-gcc: maybe-all-stage2-binutils
+all-stage3-gcc: maybe-all-stage3-binutils
+all-stage4-gcc: maybe-all-stage4-binutils
+all-stageprofile-gcc: maybe-all-stageprofile-binutils
+all-stagefeedback-gcc: maybe-all-stagefeedback-binutils
+all-gcc: maybe-all-gas
+
+all-stage1-gcc: maybe-all-stage1-gas
+all-stage2-gcc: maybe-all-stage2-gas
+all-stage3-gcc: maybe-all-stage3-gas
+all-stage4-gcc: maybe-all-stage4-gas
+all-stageprofile-gcc: maybe-all-stageprofile-gas
+all-stagefeedback-gcc: maybe-all-stagefeedback-gas
+all-gcc: maybe-all-ld
+
+all-stage1-gcc: maybe-all-stage1-ld
+all-stage2-gcc: maybe-all-stage2-ld
+all-stage3-gcc: maybe-all-stage3-ld
+all-stage4-gcc: maybe-all-stage4-ld
+all-stageprofile-gcc: maybe-all-stageprofile-ld
+all-stagefeedback-gcc: maybe-all-stagefeedback-ld
+all-gcc: maybe-all-zlib
+
+all-stage1-gcc: maybe-all-stage1-zlib
+all-stage2-gcc: maybe-all-stage2-zlib
+all-stage3-gcc: maybe-all-stage3-zlib
+all-stage4-gcc: maybe-all-stage4-zlib
+all-stageprofile-gcc: maybe-all-stageprofile-zlib
+all-stagefeedback-gcc: maybe-all-stagefeedback-zlib
+all-gcc: all-libcpp
+
+all-stage1-gcc: all-stage1-libcpp
+all-stage2-gcc: all-stage2-libcpp
+all-stage3-gcc: all-stage3-libcpp
+all-stage4-gcc: all-stage4-libcpp
+all-stageprofile-gcc: all-stageprofile-libcpp
+all-stagefeedback-gcc: all-stagefeedback-libcpp
+all-gcc: maybe-all-build-libiberty
  
-# Host modules specific to binutils.
+all-stage1-gcc: maybe-all-build-libiberty
+all-stage2-gcc: maybe-all-build-libiberty
+all-stage3-gcc: maybe-all-build-libiberty
+all-stage4-gcc: maybe-all-build-libiberty
+all-stageprofile-gcc: maybe-all-build-libiberty
+all-stagefeedback-gcc: maybe-all-build-libiberty
+all-prebootstrap: maybe-all-build-libiberty
+configure-libcpp: configure-libiberty
+
+configure-stage1-libcpp: configure-stage1-libiberty
+configure-stage2-libcpp: configure-stage2-libiberty
+configure-stage3-libcpp: configure-stage3-libiberty
+configure-stage4-libcpp: configure-stage4-libiberty
+configure-stageprofile-libcpp: configure-stageprofile-libiberty
+configure-stagefeedback-libcpp: configure-stagefeedback-libiberty
+configure-libcpp: maybe-configure-intl
+
+configure-stage1-libcpp: maybe-configure-stage1-intl
+configure-stage2-libcpp: maybe-configure-stage2-intl
+configure-stage3-libcpp: maybe-configure-stage3-intl
+configure-stage4-libcpp: maybe-configure-stage4-intl
+configure-stageprofile-libcpp: maybe-configure-stageprofile-intl
+configure-stagefeedback-libcpp: maybe-configure-stagefeedback-intl
+all-libcpp: all-libiberty
+
+all-stage1-libcpp: all-stage1-libiberty
+all-stage2-libcpp: all-stage2-libiberty
+all-stage3-libcpp: all-stage3-libiberty
+all-stage4-libcpp: all-stage4-libiberty
+all-stageprofile-libcpp: all-stageprofile-libiberty
+all-stagefeedback-libcpp: all-stagefeedback-libiberty
+all-libcpp: maybe-all-intl
+
+all-stage1-libcpp: maybe-all-stage1-intl
+all-stage2-libcpp: maybe-all-stage2-intl
+all-stage3-libcpp: maybe-all-stage3-intl
+all-stage4-libcpp: maybe-all-stage4-intl
+all-stageprofile-libcpp: maybe-all-stageprofile-intl
+all-stagefeedback-libcpp: maybe-all-stagefeedback-intl
+configure-gdb: maybe-configure-itcl
+configure-gdb: maybe-configure-tcl
+configure-gdb: maybe-configure-tk
+configure-gdb: maybe-configure-sim
+all-gdb: maybe-all-libiberty
+all-gdb: maybe-all-opcodes
+all-gdb: maybe-all-bfd
+all-gdb: maybe-all-readline
+all-gdb: maybe-all-build-bison
+all-gdb: maybe-all-build-byacc
+all-gdb: maybe-all-sim
+install-gdb: maybe-install-tcl
+install-gdb: maybe-install-tk
+install-gdb: maybe-install-itcl
+install-gdb: maybe-install-libgui
+configure-libgui: maybe-configure-tcl
+configure-libgui: maybe-configure-tk
+all-libgui: maybe-all-tcl
+all-libgui: maybe-all-tk
+all-libgui: maybe-all-itcl
  configure-bfd: configure-libiberty
-all-bfd: maybe-all-libiberty maybe-all-intl
-all-binutils: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-flex maybe-all-bison maybe-all-byacc maybe-all-intl
-# We put install-opcodes before install-binutils because the installed
-# binutils might be on PATH, and they might need the shared opcodes
-# library.
+
+configure-stage1-bfd: configure-stage1-libiberty
+configure-stage2-bfd: configure-stage2-libiberty
+configure-stage3-bfd: configure-stage3-libiberty
+configure-stage4-bfd: configure-stage4-libiberty
+configure-stageprofile-bfd: configure-stageprofile-libiberty
+configure-stagefeedback-bfd: configure-stagefeedback-libiberty
+all-bfd: maybe-all-libiberty
+
+all-stage1-bfd: maybe-all-stage1-libiberty
+all-stage2-bfd: maybe-all-stage2-libiberty
+all-stage3-bfd: maybe-all-stage3-libiberty
+all-stage4-bfd: maybe-all-stage4-libiberty
+all-stageprofile-bfd: maybe-all-stageprofile-libiberty
+all-stagefeedback-bfd: maybe-all-stagefeedback-libiberty
+all-bfd: maybe-all-intl
+
+all-stage1-bfd: maybe-all-stage1-intl
+all-stage2-bfd: maybe-all-stage2-intl
+all-stage3-bfd: maybe-all-stage3-intl
+all-stage4-bfd: maybe-all-stage4-intl
+all-stageprofile-bfd: maybe-all-stageprofile-intl
+all-stagefeedback-bfd: maybe-all-stagefeedback-intl
+all-binutils: maybe-all-libiberty
+
+all-stage1-binutils: maybe-all-stage1-libiberty
+all-stage2-binutils: maybe-all-stage2-libiberty
+all-stage3-binutils: maybe-all-stage3-libiberty
+all-stage4-binutils: maybe-all-stage4-libiberty
+all-stageprofile-binutils: maybe-all-stageprofile-libiberty
+all-stagefeedback-binutils: maybe-all-stagefeedback-libiberty
+all-binutils: maybe-all-opcodes
+
+all-stage1-binutils: maybe-all-stage1-opcodes
+all-stage2-binutils: maybe-all-stage2-opcodes
+all-stage3-binutils: maybe-all-stage3-opcodes
+all-stage4-binutils: maybe-all-stage4-opcodes
+all-stageprofile-binutils: maybe-all-stageprofile-opcodes
+all-stagefeedback-binutils: maybe-all-stagefeedback-opcodes
+all-binutils: maybe-all-bfd
+
+all-stage1-binutils: maybe-all-stage1-bfd
+all-stage2-binutils: maybe-all-stage2-bfd
+all-stage3-binutils: maybe-all-stage3-bfd
+all-stage4-binutils: maybe-all-stage4-bfd
+all-stageprofile-binutils: maybe-all-stageprofile-bfd
+all-stagefeedback-binutils: maybe-all-stagefeedback-bfd
+all-binutils: maybe-all-build-flex
+
+all-stage1-binutils: maybe-all-build-flex
+all-stage2-binutils: maybe-all-build-flex
+all-stage3-binutils: maybe-all-build-flex
+all-stage4-binutils: maybe-all-build-flex
+all-stageprofile-binutils: maybe-all-build-flex
+all-stagefeedback-binutils: maybe-all-build-flex
+all-prebootstrap: maybe-all-build-flex
+all-binutils: maybe-all-build-bison
+
+all-stage1-binutils: maybe-all-build-bison
+all-stage2-binutils: maybe-all-build-bison
+all-stage3-binutils: maybe-all-build-bison
+all-stage4-binutils: maybe-all-build-bison
+all-stageprofile-binutils: maybe-all-build-bison
+all-stagefeedback-binutils: maybe-all-build-bison
+all-prebootstrap: maybe-all-build-bison
+all-binutils: maybe-all-build-byacc
+
+all-stage1-binutils: maybe-all-build-byacc
+all-stage2-binutils: maybe-all-build-byacc
+all-stage3-binutils: maybe-all-build-byacc
+all-stage4-binutils: maybe-all-build-byacc
+all-stageprofile-binutils: maybe-all-build-byacc
+all-stagefeedback-binutils: maybe-all-build-byacc
+all-prebootstrap: maybe-all-build-byacc
+all-binutils: maybe-all-intl
+
+all-stage1-binutils: maybe-all-stage1-intl
+all-stage2-binutils: maybe-all-stage2-intl
+all-stage3-binutils: maybe-all-stage3-intl
+all-stage4-binutils: maybe-all-stage4-intl
+all-stageprofile-binutils: maybe-all-stageprofile-intl
+all-stagefeedback-binutils: maybe-all-stagefeedback-intl
  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
-all-opcodes: maybe-all-bfd maybe-all-libiberty
-
-# Other host modules in the 'src' repository.
-all-dejagnu: maybe-all-tcl maybe-all-expect maybe-all-tk
-configure-expect: maybe-configure-tcl maybe-configure-tk
-all-expect: maybe-all-tcl maybe-all-tk
-configure-itcl: maybe-configure-tcl maybe-configure-tk
-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.
+all-gas: maybe-all-libiberty
+
+all-stage1-gas: maybe-all-stage1-libiberty
+all-stage2-gas: maybe-all-stage2-libiberty
+all-stage3-gas: maybe-all-stage3-libiberty
+all-stage4-gas: maybe-all-stage4-libiberty
+all-stageprofile-gas: maybe-all-stageprofile-libiberty
+all-stagefeedback-gas: maybe-all-stagefeedback-libiberty
+all-gas: maybe-all-opcodes
+
+all-stage1-gas: maybe-all-stage1-opcodes
+all-stage2-gas: maybe-all-stage2-opcodes
+all-stage3-gas: maybe-all-stage3-opcodes
+all-stage4-gas: maybe-all-stage4-opcodes
+all-stageprofile-gas: maybe-all-stageprofile-opcodes
+all-stagefeedback-gas: maybe-all-stagefeedback-opcodes
+all-gas: maybe-all-bfd
+
+all-stage1-gas: maybe-all-stage1-bfd
+all-stage2-gas: maybe-all-stage2-bfd
+all-stage3-gas: maybe-all-stage3-bfd
+all-stage4-gas: maybe-all-stage4-bfd
+all-stageprofile-gas: maybe-all-stageprofile-bfd
+all-stagefeedback-gas: maybe-all-stagefeedback-bfd
+all-gas: maybe-all-intl
+
+all-stage1-gas: maybe-all-stage1-intl
+all-stage2-gas: maybe-all-stage2-intl
+all-stage3-gas: maybe-all-stage3-intl
+all-stage4-gas: maybe-all-stage4-intl
+all-stageprofile-gas: maybe-all-stageprofile-intl
+all-stagefeedback-gas: maybe-all-stagefeedback-intl
+all-gprof: maybe-all-libiberty
+all-gprof: maybe-all-bfd
+all-gprof: maybe-all-opcodes
+all-gprof: maybe-all-intl
+all-ld: maybe-all-libiberty
+
+all-stage1-ld: maybe-all-stage1-libiberty
+all-stage2-ld: maybe-all-stage2-libiberty
+all-stage3-ld: maybe-all-stage3-libiberty
+all-stage4-ld: maybe-all-stage4-libiberty
+all-stageprofile-ld: maybe-all-stageprofile-libiberty
+all-stagefeedback-ld: maybe-all-stagefeedback-libiberty
+all-ld: maybe-all-bfd
+
+all-stage1-ld: maybe-all-stage1-bfd
+all-stage2-ld: maybe-all-stage2-bfd
+all-stage3-ld: maybe-all-stage3-bfd
+all-stage4-ld: maybe-all-stage4-bfd
+all-stageprofile-ld: maybe-all-stageprofile-bfd
+all-stagefeedback-ld: maybe-all-stagefeedback-bfd
+all-ld: maybe-all-opcodes
+
+all-stage1-ld: maybe-all-stage1-opcodes
+all-stage2-ld: maybe-all-stage2-opcodes
+all-stage3-ld: maybe-all-stage3-opcodes
+all-stage4-ld: maybe-all-stage4-opcodes
+all-stageprofile-ld: maybe-all-stageprofile-opcodes
+all-stagefeedback-ld: maybe-all-stagefeedback-opcodes
+all-ld: maybe-all-build-bison
+
+all-stage1-ld: maybe-all-build-bison
+all-stage2-ld: maybe-all-build-bison
+all-stage3-ld: maybe-all-build-bison
+all-stage4-ld: maybe-all-build-bison
+all-stageprofile-ld: maybe-all-build-bison
+all-stagefeedback-ld: maybe-all-build-bison
+all-prebootstrap: maybe-all-build-bison
+all-ld: maybe-all-build-byacc
+
+all-stage1-ld: maybe-all-build-byacc
+all-stage2-ld: maybe-all-build-byacc
+all-stage3-ld: maybe-all-build-byacc
+all-stage4-ld: maybe-all-build-byacc
+all-stageprofile-ld: maybe-all-build-byacc
+all-stagefeedback-ld: maybe-all-build-byacc
+all-prebootstrap: maybe-all-build-byacc
+all-ld: maybe-all-build-flex
+
+all-stage1-ld: maybe-all-build-flex
+all-stage2-ld: maybe-all-build-flex
+all-stage3-ld: maybe-all-build-flex
+all-stage4-ld: maybe-all-build-flex
+all-stageprofile-ld: maybe-all-build-flex
+all-stagefeedback-ld: maybe-all-build-flex
+all-prebootstrap: maybe-all-build-flex
+all-ld: maybe-all-intl
+
+all-stage1-ld: maybe-all-stage1-intl
+all-stage2-ld: maybe-all-stage2-intl
+all-stage3-ld: maybe-all-stage3-intl
+all-stage4-ld: maybe-all-stage4-intl
+all-stageprofile-ld: maybe-all-stageprofile-intl
+all-stagefeedback-ld: maybe-all-stagefeedback-intl
+all-opcodes: maybe-all-bfd
+
+all-stage1-opcodes: maybe-all-stage1-bfd
+all-stage2-opcodes: maybe-all-stage2-bfd
+all-stage3-opcodes: maybe-all-stage3-bfd
+all-stage4-opcodes: maybe-all-stage4-bfd
+all-stageprofile-opcodes: maybe-all-stageprofile-bfd
+all-stagefeedback-opcodes: maybe-all-stagefeedback-bfd
+all-opcodes: maybe-all-libiberty
+
+all-stage1-opcodes: maybe-all-stage1-libiberty
+all-stage2-opcodes: maybe-all-stage2-libiberty
+all-stage3-opcodes: maybe-all-stage3-libiberty
+all-stage4-opcodes: maybe-all-stage4-libiberty
+all-stageprofile-opcodes: maybe-all-stageprofile-libiberty
+all-stagefeedback-opcodes: maybe-all-stagefeedback-libiberty
+all-dejagnu: maybe-all-tcl
+all-dejagnu: maybe-all-expect
+all-dejagnu: maybe-all-tk
+configure-expect: maybe-configure-tcl
+configure-expect: maybe-configure-tk
+all-expect: maybe-all-tcl
+all-expect: maybe-all-tk
+configure-itcl: maybe-configure-tcl
+configure-itcl: maybe-configure-tk
+all-itcl: maybe-all-tcl
+all-itcl: maybe-all-tk
  install-itcl: maybe-install-tcl
-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
  all-tk: maybe-all-tcl
-configure-tix: maybe-configure-tcl maybe-configure-tk
-all-tix: maybe-all-tcl maybe-all-tk
-all-texinfo: maybe-all-libiberty
-
-# Other host modules.  Warning, these are not well tested.
-all-autoconf: maybe-all-m4 maybe-all-texinfo
-all-automake: maybe-all-m4 maybe-all-texinfo
-all-bison: maybe-all-texinfo
-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-gzip: maybe-all-libiberty
-all-hello: maybe-all-libiberty
-all-m4: maybe-all-libiberty maybe-all-texinfo
-all-make: maybe-all-libiberty maybe-all-intl
-all-patch: maybe-all-libiberty
+all-sid: maybe-all-libiberty
+all-sid: maybe-all-bfd
+all-sid: maybe-all-opcodes
+all-sid: maybe-all-tcl
+all-sid: maybe-all-tk
+install-sid: maybe-install-tcl
+install-sid: maybe-install-tk
+all-sim: maybe-all-libiberty
+all-sim: maybe-all-bfd
+all-sim: maybe-all-opcodes
+all-sim: maybe-all-readline
+all-sim: maybe-configure-gdb
+all-fastjar: maybe-all-zlib
+all-fastjar: maybe-all-build-texinfo
+all-fastjar: maybe-all-libiberty
+all-autoconf: maybe-all-m4
+all-autoconf: maybe-all-build-texinfo
+all-automake: maybe-all-m4
+all-automake: maybe-all-build-texinfo
+all-automake: maybe-all-autoconf
+all-bison: maybe-all-intl
+all-bison: maybe-all-build-texinfo
+all-diff: maybe-all-intl
+all-diff: maybe-all-build-texinfo
+all-fileutils: maybe-all-intl
+all-fileutils: maybe-all-build-texinfo
+all-flex: maybe-all-build-bison
+all-flex: maybe-all-build-byacc
+all-flex: maybe-all-intl
+all-flex: maybe-all-m4
+all-flex: maybe-all-build-texinfo
+all-gzip: maybe-all-intl
+all-gzip: maybe-all-zlib
+all-gzip: maybe-all-build-texinfo
+all-hello: maybe-all-intl
+all-hello: maybe-all-build-texinfo
+all-m4: maybe-all-intl
+all-m4: maybe-all-build-texinfo
+all-make: maybe-all-intl
+all-make: maybe-all-build-texinfo
+all-patch: maybe-all-build-texinfo
+all-make: maybe-all-build-texinfo
  all-prms: maybe-all-libiberty
-all-recode: maybe-all-libiberty
-all-sed: maybe-all-libiberty
+all-recode: maybe-all-build-texinfo
+all-sed: maybe-all-build-texinfo
  all-send-pr: maybe-all-prms
-all-tar: maybe-all-libiberty
-all-uudecode: maybe-all-libiberty
-
-ALL_GCC = maybe-all-gcc
-ALL_GCC_C = $(ALL_GCC) maybe-all-target-newlib maybe-all-target-libgloss
-ALL_GCC_CXX = $(ALL_GCC_C) maybe-all-target-libstdc++-v3
-
-# Target modules specific to gcc.
-configure-target-boehm-gc: $(ALL_GCC_C) maybe-configure-target-qthreads
+all-tar: maybe-all-build-texinfo
+all-uudecode: maybe-all-build-texinfo
+configure-target-boehm-gc: maybe-configure-target-qthreads
  configure-target-fastjar: maybe-configure-target-zlib
-all-target-fastjar: maybe-all-target-zlib maybe-all-target-libiberty
-configure-target-libada: $(ALL_GCC_C)
-configure-target-libf2c: $(ALL_GCC_C)
-all-target-libf2c: maybe-all-target-libiberty
-configure-target-libffi: $(ALL_GCC_C) 
-configure-target-libjava: $(ALL_GCC_C) maybe-configure-target-zlib maybe-configure-target-boehm-gc maybe-configure-target-qthreads maybe-configure-target-libffi
-all-target-libjava: maybe-all-fastjar maybe-all-target-zlib maybe-all-target-boehm-gc maybe-all-target-qthreads maybe-all-target-libffi
-configure-target-libobjc: $(ALL_GCC_C)
+all-target-fastjar: maybe-all-target-zlib
+all-target-fastjar: maybe-all-target-libiberty
+configure-target-libjava: maybe-configure-target-zlib
+configure-target-libjava: maybe-configure-target-boehm-gc
+configure-target-libjava: maybe-configure-target-qthreads
+configure-target-libjava: maybe-configure-target-libffi
+all-target-libjava: maybe-all-fastjar
+all-target-libjava: maybe-all-target-zlib
+all-target-libjava: maybe-all-target-boehm-gc
+all-target-libjava: maybe-all-target-qthreads
+all-target-libjava: maybe-all-target-libffi
  all-target-libobjc: maybe-all-target-libiberty
-configure-target-libstdc++-v3: $(ALL_GCC_C)
  all-target-libstdc++-v3: maybe-all-target-libiberty
-configure-target-zlib: $(ALL_GCC_C)
-
-# Target modules in the 'src' repository.
-configure-target-examples: $(ALL_GCC_C)
-configure-target-libgloss: $(ALL_GCC)
  all-target-libgloss: maybe-configure-target-newlib
-configure-target-libiberty: $(ALL_GCC)
-configure-target-libtermcap: $(ALL_GCC_C)
-configure-target-newlib: $(ALL_GCC)
-configure-target-rda: $(ALL_GCC_C)
-configure-target-winsup: $(ALL_GCC_C)
-all-target-winsup: maybe-all-target-libiberty maybe-all-target-libtermcap
-
-# Other target modules.  Warning, these are not well tested.
-configure-target-gperf: $(ALL_GCC_CXX)
-all-target-gperf: maybe-all-target-libiberty maybe-all-target-libstdc++-v3
-configure-target-qthreads: $(ALL_GCC_C)
-
-# Dependencies of maybe-foo on foo.  These are used because, for example,
-# all-gcc only depends on all-gas if gas is present and being configured.
-@maybe_dependencies@
+all-target-winsup: maybe-all-target-libiberty
+all-target-winsup: maybe-all-target-libtermcap
+
+
+# Non-toplevel bootstrap rules must depend on several packages, to be built
+# before gcc.  Another wart that will go away, hopefully soon.
+@if gcc-no-bootstrap
+
+all-prebootstrap: maybe-all-bfd
+all-prebootstrap: maybe-all-opcodes
+all-prebootstrap: maybe-all-binutils
+all-prebootstrap: maybe-all-gas
+all-prebootstrap: maybe-all-intl
+all-prebootstrap: maybe-all-ld
+all-prebootstrap: maybe-all-libcpp
+all-prebootstrap: maybe-all-libiberty
+all-prebootstrap: maybe-all-zlib
+@endif gcc-no-bootstrap
+
+GDB_TK = @GDB_TK@
+all-gdb: $(gdbnlmrequirements) $(GDB_TK)
  
  # Serialization dependencies.  Host configures don't work well in parallel to
  # each other, due to contention over config.cache.  Target configures and