* c-decl.c (pop_scope): Do not set DECL_CONTEXT on file-scope

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

index 5935660..489c642 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
@@ -102,18 +104,79 @@ REALLY_SET_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.
-BUILD_CONFIGDIRS = libiberty
+BUILD_CONFIGDIRS = libiberty libbanshee
  # Build programs are put under this directory.
  BUILD_SUBDIR = @build_subdir@
  # This is set by the configure script to the arguments to use when configuring
  # directories built for the build system.
  BUILD_CONFIGARGS = @build_configargs@
  
+# This is the list of 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;
+
+# 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 +186,38 @@ 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;
+
+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
@@ -145,47 +240,55 @@ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
  
  CXX_FOR_BUILD = $(CXX)
  
+# Path to the build directory for a Canadian cross, empty otherwise.
+BUILD_DIR_PREFIX = @BUILD_DIR_PREFIX@
+
  # Special variables passed down in EXTRA_GCC_FLAGS.  They are defined
  # here so that they can be overridden by Makefile fragments.
  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/ ; \
+CONFIGURED_BISON = @CONFIGURED_BISON@
+BISON = `if [ -f $$r/$(BUILD_DIR_PREFIX)/bison/bison ] ; then \
+           echo $$r/$(BUILD_DIR_PREFIX)/bison/bison -L $$s/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 $$s/$(BUILD_DIR_PREFIX)/bison/bison ] ; then \
+           echo $$r/$(BUILD_DIR_PREFIX)/bison/bison -y -L $$s/bison/ ; \
+       elif [ -f $$s/$(BUILD_DIR_PREFIX)/byacc/byacc ] ; then \
+           echo $$r/$(BUILD_DIR_PREFIX)/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_DIR_PREFIX)/flex/flex ] ; \
+       then echo $$r/$(BUILD_DIR_PREFIX)/flex/flex ; \
+       else echo ${CONFIGURED_FLEX} ; fi`
  
-DEFAULT_M4 = @DEFAULT_M4@
-M4 = `if [ -f $$r/m4/m4 ] ; \
-       then echo $$r/m4/m4 ; \
-       else echo ${DEFAULT_M4} ; fi`
+CONFIGURED_LEX = @CONFIGURED_LEX@
+LEX = `if [ -f $$r/$(BUILD_DIR_PREFIX)/flex/flex ] ; \
+       then echo $$r/$(BUILD_DIR_PREFIX)/flex/flex ; \
+       else echo ${CONFIGURED_LEX} ; fi`
+
+CONFIGURED_M4 = @CONFIGURED_M4@
+M4 = `if [ -f $$r/$(BUILD_DIR_PREFIX)/m4/m4 ] ; \
+       then echo $$r/$(BUILD_DIR_PREFIX)/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_DIR_PREFIX)/texinfo/makeinfo/Makefile ] ; \
+       then echo $$r/$(BUILD_DIR_PREFIX)/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,11 +344,12 @@ 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@
  
  AR_FOR_TARGET=@AR_FOR_TARGET@
+CONFIGURED_AR_FOR_TARGET=@CONFIGURED_AR_FOR_TARGET@
  USUAL_AR_FOR_TARGET = ` \
    if [ -f $$r/binutils/ar ] ; then \
      echo $$r/binutils/ar ; \
@@ -253,11 +357,12 @@ USUAL_AR_FOR_TARGET = ` \
      if [ '$(host)' = '$(target)' ] ; then \
        echo $(AR); \
      else \
-       echo ar | sed '$(program_transform_name)' ; \
+      echo $(CONFIGURED_AR_FOR_TARGET) ; \
      fi; \
    fi`
  
  AS_FOR_TARGET=@AS_FOR_TARGET@
+CONFIGURED_AS_FOR_TARGET=@CONFIGURED_AS_FOR_TARGET@
  USUAL_AS_FOR_TARGET = ` \
    if [ -f $$r/gas/as-new ] ; then \
      echo $$r/gas/as-new ; \
@@ -267,7 +372,7 @@ USUAL_AS_FOR_TARGET = ` \
      if [ '$(host)' = '$(target)' ] ; then \
        echo $(AS); \
      else \
-       echo as | sed '$(program_transform_name)' ; \
+      echo $(CONFIGURED_AS_FOR_TARGET) ; \
      fi; \
    fi`
  
@@ -293,6 +398,7 @@ CXXFLAGS_FOR_TARGET = $(CXXFLAGS)
  LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
  
  DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
+CONFIGURED_DLLTOOL_FOR_TARGET=@CONFIGURED_DLLTOOL_FOR_TARGET@
  USUAL_DLLTOOL_FOR_TARGET = ` \
    if [ -f $$r/binutils/dlltool ] ; then \
      echo $$r/binutils/dlltool ; \
@@ -300,13 +406,15 @@ USUAL_DLLTOOL_FOR_TARGET = ` \
      if [ '$(host)' = '$(target)' ] ; then \
        echo $(DLLTOOL); \
      else \
-       echo dlltool | sed '$(program_transform_name)' ; \
+      echo $(CONFIGURED_DLLTOOL_FOR_TARGET) ; \
      fi; \
    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@
  USUAL_LD_FOR_TARGET = ` \
    if [ -f $$r/ld/ld-new ] ; then \
      echo $$r/ld/ld-new ; \
@@ -316,13 +424,14 @@ USUAL_LD_FOR_TARGET = ` \
      if [ '$(host)' = '$(target)' ] ; then \
        echo $(LD); \
      else \
-       echo ld | sed '$(program_transform_name)' ; \
+      echo $(CONFIGURED_LD_FOR_TARGET) ; \
      fi; \
    fi`
  
  LDFLAGS_FOR_TARGET = 
  
  NM_FOR_TARGET=@NM_FOR_TARGET@
+CONFIGURED_NM_FOR_TARGET=@CONFIGURED_NM_FOR_TARGET@
  USUAL_NM_FOR_TARGET = ` \
    if [ -f $$r/binutils/nm-new ] ; then \
      echo $$r/binutils/nm-new ; \
@@ -332,11 +441,12 @@ USUAL_NM_FOR_TARGET = ` \
      if [ '$(host)' = '$(target)' ] ; then \
        echo $(NM); \
      else \
-       echo nm | sed '$(program_transform_name)' ; \
+      echo $(CONFIGURED_NM_FOR_TARGET) ; \
      fi; \
    fi`
  
  RANLIB_FOR_TARGET=@RANLIB_FOR_TARGET@
+CONFIGURED_RANLIB_FOR_TARGET=@CONFIGURED_RANLIB_FOR_TARGET@
  USUAL_RANLIB_FOR_TARGET = ` \
    if [ -f $$r/binutils/ranlib ] ; then \
      echo $$r/binutils/ranlib ; \
@@ -348,11 +458,12 @@ USUAL_RANLIB_FOR_TARGET = ` \
           echo ranlib; \
        fi; \
      else \
-       echo ranlib | sed '$(program_transform_name)' ; \
+      echo $(CONFIGURED_RANLIB_FOR_TARGET) ; \
      fi; \
    fi`
  
  WINDRES_FOR_TARGET=@WINDRES_FOR_TARGET@
+CONFIGURED_WINDRES_FOR_TARGET=@CONFIGURED_WINDRES_FOR_TARGET@
  USUAL_WINDRES_FOR_TARGET = ` \
    if [ -f $$r/binutils/windres ] ; then \
      echo $$r/binutils/windres ; \
@@ -360,7 +471,7 @@ USUAL_WINDRES_FOR_TARGET = ` \
      if [ '$(host)' = '$(target)' ] ; then \
        echo $(WINDRES); \
      else \
-       echo windres | sed '$(program_transform_name)' ; \
+      echo $(CONFIGURED_WINDRES_FOR_TARGET) ; \
      fi; \
    fi`
  
@@ -372,8 +483,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@
@@ -414,6 +524,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)" \
@@ -439,6 +550,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)" \
@@ -457,6 +569,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 = \
@@ -560,7 +674,9 @@ configure-host: maybe-configure-gcc  \
      maybe-configure-tcl \
      maybe-configure-itcl \
      maybe-configure-ld \
+    maybe-configure-libcpp \
      maybe-configure-libgui \
+    maybe-configure-libbanshee \
      maybe-configure-libiberty \
      maybe-configure-libtool \
      maybe-configure-m4 \
@@ -596,8 +712,9 @@ configure-host: maybe-configure-gcc  \
  .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 \
@@ -613,10 +730,19 @@ 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: all-build all-host all-target
+
+.PHONY: all-build
+all-build:  \
+    maybe-all-build-libiberty \
+    maybe-all-build-libbanshee \
+    maybe-all-build-bison \
+    maybe-all-build-byacc \
+    maybe-all-build-flex \
+    maybe-all-build-m4 \
+    maybe-all-build-texinfo
  .PHONY: all-host
  all-host: maybe-all-gcc  \
      maybe-all-ash \
@@ -650,7 +776,9 @@ all-host: maybe-all-gcc  \
      maybe-all-tcl \
      maybe-all-itcl \
      maybe-all-ld \
+    maybe-all-libcpp \
      maybe-all-libgui \
+    maybe-all-libbanshee \
      maybe-all-libiberty \
      maybe-all-libtool \
      maybe-all-m4 \
@@ -686,8 +814,9 @@ all-host: maybe-all-gcc  \
  .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 \
@@ -744,7 +873,9 @@ info-host: maybe-info-gcc  \
      maybe-info-tcl \
      maybe-info-itcl \
      maybe-info-ld \
+    maybe-info-libcpp \
      maybe-info-libgui \
+    maybe-info-libbanshee \
      maybe-info-libiberty \
      maybe-info-libtool \
      maybe-info-m4 \
@@ -781,8 +912,9 @@ info-host: maybe-info-gcc  \
  .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 \
@@ -834,7 +966,9 @@ dvi-host: maybe-dvi-gcc  \
      maybe-dvi-tcl \
      maybe-dvi-itcl \
      maybe-dvi-ld \
+    maybe-dvi-libcpp \
      maybe-dvi-libgui \
+    maybe-dvi-libbanshee \
      maybe-dvi-libiberty \
      maybe-dvi-libtool \
      maybe-dvi-m4 \
@@ -871,8 +1005,9 @@ dvi-host: maybe-dvi-gcc  \
  .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 \
@@ -924,7 +1059,9 @@ TAGS-host: maybe-TAGS-gcc  \
      maybe-TAGS-tcl \
      maybe-TAGS-itcl \
      maybe-TAGS-ld \
+    maybe-TAGS-libcpp \
      maybe-TAGS-libgui \
+    maybe-TAGS-libbanshee \
      maybe-TAGS-libiberty \
      maybe-TAGS-libtool \
      maybe-TAGS-m4 \
@@ -961,8 +1098,9 @@ TAGS-host: maybe-TAGS-gcc  \
  .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 \
@@ -1014,7 +1152,9 @@ 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-libbanshee \
      maybe-install-info-libiberty \
      maybe-install-info-libtool \
      maybe-install-info-m4 \
@@ -1051,8 +1191,9 @@ install-info-host: maybe-install-info-gcc  \
  .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 \
@@ -1104,7 +1245,9 @@ installcheck-host: maybe-installcheck-gcc  \
      maybe-installcheck-tcl \
      maybe-installcheck-itcl \
      maybe-installcheck-ld \
+    maybe-installcheck-libcpp \
      maybe-installcheck-libgui \
+    maybe-installcheck-libbanshee \
      maybe-installcheck-libiberty \
      maybe-installcheck-libtool \
      maybe-installcheck-m4 \
@@ -1141,8 +1284,9 @@ installcheck-host: maybe-installcheck-gcc  \
  .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 \
@@ -1194,7 +1338,9 @@ mostlyclean-host: maybe-mostlyclean-gcc  \
      maybe-mostlyclean-tcl \
      maybe-mostlyclean-itcl \
      maybe-mostlyclean-ld \
+    maybe-mostlyclean-libcpp \
      maybe-mostlyclean-libgui \
+    maybe-mostlyclean-libbanshee \
      maybe-mostlyclean-libiberty \
      maybe-mostlyclean-libtool \
      maybe-mostlyclean-m4 \
@@ -1231,8 +1377,9 @@ mostlyclean-host: maybe-mostlyclean-gcc  \
  .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 \
@@ -1284,7 +1431,9 @@ clean-host: maybe-clean-gcc  \
      maybe-clean-tcl \
      maybe-clean-itcl \
      maybe-clean-ld \
+    maybe-clean-libcpp \
      maybe-clean-libgui \
+    maybe-clean-libbanshee \
      maybe-clean-libiberty \
      maybe-clean-libtool \
      maybe-clean-m4 \
@@ -1321,8 +1470,9 @@ clean-host: maybe-clean-gcc  \
  .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 \
@@ -1374,7 +1524,9 @@ distclean-host: maybe-distclean-gcc  \
      maybe-distclean-tcl \
      maybe-distclean-itcl \
      maybe-distclean-ld \
+    maybe-distclean-libcpp \
      maybe-distclean-libgui \
+    maybe-distclean-libbanshee \
      maybe-distclean-libiberty \
      maybe-distclean-libtool \
      maybe-distclean-m4 \
@@ -1411,8 +1563,9 @@ distclean-host: maybe-distclean-gcc  \
  .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 \
@@ -1464,7 +1617,9 @@ 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-libbanshee \
      maybe-maintainer-clean-libiberty \
      maybe-maintainer-clean-libtool \
      maybe-maintainer-clean-m4 \
@@ -1501,8 +1656,9 @@ maintainer-clean-host: maybe-maintainer-clean-gcc  \
  .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 \
@@ -1611,7 +1767,9 @@ do-check: maybe-check-gcc  \
      maybe-check-tcl \
      maybe-check-itcl \
      maybe-check-ld \
+    maybe-check-libcpp \
      maybe-check-libgui \
+    maybe-check-libbanshee \
      maybe-check-libiberty \
      maybe-check-libtool \
      maybe-check-m4 \
@@ -1645,8 +1803,9 @@ do-check: maybe-check-gcc  \
      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 \
@@ -1721,7 +1880,9 @@ install-host-nogcc:  \
      maybe-install-tcl \
      maybe-install-itcl \
      maybe-install-ld \
+    maybe-install-libcpp \
      maybe-install-libgui \
+    maybe-install-libbanshee \
      maybe-install-libiberty \
      maybe-install-libtool \
      maybe-install-m4 \
@@ -1788,7 +1949,9 @@ install-host: maybe-install-gcc  \
      maybe-install-tcl \
      maybe-install-itcl \
      maybe-install-ld \
+    maybe-install-libcpp \
      maybe-install-libgui \
+    maybe-install-libbanshee \
      maybe-install-libiberty \
      maybe-install-libtool \
      maybe-install-m4 \
@@ -1825,8 +1988,9 @@ install-host: maybe-install-gcc  \
  .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 \
@@ -1850,6 +2014,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 \
@@ -1898,25 +2063,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 \
@@ -1955,136 +2109,530 @@ 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
+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)
-
-
-# --------------------------------------
-# Modules which run on the host machine
-# --------------------------------------
+       $(BUILD_EXPORTS) \
+       (cd $(BUILD_SUBDIR)/libiberty && $(MAKE)  all)
+@endif build-libiberty
  
-.PHONY: configure-ash maybe-configure-ash
-maybe-configure-ash:
-configure-ash:
-       @test ! -f ash/Makefile || exit 0; \
-       [ -d ash ] || mkdir ash; \
+.PHONY: configure-build-libbanshee maybe-configure-build-libbanshee
+maybe-configure-build-libbanshee:
+@if build-libbanshee
+maybe-configure-build-libbanshee: configure-build-libbanshee
+configure-build-libbanshee:
+       @test ! -f $(BUILD_SUBDIR)/libbanshee/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/libbanshee ; \
         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; \
-       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)/libbanshee; \
+       cd "$(BUILD_SUBDIR)/libbanshee" || 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}/libbanshee "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}/libbanshee"; \
+         libsrcdir="$$s/libbanshee"; \
+       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-libbanshee
  
-.PHONY: all-ash maybe-all-ash
-maybe-all-ash:
-all-ash: configure-ash
+.PHONY: all-build-libbanshee maybe-all-build-libbanshee
+maybe-all-build-libbanshee:
+@if build-libbanshee
+maybe-all-build-libbanshee: all-build-libbanshee
+all-build-libbanshee: configure-build-libbanshee
         @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)/libbanshee && $(MAKE)  all)
+@endif build-libbanshee
  
-check-ash:
-       @r=`${PWD_COMMAND}`; export r; \
+.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; \
-       $(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)/bison; \
+       cd "$(BUILD_SUBDIR)/bison" || 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}/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
  
-install-ash: installdirs
+.PHONY: all-build-bison maybe-all-build-bison
+maybe-all-build-bison:
+@if build-bison
+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) install)
+       $(BUILD_EXPORTS) \
+       (cd $(BUILD_SUBDIR)/bison && $(MAKE)  all)
+@endif build-bison
  
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-ash info-ash
-maybe-info-ash:
-
-info-ash: \
-    configure-ash 
-       @[ -f ./ash/Makefile ] || exit 0; \
+.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) \
-       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)/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
  
+.PHONY: all-build-byacc maybe-all-build-byacc
+maybe-all-build-byacc:
+@if build-byacc
+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; \
+       $(BUILD_EXPORTS) \
+       (cd $(BUILD_SUBDIR)/byacc && $(MAKE)  all)
+@endif build-byacc
  
-.PHONY: maybe-dvi-ash dvi-ash
-maybe-dvi-ash:
-
-dvi-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 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) \
+       $(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
+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)  all)
+@endif build-flex
+
+.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; \
+       $(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
+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)  all)
+@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
+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)  all)
+@endif build-texinfo
+
+
+# --------------------------------------
+# 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
+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)  all)
+@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 
@@ -2092,6 +2640,7 @@ TAGS-ash: \
         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; \
@@ -2101,12 +2650,15 @@ TAGS-ash: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  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 \
@@ -2115,6 +2667,7 @@ install-info-ash: \
         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; \
@@ -2124,12 +2677,15 @@ install-info-ash: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  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 
@@ -2137,6 +2693,7 @@ installcheck-ash: \
         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; \
@@ -2146,18 +2703,22 @@ installcheck-ash: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -2167,18 +2728,22 @@ mostlyclean-ash:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -2188,18 +2753,22 @@ clean-ash:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -2209,18 +2778,22 @@ distclean-ash:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -2230,33 +2803,22 @@ maintainer-clean-ash:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  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; \
-       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 \
@@ -2271,41 +2833,56 @@ 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
+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)  all)
+@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) \
-       (cd autoconf && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(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) \
-       (cd autoconf && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(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 
@@ -2313,6 +2890,7 @@ info-autoconf: \
         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; \
@@ -2322,12 +2900,15 @@ info-autoconf: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  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 
@@ -2335,6 +2916,7 @@ dvi-autoconf: \
         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; \
@@ -2344,12 +2926,15 @@ dvi-autoconf: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  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 
@@ -2357,6 +2942,7 @@ TAGS-autoconf: \
         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; \
@@ -2366,12 +2952,15 @@ TAGS-autoconf: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  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 \
@@ -2380,6 +2969,7 @@ install-info-autoconf: \
         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; \
@@ -2389,12 +2979,15 @@ install-info-autoconf: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  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 
@@ -2402,6 +2995,7 @@ installcheck-autoconf: \
         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; \
@@ -2411,18 +3005,22 @@ installcheck-autoconf: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -2432,18 +3030,22 @@ mostlyclean-autoconf:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -2453,18 +3055,22 @@ clean-autoconf:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -2474,18 +3080,22 @@ distclean-autoconf:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -2495,33 +3105,22 @@ maintainer-clean-autoconf:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  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; \
-       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 \
@@ -2536,41 +3135,56 @@ 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
+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)  all)
+@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) \
-       (cd automake && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(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) \
-       (cd automake && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(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 
@@ -2578,6 +3192,7 @@ info-automake: \
         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; \
@@ -2587,12 +3202,15 @@ info-automake: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  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 
@@ -2600,6 +3218,7 @@ dvi-automake: \
         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; \
@@ -2609,12 +3228,15 @@ dvi-automake: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  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 
@@ -2622,6 +3244,7 @@ TAGS-automake: \
         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; \
@@ -2631,12 +3254,15 @@ TAGS-automake: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  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 \
@@ -2645,6 +3271,7 @@ install-info-automake: \
         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; \
@@ -2654,12 +3281,15 @@ install-info-automake: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  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 
@@ -2667,6 +3297,7 @@ installcheck-automake: \
         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; \
@@ -2676,18 +3307,22 @@ installcheck-automake: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -2697,18 +3332,22 @@ mostlyclean-automake:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -2718,18 +3357,22 @@ clean-automake:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -2739,18 +3382,22 @@ distclean-automake:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -2760,33 +3407,22 @@ maintainer-clean-automake:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  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; \
-       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 \
@@ -2801,41 +3437,56 @@ 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
+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)  all)
+@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) \
-       (cd bash && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(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) \
-       (cd bash && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(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 
@@ -2843,6 +3494,7 @@ info-bash: \
         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; \
@@ -2852,12 +3504,15 @@ info-bash: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  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 
@@ -2865,6 +3520,7 @@ dvi-bash: \
         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; \
@@ -2874,12 +3530,15 @@ dvi-bash: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  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 
@@ -2887,6 +3546,7 @@ TAGS-bash: \
         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; \
@@ -2896,12 +3556,15 @@ TAGS-bash: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  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 \
@@ -2910,6 +3573,7 @@ install-info-bash: \
         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; \
@@ -2919,12 +3583,15 @@ install-info-bash: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  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 
@@ -2932,6 +3599,7 @@ installcheck-bash: \
         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; \
@@ -2941,18 +3609,22 @@ installcheck-bash: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -2962,18 +3634,22 @@ mostlyclean-bash:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -2983,18 +3659,22 @@ clean-bash:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -3004,18 +3684,22 @@ distclean-bash:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -3025,33 +3709,22 @@ maintainer-clean-bash:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  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; \
         [ -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; \
-       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 \
@@ -3066,41 +3739,56 @@ 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
+maybe-all-bfd: all-bfd
  all-bfd: configure-bfd
         @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)  all)
+@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) \
-       (cd bfd && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(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) \
-       (cd bfd && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(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 
@@ -3108,6 +3796,7 @@ info-bfd: \
         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; \
@@ -3117,12 +3806,15 @@ info-bfd: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  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 
@@ -3130,6 +3822,7 @@ dvi-bfd: \
         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; \
@@ -3139,12 +3832,15 @@ dvi-bfd: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  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 
@@ -3152,6 +3848,7 @@ TAGS-bfd: \
         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; \
@@ -3161,12 +3858,15 @@ TAGS-bfd: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  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 \
@@ -3175,6 +3875,7 @@ install-info-bfd: \
         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; \
@@ -3184,12 +3885,15 @@ install-info-bfd: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  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 
@@ -3197,6 +3901,7 @@ installcheck-bfd: \
         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; \
@@ -3206,18 +3911,22 @@ installcheck-bfd: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -3227,18 +3936,22 @@ mostlyclean-bfd:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -3248,18 +3961,22 @@ clean-bfd:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -3269,18 +3986,22 @@ distclean-bfd:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -3290,33 +4011,22 @@ maintainer-clean-bfd:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  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; \
         [ -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; \
-       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 \
@@ -3331,41 +4041,56 @@ 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
+maybe-all-opcodes: all-opcodes
  all-opcodes: configure-opcodes
         @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)  all)
+@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) \
-       (cd opcodes && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(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) \
-       (cd opcodes && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(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 
@@ -3373,6 +4098,7 @@ info-opcodes: \
         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; \
@@ -3382,12 +4108,15 @@ info-opcodes: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  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 
@@ -3395,6 +4124,7 @@ dvi-opcodes: \
         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; \
@@ -3404,12 +4134,15 @@ dvi-opcodes: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  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 
@@ -3417,6 +4150,7 @@ TAGS-opcodes: \
         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; \
@@ -3426,12 +4160,15 @@ TAGS-opcodes: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  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 \
@@ -3440,6 +4177,7 @@ install-info-opcodes: \
         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; \
@@ -3449,12 +4187,15 @@ install-info-opcodes: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  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 
@@ -3462,6 +4203,7 @@ installcheck-opcodes: \
         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; \
@@ -3471,18 +4213,22 @@ installcheck-opcodes: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -3492,18 +4238,22 @@ mostlyclean-opcodes:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -3513,18 +4263,22 @@ clean-opcodes:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -3534,18 +4288,22 @@ distclean-opcodes:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -3555,33 +4313,22 @@ maintainer-clean-opcodes:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  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; \
         [ -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; \
-       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 \
@@ -3596,41 +4343,56 @@ 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
+maybe-all-binutils: all-binutils
  all-binutils: configure-binutils
         @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)  all)
+@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) \
-       (cd binutils && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(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) \
-       (cd binutils && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(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 
@@ -3638,6 +4400,7 @@ info-binutils: \
         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; \
@@ -3647,12 +4410,15 @@ info-binutils: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  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 
@@ -3660,6 +4426,7 @@ dvi-binutils: \
         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; \
@@ -3669,12 +4436,15 @@ dvi-binutils: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  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 
@@ -3682,6 +4452,7 @@ TAGS-binutils: \
         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; \
@@ -3691,12 +4462,15 @@ TAGS-binutils: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  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 \
@@ -3705,6 +4479,7 @@ install-info-binutils: \
         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; \
@@ -3714,12 +4489,15 @@ install-info-binutils: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  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 
@@ -3727,6 +4505,7 @@ installcheck-binutils: \
         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; \
@@ -3736,18 +4515,22 @@ installcheck-binutils: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -3757,18 +4540,22 @@ mostlyclean-binutils:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -3778,18 +4565,22 @@ clean-binutils:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -3799,18 +4590,22 @@ distclean-binutils:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -3820,33 +4615,22 @@ maintainer-clean-binutils:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  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; \
-       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 +4645,26 @@ 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
+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)  all)
+@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 +4672,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) \
-       (cd bison && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(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,6 +4705,7 @@ info-bison: \
         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; \
@@ -3915,12 +4715,15 @@ info-bison: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  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,6 +4731,7 @@ dvi-bison: \
         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; \
@@ -3937,12 +4741,15 @@ dvi-bison: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  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,6 +4757,7 @@ TAGS-bison: \
         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; \
@@ -3959,12 +4767,15 @@ TAGS-bison: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  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,6 +4784,7 @@ install-info-bison: \
         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; \
@@ -3982,12 +4794,15 @@ install-info-bison: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  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,6 +4810,7 @@ installcheck-bison: \
         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; \
@@ -4004,18 +4820,22 @@ installcheck-bison: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -4025,18 +4845,22 @@ mostlyclean-bison:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -4046,18 +4870,22 @@ clean-bison:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -4067,18 +4895,22 @@ distclean-bison:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -4088,33 +4920,22 @@ maintainer-clean-bison:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  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; \
-       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 \
@@ -4129,19 +4950,26 @@ 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
+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)  all)
+@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:
@@ -4149,24 +4977,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) \
-       (cd byacc && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(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 
@@ -4174,6 +5010,7 @@ info-byacc: \
         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; \
@@ -4183,12 +5020,15 @@ info-byacc: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  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 
@@ -4196,6 +5036,7 @@ dvi-byacc: \
         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; \
@@ -4205,12 +5046,15 @@ dvi-byacc: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  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 
@@ -4218,6 +5062,7 @@ TAGS-byacc: \
         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; \
@@ -4227,12 +5072,15 @@ TAGS-byacc: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  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 \
@@ -4241,6 +5089,7 @@ install-info-byacc: \
         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; \
@@ -4250,12 +5099,15 @@ install-info-byacc: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  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 
@@ -4263,6 +5115,7 @@ installcheck-byacc: \
         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; \
@@ -4272,18 +5125,22 @@ installcheck-byacc: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -4293,18 +5150,22 @@ mostlyclean-byacc:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -4314,18 +5175,22 @@ clean-byacc:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -4335,18 +5200,22 @@ distclean-byacc:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -4356,33 +5225,22 @@ maintainer-clean-byacc:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  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; \
-       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 \
@@ -4397,41 +5255,56 @@ 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
+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)  all)
+@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) \
-       (cd bzip2 && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(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) \
-       (cd bzip2 && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(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 
@@ -4439,6 +5312,7 @@ info-bzip2: \
         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; \
@@ -4448,12 +5322,15 @@ info-bzip2: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  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 
@@ -4461,6 +5338,7 @@ dvi-bzip2: \
         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; \
@@ -4470,12 +5348,15 @@ dvi-bzip2: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  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 
@@ -4483,6 +5364,7 @@ TAGS-bzip2: \
         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; \
@@ -4492,12 +5374,15 @@ TAGS-bzip2: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  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 \
@@ -4506,6 +5391,7 @@ install-info-bzip2: \
         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; \
@@ -4515,12 +5401,15 @@ install-info-bzip2: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  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 
@@ -4528,6 +5417,7 @@ installcheck-bzip2: \
         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; \
@@ -4537,18 +5427,22 @@ installcheck-bzip2: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -4558,18 +5452,22 @@ mostlyclean-bzip2:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -4579,18 +5477,22 @@ clean-bzip2:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -4600,18 +5502,22 @@ distclean-bzip2:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -4621,33 +5527,22 @@ maintainer-clean-bzip2:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  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; \
-       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 \
@@ -4662,41 +5557,56 @@ 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
+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)  all)
+@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) \
-       (cd dejagnu && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(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) \
-       (cd dejagnu && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(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 
@@ -4704,6 +5614,7 @@ info-dejagnu: \
         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; \
@@ -4713,12 +5624,15 @@ info-dejagnu: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  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 
@@ -4726,6 +5640,7 @@ dvi-dejagnu: \
         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; \
@@ -4735,12 +5650,15 @@ dvi-dejagnu: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  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 
@@ -4748,6 +5666,7 @@ TAGS-dejagnu: \
         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; \
@@ -4757,12 +5676,15 @@ TAGS-dejagnu: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  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 \
@@ -4771,6 +5693,7 @@ install-info-dejagnu: \
         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; \
@@ -4780,12 +5703,15 @@ install-info-dejagnu: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  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 
@@ -4793,6 +5719,7 @@ installcheck-dejagnu: \
         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; \
@@ -4802,18 +5729,22 @@ installcheck-dejagnu: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -4823,18 +5754,22 @@ mostlyclean-dejagnu:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -4844,18 +5779,22 @@ clean-dejagnu:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -4865,18 +5804,22 @@ distclean-dejagnu:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -4886,33 +5829,22 @@ maintainer-clean-dejagnu:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  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; \
-       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 \
@@ -4927,41 +5859,56 @@ 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
+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)  all)
+@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) \
-       (cd diff && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(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) \
-       (cd diff && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(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 
@@ -4969,6 +5916,7 @@ info-diff: \
         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; \
@@ -4978,12 +5926,15 @@ info-diff: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  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 
@@ -4991,6 +5942,7 @@ dvi-diff: \
         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; \
@@ -5000,12 +5952,15 @@ dvi-diff: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  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 
@@ -5013,6 +5968,7 @@ TAGS-diff: \
         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; \
@@ -5022,12 +5978,15 @@ TAGS-diff: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  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 \
@@ -5036,6 +5995,7 @@ install-info-diff: \
         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; \
@@ -5045,12 +6005,15 @@ install-info-diff: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  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 
@@ -5058,6 +6021,7 @@ installcheck-diff: \
         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; \
@@ -5067,18 +6031,22 @@ installcheck-diff: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -5088,18 +6056,22 @@ mostlyclean-diff:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -5109,18 +6081,22 @@ clean-diff:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -5130,18 +6106,22 @@ distclean-diff:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -5151,33 +6131,22 @@ maintainer-clean-diff:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  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; \
-       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 \
@@ -5192,37 +6161,51 @@ 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
+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)  all)
+@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) \
-       (cd dosutils && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(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 
@@ -5230,6 +6213,7 @@ info-dosutils: \
         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; \
@@ -5239,12 +6223,15 @@ info-dosutils: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  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 
@@ -5252,6 +6239,7 @@ dvi-dosutils: \
         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; \
@@ -5261,12 +6249,15 @@ dvi-dosutils: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  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 
@@ -5274,6 +6265,7 @@ TAGS-dosutils: \
         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; \
@@ -5283,12 +6275,15 @@ TAGS-dosutils: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  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 \
@@ -5297,6 +6292,7 @@ install-info-dosutils: \
         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; \
@@ -5306,12 +6302,15 @@ install-info-dosutils: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  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 
@@ -5319,6 +6318,7 @@ installcheck-dosutils: \
         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; \
@@ -5328,18 +6328,22 @@ installcheck-dosutils: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -5349,18 +6353,22 @@ mostlyclean-dosutils:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -5370,18 +6378,22 @@ clean-dosutils:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -5391,18 +6403,22 @@ distclean-dosutils:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -5412,33 +6428,22 @@ maintainer-clean-dosutils:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  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; \
-       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 \
@@ -5453,41 +6458,56 @@ 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
+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)  all)
+@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) \
-       (cd etc && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(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) \
-       (cd etc && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(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 
@@ -5495,6 +6515,7 @@ info-etc: \
         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; \
@@ -5504,12 +6525,15 @@ info-etc: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  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 
@@ -5517,6 +6541,7 @@ dvi-etc: \
         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; \
@@ -5526,12 +6551,15 @@ dvi-etc: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  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 
@@ -5539,6 +6567,7 @@ TAGS-etc: \
         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; \
@@ -5548,12 +6577,15 @@ TAGS-etc: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  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 \
@@ -5562,6 +6594,7 @@ install-info-etc: \
         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; \
@@ -5571,12 +6604,15 @@ install-info-etc: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  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 
@@ -5584,6 +6620,7 @@ installcheck-etc: \
         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; \
@@ -5593,18 +6630,22 @@ installcheck-etc: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -5614,18 +6655,22 @@ mostlyclean-etc:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -5635,18 +6680,22 @@ clean-etc:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -5656,18 +6705,22 @@ distclean-etc:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -5677,33 +6730,22 @@ maintainer-clean-etc:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  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; \
-       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 \
@@ -5718,19 +6760,26 @@ 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
+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)  all)
+@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:
@@ -5738,24 +6787,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) \
-       (cd fastjar && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(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 
@@ -5763,6 +6820,7 @@ info-fastjar: \
         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; \
@@ -5772,12 +6830,15 @@ info-fastjar: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  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 
@@ -5785,6 +6846,7 @@ dvi-fastjar: \
         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; \
@@ -5794,12 +6856,15 @@ dvi-fastjar: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  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 
@@ -5807,6 +6872,7 @@ TAGS-fastjar: \
         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; \
@@ -5816,12 +6882,15 @@ TAGS-fastjar: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  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 \
@@ -5830,6 +6899,7 @@ install-info-fastjar: \
         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; \
@@ -5839,12 +6909,15 @@ install-info-fastjar: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  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 
@@ -5852,6 +6925,7 @@ installcheck-fastjar: \
         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; \
@@ -5861,18 +6935,22 @@ installcheck-fastjar: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -5882,18 +6960,22 @@ mostlyclean-fastjar:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -5903,18 +6985,22 @@ clean-fastjar:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -5924,18 +7010,22 @@ distclean-fastjar:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -5945,33 +7035,22 @@ maintainer-clean-fastjar:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  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; \
-       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 \
@@ -5986,41 +7065,56 @@ 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
+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)  all)
+@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) \
-       (cd fileutils && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(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) \
-       (cd fileutils && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(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 
@@ -6028,6 +7122,7 @@ info-fileutils: \
         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; \
@@ -6037,12 +7132,15 @@ info-fileutils: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  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 
@@ -6050,6 +7148,7 @@ dvi-fileutils: \
         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; \
@@ -6059,12 +7158,15 @@ dvi-fileutils: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  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 
@@ -6072,6 +7174,7 @@ TAGS-fileutils: \
         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; \
@@ -6081,12 +7184,15 @@ TAGS-fileutils: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  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 \
@@ -6095,6 +7201,7 @@ install-info-fileutils: \
         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; \
@@ -6104,12 +7211,15 @@ install-info-fileutils: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  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 
@@ -6117,6 +7227,7 @@ installcheck-fileutils: \
         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; \
@@ -6126,18 +7237,22 @@ installcheck-fileutils: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -6147,18 +7262,22 @@ mostlyclean-fileutils:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -6168,18 +7287,22 @@ clean-fileutils:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -6189,18 +7312,22 @@ distclean-fileutils:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -6210,33 +7337,22 @@ maintainer-clean-fileutils:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  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; \
-       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 \
@@ -6251,41 +7367,56 @@ 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
+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)  all)
+@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) \
-       (cd findutils && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(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) \
-       (cd findutils && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(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 
@@ -6293,6 +7424,7 @@ info-findutils: \
         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; \
@@ -6302,12 +7434,15 @@ info-findutils: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  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 
@@ -6315,6 +7450,7 @@ dvi-findutils: \
         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; \
@@ -6324,12 +7460,15 @@ dvi-findutils: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  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 
@@ -6337,6 +7476,7 @@ TAGS-findutils: \
         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; \
@@ -6346,12 +7486,15 @@ TAGS-findutils: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  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 \
@@ -6360,6 +7503,7 @@ install-info-findutils: \
         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; \
@@ -6369,12 +7513,15 @@ install-info-findutils: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  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 
@@ -6382,6 +7529,7 @@ installcheck-findutils: \
         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; \
@@ -6391,18 +7539,22 @@ installcheck-findutils: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -6412,18 +7564,22 @@ mostlyclean-findutils:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -6433,18 +7589,22 @@ clean-findutils:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -6454,18 +7614,22 @@ distclean-findutils:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -6475,33 +7639,22 @@ maintainer-clean-findutils:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  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; \
-       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 \
@@ -6516,41 +7669,56 @@ 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
+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)  all)
+@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) \
-       (cd find && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(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) \
-       (cd find && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(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 
@@ -6558,6 +7726,7 @@ info-find: \
         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; \
@@ -6567,12 +7736,15 @@ info-find: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  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 
@@ -6580,6 +7752,7 @@ dvi-find: \
         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; \
@@ -6589,12 +7762,15 @@ dvi-find: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  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 
@@ -6602,6 +7778,7 @@ TAGS-find: \
         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; \
@@ -6611,12 +7788,15 @@ TAGS-find: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  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 \
@@ -6625,6 +7805,7 @@ install-info-find: \
         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; \
@@ -6634,12 +7815,15 @@ install-info-find: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  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 
@@ -6647,6 +7831,7 @@ installcheck-find: \
         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; \
@@ -6656,18 +7841,22 @@ installcheck-find: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -6677,18 +7866,22 @@ mostlyclean-find:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -6698,18 +7891,22 @@ clean-find:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -6719,18 +7916,22 @@ distclean-find:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -6740,33 +7941,22 @@ maintainer-clean-find:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  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; \
-       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 \
@@ -6781,19 +7971,26 @@ 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
+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)  all)
+@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:
@@ -6801,24 +7998,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) \
-       (cd flex && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(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 
@@ -6826,6 +8031,7 @@ info-flex: \
         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; \
@@ -6835,12 +8041,15 @@ info-flex: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  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 
@@ -6848,6 +8057,7 @@ dvi-flex: \
         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; \
@@ -6857,12 +8067,15 @@ dvi-flex: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  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 
@@ -6870,6 +8083,7 @@ TAGS-flex: \
         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; \
@@ -6879,12 +8093,15 @@ TAGS-flex: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  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 \
@@ -6893,6 +8110,7 @@ install-info-flex: \
         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; \
@@ -6902,12 +8120,15 @@ install-info-flex: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  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 
@@ -6915,6 +8136,7 @@ installcheck-flex: \
         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; \
@@ -6924,18 +8146,22 @@ installcheck-flex: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -6945,18 +8171,22 @@ mostlyclean-flex:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -6966,18 +8196,22 @@ clean-flex:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -6987,18 +8221,22 @@ distclean-flex:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -7008,33 +8246,22 @@ maintainer-clean-flex:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  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; \
         [ -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; \
-       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 \
@@ -7049,41 +8276,56 @@ 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
+maybe-all-gas: all-gas
  all-gas: configure-gas
         @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)  all)
+@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) \
-       (cd gas && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(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) \
-       (cd gas && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(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 
@@ -7091,6 +8333,7 @@ info-gas: \
         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; \
@@ -7100,12 +8343,15 @@ info-gas: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  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 
@@ -7113,6 +8359,7 @@ dvi-gas: \
         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; \
@@ -7122,12 +8369,15 @@ dvi-gas: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  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 
@@ -7135,6 +8385,7 @@ TAGS-gas: \
         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; \
@@ -7144,12 +8395,15 @@ TAGS-gas: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  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 \
@@ -7158,6 +8412,7 @@ install-info-gas: \
         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; \
@@ -7167,12 +8422,15 @@ install-info-gas: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  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 
@@ -7180,6 +8438,7 @@ installcheck-gas: \
         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; \
@@ -7189,18 +8448,22 @@ installcheck-gas: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -7210,18 +8473,22 @@ mostlyclean-gas:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -7231,18 +8498,22 @@ clean-gas:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -7252,18 +8523,22 @@ distclean-gas:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -7273,33 +8548,22 @@ maintainer-clean-gas:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
+@endif gas
  
  
  .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; \
-       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 gawk; \
         cd gawk || exit 1; \
         case $(srcdir) in \
@@ -7314,41 +8578,56 @@ configure-gawk:
             libsrcdir="$$s/gawk";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif gawk
  
  .PHONY: all-gawk maybe-all-gawk
  maybe-all-gawk:
+@if gawk
+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 gawk && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd gawk && $(MAKE) $(FLAGS_TO_PASS)  all)
+@endif gawk
  
  .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 gawk && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(HOST_EXPORTS) \
+       (cd gawk && $(MAKE) $(FLAGS_TO_PASS)  check)
  
+@endif gawk
  
  .PHONY: install-gawk maybe-install-gawk
  maybe-install-gawk:
+@if gawk
+maybe-install-gawk: install-gawk
  
  install-gawk: 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 gawk && $(MAKE) $(FLAGS_TO_PASS)  install)
  
+@endif gawk
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-gawk info-gawk
  maybe-info-gawk:
+@if gawk
+maybe-info-gawk: info-gawk
  
  info-gawk: \
      configure-gawk 
@@ -7356,6 +8635,7 @@ info-gawk: \
         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; \
@@ -7365,12 +8645,15 @@ info-gawk: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
+@endif gawk
  
  .PHONY: maybe-dvi-gawk dvi-gawk
  maybe-dvi-gawk:
+@if gawk
+maybe-dvi-gawk: dvi-gawk
  
  dvi-gawk: \
      configure-gawk 
@@ -7378,6 +8661,7 @@ dvi-gawk: \
         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; \
@@ -7387,12 +8671,15 @@ dvi-gawk: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
           || exit 1
  
+@endif gawk
  
  .PHONY: maybe-TAGS-gawk TAGS-gawk
  maybe-TAGS-gawk:
+@if gawk
+maybe-TAGS-gawk: TAGS-gawk
  
  TAGS-gawk: \
      configure-gawk 
@@ -7400,6 +8687,7 @@ TAGS-gawk: \
         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; \
@@ -7409,12 +8697,15 @@ TAGS-gawk: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
+@endif gawk
  
  .PHONY: maybe-install-info-gawk install-info-gawk
  maybe-install-info-gawk:
+@if gawk
+maybe-install-info-gawk: install-info-gawk
  
  install-info-gawk: \
      configure-gawk \
@@ -7423,6 +8714,7 @@ install-info-gawk: \
         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; \
@@ -7432,12 +8724,15 @@ install-info-gawk: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
+@endif gawk
  
  .PHONY: maybe-installcheck-gawk installcheck-gawk
  maybe-installcheck-gawk:
+@if gawk
+maybe-installcheck-gawk: installcheck-gawk
  
  installcheck-gawk: \
      configure-gawk 
@@ -7445,6 +8740,7 @@ installcheck-gawk: \
         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; \
@@ -7454,18 +8750,22 @@ installcheck-gawk: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
+@endif gawk
  
  .PHONY: maybe-mostlyclean-gawk mostlyclean-gawk
  maybe-mostlyclean-gawk:
+@if gawk
+maybe-mostlyclean-gawk: mostlyclean-gawk
  
  mostlyclean-gawk: 
         @[ -f ./gawk/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; \
@@ -7475,18 +8775,22 @@ mostlyclean-gawk:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
+@endif gawk
  
  .PHONY: maybe-clean-gawk clean-gawk
  maybe-clean-gawk:
+@if gawk
+maybe-clean-gawk: clean-gawk
  
  clean-gawk: 
         @[ -f ./gawk/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; \
@@ -7496,18 +8800,22 @@ clean-gawk:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
           || exit 1
  
+@endif gawk
  
  .PHONY: maybe-distclean-gawk distclean-gawk
  maybe-distclean-gawk:
+@if gawk
+maybe-distclean-gawk: distclean-gawk
  
  distclean-gawk: 
         @[ -f ./gawk/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; \
@@ -7517,18 +8825,22 @@ distclean-gawk:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
+@endif gawk
  
  .PHONY: maybe-maintainer-clean-gawk maintainer-clean-gawk
  maybe-maintainer-clean-gawk:
+@if gawk
+maybe-maintainer-clean-gawk: maintainer-clean-gawk
  
  maintainer-clean-gawk: 
         @[ -f ./gawk/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; \
@@ -7538,33 +8850,22 @@ maintainer-clean-gawk:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
+@endif gawk
  
  
  .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; \
-       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 gettext; \
         cd gettext || exit 1; \
         case $(srcdir) in \
@@ -7579,41 +8880,56 @@ configure-gettext:
             libsrcdir="$$s/gettext";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif gettext
  
  .PHONY: all-gettext maybe-all-gettext
  maybe-all-gettext:
+@if gettext
+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 gettext && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd gettext && $(MAKE) $(FLAGS_TO_PASS)  all)
+@endif gettext
  
  .PHONY: check-gettext maybe-check-gettext
  maybe-check-gettext:
+@if gettext
+maybe-check-gettext: check-gettext
  
  check-gettext:
         @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 gettext && $(MAKE) $(FLAGS_TO_PASS)  check)
  
+@endif gettext
  
  .PHONY: install-gettext maybe-install-gettext
  maybe-install-gettext:
+@if gettext
+maybe-install-gettext: install-gettext
  
  install-gettext: 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 gettext && $(MAKE) $(FLAGS_TO_PASS)  install)
  
+@endif gettext
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-gettext info-gettext
  maybe-info-gettext:
+@if gettext
+maybe-info-gettext: info-gettext
  
  info-gettext: \
      configure-gettext 
@@ -7621,6 +8937,7 @@ info-gettext: \
         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; \
@@ -7630,12 +8947,15 @@ info-gettext: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
+@endif gettext
  
  .PHONY: maybe-dvi-gettext dvi-gettext
  maybe-dvi-gettext:
+@if gettext
+maybe-dvi-gettext: dvi-gettext
  
  dvi-gettext: \
      configure-gettext 
@@ -7643,6 +8963,7 @@ dvi-gettext: \
         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; \
@@ -7652,12 +8973,15 @@ dvi-gettext: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
           || exit 1
  
+@endif gettext
  
  .PHONY: maybe-TAGS-gettext TAGS-gettext
  maybe-TAGS-gettext:
+@if gettext
+maybe-TAGS-gettext: TAGS-gettext
  
  TAGS-gettext: \
      configure-gettext 
@@ -7665,6 +8989,7 @@ TAGS-gettext: \
         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; \
@@ -7674,12 +8999,15 @@ TAGS-gettext: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
+@endif gettext
  
  .PHONY: maybe-install-info-gettext install-info-gettext
  maybe-install-info-gettext:
+@if gettext
+maybe-install-info-gettext: install-info-gettext
  
  install-info-gettext: \
      configure-gettext \
@@ -7688,6 +9016,7 @@ install-info-gettext: \
         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; \
@@ -7697,12 +9026,15 @@ install-info-gettext: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
+@endif gettext
  
  .PHONY: maybe-installcheck-gettext installcheck-gettext
  maybe-installcheck-gettext:
+@if gettext
+maybe-installcheck-gettext: installcheck-gettext
  
  installcheck-gettext: \
      configure-gettext 
@@ -7710,6 +9042,7 @@ installcheck-gettext: \
         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; \
@@ -7719,18 +9052,22 @@ installcheck-gettext: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
+@endif gettext
  
  .PHONY: maybe-mostlyclean-gettext mostlyclean-gettext
  maybe-mostlyclean-gettext:
+@if gettext
+maybe-mostlyclean-gettext: mostlyclean-gettext
  
  mostlyclean-gettext: 
         @[ -f ./gettext/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; \
@@ -7740,18 +9077,22 @@ mostlyclean-gettext:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
+@endif gettext
  
  .PHONY: maybe-clean-gettext clean-gettext
  maybe-clean-gettext:
+@if gettext
+maybe-clean-gettext: clean-gettext
  
  clean-gettext: 
         @[ -f ./gettext/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; \
@@ -7761,18 +9102,22 @@ clean-gettext:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
           || exit 1
  
+@endif gettext
  
  .PHONY: maybe-distclean-gettext distclean-gettext
  maybe-distclean-gettext:
+@if gettext
+maybe-distclean-gettext: distclean-gettext
  
  distclean-gettext: 
         @[ -f ./gettext/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; \
@@ -7782,18 +9127,22 @@ distclean-gettext:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
+@endif gettext
  
  .PHONY: maybe-maintainer-clean-gettext maintainer-clean-gettext
  maybe-maintainer-clean-gettext:
+@if gettext
+maybe-maintainer-clean-gettext: maintainer-clean-gettext
  
  maintainer-clean-gettext: 
         @[ -f ./gettext/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; \
@@ -7803,33 +9152,22 @@ maintainer-clean-gettext:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
+@endif gettext
  
  
  .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; \
-       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 gnuserv; \
         cd gnuserv || exit 1; \
         case $(srcdir) in \
@@ -7844,41 +9182,56 @@ configure-gnuserv:
             libsrcdir="$$s/gnuserv";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif gnuserv
  
  .PHONY: all-gnuserv maybe-all-gnuserv
  maybe-all-gnuserv:
+@if gnuserv
+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 gnuserv && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS)  all)
+@endif gnuserv
  
  .PHONY: check-gnuserv maybe-check-gnuserv
  maybe-check-gnuserv:
+@if gnuserv
+maybe-check-gnuserv: check-gnuserv
  
  check-gnuserv:
         @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 gnuserv && $(MAKE) $(FLAGS_TO_PASS)  check)
  
+@endif gnuserv
  
  .PHONY: install-gnuserv maybe-install-gnuserv
  maybe-install-gnuserv:
+@if gnuserv
+maybe-install-gnuserv: install-gnuserv
  
  install-gnuserv: 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 gnuserv && $(MAKE) $(FLAGS_TO_PASS)  install)
  
+@endif gnuserv
  
  # Other targets (info, dvi, etc.)
  
  .PHONY: maybe-info-gnuserv info-gnuserv
  maybe-info-gnuserv:
+@if gnuserv
+maybe-info-gnuserv: info-gnuserv
  
  info-gnuserv: \
      configure-gnuserv 
@@ -7886,6 +9239,7 @@ info-gnuserv: \
         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; \
@@ -7895,12 +9249,15 @@ info-gnuserv: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
+@endif gnuserv
  
  .PHONY: maybe-dvi-gnuserv dvi-gnuserv
  maybe-dvi-gnuserv:
+@if gnuserv
+maybe-dvi-gnuserv: dvi-gnuserv
  
  dvi-gnuserv: \
      configure-gnuserv 
@@ -7908,6 +9265,7 @@ dvi-gnuserv: \
         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; \
@@ -7917,12 +9275,15 @@ dvi-gnuserv: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
           || exit 1
  
+@endif gnuserv
  
  .PHONY: maybe-TAGS-gnuserv TAGS-gnuserv
  maybe-TAGS-gnuserv:
+@if gnuserv
+maybe-TAGS-gnuserv: TAGS-gnuserv
  
  TAGS-gnuserv: \
      configure-gnuserv 
@@ -7930,6 +9291,7 @@ TAGS-gnuserv: \
         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; \
@@ -7939,12 +9301,15 @@ TAGS-gnuserv: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
+@endif gnuserv
  
  .PHONY: maybe-install-info-gnuserv install-info-gnuserv
  maybe-install-info-gnuserv:
+@if gnuserv
+maybe-install-info-gnuserv: install-info-gnuserv
  
  install-info-gnuserv: \
      configure-gnuserv \
@@ -7953,6 +9318,7 @@ install-info-gnuserv: \
         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; \
@@ -7962,12 +9328,15 @@ install-info-gnuserv: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
+@endif gnuserv
  
  .PHONY: maybe-installcheck-gnuserv installcheck-gnuserv
  maybe-installcheck-gnuserv:
+@if gnuserv
+maybe-installcheck-gnuserv: installcheck-gnuserv
  
  installcheck-gnuserv: \
      configure-gnuserv 
@@ -7975,6 +9344,7 @@ installcheck-gnuserv: \
         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; \
@@ -7984,18 +9354,22 @@ installcheck-gnuserv: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
+@endif gnuserv
  
  .PHONY: maybe-mostlyclean-gnuserv mostlyclean-gnuserv
  maybe-mostlyclean-gnuserv:
+@if gnuserv
+maybe-mostlyclean-gnuserv: mostlyclean-gnuserv
  
  mostlyclean-gnuserv: 
         @[ -f ./gnuserv/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; \
@@ -8005,18 +9379,22 @@ mostlyclean-gnuserv:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
+@endif gnuserv
  
  .PHONY: maybe-clean-gnuserv clean-gnuserv
  maybe-clean-gnuserv:
+@if gnuserv
+maybe-clean-gnuserv: clean-gnuserv
  
  clean-gnuserv: 
         @[ -f ./gnuserv/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; \
@@ -8026,18 +9404,22 @@ clean-gnuserv:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
           || exit 1
  
+@endif gnuserv
  
  .PHONY: maybe-distclean-gnuserv distclean-gnuserv
  maybe-distclean-gnuserv:
+@if gnuserv
+maybe-distclean-gnuserv: distclean-gnuserv
  
  distclean-gnuserv: 
         @[ -f ./gnuserv/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; \
@@ -8047,18 +9429,22 @@ distclean-gnuserv:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
+@endif gnuserv
  
  .PHONY: maybe-maintainer-clean-gnuserv maintainer-clean-gnuserv
  maybe-maintainer-clean-gnuserv:
+@if gnuserv
+maybe-maintainer-clean-gnuserv: maintainer-clean-gnuserv
  
  maintainer-clean-gnuserv: 
         @[ -f ./gnuserv/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; \
@@ -8068,33 +9454,22 @@ maintainer-clean-gnuserv:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
+@endif gnuserv
  
  
  .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; \
-       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 \
@@ -8109,41 +9484,56 @@ configure-gprof:
             libsrcdir="$$s/gprof";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif gprof
  
  .PHONY: all-gprof maybe-all-gprof
  maybe-all-gprof:
+@if gprof
+maybe-all-gprof: all-gprof
  all-gprof: configure-gprof
         @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 gprof && $(MAKE) $(FLAGS_TO_PASS)  all)
+@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) \
-       (cd gprof && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(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) \
-       (cd gprof && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(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 
@@ -8151,6 +9541,7 @@ info-gprof: \
         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; \
@@ -8160,12 +9551,15 @@ info-gprof: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  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 
@@ -8173,6 +9567,7 @@ dvi-gprof: \
         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; \
@@ -8182,12 +9577,15 @@ dvi-gprof: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  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 
@@ -8195,6 +9593,7 @@ TAGS-gprof: \
         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; \
@@ -8204,12 +9603,15 @@ TAGS-gprof: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  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 \
@@ -8218,6 +9620,7 @@ install-info-gprof: \
         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; \
@@ -8227,12 +9630,15 @@ install-info-gprof: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  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 
@@ -8240,6 +9646,7 @@ installcheck-gprof: \
         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; \
@@ -8249,18 +9656,22 @@ installcheck-gprof: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  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; \
@@ -8270,18 +9681,22 @@ mostlyclean-gprof:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  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; \
@@ -8291,18 +9706,22 @@ clean-gprof:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  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; \
@@ -8312,18 +9731,22 @@ distclean-gprof:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  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; \
@@ -8333,33 +9756,22 @@ maintainer-clean-gprof:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  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; \
-       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; \
-       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 gzip; \
         cd gzip || exit 1; \
         case $(srcdir) in \
@@ -8374,41 +9786,56 @@ 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
+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)  all)
+@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) \
-       (cd gzip && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(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) \
-       (cd gzip && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(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 
@@ -8416,6 +9843,7 @@ info-gzip: \
         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; \
@@ -8425,12 +9853,15 @@ info-gzip: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  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 
@@ -8438,6 +9869,7 @@ dvi-gzip: \
         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; \
@@ -8447,12 +9879,15 @@ dvi-gzip: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  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 
@@ -8460,6 +9895,7 @@ TAGS-gzip: \
         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; \
@@ -8469,12 +9905,15 @@ TAGS-gzip: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  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 \
@@ -8483,6 +9922,7 @@ install-info-gzip: \
         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; \
@@ -8492,12 +9932,15 @@ install-info-gzip: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  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 
@@ -8505,6 +9948,7 @@ installcheck-gzip: \
         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; \
@@ -8514,18 +9958,22 @@ installcheck-gzip: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -8535,18 +9983,22 @@ mostlyclean-gzip:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -8556,18 +10008,22 @@ clean-gzip:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -8577,18 +10033,22 @@ distclean-gzip:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -8598,33 +10058,22 @@ maintainer-clean-gzip:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  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; \
-       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 \
@@ -8639,41 +10088,56 @@ 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
+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)  all)
+@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) \
-       (cd hello && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(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) \
-       (cd hello && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(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 
@@ -8681,6 +10145,7 @@ info-hello: \
         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; \
@@ -8690,12 +10155,15 @@ info-hello: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  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 
@@ -8703,6 +10171,7 @@ dvi-hello: \
         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; \
@@ -8712,12 +10181,15 @@ dvi-hello: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  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 
@@ -8725,6 +10197,7 @@ TAGS-hello: \
         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; \
@@ -8734,12 +10207,15 @@ TAGS-hello: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  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 \
@@ -8748,6 +10224,7 @@ install-info-hello: \
         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; \
@@ -8757,12 +10234,15 @@ install-info-hello: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  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 
@@ -8770,6 +10250,7 @@ installcheck-hello: \
         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; \
@@ -8779,18 +10260,22 @@ installcheck-hello: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -8800,18 +10285,22 @@ mostlyclean-hello:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -8821,18 +10310,22 @@ clean-hello:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -8842,18 +10335,22 @@ distclean-hello:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -8863,33 +10360,22 @@ maintainer-clean-hello:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  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; \
-       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 \
@@ -8904,41 +10390,56 @@ 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
+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)  all)
+@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) \
-       (cd indent && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(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) \
-       (cd indent && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(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 
@@ -8946,6 +10447,7 @@ info-indent: \
         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; \
@@ -8955,12 +10457,15 @@ info-indent: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  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 
@@ -8968,6 +10473,7 @@ dvi-indent: \
         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; \
@@ -8977,12 +10483,15 @@ dvi-indent: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  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 
@@ -8990,6 +10499,7 @@ TAGS-indent: \
         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; \
@@ -8999,12 +10509,15 @@ TAGS-indent: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  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 \
@@ -9013,6 +10526,7 @@ install-info-indent: \
         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; \
@@ -9022,12 +10536,15 @@ install-info-indent: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  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 
@@ -9035,6 +10552,7 @@ installcheck-indent: \
         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; \
@@ -9044,18 +10562,22 @@ installcheck-indent: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -9065,18 +10587,22 @@ mostlyclean-indent:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -9086,18 +10612,22 @@ clean-indent:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -9107,18 +10637,22 @@ distclean-indent:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -9128,33 +10662,22 @@ maintainer-clean-indent:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  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; \
         [ -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; \
-       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 \
@@ -9169,41 +10692,56 @@ 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
+maybe-all-intl: all-intl
  all-intl: configure-intl
         @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)  all)
+@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) \
-       (cd intl && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(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) \
-       (cd intl && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(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 
@@ -9211,6 +10749,7 @@ info-intl: \
         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; \
@@ -9220,12 +10759,15 @@ info-intl: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  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 
@@ -9233,6 +10775,7 @@ dvi-intl: \
         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; \
@@ -9242,12 +10785,15 @@ dvi-intl: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  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 
@@ -9255,6 +10801,7 @@ TAGS-intl: \
         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; \
@@ -9264,12 +10811,15 @@ TAGS-intl: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  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 \
@@ -9278,6 +10828,7 @@ install-info-intl: \
         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; \
@@ -9287,12 +10838,15 @@ install-info-intl: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  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 
@@ -9300,6 +10854,7 @@ installcheck-intl: \
         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; \
@@ -9309,18 +10864,22 @@ installcheck-intl: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -9330,18 +10889,22 @@ mostlyclean-intl:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -9351,18 +10914,22 @@ clean-intl:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -9372,18 +10939,22 @@ distclean-intl:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -9393,33 +10964,22 @@ maintainer-clean-intl:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  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; \
-       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 \
@@ -9434,41 +10994,56 @@ 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
+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)  all)
+@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) \
-       (cd tcl && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(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) \
-       (cd tcl && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(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 
@@ -9476,6 +11051,7 @@ info-tcl: \
         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; \
@@ -9485,12 +11061,15 @@ info-tcl: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  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 
@@ -9498,6 +11077,7 @@ dvi-tcl: \
         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; \
@@ -9507,12 +11087,15 @@ dvi-tcl: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  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 
@@ -9520,6 +11103,7 @@ TAGS-tcl: \
         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; \
@@ -9529,12 +11113,15 @@ TAGS-tcl: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  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 \
@@ -9543,6 +11130,7 @@ install-info-tcl: \
         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; \
@@ -9552,12 +11140,15 @@ install-info-tcl: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  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 
@@ -9565,6 +11156,7 @@ installcheck-tcl: \
         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; \
@@ -9574,25 +11166,32 @@ installcheck-tcl: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -9602,18 +11201,22 @@ clean-tcl:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -9623,18 +11226,22 @@ distclean-tcl:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -9644,33 +11251,22 @@ maintainer-clean-tcl:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  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; \
-       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 \
@@ -9685,41 +11281,56 @@ 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
+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)  all)
+@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) \
-       (cd itcl && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(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) \
-       (cd itcl && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(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 
@@ -9727,6 +11338,7 @@ info-itcl: \
         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; \
@@ -9736,12 +11348,15 @@ info-itcl: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  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 
@@ -9749,6 +11364,7 @@ dvi-itcl: \
         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; \
@@ -9758,12 +11374,15 @@ dvi-itcl: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  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 
@@ -9771,6 +11390,7 @@ TAGS-itcl: \
         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; \
@@ -9780,12 +11400,15 @@ TAGS-itcl: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  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 \
@@ -9794,6 +11417,7 @@ install-info-itcl: \
         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; \
@@ -9803,12 +11427,15 @@ install-info-itcl: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  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 
@@ -9816,6 +11443,7 @@ installcheck-itcl: \
         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; \
@@ -9825,18 +11453,22 @@ installcheck-itcl: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -9846,18 +11478,22 @@ mostlyclean-itcl:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -9867,18 +11503,22 @@ clean-itcl:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -9888,18 +11528,22 @@ distclean-itcl:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -9909,33 +11553,22 @@ maintainer-clean-itcl:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  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; \
         [ -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; \
-       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 \
@@ -9950,41 +11583,56 @@ 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
+maybe-all-ld: all-ld
  all-ld: configure-ld
         @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)  all)
+@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) \
-       (cd ld && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(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) \
-       (cd ld && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(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 
@@ -9992,6 +11640,7 @@ info-ld: \
         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; \
@@ -10001,12 +11650,15 @@ info-ld: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  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 
@@ -10014,6 +11666,7 @@ dvi-ld: \
         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; \
@@ -10023,12 +11676,15 @@ dvi-ld: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  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 
@@ -10036,6 +11692,7 @@ TAGS-ld: \
         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; \
@@ -10045,12 +11702,15 @@ TAGS-ld: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  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 \
@@ -10059,6 +11719,7 @@ install-info-ld: \
         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; \
@@ -10068,12 +11729,15 @@ install-info-ld: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  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 
@@ -10081,6 +11745,7 @@ installcheck-ld: \
         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; \
@@ -10090,18 +11755,22 @@ installcheck-ld: \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -10111,18 +11780,22 @@ mostlyclean-ld:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -10132,18 +11805,22 @@ clean-ld:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -10153,18 +11830,22 @@ distclean-ld:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
@@ -10174,8709 +11855,10820 @@ maintainer-clean-ld:
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  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 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; \
-       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
+.PHONY: all-libcpp maybe-all-libcpp
+maybe-all-libcpp:
+@if libcpp
+maybe-all-libcpp: all-libcpp
+all-libcpp: configure-libcpp
         @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)  all)
+@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) \
+       $(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}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  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) \
+       $(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}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  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) \
+       $(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}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  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) \
+       $(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}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  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) \
+       $(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}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  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) \
+       $(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}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  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) \
+       $(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}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  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) \
+       $(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}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  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) \
+       $(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}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  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; \
-       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
+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)  all)
+@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) \
+       $(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}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  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) \
+       $(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}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  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) \
+       $(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}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  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) \
+       $(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}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  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) \
+       $(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}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  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) \
+       $(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}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  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) \
+       $(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}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  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) \
+       $(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}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  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) \
+       $(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}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  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-libbanshee maybe-configure-libbanshee
+maybe-configure-libbanshee:
+@if libbanshee
+maybe-configure-libbanshee: configure-libbanshee
+configure-libbanshee:
+       @test ! -f libbanshee/Makefile || exit 0; \
+       [ -d libbanshee ] || mkdir libbanshee; \
         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; \
-       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 libbanshee; \
+       cd libbanshee || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/libtool"; \
-           libsrcdir="$$s/libtool";; \
+           srcdiroption="--srcdir=$(srcdir)/libbanshee"; \
+           libsrcdir="$$s/libbanshee";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/libtool"; \
-           libsrcdir="$$s/libtool";; \
+           srcdiroption="--srcdir=../$(srcdir)/libbanshee"; \
+           libsrcdir="$$s/libbanshee";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif libbanshee
  
-.PHONY: all-libtool maybe-all-libtool
-maybe-all-libtool:
-all-libtool: configure-libtool
+.PHONY: all-libbanshee maybe-all-libbanshee
+maybe-all-libbanshee:
+@if libbanshee
+maybe-all-libbanshee: all-libbanshee
+all-libbanshee: configure-libbanshee
         @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 libbanshee && $(MAKE) $(FLAGS_TO_PASS)  all)
+@endif libbanshee
  
-.PHONY: check-libtool maybe-check-libtool
-maybe-check-libtool:
+.PHONY: check-libbanshee maybe-check-libbanshee
+maybe-check-libbanshee:
+@if libbanshee
+maybe-check-libbanshee: check-libbanshee
  
-check-libtool:
+check-libbanshee:
         @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 libbanshee && $(MAKE) $(FLAGS_TO_PASS)  check)
  
+@endif libbanshee
  
-.PHONY: install-libtool maybe-install-libtool
-maybe-install-libtool:
+.PHONY: install-libbanshee maybe-install-libbanshee
+maybe-install-libbanshee:
+@if libbanshee
+maybe-install-libbanshee: install-libbanshee
  
-install-libtool: installdirs
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       (cd libtool && $(MAKE) $(FLAGS_TO_PASS) install)
+install-libbanshee:
  
+@endif libbanshee
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-libtool info-libtool
-maybe-info-libtool:
+.PHONY: maybe-info-libbanshee info-libbanshee
+maybe-info-libbanshee:
+@if libbanshee
+maybe-info-libbanshee: info-libbanshee
  
-info-libtool: \
-    configure-libtool 
-       @[ -f ./libtool/Makefile ] || exit 0; \
+info-libbanshee: \
+    configure-libbanshee 
+       @[ -f ./libbanshee/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 && \
+       echo "Doing info in libbanshee" ; \
+       (cd libbanshee && \
           $(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 libbanshee
  
-.PHONY: maybe-dvi-libtool dvi-libtool
-maybe-dvi-libtool:
+.PHONY: maybe-dvi-libbanshee dvi-libbanshee
+maybe-dvi-libbanshee:
+@if libbanshee
+maybe-dvi-libbanshee: dvi-libbanshee
  
-dvi-libtool: \
-    configure-libtool 
-       @[ -f ./libtool/Makefile ] || exit 0; \
+dvi-libbanshee: \
+    configure-libbanshee 
+       @[ -f ./libbanshee/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 && \
+       echo "Doing dvi in libbanshee" ; \
+       (cd libbanshee && \
           $(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 libbanshee
  
-.PHONY: maybe-TAGS-libtool TAGS-libtool
-maybe-TAGS-libtool:
+.PHONY: maybe-TAGS-libbanshee TAGS-libbanshee
+maybe-TAGS-libbanshee:
+@if libbanshee
+maybe-TAGS-libbanshee: TAGS-libbanshee
  
-TAGS-libtool: \
-    configure-libtool 
-       @[ -f ./libtool/Makefile ] || exit 0; \
+TAGS-libbanshee: \
+    configure-libbanshee 
+       @[ -f ./libbanshee/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 && \
+       echo "Doing TAGS in libbanshee" ; \
+       (cd libbanshee && \
           $(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 libbanshee
  
-.PHONY: maybe-install-info-libtool install-info-libtool
-maybe-install-info-libtool:
+.PHONY: maybe-install-info-libbanshee install-info-libbanshee
+maybe-install-info-libbanshee:
+@if libbanshee
+maybe-install-info-libbanshee: install-info-libbanshee
  
-install-info-libtool: \
-    configure-libtool \
-    info-libtool 
-       @[ -f ./libtool/Makefile ] || exit 0; \
+install-info-libbanshee: \
+    configure-libbanshee \
+    info-libbanshee 
+       @[ -f ./libbanshee/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 && \
+       echo "Doing install-info in libbanshee" ; \
+       (cd libbanshee && \
           $(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 libbanshee
  
-.PHONY: maybe-installcheck-libtool installcheck-libtool
-maybe-installcheck-libtool:
+.PHONY: maybe-installcheck-libbanshee installcheck-libbanshee
+maybe-installcheck-libbanshee:
+@if libbanshee
+maybe-installcheck-libbanshee: installcheck-libbanshee
  
-installcheck-libtool: \
-    configure-libtool 
-       @[ -f ./libtool/Makefile ] || exit 0; \
+installcheck-libbanshee: \
+    configure-libbanshee 
+       @[ -f ./libbanshee/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" ; \
-       (cd libtool && \
+       echo "Doing installcheck in libbanshee" ; \
+       (cd libbanshee && \
           $(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 libbanshee
  
-.PHONY: maybe-mostlyclean-libtool mostlyclean-libtool
-maybe-mostlyclean-libtool:
+.PHONY: maybe-mostlyclean-libbanshee mostlyclean-libbanshee
+maybe-mostlyclean-libbanshee:
+@if libbanshee
+maybe-mostlyclean-libbanshee: mostlyclean-libbanshee
  
-mostlyclean-libtool: 
-       @[ -f ./libtool/Makefile ] || exit 0; \
+mostlyclean-libbanshee: 
+       @[ -f ./libbanshee/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 libtool" ; \
-       (cd libtool && \
+       echo "Doing mostlyclean in libbanshee" ; \
+       (cd libbanshee && \
           $(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 libbanshee
  
-.PHONY: maybe-clean-libtool clean-libtool
-maybe-clean-libtool:
+.PHONY: maybe-clean-libbanshee clean-libbanshee
+maybe-clean-libbanshee:
+@if libbanshee
+maybe-clean-libbanshee: clean-libbanshee
  
-clean-libtool: 
-       @[ -f ./libtool/Makefile ] || exit 0; \
+clean-libbanshee: 
+       @[ -f ./libbanshee/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 libtool" ; \
-       (cd libtool && \
+       echo "Doing clean in libbanshee" ; \
+       (cd libbanshee && \
           $(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 libbanshee
  
-.PHONY: maybe-distclean-libtool distclean-libtool
-maybe-distclean-libtool:
+.PHONY: maybe-distclean-libbanshee distclean-libbanshee
+maybe-distclean-libbanshee:
+@if libbanshee
+maybe-distclean-libbanshee: distclean-libbanshee
  
-distclean-libtool: 
-       @[ -f ./libtool/Makefile ] || exit 0; \
+distclean-libbanshee: 
+       @[ -f ./libbanshee/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 libtool" ; \
-       (cd libtool && \
+       echo "Doing distclean in libbanshee" ; \
+       (cd libbanshee && \
           $(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 libbanshee
  
-.PHONY: maybe-maintainer-clean-libtool maintainer-clean-libtool
-maybe-maintainer-clean-libtool:
+.PHONY: maybe-maintainer-clean-libbanshee maintainer-clean-libbanshee
+maybe-maintainer-clean-libbanshee:
+@if libbanshee
+maybe-maintainer-clean-libbanshee: maintainer-clean-libbanshee
  
-maintainer-clean-libtool: 
-       @[ -f ./libtool/Makefile ] || exit 0; \
+maintainer-clean-libbanshee: 
+       @[ -f ./libbanshee/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 libtool" ; \
-       (cd libtool && \
+       echo "Doing maintainer-clean in libbanshee" ; \
+       (cd libbanshee && \
           $(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 libbanshee
  
  
-.PHONY: configure-m4 maybe-configure-m4
-maybe-configure-m4:
-configure-m4:
-       @test ! -f m4/Makefile || exit 0; \
-       [ -d m4 ] || mkdir m4; \
+.PHONY: configure-libiberty maybe-configure-libiberty
+maybe-configure-libiberty:
+@if libiberty
+maybe-configure-libiberty: configure-libiberty
+configure-libiberty:
+       @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; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in m4; \
-       cd m4 || exit 1; \
+       $(HOST_EXPORTS) \
+       echo Configuring in libiberty; \
+       cd libiberty || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/m4"; \
-           libsrcdir="$$s/m4";; \
+           srcdiroption="--srcdir=$(srcdir)/libiberty"; \
+           libsrcdir="$$s/libiberty";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/m4"; \
-           libsrcdir="$$s/m4";; \
+           srcdiroption="--srcdir=../$(srcdir)/libiberty"; \
+           libsrcdir="$$s/libiberty";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif libiberty
  
-.PHONY: all-m4 maybe-all-m4
-maybe-all-m4:
-all-m4: configure-m4
+.PHONY: all-libiberty maybe-all-libiberty
+maybe-all-libiberty:
+@if libiberty
+maybe-all-libiberty: all-libiberty
+all-libiberty: configure-libiberty
         @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 libiberty && $(MAKE) $(FLAGS_TO_PASS)  all)
+@endif libiberty
  
-.PHONY: check-m4 maybe-check-m4
-maybe-check-m4:
+.PHONY: check-libiberty maybe-check-libiberty
+maybe-check-libiberty:
+@if libiberty
+maybe-check-libiberty: check-libiberty
  
-check-m4:
+check-libiberty:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd m4 && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(HOST_EXPORTS) \
+       (cd libiberty && $(MAKE) $(FLAGS_TO_PASS)  check)
  
+@endif libiberty
  
-.PHONY: install-m4 maybe-install-m4
-maybe-install-m4:
+.PHONY: install-libiberty maybe-install-libiberty
+maybe-install-libiberty:
+@if libiberty
+maybe-install-libiberty: install-libiberty
  
-install-m4: installdirs
+install-libiberty: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd m4 && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(HOST_EXPORTS) \
+       (cd libiberty && $(MAKE) $(FLAGS_TO_PASS)  install)
  
+@endif libiberty
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-m4 info-m4
-maybe-info-m4:
+.PHONY: maybe-info-libiberty info-libiberty
+maybe-info-libiberty:
+@if libiberty
+maybe-info-libiberty: info-libiberty
  
-info-m4: \
-    configure-m4 
-       @[ -f ./m4/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) \
+       $(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" ; \
-       (cd m4 && \
+       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}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
           || exit 1
  
+@endif libiberty
  
-.PHONY: maybe-dvi-m4 dvi-m4
-maybe-dvi-m4:
+.PHONY: maybe-dvi-libiberty dvi-libiberty
+maybe-dvi-libiberty:
+@if libiberty
+maybe-dvi-libiberty: dvi-libiberty
  
-dvi-m4: \
-    configure-m4 
-       @[ -f ./m4/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) \
+       $(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" ; \
-       (cd m4 && \
+       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}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
           || exit 1
  
+@endif libiberty
  
-.PHONY: maybe-TAGS-m4 TAGS-m4
-maybe-TAGS-m4:
+.PHONY: maybe-TAGS-libiberty TAGS-libiberty
+maybe-TAGS-libiberty:
+@if libiberty
+maybe-TAGS-libiberty: TAGS-libiberty
  
-TAGS-m4: \
-    configure-m4 
-       @[ -f ./m4/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) \
+       $(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" ; \
-       (cd m4 && \
+       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}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
           || exit 1
  
+@endif libiberty
  
-.PHONY: maybe-install-info-m4 install-info-m4
-maybe-install-info-m4:
+.PHONY: maybe-install-info-libiberty install-info-libiberty
+maybe-install-info-libiberty:
+@if libiberty
+maybe-install-info-libiberty: install-info-libiberty
  
-install-info-m4: \
-    configure-m4 \
-    info-m4 
-       @[ -f ./m4/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) \
+       $(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" ; \
-       (cd m4 && \
+       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}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
           || exit 1
  
+@endif libiberty
  
-.PHONY: maybe-installcheck-m4 installcheck-m4
-maybe-installcheck-m4:
+.PHONY: maybe-installcheck-libiberty installcheck-libiberty
+maybe-installcheck-libiberty:
+@if libiberty
+maybe-installcheck-libiberty: installcheck-libiberty
  
-installcheck-m4: \
-    configure-m4 
-       @[ -f ./m4/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) \
+       $(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" ; \
-       (cd m4 && \
+       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) \
+                  installcheck) \
           || exit 1
  
+@endif libiberty
  
-.PHONY: maybe-mostlyclean-m4 mostlyclean-m4
-maybe-mostlyclean-m4:
+.PHONY: maybe-mostlyclean-libiberty mostlyclean-libiberty
+maybe-mostlyclean-libiberty:
+@if libiberty
+maybe-mostlyclean-libiberty: mostlyclean-libiberty
  
-mostlyclean-m4: 
-       @[ -f ./m4/Makefile ] || exit 0; \
+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 m4" ; \
-       (cd m4 && \
+       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) \
+                  mostlyclean) \
           || exit 1
  
+@endif libiberty
  
-.PHONY: maybe-clean-m4 clean-m4
-maybe-clean-m4:
+.PHONY: maybe-clean-libiberty clean-libiberty
+maybe-clean-libiberty:
+@if libiberty
+maybe-clean-libiberty: clean-libiberty
  
-clean-m4: 
-       @[ -f ./m4/Makefile ] || exit 0; \
+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 m4" ; \
-       (cd m4 && \
+       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) \
+                  clean) \
           || exit 1
  
+@endif libiberty
  
-.PHONY: maybe-distclean-m4 distclean-m4
-maybe-distclean-m4:
+.PHONY: maybe-distclean-libiberty distclean-libiberty
+maybe-distclean-libiberty:
+@if libiberty
+maybe-distclean-libiberty: distclean-libiberty
  
-distclean-m4: 
-       @[ -f ./m4/Makefile ] || exit 0; \
+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 m4" ; \
-       (cd m4 && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+       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) \
+                  distclean) \
           || exit 1
  
+@endif libiberty
  
-.PHONY: maybe-maintainer-clean-m4 maintainer-clean-m4
-maybe-maintainer-clean-m4:
+.PHONY: maybe-maintainer-clean-libiberty maintainer-clean-libiberty
+maybe-maintainer-clean-libiberty:
+@if libiberty
+maybe-maintainer-clean-libiberty: maintainer-clean-libiberty
  
-maintainer-clean-m4: 
-       @[ -f ./m4/Makefile ] || exit 0; \
+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 m4" ; \
-       (cd m4 && \
+       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) \
+                  maintainer-clean) \
           || exit 1
  
+@endif libiberty
  
  
-.PHONY: configure-make maybe-configure-make
-maybe-configure-make:
-configure-make:
-       @test ! -f make/Makefile || exit 0; \
-       [ -d make ] || mkdir make; \
+.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; \
-       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; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in make; \
-       cd make || exit 1; \
+       $(HOST_EXPORTS) \
+       echo Configuring in libtool; \
+       cd libtool || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/make"; \
-           libsrcdir="$$s/make";; \
+           srcdiroption="--srcdir=$(srcdir)/libtool"; \
+           libsrcdir="$$s/libtool";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/make"; \
-           libsrcdir="$$s/make";; \
+           srcdiroption="--srcdir=../$(srcdir)/libtool"; \
+           libsrcdir="$$s/libtool";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif libtool
  
-.PHONY: all-make maybe-all-make
-maybe-all-make:
-all-make: configure-make
+.PHONY: all-libtool maybe-all-libtool
+maybe-all-libtool:
+@if libtool
+maybe-all-libtool: all-libtool
+all-libtool: configure-libtool
         @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 libtool && $(MAKE) $(FLAGS_TO_PASS)  all)
+@endif libtool
  
-.PHONY: check-make maybe-check-make
-maybe-check-make:
+.PHONY: check-libtool maybe-check-libtool
+maybe-check-libtool:
+@if libtool
+maybe-check-libtool: check-libtool
  
-check-make:
+check-libtool:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd make && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(HOST_EXPORTS) \
+       (cd libtool && $(MAKE) $(FLAGS_TO_PASS)  check)
  
+@endif libtool
  
-.PHONY: install-make maybe-install-make
-maybe-install-make:
+.PHONY: install-libtool maybe-install-libtool
+maybe-install-libtool:
+@if libtool
+maybe-install-libtool: install-libtool
  
-install-make: installdirs
+install-libtool: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd make && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(HOST_EXPORTS) \
+       (cd libtool && $(MAKE) $(FLAGS_TO_PASS)  install)
  
+@endif libtool
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-make info-make
-maybe-info-make:
+.PHONY: maybe-info-libtool info-libtool
+maybe-info-libtool:
+@if libtool
+maybe-info-libtool: info-libtool
  
-info-make: \
-    configure-make 
-       @[ -f ./make/Makefile ] || exit 0; \
+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 make" ; \
-       (cd make && \
+       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) \
+                  info) \
           || exit 1
  
+@endif libtool
  
-.PHONY: maybe-dvi-make dvi-make
-maybe-dvi-make:
+.PHONY: maybe-dvi-libtool dvi-libtool
+maybe-dvi-libtool:
+@if libtool
+maybe-dvi-libtool: dvi-libtool
  
-dvi-make: \
-    configure-make 
-       @[ -f ./make/Makefile ] || exit 0; \
+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 make" ; \
-       (cd make && \
+       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) \
+                  dvi) \
           || exit 1
  
+@endif libtool
  
-.PHONY: maybe-TAGS-make TAGS-make
-maybe-TAGS-make:
+.PHONY: maybe-TAGS-libtool TAGS-libtool
+maybe-TAGS-libtool:
+@if libtool
+maybe-TAGS-libtool: TAGS-libtool
  
-TAGS-make: \
-    configure-make 
-       @[ -f ./make/Makefile ] || exit 0; \
+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 make" ; \
-       (cd make && \
+       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) \
+                  TAGS) \
           || exit 1
  
+@endif libtool
  
-.PHONY: maybe-install-info-make install-info-make
-maybe-install-info-make:
+.PHONY: maybe-install-info-libtool install-info-libtool
+maybe-install-info-libtool:
+@if libtool
+maybe-install-info-libtool: install-info-libtool
  
-install-info-make: \
-    configure-make \
-    info-make 
-       @[ -f ./make/Makefile ] || exit 0; \
+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 make" ; \
-       (cd make && \
+       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) \
+                  install-info) \
           || exit 1
  
+@endif libtool
  
-.PHONY: maybe-installcheck-make installcheck-make
-maybe-installcheck-make:
+.PHONY: maybe-installcheck-libtool installcheck-libtool
+maybe-installcheck-libtool:
+@if libtool
+maybe-installcheck-libtool: installcheck-libtool
  
-installcheck-make: \
-    configure-make 
-       @[ -f ./make/Makefile ] || exit 0; \
+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 make" ; \
-       (cd make && \
+       echo "Doing installcheck 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}" \
-                 installcheck) \
+                  installcheck) \
           || exit 1
  
+@endif libtool
  
-.PHONY: maybe-mostlyclean-make mostlyclean-make
-maybe-mostlyclean-make:
+.PHONY: maybe-mostlyclean-libtool mostlyclean-libtool
+maybe-mostlyclean-libtool:
+@if libtool
+maybe-mostlyclean-libtool: mostlyclean-libtool
  
-mostlyclean-make: 
-       @[ -f ./make/Makefile ] || exit 0; \
+mostlyclean-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 mostlyclean in make" ; \
-       (cd make && \
+       echo "Doing mostlyclean 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}" \
-                 mostlyclean) \
+                  mostlyclean) \
           || exit 1
  
+@endif libtool
  
-.PHONY: maybe-clean-make clean-make
-maybe-clean-make:
+.PHONY: maybe-clean-libtool clean-libtool
+maybe-clean-libtool:
+@if libtool
+maybe-clean-libtool: clean-libtool
  
-clean-make: 
-       @[ -f ./make/Makefile ] || exit 0; \
+clean-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 clean in make" ; \
-       (cd make && \
+       echo "Doing clean 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}" \
-                 clean) \
+                  clean) \
           || exit 1
  
+@endif libtool
  
-.PHONY: maybe-distclean-make distclean-make
-maybe-distclean-make:
+.PHONY: maybe-distclean-libtool distclean-libtool
+maybe-distclean-libtool:
+@if libtool
+maybe-distclean-libtool: distclean-libtool
  
-distclean-make: 
-       @[ -f ./make/Makefile ] || exit 0; \
+distclean-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 distclean in make" ; \
-       (cd make && \
+       echo "Doing distclean 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}" \
-                 distclean) \
+                  distclean) \
           || exit 1
  
+@endif libtool
  
-.PHONY: maybe-maintainer-clean-make maintainer-clean-make
-maybe-maintainer-clean-make:
+.PHONY: maybe-maintainer-clean-libtool maintainer-clean-libtool
+maybe-maintainer-clean-libtool:
+@if libtool
+maybe-maintainer-clean-libtool: maintainer-clean-libtool
  
-maintainer-clean-make: 
-       @[ -f ./make/Makefile ] || exit 0; \
+maintainer-clean-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 maintainer-clean in make" ; \
-       (cd make && \
+       echo "Doing maintainer-clean 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}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
           || exit 1
  
+@endif libtool
  
  
-.PHONY: configure-mmalloc maybe-configure-mmalloc
-maybe-configure-mmalloc:
-configure-mmalloc:
-       @test ! -f mmalloc/Makefile || exit 0; \
-       [ -d mmalloc ] || mkdir mmalloc; \
+.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; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in mmalloc; \
-       cd mmalloc || exit 1; \
+       $(HOST_EXPORTS) \
+       echo Configuring in m4; \
+       cd m4 || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/mmalloc"; \
-           libsrcdir="$$s/mmalloc";; \
+           srcdiroption="--srcdir=$(srcdir)/m4"; \
+           libsrcdir="$$s/m4";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/mmalloc"; \
-           libsrcdir="$$s/mmalloc";; \
+           srcdiroption="--srcdir=../$(srcdir)/m4"; \
+           libsrcdir="$$s/m4";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif m4
  
-.PHONY: all-mmalloc maybe-all-mmalloc
-maybe-all-mmalloc:
-all-mmalloc: configure-mmalloc
+.PHONY: all-m4 maybe-all-m4
+maybe-all-m4:
+@if m4
+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 mmalloc && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd m4 && $(MAKE) $(FLAGS_TO_PASS)  all)
+@endif m4
  
-.PHONY: check-mmalloc maybe-check-mmalloc
-maybe-check-mmalloc:
+.PHONY: check-m4 maybe-check-m4
+maybe-check-m4:
+@if m4
+maybe-check-m4: check-m4
  
-check-mmalloc:
+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-mmalloc maybe-install-mmalloc
-maybe-install-mmalloc:
+.PHONY: install-m4 maybe-install-m4
+maybe-install-m4:
+@if m4
+maybe-install-m4: install-m4
  
-install-mmalloc: installdirs
+install-m4: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd mmalloc && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(HOST_EXPORTS) \
+       (cd m4 && $(MAKE) $(FLAGS_TO_PASS)  install)
  
+@endif m4
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-mmalloc info-mmalloc
-maybe-info-mmalloc:
+.PHONY: maybe-info-m4 info-m4
+maybe-info-m4:
+@if m4
+maybe-info-m4: info-m4
  
-info-mmalloc: \
-    configure-mmalloc 
-       @[ -f ./mmalloc/Makefile ] || exit 0; \
+info-m4: \
+    configure-m4 
+       @[ -f ./m4/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 mmalloc" ; \
-       (cd mmalloc && \
+       echo "Doing info in m4" ; \
+       (cd m4 && \
           $(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 m4
  
-.PHONY: maybe-dvi-mmalloc dvi-mmalloc
-maybe-dvi-mmalloc:
+.PHONY: maybe-dvi-m4 dvi-m4
+maybe-dvi-m4:
+@if m4
+maybe-dvi-m4: dvi-m4
  
-dvi-mmalloc: \
-    configure-mmalloc 
-       @[ -f ./mmalloc/Makefile ] || exit 0; \
+dvi-m4: \
+    configure-m4 
+       @[ -f ./m4/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 mmalloc" ; \
-       (cd mmalloc && \
+       echo "Doing dvi in m4" ; \
+       (cd m4 && \
           $(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 m4
  
-.PHONY: maybe-TAGS-mmalloc TAGS-mmalloc
-maybe-TAGS-mmalloc:
+.PHONY: maybe-TAGS-m4 TAGS-m4
+maybe-TAGS-m4:
+@if m4
+maybe-TAGS-m4: TAGS-m4
  
-TAGS-mmalloc: \
-    configure-mmalloc 
-       @[ -f ./mmalloc/Makefile ] || exit 0; \
+TAGS-m4: \
+    configure-m4 
+       @[ -f ./m4/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 mmalloc" ; \
-       (cd mmalloc && \
+       echo "Doing TAGS in m4" ; \
+       (cd m4 && \
           $(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 m4
  
-.PHONY: maybe-install-info-mmalloc install-info-mmalloc
-maybe-install-info-mmalloc:
+.PHONY: maybe-install-info-m4 install-info-m4
+maybe-install-info-m4:
+@if m4
+maybe-install-info-m4: install-info-m4
  
-install-info-mmalloc: \
-    configure-mmalloc \
-    info-mmalloc 
-       @[ -f ./mmalloc/Makefile ] || exit 0; \
+install-info-m4: \
+    configure-m4 \
+    info-m4 
+       @[ -f ./m4/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 mmalloc" ; \
-       (cd mmalloc && \
+       echo "Doing install-info in m4" ; \
+       (cd m4 && \
           $(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 m4
  
-.PHONY: maybe-installcheck-mmalloc installcheck-mmalloc
-maybe-installcheck-mmalloc:
+.PHONY: maybe-installcheck-m4 installcheck-m4
+maybe-installcheck-m4:
+@if m4
+maybe-installcheck-m4: installcheck-m4
  
-installcheck-mmalloc: \
-    configure-mmalloc 
-       @[ -f ./mmalloc/Makefile ] || exit 0; \
+installcheck-m4: \
+    configure-m4 
+       @[ -f ./m4/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 mmalloc" ; \
-       (cd mmalloc && \
+       echo "Doing installcheck in m4" ; \
+       (cd m4 && \
           $(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 m4
  
-.PHONY: maybe-mostlyclean-mmalloc mostlyclean-mmalloc
-maybe-mostlyclean-mmalloc:
+.PHONY: maybe-mostlyclean-m4 mostlyclean-m4
+maybe-mostlyclean-m4:
+@if m4
+maybe-mostlyclean-m4: mostlyclean-m4
  
-mostlyclean-mmalloc: 
-       @[ -f ./mmalloc/Makefile ] || exit 0; \
+mostlyclean-m4: 
+       @[ -f ./m4/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 mmalloc" ; \
-       (cd mmalloc && \
+       echo "Doing mostlyclean in m4" ; \
+       (cd m4 && \
           $(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 m4
  
-.PHONY: maybe-clean-mmalloc clean-mmalloc
-maybe-clean-mmalloc:
+.PHONY: maybe-clean-m4 clean-m4
+maybe-clean-m4:
+@if m4
+maybe-clean-m4: clean-m4
  
-clean-mmalloc: 
-       @[ -f ./mmalloc/Makefile ] || exit 0; \
+clean-m4: 
+       @[ -f ./m4/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 mmalloc" ; \
-       (cd mmalloc && \
+       echo "Doing clean in m4" ; \
+       (cd m4 && \
           $(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 m4
  
-.PHONY: maybe-distclean-mmalloc distclean-mmalloc
-maybe-distclean-mmalloc:
+.PHONY: maybe-distclean-m4 distclean-m4
+maybe-distclean-m4:
+@if m4
+maybe-distclean-m4: distclean-m4
  
-distclean-mmalloc: 
-       @[ -f ./mmalloc/Makefile ] || exit 0; \
+distclean-m4: 
+       @[ -f ./m4/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 mmalloc" ; \
-       (cd mmalloc && \
+       echo "Doing distclean in m4" ; \
+       (cd m4 && \
           $(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 m4
  
-.PHONY: maybe-maintainer-clean-mmalloc maintainer-clean-mmalloc
-maybe-maintainer-clean-mmalloc:
+.PHONY: maybe-maintainer-clean-m4 maintainer-clean-m4
+maybe-maintainer-clean-m4:
+@if m4
+maybe-maintainer-clean-m4: maintainer-clean-m4
  
-maintainer-clean-mmalloc: 
-       @[ -f ./mmalloc/Makefile ] || exit 0; \
+maintainer-clean-m4: 
+       @[ -f ./m4/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 mmalloc" ; \
-       (cd mmalloc && \
+       echo "Doing maintainer-clean in m4" ; \
+       (cd m4 && \
           $(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 m4
  
  
-.PHONY: configure-patch maybe-configure-patch
-maybe-configure-patch:
-configure-patch:
-       @test ! -f patch/Makefile || exit 0; \
-       [ -d patch ] || mkdir patch; \
+.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; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in patch; \
-       cd patch || exit 1; \
+       $(HOST_EXPORTS) \
+       echo Configuring in make; \
+       cd make || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/patch"; \
-           libsrcdir="$$s/patch";; \
+           srcdiroption="--srcdir=$(srcdir)/make"; \
+           libsrcdir="$$s/make";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/patch"; \
-           libsrcdir="$$s/patch";; \
+           srcdiroption="--srcdir=../$(srcdir)/make"; \
+           libsrcdir="$$s/make";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif make
  
-.PHONY: all-patch maybe-all-patch
-maybe-all-patch:
-all-patch: configure-patch
+.PHONY: all-make maybe-all-make
+maybe-all-make:
+@if make
+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 patch && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd make && $(MAKE) $(FLAGS_TO_PASS)  all)
+@endif make
  
-.PHONY: check-patch maybe-check-patch
-maybe-check-patch:
+.PHONY: check-make maybe-check-make
+maybe-check-make:
+@if make
+maybe-check-make: check-make
  
-check-patch:
+check-make:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd patch && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(HOST_EXPORTS) \
+       (cd make && $(MAKE) $(FLAGS_TO_PASS)  check)
  
+@endif make
  
-.PHONY: install-patch maybe-install-patch
-maybe-install-patch:
+.PHONY: install-make maybe-install-make
+maybe-install-make:
+@if make
+maybe-install-make: install-make
  
-install-patch: installdirs
+install-make: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd patch && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(HOST_EXPORTS) \
+       (cd make && $(MAKE) $(FLAGS_TO_PASS)  install)
  
+@endif make
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-patch info-patch
-maybe-info-patch:
+.PHONY: maybe-info-make info-make
+maybe-info-make:
+@if make
+maybe-info-make: info-make
  
-info-patch: \
-    configure-patch 
-       @[ -f ./patch/Makefile ] || exit 0; \
+info-make: \
+    configure-make 
+       @[ -f ./make/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 patch" ; \
-       (cd patch && \
+       echo "Doing info in make" ; \
+       (cd make && \
           $(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 make
  
-.PHONY: maybe-dvi-patch dvi-patch
-maybe-dvi-patch:
+.PHONY: maybe-dvi-make dvi-make
+maybe-dvi-make:
+@if make
+maybe-dvi-make: dvi-make
  
-dvi-patch: \
-    configure-patch 
-       @[ -f ./patch/Makefile ] || exit 0; \
+dvi-make: \
+    configure-make 
+       @[ -f ./make/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 patch" ; \
-       (cd patch && \
+       echo "Doing dvi in make" ; \
+       (cd make && \
           $(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 make
  
-.PHONY: maybe-TAGS-patch TAGS-patch
-maybe-TAGS-patch:
+.PHONY: maybe-TAGS-make TAGS-make
+maybe-TAGS-make:
+@if make
+maybe-TAGS-make: TAGS-make
  
-TAGS-patch: \
-    configure-patch 
-       @[ -f ./patch/Makefile ] || exit 0; \
+TAGS-make: \
+    configure-make 
+       @[ -f ./make/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 patch" ; \
-       (cd patch && \
+       echo "Doing TAGS in make" ; \
+       (cd make && \
           $(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 make
  
-.PHONY: maybe-install-info-patch install-info-patch
-maybe-install-info-patch:
+.PHONY: maybe-install-info-make install-info-make
+maybe-install-info-make:
+@if make
+maybe-install-info-make: install-info-make
  
-install-info-patch: \
-    configure-patch \
-    info-patch 
-       @[ -f ./patch/Makefile ] || exit 0; \
+install-info-make: \
+    configure-make \
+    info-make 
+       @[ -f ./make/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 patch" ; \
-       (cd patch && \
+       echo "Doing install-info in make" ; \
+       (cd make && \
           $(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 make
  
-.PHONY: maybe-installcheck-patch installcheck-patch
-maybe-installcheck-patch:
+.PHONY: maybe-installcheck-make installcheck-make
+maybe-installcheck-make:
+@if make
+maybe-installcheck-make: installcheck-make
  
-installcheck-patch: \
-    configure-patch 
-       @[ -f ./patch/Makefile ] || exit 0; \
+installcheck-make: \
+    configure-make 
+       @[ -f ./make/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 patch" ; \
-       (cd patch && \
+       echo "Doing installcheck in make" ; \
+       (cd make && \
           $(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 make
  
-.PHONY: maybe-mostlyclean-patch mostlyclean-patch
-maybe-mostlyclean-patch:
+.PHONY: maybe-mostlyclean-make mostlyclean-make
+maybe-mostlyclean-make:
+@if make
+maybe-mostlyclean-make: mostlyclean-make
  
-mostlyclean-patch: 
-       @[ -f ./patch/Makefile ] || exit 0; \
+mostlyclean-make: 
+       @[ -f ./make/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 patch" ; \
-       (cd patch && \
+       echo "Doing mostlyclean in make" ; \
+       (cd make && \
           $(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 make
  
-.PHONY: maybe-clean-patch clean-patch
-maybe-clean-patch:
+.PHONY: maybe-clean-make clean-make
+maybe-clean-make:
+@if make
+maybe-clean-make: clean-make
  
-clean-patch: 
-       @[ -f ./patch/Makefile ] || exit 0; \
+clean-make: 
+       @[ -f ./make/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 patch" ; \
-       (cd patch && \
+       echo "Doing clean in make" ; \
+       (cd make && \
           $(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 make
  
-.PHONY: maybe-distclean-patch distclean-patch
-maybe-distclean-patch:
+.PHONY: maybe-distclean-make distclean-make
+maybe-distclean-make:
+@if make
+maybe-distclean-make: distclean-make
  
-distclean-patch: 
-       @[ -f ./patch/Makefile ] || exit 0; \
+distclean-make: 
+       @[ -f ./make/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 patch" ; \
-       (cd patch && \
+       echo "Doing distclean in make" ; \
+       (cd make && \
           $(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 make
  
-.PHONY: maybe-maintainer-clean-patch maintainer-clean-patch
-maybe-maintainer-clean-patch:
+.PHONY: maybe-maintainer-clean-make maintainer-clean-make
+maybe-maintainer-clean-make:
+@if make
+maybe-maintainer-clean-make: maintainer-clean-make
  
-maintainer-clean-patch: 
-       @[ -f ./patch/Makefile ] || exit 0; \
+maintainer-clean-make: 
+       @[ -f ./make/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 patch" ; \
-       (cd patch && \
+       echo "Doing maintainer-clean in make" ; \
+       (cd make && \
           $(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 make
  
  
-.PHONY: configure-perl maybe-configure-perl
-maybe-configure-perl:
-configure-perl:
-       @test ! -f perl/Makefile || exit 0; \
-       [ -d perl ] || mkdir perl; \
+.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; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in perl; \
-       cd perl || exit 1; \
+       $(HOST_EXPORTS) \
+       echo Configuring in mmalloc; \
+       cd mmalloc || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/perl"; \
-           libsrcdir="$$s/perl";; \
+           srcdiroption="--srcdir=$(srcdir)/mmalloc"; \
+           libsrcdir="$$s/mmalloc";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/perl"; \
-           libsrcdir="$$s/perl";; \
+           srcdiroption="--srcdir=../$(srcdir)/mmalloc"; \
+           libsrcdir="$$s/mmalloc";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif mmalloc
  
-.PHONY: all-perl maybe-all-perl
-maybe-all-perl:
-all-perl: configure-perl
+.PHONY: all-mmalloc maybe-all-mmalloc
+maybe-all-mmalloc:
+@if mmalloc
+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 perl && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd mmalloc && $(MAKE) $(FLAGS_TO_PASS)  all)
+@endif mmalloc
  
-.PHONY: check-perl maybe-check-perl
-maybe-check-perl:
+.PHONY: check-mmalloc maybe-check-mmalloc
+maybe-check-mmalloc:
+@if mmalloc
+maybe-check-mmalloc: check-mmalloc
  
-check-perl:
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       (cd perl && $(MAKE) $(FLAGS_TO_PASS) check)
+check-mmalloc:
  
+@endif mmalloc
  
-.PHONY: install-perl maybe-install-perl
-maybe-install-perl:
+.PHONY: install-mmalloc maybe-install-mmalloc
+maybe-install-mmalloc:
+@if mmalloc
+maybe-install-mmalloc: install-mmalloc
  
-install-perl: installdirs
+install-mmalloc: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd perl && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(HOST_EXPORTS) \
+       (cd mmalloc && $(MAKE) $(FLAGS_TO_PASS)  install)
  
+@endif mmalloc
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-perl info-perl
-maybe-info-perl:
+.PHONY: maybe-info-mmalloc info-mmalloc
+maybe-info-mmalloc:
+@if mmalloc
+maybe-info-mmalloc: info-mmalloc
  
-info-perl: \
-    configure-perl 
-       @[ -f ./perl/Makefile ] || exit 0; \
+info-mmalloc: \
+    configure-mmalloc 
+       @[ -f ./mmalloc/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 perl" ; \
-       (cd perl && \
+       echo "Doing info in mmalloc" ; \
+       (cd mmalloc && \
           $(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 mmalloc
  
-.PHONY: maybe-dvi-perl dvi-perl
-maybe-dvi-perl:
+.PHONY: maybe-dvi-mmalloc dvi-mmalloc
+maybe-dvi-mmalloc:
+@if mmalloc
+maybe-dvi-mmalloc: dvi-mmalloc
  
-dvi-perl: \
-    configure-perl 
-       @[ -f ./perl/Makefile ] || exit 0; \
+dvi-mmalloc: \
+    configure-mmalloc 
+       @[ -f ./mmalloc/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 perl" ; \
-       (cd perl && \
+       echo "Doing dvi in mmalloc" ; \
+       (cd mmalloc && \
           $(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 mmalloc
  
-.PHONY: maybe-TAGS-perl TAGS-perl
-maybe-TAGS-perl:
+.PHONY: maybe-TAGS-mmalloc TAGS-mmalloc
+maybe-TAGS-mmalloc:
+@if mmalloc
+maybe-TAGS-mmalloc: TAGS-mmalloc
  
-TAGS-perl: \
-    configure-perl 
-       @[ -f ./perl/Makefile ] || exit 0; \
+TAGS-mmalloc: \
+    configure-mmalloc 
+       @[ -f ./mmalloc/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 perl" ; \
-       (cd perl && \
+       echo "Doing TAGS in mmalloc" ; \
+       (cd mmalloc && \
           $(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 mmalloc
  
-.PHONY: maybe-install-info-perl install-info-perl
-maybe-install-info-perl:
+.PHONY: maybe-install-info-mmalloc install-info-mmalloc
+maybe-install-info-mmalloc:
+@if mmalloc
+maybe-install-info-mmalloc: install-info-mmalloc
  
-install-info-perl: \
-    configure-perl \
-    info-perl 
-       @[ -f ./perl/Makefile ] || exit 0; \
+install-info-mmalloc: \
+    configure-mmalloc \
+    info-mmalloc 
+       @[ -f ./mmalloc/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 perl" ; \
-       (cd perl && \
+       echo "Doing install-info in mmalloc" ; \
+       (cd mmalloc && \
           $(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 mmalloc
  
-.PHONY: maybe-installcheck-perl installcheck-perl
-maybe-installcheck-perl:
+.PHONY: maybe-installcheck-mmalloc installcheck-mmalloc
+maybe-installcheck-mmalloc:
+@if mmalloc
+maybe-installcheck-mmalloc: installcheck-mmalloc
  
-installcheck-perl: \
-    configure-perl 
-       @[ -f ./perl/Makefile ] || exit 0; \
+installcheck-mmalloc: \
+    configure-mmalloc 
+       @[ -f ./mmalloc/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 perl" ; \
-       (cd perl && \
+       echo "Doing installcheck in mmalloc" ; \
+       (cd mmalloc && \
           $(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 mmalloc
  
-.PHONY: maybe-mostlyclean-perl mostlyclean-perl
-maybe-mostlyclean-perl:
+.PHONY: maybe-mostlyclean-mmalloc mostlyclean-mmalloc
+maybe-mostlyclean-mmalloc:
+@if mmalloc
+maybe-mostlyclean-mmalloc: mostlyclean-mmalloc
  
-mostlyclean-perl: 
-       @[ -f ./perl/Makefile ] || exit 0; \
+mostlyclean-mmalloc: 
+       @[ -f ./mmalloc/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 perl" ; \
-       (cd perl && \
+       echo "Doing mostlyclean in mmalloc" ; \
+       (cd mmalloc && \
           $(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 mmalloc
  
-.PHONY: maybe-clean-perl clean-perl
-maybe-clean-perl:
+.PHONY: maybe-clean-mmalloc clean-mmalloc
+maybe-clean-mmalloc:
+@if mmalloc
+maybe-clean-mmalloc: clean-mmalloc
  
-clean-perl: 
-       @[ -f ./perl/Makefile ] || exit 0; \
+clean-mmalloc: 
+       @[ -f ./mmalloc/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 perl" ; \
-       (cd perl && \
+       echo "Doing clean in mmalloc" ; \
+       (cd mmalloc && \
           $(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 mmalloc
  
-.PHONY: maybe-distclean-perl distclean-perl
-maybe-distclean-perl:
+.PHONY: maybe-distclean-mmalloc distclean-mmalloc
+maybe-distclean-mmalloc:
+@if mmalloc
+maybe-distclean-mmalloc: distclean-mmalloc
  
-distclean-perl: 
-       @[ -f ./perl/Makefile ] || exit 0; \
+distclean-mmalloc: 
+       @[ -f ./mmalloc/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 perl" ; \
-       (cd perl && \
+       echo "Doing distclean in mmalloc" ; \
+       (cd mmalloc && \
           $(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 mmalloc
  
-.PHONY: maybe-maintainer-clean-perl maintainer-clean-perl
-maybe-maintainer-clean-perl:
+.PHONY: maybe-maintainer-clean-mmalloc maintainer-clean-mmalloc
+maybe-maintainer-clean-mmalloc:
+@if mmalloc
+maybe-maintainer-clean-mmalloc: maintainer-clean-mmalloc
  
-maintainer-clean-perl: 
-       @[ -f ./perl/Makefile ] || exit 0; \
+maintainer-clean-mmalloc: 
+       @[ -f ./mmalloc/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 perl" ; \
-       (cd perl && \
+       echo "Doing maintainer-clean in mmalloc" ; \
+       (cd mmalloc && \
           $(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 mmalloc
  
  
-.PHONY: configure-prms maybe-configure-prms
-maybe-configure-prms:
-configure-prms:
-       @test ! -f prms/Makefile || exit 0; \
-       [ -d prms ] || mkdir prms; \
+.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; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in prms; \
-       cd prms || exit 1; \
+       $(HOST_EXPORTS) \
+       echo Configuring in patch; \
+       cd patch || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/prms"; \
-           libsrcdir="$$s/prms";; \
+           srcdiroption="--srcdir=$(srcdir)/patch"; \
+           libsrcdir="$$s/patch";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/prms"; \
-           libsrcdir="$$s/prms";; \
+           srcdiroption="--srcdir=../$(srcdir)/patch"; \
+           libsrcdir="$$s/patch";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif patch
  
-.PHONY: all-prms maybe-all-prms
-maybe-all-prms:
-all-prms: configure-prms
+.PHONY: all-patch maybe-all-patch
+maybe-all-patch:
+@if patch
+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 prms && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd patch && $(MAKE) $(FLAGS_TO_PASS)  all)
+@endif patch
  
-.PHONY: check-prms maybe-check-prms
-maybe-check-prms:
+.PHONY: check-patch maybe-check-patch
+maybe-check-patch:
+@if patch
+maybe-check-patch: check-patch
  
-check-prms:
+check-patch:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd prms && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(HOST_EXPORTS) \
+       (cd patch && $(MAKE) $(FLAGS_TO_PASS)  check)
  
+@endif patch
  
-.PHONY: install-prms maybe-install-prms
-maybe-install-prms:
+.PHONY: install-patch maybe-install-patch
+maybe-install-patch:
+@if patch
+maybe-install-patch: install-patch
  
-install-prms: installdirs
+install-patch: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd prms && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(HOST_EXPORTS) \
+       (cd patch && $(MAKE) $(FLAGS_TO_PASS)  install)
  
+@endif patch
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-prms info-prms
-maybe-info-prms:
+.PHONY: maybe-info-patch info-patch
+maybe-info-patch:
+@if patch
+maybe-info-patch: info-patch
  
-info-prms: \
-    configure-prms 
-       @[ -f ./prms/Makefile ] || exit 0; \
+info-patch: \
+    configure-patch 
+       @[ -f ./patch/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 prms" ; \
-       (cd prms && \
+       echo "Doing info in patch" ; \
+       (cd patch && \
           $(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 patch
  
-.PHONY: maybe-dvi-prms dvi-prms
-maybe-dvi-prms:
+.PHONY: maybe-dvi-patch dvi-patch
+maybe-dvi-patch:
+@if patch
+maybe-dvi-patch: dvi-patch
  
-dvi-prms: \
-    configure-prms 
-       @[ -f ./prms/Makefile ] || exit 0; \
+dvi-patch: \
+    configure-patch 
+       @[ -f ./patch/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 prms" ; \
-       (cd prms && \
+       echo "Doing dvi in patch" ; \
+       (cd patch && \
           $(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 patch
  
-.PHONY: maybe-TAGS-prms TAGS-prms
-maybe-TAGS-prms:
+.PHONY: maybe-TAGS-patch TAGS-patch
+maybe-TAGS-patch:
+@if patch
+maybe-TAGS-patch: TAGS-patch
  
-TAGS-prms: \
-    configure-prms 
-       @[ -f ./prms/Makefile ] || exit 0; \
+TAGS-patch: \
+    configure-patch 
+       @[ -f ./patch/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 prms" ; \
-       (cd prms && \
+       echo "Doing TAGS in patch" ; \
+       (cd patch && \
           $(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 patch
  
-.PHONY: maybe-install-info-prms install-info-prms
-maybe-install-info-prms:
+.PHONY: maybe-install-info-patch install-info-patch
+maybe-install-info-patch:
+@if patch
+maybe-install-info-patch: install-info-patch
  
-install-info-prms: \
-    configure-prms \
-    info-prms 
-       @[ -f ./prms/Makefile ] || exit 0; \
+install-info-patch: \
+    configure-patch \
+    info-patch 
+       @[ -f ./patch/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 prms" ; \
-       (cd prms && \
+       echo "Doing install-info in patch" ; \
+       (cd patch && \
           $(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 patch
  
-.PHONY: maybe-installcheck-prms installcheck-prms
-maybe-installcheck-prms:
+.PHONY: maybe-installcheck-patch installcheck-patch
+maybe-installcheck-patch:
+@if patch
+maybe-installcheck-patch: installcheck-patch
  
-installcheck-prms: \
-    configure-prms 
-       @[ -f ./prms/Makefile ] || exit 0; \
+installcheck-patch: \
+    configure-patch 
+       @[ -f ./patch/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 prms" ; \
-       (cd prms && \
+       echo "Doing installcheck in patch" ; \
+       (cd patch && \
           $(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 patch
  
-.PHONY: maybe-mostlyclean-prms mostlyclean-prms
-maybe-mostlyclean-prms:
+.PHONY: maybe-mostlyclean-patch mostlyclean-patch
+maybe-mostlyclean-patch:
+@if patch
+maybe-mostlyclean-patch: mostlyclean-patch
  
-mostlyclean-prms: 
-       @[ -f ./prms/Makefile ] || exit 0; \
+mostlyclean-patch: 
+       @[ -f ./patch/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 prms" ; \
-       (cd prms && \
+       echo "Doing mostlyclean in patch" ; \
+       (cd patch && \
           $(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 patch
  
-.PHONY: maybe-clean-prms clean-prms
-maybe-clean-prms:
+.PHONY: maybe-clean-patch clean-patch
+maybe-clean-patch:
+@if patch
+maybe-clean-patch: clean-patch
  
-clean-prms: 
-       @[ -f ./prms/Makefile ] || exit 0; \
+clean-patch: 
+       @[ -f ./patch/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 prms" ; \
-       (cd prms && \
+       echo "Doing clean in patch" ; \
+       (cd patch && \
           $(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 patch
  
-.PHONY: maybe-distclean-prms distclean-prms
-maybe-distclean-prms:
+.PHONY: maybe-distclean-patch distclean-patch
+maybe-distclean-patch:
+@if patch
+maybe-distclean-patch: distclean-patch
  
-distclean-prms: 
-       @[ -f ./prms/Makefile ] || exit 0; \
+distclean-patch: 
+       @[ -f ./patch/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 prms" ; \
-       (cd prms && \
+       echo "Doing distclean in patch" ; \
+       (cd patch && \
           $(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 patch
  
-.PHONY: maybe-maintainer-clean-prms maintainer-clean-prms
-maybe-maintainer-clean-prms:
+.PHONY: maybe-maintainer-clean-patch maintainer-clean-patch
+maybe-maintainer-clean-patch:
+@if patch
+maybe-maintainer-clean-patch: maintainer-clean-patch
  
-maintainer-clean-prms: 
-       @[ -f ./prms/Makefile ] || exit 0; \
+maintainer-clean-patch: 
+       @[ -f ./patch/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 prms" ; \
-       (cd prms && \
+       echo "Doing maintainer-clean in patch" ; \
+       (cd patch && \
           $(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 patch
  
  
-.PHONY: configure-rcs maybe-configure-rcs
-maybe-configure-rcs:
-configure-rcs:
-       @test ! -f rcs/Makefile || exit 0; \
-       [ -d rcs ] || mkdir rcs; \
+.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; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in rcs; \
-       cd rcs || exit 1; \
+       $(HOST_EXPORTS) \
+       echo Configuring in perl; \
+       cd perl || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/rcs"; \
-           libsrcdir="$$s/rcs";; \
+           srcdiroption="--srcdir=$(srcdir)/perl"; \
+           libsrcdir="$$s/perl";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/rcs"; \
-           libsrcdir="$$s/rcs";; \
+           srcdiroption="--srcdir=../$(srcdir)/perl"; \
+           libsrcdir="$$s/perl";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif perl
  
-.PHONY: all-rcs maybe-all-rcs
-maybe-all-rcs:
-all-rcs: configure-rcs
+.PHONY: all-perl maybe-all-perl
+maybe-all-perl:
+@if perl
+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 rcs && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd perl && $(MAKE) $(FLAGS_TO_PASS)  all)
+@endif perl
  
-.PHONY: check-rcs maybe-check-rcs
-maybe-check-rcs:
+.PHONY: check-perl maybe-check-perl
+maybe-check-perl:
+@if perl
+maybe-check-perl: check-perl
  
-check-rcs:
+check-perl:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd rcs && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(HOST_EXPORTS) \
+       (cd perl && $(MAKE) $(FLAGS_TO_PASS)  check)
  
+@endif perl
  
-.PHONY: install-rcs maybe-install-rcs
-maybe-install-rcs:
+.PHONY: install-perl maybe-install-perl
+maybe-install-perl:
+@if perl
+maybe-install-perl: install-perl
  
-install-rcs: installdirs
+install-perl: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd rcs && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(HOST_EXPORTS) \
+       (cd perl && $(MAKE) $(FLAGS_TO_PASS)  install)
  
+@endif perl
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-rcs info-rcs
-maybe-info-rcs:
+.PHONY: maybe-info-perl info-perl
+maybe-info-perl:
+@if perl
+maybe-info-perl: info-perl
  
-info-rcs: \
-    configure-rcs 
-       @[ -f ./rcs/Makefile ] || exit 0; \
+info-perl: \
+    configure-perl 
+       @[ -f ./perl/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 rcs" ; \
-       (cd rcs && \
+       echo "Doing info in perl" ; \
+       (cd perl && \
           $(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 perl
  
-.PHONY: maybe-dvi-rcs dvi-rcs
-maybe-dvi-rcs:
+.PHONY: maybe-dvi-perl dvi-perl
+maybe-dvi-perl:
+@if perl
+maybe-dvi-perl: dvi-perl
  
-dvi-rcs: \
-    configure-rcs 
-       @[ -f ./rcs/Makefile ] || exit 0; \
+dvi-perl: \
+    configure-perl 
+       @[ -f ./perl/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 rcs" ; \
-       (cd rcs && \
+       echo "Doing dvi in perl" ; \
+       (cd perl && \
           $(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 perl
  
-.PHONY: maybe-TAGS-rcs TAGS-rcs
-maybe-TAGS-rcs:
+.PHONY: maybe-TAGS-perl TAGS-perl
+maybe-TAGS-perl:
+@if perl
+maybe-TAGS-perl: TAGS-perl
  
-TAGS-rcs: \
-    configure-rcs 
-       @[ -f ./rcs/Makefile ] || exit 0; \
+TAGS-perl: \
+    configure-perl 
+       @[ -f ./perl/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 rcs" ; \
-       (cd rcs && \
+       echo "Doing TAGS in perl" ; \
+       (cd perl && \
           $(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 perl
  
-.PHONY: maybe-install-info-rcs install-info-rcs
-maybe-install-info-rcs:
+.PHONY: maybe-install-info-perl install-info-perl
+maybe-install-info-perl:
+@if perl
+maybe-install-info-perl: install-info-perl
  
-install-info-rcs: \
-    configure-rcs \
-    info-rcs 
-       @[ -f ./rcs/Makefile ] || exit 0; \
+install-info-perl: \
+    configure-perl \
+    info-perl 
+       @[ -f ./perl/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 rcs" ; \
-       (cd rcs && \
+       echo "Doing install-info in perl" ; \
+       (cd perl && \
           $(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 perl
  
-.PHONY: maybe-installcheck-rcs installcheck-rcs
-maybe-installcheck-rcs:
+.PHONY: maybe-installcheck-perl installcheck-perl
+maybe-installcheck-perl:
+@if perl
+maybe-installcheck-perl: installcheck-perl
  
-installcheck-rcs: \
-    configure-rcs 
-       @[ -f ./rcs/Makefile ] || exit 0; \
+installcheck-perl: \
+    configure-perl 
+       @[ -f ./perl/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 rcs" ; \
-       (cd rcs && \
+       echo "Doing installcheck in perl" ; \
+       (cd perl && \
           $(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 perl
  
-.PHONY: maybe-mostlyclean-rcs mostlyclean-rcs
-maybe-mostlyclean-rcs:
+.PHONY: maybe-mostlyclean-perl mostlyclean-perl
+maybe-mostlyclean-perl:
+@if perl
+maybe-mostlyclean-perl: mostlyclean-perl
  
-mostlyclean-rcs: 
-       @[ -f ./rcs/Makefile ] || exit 0; \
+mostlyclean-perl: 
+       @[ -f ./perl/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 rcs" ; \
-       (cd rcs && \
+       echo "Doing mostlyclean in perl" ; \
+       (cd perl && \
           $(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 perl
  
-.PHONY: maybe-clean-rcs clean-rcs
-maybe-clean-rcs:
+.PHONY: maybe-clean-perl clean-perl
+maybe-clean-perl:
+@if perl
+maybe-clean-perl: clean-perl
  
-clean-rcs: 
-       @[ -f ./rcs/Makefile ] || exit 0; \
+clean-perl: 
+       @[ -f ./perl/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 rcs" ; \
-       (cd rcs && \
+       echo "Doing clean in perl" ; \
+       (cd perl && \
           $(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 perl
  
-.PHONY: maybe-distclean-rcs distclean-rcs
-maybe-distclean-rcs:
+.PHONY: maybe-distclean-perl distclean-perl
+maybe-distclean-perl:
+@if perl
+maybe-distclean-perl: distclean-perl
  
-distclean-rcs: 
-       @[ -f ./rcs/Makefile ] || exit 0; \
+distclean-perl: 
+       @[ -f ./perl/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 rcs" ; \
-       (cd rcs && \
+       echo "Doing distclean in perl" ; \
+       (cd perl && \
           $(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 perl
  
-.PHONY: maybe-maintainer-clean-rcs maintainer-clean-rcs
-maybe-maintainer-clean-rcs:
+.PHONY: maybe-maintainer-clean-perl maintainer-clean-perl
+maybe-maintainer-clean-perl:
+@if perl
+maybe-maintainer-clean-perl: maintainer-clean-perl
  
-maintainer-clean-rcs: 
-       @[ -f ./rcs/Makefile ] || exit 0; \
+maintainer-clean-perl: 
+       @[ -f ./perl/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 rcs" ; \
-       (cd rcs && \
+       echo "Doing maintainer-clean in perl" ; \
+       (cd perl && \
           $(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 perl
  
  
-.PHONY: configure-readline maybe-configure-readline
-maybe-configure-readline:
-configure-readline:
-       @test ! -f readline/Makefile || exit 0; \
-       [ -d readline ] || mkdir readline; \
+.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; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in readline; \
-       cd readline || exit 1; \
+       $(HOST_EXPORTS) \
+       echo Configuring in prms; \
+       cd prms || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/readline"; \
-           libsrcdir="$$s/readline";; \
+           srcdiroption="--srcdir=$(srcdir)/prms"; \
+           libsrcdir="$$s/prms";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/readline"; \
-           libsrcdir="$$s/readline";; \
+           srcdiroption="--srcdir=../$(srcdir)/prms"; \
+           libsrcdir="$$s/prms";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif prms
  
-.PHONY: all-readline maybe-all-readline
-maybe-all-readline:
-all-readline: configure-readline
+.PHONY: all-prms maybe-all-prms
+maybe-all-prms:
+@if prms
+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 readline && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd prms && $(MAKE) $(FLAGS_TO_PASS)  all)
+@endif prms
  
-.PHONY: check-readline maybe-check-readline
-maybe-check-readline:
+.PHONY: check-prms maybe-check-prms
+maybe-check-prms:
+@if prms
+maybe-check-prms: check-prms
  
-check-readline:
+check-prms:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd readline && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(HOST_EXPORTS) \
+       (cd prms && $(MAKE) $(FLAGS_TO_PASS)  check)
  
+@endif prms
  
-.PHONY: install-readline maybe-install-readline
-maybe-install-readline:
+.PHONY: install-prms maybe-install-prms
+maybe-install-prms:
+@if prms
+maybe-install-prms: install-prms
  
-install-readline: installdirs
+install-prms: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd readline && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(HOST_EXPORTS) \
+       (cd prms && $(MAKE) $(FLAGS_TO_PASS)  install)
  
+@endif prms
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-readline info-readline
-maybe-info-readline:
+.PHONY: maybe-info-prms info-prms
+maybe-info-prms:
+@if prms
+maybe-info-prms: info-prms
  
-info-readline: \
-    configure-readline 
-       @[ -f ./readline/Makefile ] || exit 0; \
+info-prms: \
+    configure-prms 
+       @[ -f ./prms/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 readline" ; \
-       (cd readline && \
+       echo "Doing info in prms" ; \
+       (cd prms && \
           $(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 prms
  
-.PHONY: maybe-dvi-readline dvi-readline
-maybe-dvi-readline:
+.PHONY: maybe-dvi-prms dvi-prms
+maybe-dvi-prms:
+@if prms
+maybe-dvi-prms: dvi-prms
  
-dvi-readline: \
-    configure-readline 
-       @[ -f ./readline/Makefile ] || exit 0; \
+dvi-prms: \
+    configure-prms 
+       @[ -f ./prms/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 readline" ; \
-       (cd readline && \
+       echo "Doing dvi in prms" ; \
+       (cd prms && \
           $(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 prms
  
-.PHONY: maybe-TAGS-readline TAGS-readline
-maybe-TAGS-readline:
+.PHONY: maybe-TAGS-prms TAGS-prms
+maybe-TAGS-prms:
+@if prms
+maybe-TAGS-prms: TAGS-prms
  
-TAGS-readline: \
-    configure-readline 
-       @[ -f ./readline/Makefile ] || exit 0; \
+TAGS-prms: \
+    configure-prms 
+       @[ -f ./prms/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 readline" ; \
-       (cd readline && \
+       echo "Doing TAGS in prms" ; \
+       (cd prms && \
           $(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 prms
  
-.PHONY: maybe-install-info-readline install-info-readline
-maybe-install-info-readline:
+.PHONY: maybe-install-info-prms install-info-prms
+maybe-install-info-prms:
+@if prms
+maybe-install-info-prms: install-info-prms
  
-install-info-readline: \
-    configure-readline \
-    info-readline 
-       @[ -f ./readline/Makefile ] || exit 0; \
+install-info-prms: \
+    configure-prms \
+    info-prms 
+       @[ -f ./prms/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 readline" ; \
-       (cd readline && \
+       echo "Doing install-info in prms" ; \
+       (cd prms && \
           $(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 prms
  
-.PHONY: maybe-installcheck-readline installcheck-readline
-maybe-installcheck-readline:
+.PHONY: maybe-installcheck-prms installcheck-prms
+maybe-installcheck-prms:
+@if prms
+maybe-installcheck-prms: installcheck-prms
  
-installcheck-readline: \
-    configure-readline 
-       @[ -f ./readline/Makefile ] || exit 0; \
+installcheck-prms: \
+    configure-prms 
+       @[ -f ./prms/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 readline" ; \
-       (cd readline && \
+       echo "Doing installcheck in prms" ; \
+       (cd prms && \
           $(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 prms
  
-.PHONY: maybe-mostlyclean-readline mostlyclean-readline
-maybe-mostlyclean-readline:
+.PHONY: maybe-mostlyclean-prms mostlyclean-prms
+maybe-mostlyclean-prms:
+@if prms
+maybe-mostlyclean-prms: mostlyclean-prms
  
-mostlyclean-readline: 
-       @[ -f ./readline/Makefile ] || exit 0; \
+mostlyclean-prms: 
+       @[ -f ./prms/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 readline" ; \
-       (cd readline && \
+       echo "Doing mostlyclean in prms" ; \
+       (cd prms && \
           $(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 prms
  
-.PHONY: maybe-clean-readline clean-readline
-maybe-clean-readline:
+.PHONY: maybe-clean-prms clean-prms
+maybe-clean-prms:
+@if prms
+maybe-clean-prms: clean-prms
  
-clean-readline: 
-       @[ -f ./readline/Makefile ] || exit 0; \
+clean-prms: 
+       @[ -f ./prms/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 readline" ; \
-       (cd readline && \
+       echo "Doing clean in prms" ; \
+       (cd prms && \
           $(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 prms
  
-.PHONY: maybe-distclean-readline distclean-readline
-maybe-distclean-readline:
+.PHONY: maybe-distclean-prms distclean-prms
+maybe-distclean-prms:
+@if prms
+maybe-distclean-prms: distclean-prms
  
-distclean-readline: 
-       @[ -f ./readline/Makefile ] || exit 0; \
+distclean-prms: 
+       @[ -f ./prms/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 readline" ; \
-       (cd readline && \
+       echo "Doing distclean in prms" ; \
+       (cd prms && \
           $(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 prms
  
-.PHONY: maybe-maintainer-clean-readline maintainer-clean-readline
-maybe-maintainer-clean-readline:
+.PHONY: maybe-maintainer-clean-prms maintainer-clean-prms
+maybe-maintainer-clean-prms:
+@if prms
+maybe-maintainer-clean-prms: maintainer-clean-prms
  
-maintainer-clean-readline: 
-       @[ -f ./readline/Makefile ] || exit 0; \
+maintainer-clean-prms: 
+       @[ -f ./prms/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 readline" ; \
-       (cd readline && \
+       echo "Doing maintainer-clean in prms" ; \
+       (cd prms && \
           $(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 prms
  
  
-.PHONY: configure-release maybe-configure-release
-maybe-configure-release:
-configure-release:
-       @test ! -f release/Makefile || exit 0; \
-       [ -d release ] || mkdir release; \
+.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; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in release; \
-       cd release || exit 1; \
+       $(HOST_EXPORTS) \
+       echo Configuring in rcs; \
+       cd rcs || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/release"; \
-           libsrcdir="$$s/release";; \
+           srcdiroption="--srcdir=$(srcdir)/rcs"; \
+           libsrcdir="$$s/rcs";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/release"; \
-           libsrcdir="$$s/release";; \
+           srcdiroption="--srcdir=../$(srcdir)/rcs"; \
+           libsrcdir="$$s/rcs";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif rcs
  
-.PHONY: all-release maybe-all-release
-maybe-all-release:
-all-release: configure-release
+.PHONY: all-rcs maybe-all-rcs
+maybe-all-rcs:
+@if rcs
+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 release && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd rcs && $(MAKE) $(FLAGS_TO_PASS)  all)
+@endif rcs
  
-.PHONY: check-release maybe-check-release
-maybe-check-release:
+.PHONY: check-rcs maybe-check-rcs
+maybe-check-rcs:
+@if rcs
+maybe-check-rcs: check-rcs
  
-check-release:
+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-release maybe-install-release
-maybe-install-release:
+.PHONY: install-rcs maybe-install-rcs
+maybe-install-rcs:
+@if rcs
+maybe-install-rcs: install-rcs
  
-install-release:
+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-release info-release
-maybe-info-release:
+.PHONY: maybe-info-rcs info-rcs
+maybe-info-rcs:
+@if rcs
+maybe-info-rcs: info-rcs
  
-info-release: \
-    configure-release 
-       @[ -f ./release/Makefile ] || exit 0; \
+info-rcs: \
+    configure-rcs 
+       @[ -f ./rcs/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 release" ; \
-       (cd release && \
+       echo "Doing info in rcs" ; \
+       (cd rcs && \
           $(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 rcs
  
-.PHONY: maybe-dvi-release dvi-release
-maybe-dvi-release:
+.PHONY: maybe-dvi-rcs dvi-rcs
+maybe-dvi-rcs:
+@if rcs
+maybe-dvi-rcs: dvi-rcs
  
-dvi-release: \
-    configure-release 
-       @[ -f ./release/Makefile ] || exit 0; \
+dvi-rcs: \
+    configure-rcs 
+       @[ -f ./rcs/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 release" ; \
-       (cd release && \
+       echo "Doing dvi in rcs" ; \
+       (cd rcs && \
           $(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 rcs
  
-.PHONY: maybe-TAGS-release TAGS-release
-maybe-TAGS-release:
+.PHONY: maybe-TAGS-rcs TAGS-rcs
+maybe-TAGS-rcs:
+@if rcs
+maybe-TAGS-rcs: TAGS-rcs
  
-TAGS-release: \
-    configure-release 
-       @[ -f ./release/Makefile ] || exit 0; \
+TAGS-rcs: \
+    configure-rcs 
+       @[ -f ./rcs/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 release" ; \
-       (cd release && \
+       echo "Doing TAGS in rcs" ; \
+       (cd rcs && \
           $(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 rcs
  
-.PHONY: maybe-install-info-release install-info-release
-maybe-install-info-release:
+.PHONY: maybe-install-info-rcs install-info-rcs
+maybe-install-info-rcs:
+@if rcs
+maybe-install-info-rcs: install-info-rcs
  
-install-info-release: \
-    configure-release \
-    info-release 
-       @[ -f ./release/Makefile ] || exit 0; \
+install-info-rcs: \
+    configure-rcs \
+    info-rcs 
+       @[ -f ./rcs/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 release" ; \
-       (cd release && \
+       echo "Doing install-info in rcs" ; \
+       (cd rcs && \
           $(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 rcs
  
-.PHONY: maybe-installcheck-release installcheck-release
-maybe-installcheck-release:
+.PHONY: maybe-installcheck-rcs installcheck-rcs
+maybe-installcheck-rcs:
+@if rcs
+maybe-installcheck-rcs: installcheck-rcs
  
-installcheck-release: \
-    configure-release 
-       @[ -f ./release/Makefile ] || exit 0; \
+installcheck-rcs: \
+    configure-rcs 
+       @[ -f ./rcs/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 release" ; \
-       (cd release && \
+       echo "Doing installcheck in rcs" ; \
+       (cd rcs && \
           $(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 rcs
  
-.PHONY: maybe-mostlyclean-release mostlyclean-release
-maybe-mostlyclean-release:
+.PHONY: maybe-mostlyclean-rcs mostlyclean-rcs
+maybe-mostlyclean-rcs:
+@if rcs
+maybe-mostlyclean-rcs: mostlyclean-rcs
  
-mostlyclean-release: 
-       @[ -f ./release/Makefile ] || exit 0; \
+mostlyclean-rcs: 
+       @[ -f ./rcs/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 release" ; \
-       (cd release && \
+       echo "Doing mostlyclean in rcs" ; \
+       (cd rcs && \
           $(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 rcs
  
-.PHONY: maybe-clean-release clean-release
-maybe-clean-release:
+.PHONY: maybe-clean-rcs clean-rcs
+maybe-clean-rcs:
+@if rcs
+maybe-clean-rcs: clean-rcs
  
-clean-release: 
-       @[ -f ./release/Makefile ] || exit 0; \
+clean-rcs: 
+       @[ -f ./rcs/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 release" ; \
-       (cd release && \
+       echo "Doing clean in rcs" ; \
+       (cd rcs && \
           $(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 rcs
  
-.PHONY: maybe-distclean-release distclean-release
-maybe-distclean-release:
+.PHONY: maybe-distclean-rcs distclean-rcs
+maybe-distclean-rcs:
+@if rcs
+maybe-distclean-rcs: distclean-rcs
  
-distclean-release: 
-       @[ -f ./release/Makefile ] || exit 0; \
+distclean-rcs: 
+       @[ -f ./rcs/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 release" ; \
-       (cd release && \
+       echo "Doing distclean in rcs" ; \
+       (cd rcs && \
           $(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 rcs
  
-.PHONY: maybe-maintainer-clean-release maintainer-clean-release
-maybe-maintainer-clean-release:
+.PHONY: maybe-maintainer-clean-rcs maintainer-clean-rcs
+maybe-maintainer-clean-rcs:
+@if rcs
+maybe-maintainer-clean-rcs: maintainer-clean-rcs
  
-maintainer-clean-release: 
-       @[ -f ./release/Makefile ] || exit 0; \
+maintainer-clean-rcs: 
+       @[ -f ./rcs/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 release" ; \
-       (cd release && \
+       echo "Doing maintainer-clean in rcs" ; \
+       (cd rcs && \
           $(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 rcs
  
  
-.PHONY: configure-recode maybe-configure-recode
-maybe-configure-recode:
-configure-recode:
-       @test ! -f recode/Makefile || exit 0; \
-       [ -d recode ] || mkdir recode; \
+.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; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in recode; \
-       cd recode || exit 1; \
+       $(HOST_EXPORTS) \
+       echo Configuring in readline; \
+       cd readline || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/recode"; \
-           libsrcdir="$$s/recode";; \
+           srcdiroption="--srcdir=$(srcdir)/readline"; \
+           libsrcdir="$$s/readline";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/recode"; \
-           libsrcdir="$$s/recode";; \
+           srcdiroption="--srcdir=../$(srcdir)/readline"; \
+           libsrcdir="$$s/readline";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif readline
  
-.PHONY: all-recode maybe-all-recode
-maybe-all-recode:
-all-recode: configure-recode
+.PHONY: all-readline maybe-all-readline
+maybe-all-readline:
+@if readline
+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 recode && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd readline && $(MAKE) $(FLAGS_TO_PASS)  all)
+@endif readline
  
-.PHONY: check-recode maybe-check-recode
-maybe-check-recode:
+.PHONY: check-readline maybe-check-readline
+maybe-check-readline:
+@if readline
+maybe-check-readline: check-readline
  
-check-recode:
+check-readline:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd recode && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(HOST_EXPORTS) \
+       (cd readline && $(MAKE) $(FLAGS_TO_PASS)  check)
  
+@endif readline
  
-.PHONY: install-recode maybe-install-recode
-maybe-install-recode:
+.PHONY: install-readline maybe-install-readline
+maybe-install-readline:
+@if readline
+maybe-install-readline: install-readline
  
-install-recode: installdirs
+install-readline: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd recode && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(HOST_EXPORTS) \
+       (cd readline && $(MAKE) $(FLAGS_TO_PASS)  install)
  
+@endif readline
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-recode info-recode
-maybe-info-recode:
+.PHONY: maybe-info-readline info-readline
+maybe-info-readline:
+@if readline
+maybe-info-readline: info-readline
  
-info-recode: \
-    configure-recode 
-       @[ -f ./recode/Makefile ] || exit 0; \
+info-readline: \
+    configure-readline 
+       @[ -f ./readline/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 recode" ; \
-       (cd recode && \
+       echo "Doing info in readline" ; \
+       (cd readline && \
           $(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 readline
  
-.PHONY: maybe-dvi-recode dvi-recode
-maybe-dvi-recode:
+.PHONY: maybe-dvi-readline dvi-readline
+maybe-dvi-readline:
+@if readline
+maybe-dvi-readline: dvi-readline
  
-dvi-recode: \
-    configure-recode 
-       @[ -f ./recode/Makefile ] || exit 0; \
+dvi-readline: \
+    configure-readline 
+       @[ -f ./readline/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 recode" ; \
-       (cd recode && \
+       echo "Doing dvi in readline" ; \
+       (cd readline && \
           $(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 readline
  
-.PHONY: maybe-TAGS-recode TAGS-recode
-maybe-TAGS-recode:
+.PHONY: maybe-TAGS-readline TAGS-readline
+maybe-TAGS-readline:
+@if readline
+maybe-TAGS-readline: TAGS-readline
  
-TAGS-recode: \
-    configure-recode 
-       @[ -f ./recode/Makefile ] || exit 0; \
+TAGS-readline: \
+    configure-readline 
+       @[ -f ./readline/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 recode" ; \
-       (cd recode && \
+       echo "Doing TAGS in readline" ; \
+       (cd readline && \
           $(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 readline
  
-.PHONY: maybe-install-info-recode install-info-recode
-maybe-install-info-recode:
+.PHONY: maybe-install-info-readline install-info-readline
+maybe-install-info-readline:
+@if readline
+maybe-install-info-readline: install-info-readline
  
-install-info-recode: \
-    configure-recode \
-    info-recode 
-       @[ -f ./recode/Makefile ] || exit 0; \
+install-info-readline: \
+    configure-readline \
+    info-readline 
+       @[ -f ./readline/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 recode" ; \
-       (cd recode && \
+       echo "Doing install-info in readline" ; \
+       (cd readline && \
           $(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 readline
  
-.PHONY: maybe-installcheck-recode installcheck-recode
-maybe-installcheck-recode:
+.PHONY: maybe-installcheck-readline installcheck-readline
+maybe-installcheck-readline:
+@if readline
+maybe-installcheck-readline: installcheck-readline
  
-installcheck-recode: \
-    configure-recode 
-       @[ -f ./recode/Makefile ] || exit 0; \
+installcheck-readline: \
+    configure-readline 
+       @[ -f ./readline/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 recode" ; \
-       (cd recode && \
+       echo "Doing installcheck in readline" ; \
+       (cd readline && \
           $(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 readline
  
-.PHONY: maybe-mostlyclean-recode mostlyclean-recode
-maybe-mostlyclean-recode:
+.PHONY: maybe-mostlyclean-readline mostlyclean-readline
+maybe-mostlyclean-readline:
+@if readline
+maybe-mostlyclean-readline: mostlyclean-readline
  
-mostlyclean-recode: 
-       @[ -f ./recode/Makefile ] || exit 0; \
+mostlyclean-readline: 
+       @[ -f ./readline/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 recode" ; \
-       (cd recode && \
+       echo "Doing mostlyclean in readline" ; \
+       (cd readline && \
           $(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 readline
  
-.PHONY: maybe-clean-recode clean-recode
-maybe-clean-recode:
+.PHONY: maybe-clean-readline clean-readline
+maybe-clean-readline:
+@if readline
+maybe-clean-readline: clean-readline
  
-clean-recode: 
-       @[ -f ./recode/Makefile ] || exit 0; \
+clean-readline: 
+       @[ -f ./readline/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 recode" ; \
-       (cd recode && \
+       echo "Doing clean in readline" ; \
+       (cd readline && \
           $(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 readline
  
-.PHONY: maybe-distclean-recode distclean-recode
-maybe-distclean-recode:
+.PHONY: maybe-distclean-readline distclean-readline
+maybe-distclean-readline:
+@if readline
+maybe-distclean-readline: distclean-readline
  
-distclean-recode: 
-       @[ -f ./recode/Makefile ] || exit 0; \
+distclean-readline: 
+       @[ -f ./readline/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 recode" ; \
-       (cd recode && \
+       echo "Doing distclean in readline" ; \
+       (cd readline && \
           $(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 readline
  
-.PHONY: maybe-maintainer-clean-recode maintainer-clean-recode
-maybe-maintainer-clean-recode:
+.PHONY: maybe-maintainer-clean-readline maintainer-clean-readline
+maybe-maintainer-clean-readline:
+@if readline
+maybe-maintainer-clean-readline: maintainer-clean-readline
  
-maintainer-clean-recode: 
-       @[ -f ./recode/Makefile ] || exit 0; \
+maintainer-clean-readline: 
+       @[ -f ./readline/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 recode" ; \
-       (cd recode && \
+       echo "Doing maintainer-clean in readline" ; \
+       (cd readline && \
           $(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 readline
  
  
-.PHONY: configure-sed maybe-configure-sed
-maybe-configure-sed:
-configure-sed:
-       @test ! -f sed/Makefile || exit 0; \
-       [ -d sed ] || mkdir sed; \
+.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; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in sed; \
-       cd sed || exit 1; \
+       $(HOST_EXPORTS) \
+       echo Configuring in release; \
+       cd release || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/sed"; \
-           libsrcdir="$$s/sed";; \
+           srcdiroption="--srcdir=$(srcdir)/release"; \
+           libsrcdir="$$s/release";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/sed"; \
-           libsrcdir="$$s/sed";; \
+           srcdiroption="--srcdir=../$(srcdir)/release"; \
+           libsrcdir="$$s/release";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif release
  
-.PHONY: all-sed maybe-all-sed
-maybe-all-sed:
-all-sed: configure-sed
+.PHONY: all-release maybe-all-release
+maybe-all-release:
+@if release
+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 sed && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd release && $(MAKE) $(FLAGS_TO_PASS)  all)
+@endif release
  
-.PHONY: check-sed maybe-check-sed
-maybe-check-sed:
+.PHONY: check-release maybe-check-release
+maybe-check-release:
+@if release
+maybe-check-release: check-release
  
-check-sed:
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       (cd sed && $(MAKE) $(FLAGS_TO_PASS) check)
+check-release:
  
+@endif release
  
-.PHONY: install-sed maybe-install-sed
-maybe-install-sed:
+.PHONY: install-release maybe-install-release
+maybe-install-release:
+@if release
+maybe-install-release: install-release
  
-install-sed: installdirs
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       (cd sed && $(MAKE) $(FLAGS_TO_PASS) install)
+install-release:
  
+@endif release
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-sed info-sed
-maybe-info-sed:
+.PHONY: maybe-info-release info-release
+maybe-info-release:
+@if release
+maybe-info-release: info-release
  
-info-sed: \
-    configure-sed 
-       @[ -f ./sed/Makefile ] || exit 0; \
+info-release: \
+    configure-release 
+       @[ -f ./release/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 sed" ; \
-       (cd sed && \
+       echo "Doing info in release" ; \
+       (cd release && \
           $(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 release
  
-.PHONY: maybe-dvi-sed dvi-sed
-maybe-dvi-sed:
+.PHONY: maybe-dvi-release dvi-release
+maybe-dvi-release:
+@if release
+maybe-dvi-release: dvi-release
  
-dvi-sed: \
-    configure-sed 
-       @[ -f ./sed/Makefile ] || exit 0; \
+dvi-release: \
+    configure-release 
+       @[ -f ./release/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 sed" ; \
-       (cd sed && \
+       echo "Doing dvi in release" ; \
+       (cd release && \
           $(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 release
  
-.PHONY: maybe-TAGS-sed TAGS-sed
-maybe-TAGS-sed:
+.PHONY: maybe-TAGS-release TAGS-release
+maybe-TAGS-release:
+@if release
+maybe-TAGS-release: TAGS-release
  
-TAGS-sed: \
-    configure-sed 
-       @[ -f ./sed/Makefile ] || exit 0; \
+TAGS-release: \
+    configure-release 
+       @[ -f ./release/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 sed" ; \
-       (cd sed && \
+       echo "Doing TAGS in release" ; \
+       (cd release && \
           $(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 release
  
-.PHONY: maybe-install-info-sed install-info-sed
-maybe-install-info-sed:
+.PHONY: maybe-install-info-release install-info-release
+maybe-install-info-release:
+@if release
+maybe-install-info-release: install-info-release
  
-install-info-sed: \
-    configure-sed \
-    info-sed 
-       @[ -f ./sed/Makefile ] || exit 0; \
+install-info-release: \
+    configure-release \
+    info-release 
+       @[ -f ./release/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 sed" ; \
-       (cd sed && \
+       echo "Doing install-info in release" ; \
+       (cd release && \
           $(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 release
  
-.PHONY: maybe-installcheck-sed installcheck-sed
-maybe-installcheck-sed:
+.PHONY: maybe-installcheck-release installcheck-release
+maybe-installcheck-release:
+@if release
+maybe-installcheck-release: installcheck-release
  
-installcheck-sed: \
-    configure-sed 
-       @[ -f ./sed/Makefile ] || exit 0; \
+installcheck-release: \
+    configure-release 
+       @[ -f ./release/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 sed" ; \
-       (cd sed && \
+       echo "Doing installcheck in release" ; \
+       (cd release && \
           $(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 release
  
-.PHONY: maybe-mostlyclean-sed mostlyclean-sed
-maybe-mostlyclean-sed:
+.PHONY: maybe-mostlyclean-release mostlyclean-release
+maybe-mostlyclean-release:
+@if release
+maybe-mostlyclean-release: mostlyclean-release
  
-mostlyclean-sed: 
-       @[ -f ./sed/Makefile ] || exit 0; \
+mostlyclean-release: 
+       @[ -f ./release/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 sed" ; \
-       (cd sed && \
+       echo "Doing mostlyclean in release" ; \
+       (cd release && \
           $(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 release
  
-.PHONY: maybe-clean-sed clean-sed
-maybe-clean-sed:
+.PHONY: maybe-clean-release clean-release
+maybe-clean-release:
+@if release
+maybe-clean-release: clean-release
  
-clean-sed: 
-       @[ -f ./sed/Makefile ] || exit 0; \
+clean-release: 
+       @[ -f ./release/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 sed" ; \
-       (cd sed && \
+       echo "Doing clean in release" ; \
+       (cd release && \
           $(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 release
  
-.PHONY: maybe-distclean-sed distclean-sed
-maybe-distclean-sed:
+.PHONY: maybe-distclean-release distclean-release
+maybe-distclean-release:
+@if release
+maybe-distclean-release: distclean-release
  
-distclean-sed: 
-       @[ -f ./sed/Makefile ] || exit 0; \
+distclean-release: 
+       @[ -f ./release/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 sed" ; \
-       (cd sed && \
+       echo "Doing distclean in release" ; \
+       (cd release && \
           $(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 release
  
-.PHONY: maybe-maintainer-clean-sed maintainer-clean-sed
-maybe-maintainer-clean-sed:
+.PHONY: maybe-maintainer-clean-release maintainer-clean-release
+maybe-maintainer-clean-release:
+@if release
+maybe-maintainer-clean-release: maintainer-clean-release
  
-maintainer-clean-sed: 
-       @[ -f ./sed/Makefile ] || exit 0; \
+maintainer-clean-release: 
+       @[ -f ./release/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 sed" ; \
-       (cd sed && \
+       echo "Doing maintainer-clean in release" ; \
+       (cd release && \
           $(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 release
  
  
-.PHONY: configure-send-pr maybe-configure-send-pr
-maybe-configure-send-pr:
-configure-send-pr:
-       @test ! -f send-pr/Makefile || exit 0; \
-       [ -d send-pr ] || mkdir send-pr; \
+.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; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in send-pr; \
-       cd send-pr || exit 1; \
+       $(HOST_EXPORTS) \
+       echo Configuring in recode; \
+       cd recode || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/send-pr"; \
-           libsrcdir="$$s/send-pr";; \
+           srcdiroption="--srcdir=$(srcdir)/recode"; \
+           libsrcdir="$$s/recode";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/send-pr"; \
-           libsrcdir="$$s/send-pr";; \
+           srcdiroption="--srcdir=../$(srcdir)/recode"; \
+           libsrcdir="$$s/recode";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif recode
  
-.PHONY: all-send-pr maybe-all-send-pr
-maybe-all-send-pr:
-all-send-pr: configure-send-pr
+.PHONY: all-recode maybe-all-recode
+maybe-all-recode:
+@if recode
+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 send-pr && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd recode && $(MAKE) $(FLAGS_TO_PASS)  all)
+@endif recode
  
-.PHONY: check-send-pr maybe-check-send-pr
-maybe-check-send-pr:
+.PHONY: check-recode maybe-check-recode
+maybe-check-recode:
+@if recode
+maybe-check-recode: check-recode
  
-check-send-pr:
+check-recode:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd send-pr && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(HOST_EXPORTS) \
+       (cd recode && $(MAKE) $(FLAGS_TO_PASS)  check)
  
+@endif recode
  
-.PHONY: install-send-pr maybe-install-send-pr
-maybe-install-send-pr:
+.PHONY: install-recode maybe-install-recode
+maybe-install-recode:
+@if recode
+maybe-install-recode: install-recode
  
-install-send-pr: installdirs
+install-recode: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd send-pr && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(HOST_EXPORTS) \
+       (cd recode && $(MAKE) $(FLAGS_TO_PASS)  install)
  
+@endif recode
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-send-pr info-send-pr
-maybe-info-send-pr:
+.PHONY: maybe-info-recode info-recode
+maybe-info-recode:
+@if recode
+maybe-info-recode: info-recode
  
-info-send-pr: \
-    configure-send-pr 
-       @[ -f ./send-pr/Makefile ] || exit 0; \
+info-recode: \
+    configure-recode 
+       @[ -f ./recode/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 send-pr" ; \
-       (cd send-pr && \
+       echo "Doing info in recode" ; \
+       (cd recode && \
           $(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 recode
  
-.PHONY: maybe-dvi-send-pr dvi-send-pr
-maybe-dvi-send-pr:
+.PHONY: maybe-dvi-recode dvi-recode
+maybe-dvi-recode:
+@if recode
+maybe-dvi-recode: dvi-recode
  
-dvi-send-pr: \
-    configure-send-pr 
-       @[ -f ./send-pr/Makefile ] || exit 0; \
+dvi-recode: \
+    configure-recode 
+       @[ -f ./recode/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 send-pr" ; \
-       (cd send-pr && \
+       echo "Doing dvi in recode" ; \
+       (cd recode && \
           $(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 recode
  
-.PHONY: maybe-TAGS-send-pr TAGS-send-pr
-maybe-TAGS-send-pr:
+.PHONY: maybe-TAGS-recode TAGS-recode
+maybe-TAGS-recode:
+@if recode
+maybe-TAGS-recode: TAGS-recode
  
-TAGS-send-pr: \
-    configure-send-pr 
-       @[ -f ./send-pr/Makefile ] || exit 0; \
+TAGS-recode: \
+    configure-recode 
+       @[ -f ./recode/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 send-pr" ; \
-       (cd send-pr && \
+       echo "Doing TAGS in recode" ; \
+       (cd recode && \
           $(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 recode
  
-.PHONY: maybe-install-info-send-pr install-info-send-pr
-maybe-install-info-send-pr:
+.PHONY: maybe-install-info-recode install-info-recode
+maybe-install-info-recode:
+@if recode
+maybe-install-info-recode: install-info-recode
  
-install-info-send-pr: \
-    configure-send-pr \
-    info-send-pr 
-       @[ -f ./send-pr/Makefile ] || exit 0; \
+install-info-recode: \
+    configure-recode \
+    info-recode 
+       @[ -f ./recode/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 send-pr" ; \
-       (cd send-pr && \
+       echo "Doing install-info in recode" ; \
+       (cd recode && \
           $(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 recode
  
-.PHONY: maybe-installcheck-send-pr installcheck-send-pr
-maybe-installcheck-send-pr:
+.PHONY: maybe-installcheck-recode installcheck-recode
+maybe-installcheck-recode:
+@if recode
+maybe-installcheck-recode: installcheck-recode
  
-installcheck-send-pr: \
-    configure-send-pr 
-       @[ -f ./send-pr/Makefile ] || exit 0; \
+installcheck-recode: \
+    configure-recode 
+       @[ -f ./recode/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 send-pr" ; \
-       (cd send-pr && \
+       echo "Doing installcheck in recode" ; \
+       (cd recode && \
           $(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 recode
  
-.PHONY: maybe-mostlyclean-send-pr mostlyclean-send-pr
-maybe-mostlyclean-send-pr:
+.PHONY: maybe-mostlyclean-recode mostlyclean-recode
+maybe-mostlyclean-recode:
+@if recode
+maybe-mostlyclean-recode: mostlyclean-recode
  
-mostlyclean-send-pr: 
-       @[ -f ./send-pr/Makefile ] || exit 0; \
+mostlyclean-recode: 
+       @[ -f ./recode/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 send-pr" ; \
-       (cd send-pr && \
+       echo "Doing mostlyclean in recode" ; \
+       (cd recode && \
           $(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 recode
  
-.PHONY: maybe-clean-send-pr clean-send-pr
-maybe-clean-send-pr:
+.PHONY: maybe-clean-recode clean-recode
+maybe-clean-recode:
+@if recode
+maybe-clean-recode: clean-recode
  
-clean-send-pr: 
-       @[ -f ./send-pr/Makefile ] || exit 0; \
+clean-recode: 
+       @[ -f ./recode/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 send-pr" ; \
-       (cd send-pr && \
+       echo "Doing clean in recode" ; \
+       (cd recode && \
           $(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 recode
  
-.PHONY: maybe-distclean-send-pr distclean-send-pr
-maybe-distclean-send-pr:
+.PHONY: maybe-distclean-recode distclean-recode
+maybe-distclean-recode:
+@if recode
+maybe-distclean-recode: distclean-recode
  
-distclean-send-pr: 
-       @[ -f ./send-pr/Makefile ] || exit 0; \
+distclean-recode: 
+       @[ -f ./recode/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 send-pr" ; \
-       (cd send-pr && \
+       echo "Doing distclean in recode" ; \
+       (cd recode && \
           $(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 recode
  
-.PHONY: maybe-maintainer-clean-send-pr maintainer-clean-send-pr
-maybe-maintainer-clean-send-pr:
+.PHONY: maybe-maintainer-clean-recode maintainer-clean-recode
+maybe-maintainer-clean-recode:
+@if recode
+maybe-maintainer-clean-recode: maintainer-clean-recode
  
-maintainer-clean-send-pr: 
-       @[ -f ./send-pr/Makefile ] || exit 0; \
+maintainer-clean-recode: 
+       @[ -f ./recode/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 send-pr" ; \
-       (cd send-pr && \
+       echo "Doing maintainer-clean in recode" ; \
+       (cd recode && \
           $(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 recode
  
  
-.PHONY: configure-shellutils maybe-configure-shellutils
-maybe-configure-shellutils:
-configure-shellutils:
-       @test ! -f shellutils/Makefile || exit 0; \
-       [ -d shellutils ] || mkdir shellutils; \
+.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; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in shellutils; \
-       cd shellutils || exit 1; \
+       $(HOST_EXPORTS) \
+       echo Configuring in sed; \
+       cd sed || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/shellutils"; \
-           libsrcdir="$$s/shellutils";; \
+           srcdiroption="--srcdir=$(srcdir)/sed"; \
+           libsrcdir="$$s/sed";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/shellutils"; \
-           libsrcdir="$$s/shellutils";; \
+           srcdiroption="--srcdir=../$(srcdir)/sed"; \
+           libsrcdir="$$s/sed";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif sed
  
-.PHONY: all-shellutils maybe-all-shellutils
-maybe-all-shellutils:
-all-shellutils: configure-shellutils
+.PHONY: all-sed maybe-all-sed
+maybe-all-sed:
+@if sed
+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 shellutils && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd sed && $(MAKE) $(FLAGS_TO_PASS)  all)
+@endif sed
  
-.PHONY: check-shellutils maybe-check-shellutils
-maybe-check-shellutils:
+.PHONY: check-sed maybe-check-sed
+maybe-check-sed:
+@if sed
+maybe-check-sed: check-sed
  
-check-shellutils:
+check-sed:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd shellutils && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(HOST_EXPORTS) \
+       (cd sed && $(MAKE) $(FLAGS_TO_PASS)  check)
  
+@endif sed
  
-.PHONY: install-shellutils maybe-install-shellutils
-maybe-install-shellutils:
+.PHONY: install-sed maybe-install-sed
+maybe-install-sed:
+@if sed
+maybe-install-sed: install-sed
  
-install-shellutils: installdirs
+install-sed: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd shellutils && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(HOST_EXPORTS) \
+       (cd sed && $(MAKE) $(FLAGS_TO_PASS)  install)
  
+@endif sed
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-shellutils info-shellutils
-maybe-info-shellutils:
+.PHONY: maybe-info-sed info-sed
+maybe-info-sed:
+@if sed
+maybe-info-sed: info-sed
  
-info-shellutils: \
-    configure-shellutils 
-       @[ -f ./shellutils/Makefile ] || exit 0; \
+info-sed: \
+    configure-sed 
+       @[ -f ./sed/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 shellutils" ; \
-       (cd shellutils && \
+       echo "Doing info in sed" ; \
+       (cd sed && \
           $(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 sed
  
-.PHONY: maybe-dvi-shellutils dvi-shellutils
-maybe-dvi-shellutils:
+.PHONY: maybe-dvi-sed dvi-sed
+maybe-dvi-sed:
+@if sed
+maybe-dvi-sed: dvi-sed
  
-dvi-shellutils: \
-    configure-shellutils 
-       @[ -f ./shellutils/Makefile ] || exit 0; \
+dvi-sed: \
+    configure-sed 
+       @[ -f ./sed/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 shellutils" ; \
-       (cd shellutils && \
+       echo "Doing dvi in sed" ; \
+       (cd sed && \
           $(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 sed
  
-.PHONY: maybe-TAGS-shellutils TAGS-shellutils
-maybe-TAGS-shellutils:
+.PHONY: maybe-TAGS-sed TAGS-sed
+maybe-TAGS-sed:
+@if sed
+maybe-TAGS-sed: TAGS-sed
  
-TAGS-shellutils: \
-    configure-shellutils 
-       @[ -f ./shellutils/Makefile ] || exit 0; \
+TAGS-sed: \
+    configure-sed 
+       @[ -f ./sed/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 shellutils" ; \
-       (cd shellutils && \
+       echo "Doing TAGS in sed" ; \
+       (cd sed && \
           $(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 sed
  
-.PHONY: maybe-install-info-shellutils install-info-shellutils
-maybe-install-info-shellutils:
+.PHONY: maybe-install-info-sed install-info-sed
+maybe-install-info-sed:
+@if sed
+maybe-install-info-sed: install-info-sed
  
-install-info-shellutils: \
-    configure-shellutils \
-    info-shellutils 
-       @[ -f ./shellutils/Makefile ] || exit 0; \
+install-info-sed: \
+    configure-sed \
+    info-sed 
+       @[ -f ./sed/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 shellutils" ; \
-       (cd shellutils && \
+       echo "Doing install-info in sed" ; \
+       (cd sed && \
           $(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 sed
  
-.PHONY: maybe-installcheck-shellutils installcheck-shellutils
-maybe-installcheck-shellutils:
+.PHONY: maybe-installcheck-sed installcheck-sed
+maybe-installcheck-sed:
+@if sed
+maybe-installcheck-sed: installcheck-sed
  
-installcheck-shellutils: \
-    configure-shellutils 
-       @[ -f ./shellutils/Makefile ] || exit 0; \
+installcheck-sed: \
+    configure-sed 
+       @[ -f ./sed/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 shellutils" ; \
-       (cd shellutils && \
+       echo "Doing installcheck in sed" ; \
+       (cd sed && \
           $(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 sed
  
-.PHONY: maybe-mostlyclean-shellutils mostlyclean-shellutils
-maybe-mostlyclean-shellutils:
+.PHONY: maybe-mostlyclean-sed mostlyclean-sed
+maybe-mostlyclean-sed:
+@if sed
+maybe-mostlyclean-sed: mostlyclean-sed
  
-mostlyclean-shellutils: 
-       @[ -f ./shellutils/Makefile ] || exit 0; \
+mostlyclean-sed: 
+       @[ -f ./sed/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 shellutils" ; \
-       (cd shellutils && \
+       echo "Doing mostlyclean in sed" ; \
+       (cd sed && \
           $(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 sed
  
-.PHONY: maybe-clean-shellutils clean-shellutils
-maybe-clean-shellutils:
+.PHONY: maybe-clean-sed clean-sed
+maybe-clean-sed:
+@if sed
+maybe-clean-sed: clean-sed
  
-clean-shellutils: 
-       @[ -f ./shellutils/Makefile ] || exit 0; \
+clean-sed: 
+       @[ -f ./sed/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 shellutils" ; \
-       (cd shellutils && \
+       echo "Doing clean in sed" ; \
+       (cd sed && \
           $(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 sed
  
-.PHONY: maybe-distclean-shellutils distclean-shellutils
-maybe-distclean-shellutils:
+.PHONY: maybe-distclean-sed distclean-sed
+maybe-distclean-sed:
+@if sed
+maybe-distclean-sed: distclean-sed
  
-distclean-shellutils: 
-       @[ -f ./shellutils/Makefile ] || exit 0; \
+distclean-sed: 
+       @[ -f ./sed/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 shellutils" ; \
-       (cd shellutils && \
+       echo "Doing distclean in sed" ; \
+       (cd sed && \
           $(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 sed
  
-.PHONY: maybe-maintainer-clean-shellutils maintainer-clean-shellutils
-maybe-maintainer-clean-shellutils:
+.PHONY: maybe-maintainer-clean-sed maintainer-clean-sed
+maybe-maintainer-clean-sed:
+@if sed
+maybe-maintainer-clean-sed: maintainer-clean-sed
  
-maintainer-clean-shellutils: 
-       @[ -f ./shellutils/Makefile ] || exit 0; \
+maintainer-clean-sed: 
+       @[ -f ./sed/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 shellutils" ; \
-       (cd shellutils && \
+       echo "Doing maintainer-clean in sed" ; \
+       (cd sed && \
           $(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 sed
  
  
-.PHONY: configure-sid maybe-configure-sid
-maybe-configure-sid:
-configure-sid:
-       @test ! -f sid/Makefile || exit 0; \
-       [ -d sid ] || mkdir sid; \
+.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; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in sid; \
-       cd sid || exit 1; \
+       $(HOST_EXPORTS) \
+       echo Configuring in send-pr; \
+       cd send-pr || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/sid"; \
-           libsrcdir="$$s/sid";; \
+           srcdiroption="--srcdir=$(srcdir)/send-pr"; \
+           libsrcdir="$$s/send-pr";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/sid"; \
-           libsrcdir="$$s/sid";; \
+           srcdiroption="--srcdir=../$(srcdir)/send-pr"; \
+           libsrcdir="$$s/send-pr";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif send-pr
  
-.PHONY: all-sid maybe-all-sid
-maybe-all-sid:
-all-sid: configure-sid
+.PHONY: all-send-pr maybe-all-send-pr
+maybe-all-send-pr:
+@if send-pr
+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 sid && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd send-pr && $(MAKE) $(FLAGS_TO_PASS)  all)
+@endif send-pr
  
-.PHONY: check-sid maybe-check-sid
-maybe-check-sid:
+.PHONY: check-send-pr maybe-check-send-pr
+maybe-check-send-pr:
+@if send-pr
+maybe-check-send-pr: check-send-pr
  
-check-sid:
+check-send-pr:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd sid && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(HOST_EXPORTS) \
+       (cd send-pr && $(MAKE) $(FLAGS_TO_PASS)  check)
  
+@endif send-pr
  
-.PHONY: install-sid maybe-install-sid
-maybe-install-sid:
+.PHONY: install-send-pr maybe-install-send-pr
+maybe-install-send-pr:
+@if send-pr
+maybe-install-send-pr: install-send-pr
  
-install-sid: installdirs
+install-send-pr: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd sid && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(HOST_EXPORTS) \
+       (cd send-pr && $(MAKE) $(FLAGS_TO_PASS)  install)
  
+@endif send-pr
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-sid info-sid
-maybe-info-sid:
+.PHONY: maybe-info-send-pr info-send-pr
+maybe-info-send-pr:
+@if send-pr
+maybe-info-send-pr: info-send-pr
  
-info-sid: \
-    configure-sid 
-       @[ -f ./sid/Makefile ] || exit 0; \
+info-send-pr: \
+    configure-send-pr 
+       @[ -f ./send-pr/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 sid" ; \
-       (cd sid && \
+       echo "Doing info in send-pr" ; \
+       (cd send-pr && \
           $(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 send-pr
  
-.PHONY: maybe-dvi-sid dvi-sid
-maybe-dvi-sid:
+.PHONY: maybe-dvi-send-pr dvi-send-pr
+maybe-dvi-send-pr:
+@if send-pr
+maybe-dvi-send-pr: dvi-send-pr
  
-dvi-sid: \
-    configure-sid 
-       @[ -f ./sid/Makefile ] || exit 0; \
+dvi-send-pr: \
+    configure-send-pr 
+       @[ -f ./send-pr/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 sid" ; \
-       (cd sid && \
+       echo "Doing dvi in send-pr" ; \
+       (cd send-pr && \
           $(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 send-pr
  
-.PHONY: maybe-TAGS-sid TAGS-sid
-maybe-TAGS-sid:
+.PHONY: maybe-TAGS-send-pr TAGS-send-pr
+maybe-TAGS-send-pr:
+@if send-pr
+maybe-TAGS-send-pr: TAGS-send-pr
  
-TAGS-sid: \
-    configure-sid 
-       @[ -f ./sid/Makefile ] || exit 0; \
+TAGS-send-pr: \
+    configure-send-pr 
+       @[ -f ./send-pr/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 sid" ; \
-       (cd sid && \
+       echo "Doing TAGS in send-pr" ; \
+       (cd send-pr && \
           $(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 send-pr
  
-.PHONY: maybe-install-info-sid install-info-sid
-maybe-install-info-sid:
+.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-sid: \
-    configure-sid \
-    info-sid 
-       @[ -f ./sid/Makefile ] || exit 0; \
+install-info-send-pr: \
+    configure-send-pr \
+    info-send-pr 
+       @[ -f ./send-pr/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 sid" ; \
-       (cd sid && \
+       echo "Doing install-info in send-pr" ; \
+       (cd send-pr && \
           $(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 send-pr
  
-.PHONY: maybe-installcheck-sid installcheck-sid
-maybe-installcheck-sid:
+.PHONY: maybe-installcheck-send-pr installcheck-send-pr
+maybe-installcheck-send-pr:
+@if send-pr
+maybe-installcheck-send-pr: installcheck-send-pr
  
-installcheck-sid: \
-    configure-sid 
-       @[ -f ./sid/Makefile ] || exit 0; \
+installcheck-send-pr: \
+    configure-send-pr 
+       @[ -f ./send-pr/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 sid" ; \
-       (cd sid && \
+       echo "Doing installcheck in send-pr" ; \
+       (cd send-pr && \
           $(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 send-pr
  
-.PHONY: maybe-mostlyclean-sid mostlyclean-sid
-maybe-mostlyclean-sid:
+.PHONY: maybe-mostlyclean-send-pr mostlyclean-send-pr
+maybe-mostlyclean-send-pr:
+@if send-pr
+maybe-mostlyclean-send-pr: mostlyclean-send-pr
  
-mostlyclean-sid: 
-       @[ -f ./sid/Makefile ] || exit 0; \
+mostlyclean-send-pr: 
+       @[ -f ./send-pr/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 sid" ; \
-       (cd sid && \
+       echo "Doing mostlyclean in send-pr" ; \
+       (cd send-pr && \
           $(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 send-pr
  
-.PHONY: maybe-clean-sid clean-sid
-maybe-clean-sid:
+.PHONY: maybe-clean-send-pr clean-send-pr
+maybe-clean-send-pr:
+@if send-pr
+maybe-clean-send-pr: clean-send-pr
  
-clean-sid: 
-       @[ -f ./sid/Makefile ] || exit 0; \
+clean-send-pr: 
+       @[ -f ./send-pr/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 sid" ; \
-       (cd sid && \
+       echo "Doing clean in send-pr" ; \
+       (cd send-pr && \
           $(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 send-pr
  
-.PHONY: maybe-distclean-sid distclean-sid
-maybe-distclean-sid:
+.PHONY: maybe-distclean-send-pr distclean-send-pr
+maybe-distclean-send-pr:
+@if send-pr
+maybe-distclean-send-pr: distclean-send-pr
  
-distclean-sid: 
-       @[ -f ./sid/Makefile ] || exit 0; \
+distclean-send-pr: 
+       @[ -f ./send-pr/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 sid" ; \
-       (cd sid && \
+       echo "Doing distclean in send-pr" ; \
+       (cd send-pr && \
           $(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 send-pr
  
-.PHONY: maybe-maintainer-clean-sid maintainer-clean-sid
-maybe-maintainer-clean-sid:
+.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-sid: 
-       @[ -f ./sid/Makefile ] || exit 0; \
+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) \
+       $(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" ; \
-       (cd sid && \
+       echo "Doing maintainer-clean in send-pr" ; \
+       (cd send-pr && \
           $(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 send-pr
  
  
-.PHONY: configure-sim maybe-configure-sim
-maybe-configure-sim:
-configure-sim:
-       @test ! -f sim/Makefile || exit 0; \
-       [ -d sim ] || mkdir sim; \
+.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; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in sim; \
-       cd sim || exit 1; \
+       $(HOST_EXPORTS) \
+       echo Configuring in shellutils; \
+       cd shellutils || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/sim"; \
-           libsrcdir="$$s/sim";; \
+           srcdiroption="--srcdir=$(srcdir)/shellutils"; \
+           libsrcdir="$$s/shellutils";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/sim"; \
-           libsrcdir="$$s/sim";; \
+           srcdiroption="--srcdir=../$(srcdir)/shellutils"; \
+           libsrcdir="$$s/shellutils";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif shellutils
  
-.PHONY: all-sim maybe-all-sim
-maybe-all-sim:
-all-sim: configure-sim
+.PHONY: all-shellutils maybe-all-shellutils
+maybe-all-shellutils:
+@if shellutils
+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 sim && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd shellutils && $(MAKE) $(FLAGS_TO_PASS)  all)
+@endif shellutils
  
-.PHONY: check-sim maybe-check-sim
-maybe-check-sim:
+.PHONY: check-shellutils maybe-check-shellutils
+maybe-check-shellutils:
+@if shellutils
+maybe-check-shellutils: check-shellutils
  
-check-sim:
+check-shellutils:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd sim && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(HOST_EXPORTS) \
+       (cd shellutils && $(MAKE) $(FLAGS_TO_PASS)  check)
  
+@endif shellutils
  
-.PHONY: install-sim maybe-install-sim
-maybe-install-sim:
+.PHONY: install-shellutils maybe-install-shellutils
+maybe-install-shellutils:
+@if shellutils
+maybe-install-shellutils: install-shellutils
  
-install-sim: installdirs
+install-shellutils: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd sim && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(HOST_EXPORTS) \
+       (cd shellutils && $(MAKE) $(FLAGS_TO_PASS)  install)
  
+@endif shellutils
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-sim info-sim
-maybe-info-sim:
+.PHONY: maybe-info-shellutils info-shellutils
+maybe-info-shellutils:
+@if shellutils
+maybe-info-shellutils: info-shellutils
  
-info-sim: \
-    configure-sim 
-       @[ -f ./sim/Makefile ] || exit 0; \
+info-shellutils: \
+    configure-shellutils 
+       @[ -f ./shellutils/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 sim" ; \
-       (cd sim && \
+       echo "Doing info in shellutils" ; \
+       (cd shellutils && \
           $(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 shellutils
  
-.PHONY: maybe-dvi-sim dvi-sim
-maybe-dvi-sim:
+.PHONY: maybe-dvi-shellutils dvi-shellutils
+maybe-dvi-shellutils:
+@if shellutils
+maybe-dvi-shellutils: dvi-shellutils
  
-dvi-sim: \
-    configure-sim 
-       @[ -f ./sim/Makefile ] || exit 0; \
+dvi-shellutils: \
+    configure-shellutils 
+       @[ -f ./shellutils/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 sim" ; \
-       (cd sim && \
+       echo "Doing dvi in shellutils" ; \
+       (cd shellutils && \
           $(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 shellutils
  
-.PHONY: maybe-TAGS-sim TAGS-sim
-maybe-TAGS-sim:
+.PHONY: maybe-TAGS-shellutils TAGS-shellutils
+maybe-TAGS-shellutils:
+@if shellutils
+maybe-TAGS-shellutils: TAGS-shellutils
  
-TAGS-sim: \
-    configure-sim 
-       @[ -f ./sim/Makefile ] || exit 0; \
+TAGS-shellutils: \
+    configure-shellutils 
+       @[ -f ./shellutils/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 sim" ; \
-       (cd sim && \
+       echo "Doing TAGS in shellutils" ; \
+       (cd shellutils && \
           $(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 shellutils
  
-.PHONY: maybe-install-info-sim install-info-sim
-maybe-install-info-sim:
+.PHONY: maybe-install-info-shellutils install-info-shellutils
+maybe-install-info-shellutils:
+@if shellutils
+maybe-install-info-shellutils: install-info-shellutils
  
-install-info-sim: \
-    configure-sim \
-    info-sim 
-       @[ -f ./sim/Makefile ] || exit 0; \
+install-info-shellutils: \
+    configure-shellutils \
+    info-shellutils 
+       @[ -f ./shellutils/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 sim" ; \
-       (cd sim && \
+       echo "Doing install-info in shellutils" ; \
+       (cd shellutils && \
           $(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 shellutils
  
-.PHONY: maybe-installcheck-sim installcheck-sim
-maybe-installcheck-sim:
+.PHONY: maybe-installcheck-shellutils installcheck-shellutils
+maybe-installcheck-shellutils:
+@if shellutils
+maybe-installcheck-shellutils: installcheck-shellutils
  
-installcheck-sim: \
-    configure-sim 
-       @[ -f ./sim/Makefile ] || exit 0; \
+installcheck-shellutils: \
+    configure-shellutils 
+       @[ -f ./shellutils/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 sim" ; \
-       (cd sim && \
+       echo "Doing installcheck in shellutils" ; \
+       (cd shellutils && \
           $(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 shellutils
  
-.PHONY: maybe-mostlyclean-sim mostlyclean-sim
-maybe-mostlyclean-sim:
+.PHONY: maybe-mostlyclean-shellutils mostlyclean-shellutils
+maybe-mostlyclean-shellutils:
+@if shellutils
+maybe-mostlyclean-shellutils: mostlyclean-shellutils
  
-mostlyclean-sim: 
-       @[ -f ./sim/Makefile ] || exit 0; \
+mostlyclean-shellutils: 
+       @[ -f ./shellutils/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 sim" ; \
-       (cd sim && \
+       echo "Doing mostlyclean in shellutils" ; \
+       (cd shellutils && \
           $(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 shellutils
  
-.PHONY: maybe-clean-sim clean-sim
-maybe-clean-sim:
+.PHONY: maybe-clean-shellutils clean-shellutils
+maybe-clean-shellutils:
+@if shellutils
+maybe-clean-shellutils: clean-shellutils
  
-clean-sim: 
-       @[ -f ./sim/Makefile ] || exit 0; \
+clean-shellutils: 
+       @[ -f ./shellutils/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 sim" ; \
-       (cd sim && \
+       echo "Doing clean in shellutils" ; \
+       (cd shellutils && \
           $(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 shellutils
  
-.PHONY: maybe-distclean-sim distclean-sim
-maybe-distclean-sim:
+.PHONY: maybe-distclean-shellutils distclean-shellutils
+maybe-distclean-shellutils:
+@if shellutils
+maybe-distclean-shellutils: distclean-shellutils
  
-distclean-sim: 
-       @[ -f ./sim/Makefile ] || exit 0; \
+distclean-shellutils: 
+       @[ -f ./shellutils/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 sim" ; \
-       (cd sim && \
+       echo "Doing distclean in shellutils" ; \
+       (cd shellutils && \
           $(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 shellutils
  
-.PHONY: maybe-maintainer-clean-sim maintainer-clean-sim
-maybe-maintainer-clean-sim:
+.PHONY: maybe-maintainer-clean-shellutils maintainer-clean-shellutils
+maybe-maintainer-clean-shellutils:
+@if shellutils
+maybe-maintainer-clean-shellutils: maintainer-clean-shellutils
  
-maintainer-clean-sim: 
-       @[ -f ./sim/Makefile ] || exit 0; \
+maintainer-clean-shellutils: 
+       @[ -f ./shellutils/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 sim" ; \
-       (cd sim && \
+       echo "Doing maintainer-clean in shellutils" ; \
+       (cd shellutils && \
           $(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 shellutils
  
  
-.PHONY: configure-tar maybe-configure-tar
-maybe-configure-tar:
-configure-tar:
-       @test ! -f tar/Makefile || exit 0; \
-       [ -d tar ] || mkdir tar; \
+.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; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in tar; \
-       cd tar || exit 1; \
+       $(HOST_EXPORTS) \
+       echo Configuring in sid; \
+       cd sid || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/tar"; \
-           libsrcdir="$$s/tar";; \
+           srcdiroption="--srcdir=$(srcdir)/sid"; \
+           libsrcdir="$$s/sid";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/tar"; \
-           libsrcdir="$$s/tar";; \
+           srcdiroption="--srcdir=../$(srcdir)/sid"; \
+           libsrcdir="$$s/sid";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif sid
  
-.PHONY: all-tar maybe-all-tar
-maybe-all-tar:
-all-tar: configure-tar
+.PHONY: all-sid maybe-all-sid
+maybe-all-sid:
+@if sid
+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 tar && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd sid && $(MAKE) $(FLAGS_TO_PASS)  all)
+@endif sid
  
-.PHONY: check-tar maybe-check-tar
-maybe-check-tar:
+.PHONY: check-sid maybe-check-sid
+maybe-check-sid:
+@if sid
+maybe-check-sid: check-sid
  
-check-tar:
+check-sid:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd tar && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(HOST_EXPORTS) \
+       (cd sid && $(MAKE) $(FLAGS_TO_PASS)  check)
  
+@endif sid
  
-.PHONY: install-tar maybe-install-tar
-maybe-install-tar:
+.PHONY: install-sid maybe-install-sid
+maybe-install-sid:
+@if sid
+maybe-install-sid: install-sid
  
-install-tar: installdirs
+install-sid: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd tar && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(HOST_EXPORTS) \
+       (cd sid && $(MAKE) $(FLAGS_TO_PASS)  install)
  
+@endif sid
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-tar info-tar
-maybe-info-tar:
+.PHONY: maybe-info-sid info-sid
+maybe-info-sid:
+@if sid
+maybe-info-sid: info-sid
  
-info-tar: \
-    configure-tar 
-       @[ -f ./tar/Makefile ] || exit 0; \
+info-sid: \
+    configure-sid 
+       @[ -f ./sid/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 tar" ; \
-       (cd tar && \
+       echo "Doing info in sid" ; \
+       (cd sid && \
           $(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 sid
  
-.PHONY: maybe-dvi-tar dvi-tar
-maybe-dvi-tar:
+.PHONY: maybe-dvi-sid dvi-sid
+maybe-dvi-sid:
+@if sid
+maybe-dvi-sid: dvi-sid
  
-dvi-tar: \
-    configure-tar 
-       @[ -f ./tar/Makefile ] || exit 0; \
+dvi-sid: \
+    configure-sid 
+       @[ -f ./sid/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 tar" ; \
-       (cd tar && \
+       echo "Doing dvi in sid" ; \
+       (cd sid && \
           $(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 sid
  
-.PHONY: maybe-TAGS-tar TAGS-tar
-maybe-TAGS-tar:
+.PHONY: maybe-TAGS-sid TAGS-sid
+maybe-TAGS-sid:
+@if sid
+maybe-TAGS-sid: TAGS-sid
  
-TAGS-tar: \
-    configure-tar 
-       @[ -f ./tar/Makefile ] || exit 0; \
+TAGS-sid: \
+    configure-sid 
+       @[ -f ./sid/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 tar" ; \
-       (cd tar && \
+       echo "Doing TAGS in sid" ; \
+       (cd sid && \
           $(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 sid
  
-.PHONY: maybe-install-info-tar install-info-tar
-maybe-install-info-tar:
+.PHONY: maybe-install-info-sid install-info-sid
+maybe-install-info-sid:
+@if sid
+maybe-install-info-sid: install-info-sid
  
-install-info-tar: \
-    configure-tar \
-    info-tar 
-       @[ -f ./tar/Makefile ] || exit 0; \
+install-info-sid: \
+    configure-sid \
+    info-sid 
+       @[ -f ./sid/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 tar" ; \
-       (cd tar && \
+       echo "Doing install-info in sid" ; \
+       (cd sid && \
           $(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 sid
  
-.PHONY: maybe-installcheck-tar installcheck-tar
-maybe-installcheck-tar:
+.PHONY: maybe-installcheck-sid installcheck-sid
+maybe-installcheck-sid:
+@if sid
+maybe-installcheck-sid: installcheck-sid
  
-installcheck-tar: \
-    configure-tar 
-       @[ -f ./tar/Makefile ] || exit 0; \
+installcheck-sid: \
+    configure-sid 
+       @[ -f ./sid/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 tar" ; \
-       (cd tar && \
+       echo "Doing installcheck in sid" ; \
+       (cd sid && \
           $(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 sid
  
-.PHONY: maybe-mostlyclean-tar mostlyclean-tar
-maybe-mostlyclean-tar:
+.PHONY: maybe-mostlyclean-sid mostlyclean-sid
+maybe-mostlyclean-sid:
+@if sid
+maybe-mostlyclean-sid: mostlyclean-sid
  
-mostlyclean-tar: 
-       @[ -f ./tar/Makefile ] || exit 0; \
+mostlyclean-sid: 
+       @[ -f ./sid/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 tar" ; \
-       (cd tar && \
+       echo "Doing mostlyclean in sid" ; \
+       (cd sid && \
           $(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 sid
  
-.PHONY: maybe-clean-tar clean-tar
-maybe-clean-tar:
+.PHONY: maybe-clean-sid clean-sid
+maybe-clean-sid:
+@if sid
+maybe-clean-sid: clean-sid
  
-clean-tar: 
-       @[ -f ./tar/Makefile ] || exit 0; \
+clean-sid: 
+       @[ -f ./sid/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 tar" ; \
-       (cd tar && \
+       echo "Doing clean in sid" ; \
+       (cd sid && \
           $(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 sid
  
-.PHONY: maybe-distclean-tar distclean-tar
-maybe-distclean-tar:
+.PHONY: maybe-distclean-sid distclean-sid
+maybe-distclean-sid:
+@if sid
+maybe-distclean-sid: distclean-sid
  
-distclean-tar: 
-       @[ -f ./tar/Makefile ] || exit 0; \
+distclean-sid: 
+       @[ -f ./sid/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 tar" ; \
-       (cd tar && \
+       echo "Doing distclean in sid" ; \
+       (cd sid && \
           $(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 sid
  
-.PHONY: maybe-maintainer-clean-tar maintainer-clean-tar
-maybe-maintainer-clean-tar:
+.PHONY: maybe-maintainer-clean-sid maintainer-clean-sid
+maybe-maintainer-clean-sid:
+@if sid
+maybe-maintainer-clean-sid: maintainer-clean-sid
  
-maintainer-clean-tar: 
-       @[ -f ./tar/Makefile ] || exit 0; \
+maintainer-clean-sid: 
+       @[ -f ./sid/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 tar" ; \
-       (cd tar && \
+       echo "Doing maintainer-clean in sid" ; \
+       (cd sid && \
           $(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 sid
  
  
-.PHONY: configure-texinfo maybe-configure-texinfo
-maybe-configure-texinfo:
-configure-texinfo:
-       @test ! -f texinfo/Makefile || exit 0; \
-       [ -d texinfo ] || mkdir texinfo; \
-       r=`${PWD_COMMAND}`; export r; \
+.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; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in texinfo; \
-       cd texinfo || exit 1; \
+       $(HOST_EXPORTS) \
+       echo Configuring in sim; \
+       cd sim || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/texinfo"; \
-           libsrcdir="$$s/texinfo";; \
+           srcdiroption="--srcdir=$(srcdir)/sim"; \
+           libsrcdir="$$s/sim";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/texinfo"; \
-           libsrcdir="$$s/texinfo";; \
+           srcdiroption="--srcdir=../$(srcdir)/sim"; \
+           libsrcdir="$$s/sim";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif sim
  
-.PHONY: all-texinfo maybe-all-texinfo
-maybe-all-texinfo:
-all-texinfo: configure-texinfo
+.PHONY: all-sim maybe-all-sim
+maybe-all-sim:
+@if sim
+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 texinfo && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd sim && $(MAKE) $(FLAGS_TO_PASS)  all)
+@endif sim
  
-.PHONY: check-texinfo maybe-check-texinfo
-maybe-check-texinfo:
+.PHONY: check-sim maybe-check-sim
+maybe-check-sim:
+@if sim
+maybe-check-sim: check-sim
  
-check-texinfo:
+check-sim:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd texinfo && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(HOST_EXPORTS) \
+       (cd sim && $(MAKE) $(FLAGS_TO_PASS)  check)
  
+@endif sim
  
-.PHONY: install-texinfo maybe-install-texinfo
-maybe-install-texinfo:
+.PHONY: install-sim maybe-install-sim
+maybe-install-sim:
+@if sim
+maybe-install-sim: install-sim
  
-install-texinfo:
+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-texinfo info-texinfo
-maybe-info-texinfo:
+.PHONY: maybe-info-sim info-sim
+maybe-info-sim:
+@if sim
+maybe-info-sim: info-sim
  
-info-texinfo: \
-    configure-texinfo 
-       @[ -f ./texinfo/Makefile ] || exit 0; \
+info-sim: \
+    configure-sim 
+       @[ -f ./sim/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 texinfo" ; \
-       (cd texinfo && \
+       echo "Doing info in sim" ; \
+       (cd sim && \
           $(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 sim
  
-.PHONY: maybe-dvi-texinfo dvi-texinfo
-maybe-dvi-texinfo:
+.PHONY: maybe-dvi-sim dvi-sim
+maybe-dvi-sim:
+@if sim
+maybe-dvi-sim: dvi-sim
  
-dvi-texinfo: \
-    configure-texinfo 
-       @[ -f ./texinfo/Makefile ] || exit 0; \
+dvi-sim: \
+    configure-sim 
+       @[ -f ./sim/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 texinfo" ; \
-       (cd texinfo && \
+       echo "Doing dvi in sim" ; \
+       (cd sim && \
           $(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 sim
  
-.PHONY: maybe-TAGS-texinfo TAGS-texinfo
-maybe-TAGS-texinfo:
+.PHONY: maybe-TAGS-sim TAGS-sim
+maybe-TAGS-sim:
+@if sim
+maybe-TAGS-sim: TAGS-sim
  
-TAGS-texinfo: \
-    configure-texinfo 
-       @[ -f ./texinfo/Makefile ] || exit 0; \
+TAGS-sim: \
+    configure-sim 
+       @[ -f ./sim/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 texinfo" ; \
-       (cd texinfo && \
+       echo "Doing TAGS in sim" ; \
+       (cd sim && \
           $(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 sim
  
-.PHONY: maybe-install-info-texinfo install-info-texinfo
-maybe-install-info-texinfo:
+.PHONY: maybe-install-info-sim install-info-sim
+maybe-install-info-sim:
+@if sim
+maybe-install-info-sim: install-info-sim
  
-install-info-texinfo: \
-    configure-texinfo \
-    info-texinfo 
-       @[ -f ./texinfo/Makefile ] || exit 0; \
+install-info-sim: \
+    configure-sim \
+    info-sim 
+       @[ -f ./sim/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 texinfo" ; \
-       (cd texinfo && \
+       echo "Doing install-info in sim" ; \
+       (cd sim && \
           $(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 sim
  
-.PHONY: maybe-installcheck-texinfo installcheck-texinfo
-maybe-installcheck-texinfo:
+.PHONY: maybe-installcheck-sim installcheck-sim
+maybe-installcheck-sim:
+@if sim
+maybe-installcheck-sim: installcheck-sim
  
-installcheck-texinfo: \
-    configure-texinfo 
-       @[ -f ./texinfo/Makefile ] || exit 0; \
+installcheck-sim: \
+    configure-sim 
+       @[ -f ./sim/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 texinfo" ; \
-       (cd texinfo && \
+       echo "Doing installcheck in sim" ; \
+       (cd sim && \
           $(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 sim
  
-.PHONY: maybe-mostlyclean-texinfo mostlyclean-texinfo
-maybe-mostlyclean-texinfo:
+.PHONY: maybe-mostlyclean-sim mostlyclean-sim
+maybe-mostlyclean-sim:
+@if sim
+maybe-mostlyclean-sim: mostlyclean-sim
  
-mostlyclean-texinfo: 
-       @[ -f ./texinfo/Makefile ] || exit 0; \
+mostlyclean-sim: 
+       @[ -f ./sim/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 texinfo" ; \
-       (cd texinfo && \
+       echo "Doing mostlyclean in sim" ; \
+       (cd sim && \
           $(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 sim
  
-.PHONY: maybe-clean-texinfo clean-texinfo
-maybe-clean-texinfo:
+.PHONY: maybe-clean-sim clean-sim
+maybe-clean-sim:
+@if sim
+maybe-clean-sim: clean-sim
  
-clean-texinfo: 
-       @[ -f ./texinfo/Makefile ] || exit 0; \
+clean-sim: 
+       @[ -f ./sim/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 texinfo" ; \
-       (cd texinfo && \
+       echo "Doing clean in sim" ; \
+       (cd sim && \
           $(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 sim
  
-.PHONY: maybe-distclean-texinfo distclean-texinfo
-maybe-distclean-texinfo:
+.PHONY: maybe-distclean-sim distclean-sim
+maybe-distclean-sim:
+@if sim
+maybe-distclean-sim: distclean-sim
  
-distclean-texinfo: 
-       @[ -f ./texinfo/Makefile ] || exit 0; \
+distclean-sim: 
+       @[ -f ./sim/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 texinfo" ; \
-       (cd texinfo && \
+       echo "Doing distclean in sim" ; \
+       (cd sim && \
           $(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 sim
  
-.PHONY: maybe-maintainer-clean-texinfo maintainer-clean-texinfo
-maybe-maintainer-clean-texinfo:
+.PHONY: maybe-maintainer-clean-sim maintainer-clean-sim
+maybe-maintainer-clean-sim:
+@if sim
+maybe-maintainer-clean-sim: maintainer-clean-sim
  
-maintainer-clean-texinfo: 
-       @[ -f ./texinfo/Makefile ] || exit 0; \
+maintainer-clean-sim: 
+       @[ -f ./sim/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 texinfo" ; \
-       (cd texinfo && \
+       echo "Doing maintainer-clean in sim" ; \
+       (cd sim && \
           $(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 sim
  
  
-.PHONY: configure-textutils maybe-configure-textutils
-maybe-configure-textutils:
-configure-textutils:
-       @test ! -f textutils/Makefile || exit 0; \
-       [ -d textutils ] || mkdir textutils; \
+.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; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in textutils; \
-       cd textutils || exit 1; \
+       $(HOST_EXPORTS) \
+       echo Configuring in tar; \
+       cd tar || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/textutils"; \
-           libsrcdir="$$s/textutils";; \
+           srcdiroption="--srcdir=$(srcdir)/tar"; \
+           libsrcdir="$$s/tar";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/textutils"; \
-           libsrcdir="$$s/textutils";; \
+           srcdiroption="--srcdir=../$(srcdir)/tar"; \
+           libsrcdir="$$s/tar";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif tar
  
-.PHONY: all-textutils maybe-all-textutils
-maybe-all-textutils:
-all-textutils: configure-textutils
+.PHONY: all-tar maybe-all-tar
+maybe-all-tar:
+@if tar
+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 textutils && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd tar && $(MAKE) $(FLAGS_TO_PASS)  all)
+@endif tar
  
-.PHONY: check-textutils maybe-check-textutils
-maybe-check-textutils:
+.PHONY: check-tar maybe-check-tar
+maybe-check-tar:
+@if tar
+maybe-check-tar: check-tar
  
-check-textutils:
+check-tar:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd textutils && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(HOST_EXPORTS) \
+       (cd tar && $(MAKE) $(FLAGS_TO_PASS)  check)
  
+@endif tar
  
-.PHONY: install-textutils maybe-install-textutils
-maybe-install-textutils:
+.PHONY: install-tar maybe-install-tar
+maybe-install-tar:
+@if tar
+maybe-install-tar: install-tar
  
-install-textutils: installdirs
+install-tar: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd textutils && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(HOST_EXPORTS) \
+       (cd tar && $(MAKE) $(FLAGS_TO_PASS)  install)
  
+@endif tar
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-textutils info-textutils
-maybe-info-textutils:
+.PHONY: maybe-info-tar info-tar
+maybe-info-tar:
+@if tar
+maybe-info-tar: info-tar
  
-info-textutils: \
-    configure-textutils 
-       @[ -f ./textutils/Makefile ] || exit 0; \
+info-tar: \
+    configure-tar 
+       @[ -f ./tar/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 textutils" ; \
-       (cd textutils && \
+       echo "Doing info in tar" ; \
+       (cd tar && \
           $(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 tar
  
-.PHONY: maybe-dvi-textutils dvi-textutils
-maybe-dvi-textutils:
+.PHONY: maybe-dvi-tar dvi-tar
+maybe-dvi-tar:
+@if tar
+maybe-dvi-tar: dvi-tar
  
-dvi-textutils: \
-    configure-textutils 
-       @[ -f ./textutils/Makefile ] || exit 0; \
+dvi-tar: \
+    configure-tar 
+       @[ -f ./tar/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 textutils" ; \
-       (cd textutils && \
+       echo "Doing dvi in tar" ; \
+       (cd tar && \
           $(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 tar
  
-.PHONY: maybe-TAGS-textutils TAGS-textutils
-maybe-TAGS-textutils:
+.PHONY: maybe-TAGS-tar TAGS-tar
+maybe-TAGS-tar:
+@if tar
+maybe-TAGS-tar: TAGS-tar
  
-TAGS-textutils: \
-    configure-textutils 
-       @[ -f ./textutils/Makefile ] || exit 0; \
+TAGS-tar: \
+    configure-tar 
+       @[ -f ./tar/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 textutils" ; \
-       (cd textutils && \
+       echo "Doing TAGS in tar" ; \
+       (cd tar && \
           $(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 tar
  
-.PHONY: maybe-install-info-textutils install-info-textutils
-maybe-install-info-textutils:
+.PHONY: maybe-install-info-tar install-info-tar
+maybe-install-info-tar:
+@if tar
+maybe-install-info-tar: install-info-tar
  
-install-info-textutils: \
-    configure-textutils \
-    info-textutils 
-       @[ -f ./textutils/Makefile ] || exit 0; \
+install-info-tar: \
+    configure-tar \
+    info-tar 
+       @[ -f ./tar/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 textutils" ; \
-       (cd textutils && \
+       echo "Doing install-info in tar" ; \
+       (cd tar && \
           $(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 tar
  
-.PHONY: maybe-installcheck-textutils installcheck-textutils
-maybe-installcheck-textutils:
+.PHONY: maybe-installcheck-tar installcheck-tar
+maybe-installcheck-tar:
+@if tar
+maybe-installcheck-tar: installcheck-tar
  
-installcheck-textutils: \
-    configure-textutils 
-       @[ -f ./textutils/Makefile ] || exit 0; \
+installcheck-tar: \
+    configure-tar 
+       @[ -f ./tar/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 textutils" ; \
-       (cd textutils && \
+       echo "Doing installcheck in tar" ; \
+       (cd tar && \
           $(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 tar
  
-.PHONY: maybe-mostlyclean-textutils mostlyclean-textutils
-maybe-mostlyclean-textutils:
+.PHONY: maybe-mostlyclean-tar mostlyclean-tar
+maybe-mostlyclean-tar:
+@if tar
+maybe-mostlyclean-tar: mostlyclean-tar
  
-mostlyclean-textutils: 
-       @[ -f ./textutils/Makefile ] || exit 0; \
+mostlyclean-tar: 
+       @[ -f ./tar/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 textutils" ; \
-       (cd textutils && \
+       echo "Doing mostlyclean in tar" ; \
+       (cd tar && \
           $(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 tar
  
-.PHONY: maybe-clean-textutils clean-textutils
-maybe-clean-textutils:
+.PHONY: maybe-clean-tar clean-tar
+maybe-clean-tar:
+@if tar
+maybe-clean-tar: clean-tar
  
-clean-textutils: 
-       @[ -f ./textutils/Makefile ] || exit 0; \
+clean-tar: 
+       @[ -f ./tar/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 textutils" ; \
-       (cd textutils && \
+       echo "Doing clean in tar" ; \
+       (cd tar && \
           $(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 tar
  
-.PHONY: maybe-distclean-textutils distclean-textutils
-maybe-distclean-textutils:
+.PHONY: maybe-distclean-tar distclean-tar
+maybe-distclean-tar:
+@if tar
+maybe-distclean-tar: distclean-tar
  
-distclean-textutils: 
-       @[ -f ./textutils/Makefile ] || exit 0; \
+distclean-tar: 
+       @[ -f ./tar/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 textutils" ; \
-       (cd textutils && \
+       echo "Doing distclean in tar" ; \
+       (cd tar && \
           $(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 tar
  
-.PHONY: maybe-maintainer-clean-textutils maintainer-clean-textutils
-maybe-maintainer-clean-textutils:
+.PHONY: maybe-maintainer-clean-tar maintainer-clean-tar
+maybe-maintainer-clean-tar:
+@if tar
+maybe-maintainer-clean-tar: maintainer-clean-tar
  
-maintainer-clean-textutils: 
-       @[ -f ./textutils/Makefile ] || exit 0; \
+maintainer-clean-tar: 
+       @[ -f ./tar/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 textutils" ; \
-       (cd textutils && \
+       echo "Doing maintainer-clean in tar" ; \
+       (cd tar && \
           $(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 tar
  
  
-.PHONY: configure-time maybe-configure-time
-maybe-configure-time:
-configure-time:
-       @test ! -f time/Makefile || exit 0; \
-       [ -d time ] || mkdir time; \
+.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; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in time; \
-       cd time || exit 1; \
+       $(HOST_EXPORTS) \
+       echo Configuring in texinfo; \
+       cd texinfo || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/time"; \
-           libsrcdir="$$s/time";; \
+           srcdiroption="--srcdir=$(srcdir)/texinfo"; \
+           libsrcdir="$$s/texinfo";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/time"; \
-           libsrcdir="$$s/time";; \
+           srcdiroption="--srcdir=../$(srcdir)/texinfo"; \
+           libsrcdir="$$s/texinfo";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif texinfo
  
-.PHONY: all-time maybe-all-time
-maybe-all-time:
-all-time: configure-time
+.PHONY: all-texinfo maybe-all-texinfo
+maybe-all-texinfo:
+@if texinfo
+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 time && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd texinfo && $(MAKE) $(FLAGS_TO_PASS)  all)
+@endif texinfo
  
-.PHONY: check-time maybe-check-time
-maybe-check-time:
+.PHONY: check-texinfo maybe-check-texinfo
+maybe-check-texinfo:
+@if texinfo
+maybe-check-texinfo: check-texinfo
  
-check-time:
+check-texinfo:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd time && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(HOST_EXPORTS) \
+       (cd texinfo && $(MAKE) $(FLAGS_TO_PASS)  check)
  
+@endif texinfo
  
-.PHONY: install-time maybe-install-time
-maybe-install-time:
+.PHONY: install-texinfo maybe-install-texinfo
+maybe-install-texinfo:
+@if texinfo
+maybe-install-texinfo: install-texinfo
  
-install-time: installdirs
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       (cd time && $(MAKE) $(FLAGS_TO_PASS) install)
+install-texinfo:
  
+@endif texinfo
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-time info-time
-maybe-info-time:
+.PHONY: maybe-info-texinfo info-texinfo
+maybe-info-texinfo:
+@if texinfo
+maybe-info-texinfo: info-texinfo
  
-info-time: \
-    configure-time 
-       @[ -f ./time/Makefile ] || exit 0; \
+info-texinfo: \
+    configure-texinfo 
+       @[ -f ./texinfo/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 time" ; \
-       (cd time && \
+       echo "Doing info in texinfo" ; \
+       (cd texinfo && \
           $(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 texinfo
  
-.PHONY: maybe-dvi-time dvi-time
-maybe-dvi-time:
+.PHONY: maybe-dvi-texinfo dvi-texinfo
+maybe-dvi-texinfo:
+@if texinfo
+maybe-dvi-texinfo: dvi-texinfo
  
-dvi-time: \
-    configure-time 
-       @[ -f ./time/Makefile ] || exit 0; \
+dvi-texinfo: \
+    configure-texinfo 
+       @[ -f ./texinfo/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 time" ; \
-       (cd time && \
+       echo "Doing dvi in texinfo" ; \
+       (cd texinfo && \
           $(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 texinfo
  
-.PHONY: maybe-TAGS-time TAGS-time
-maybe-TAGS-time:
+.PHONY: maybe-TAGS-texinfo TAGS-texinfo
+maybe-TAGS-texinfo:
+@if texinfo
+maybe-TAGS-texinfo: TAGS-texinfo
  
-TAGS-time: \
-    configure-time 
-       @[ -f ./time/Makefile ] || exit 0; \
+TAGS-texinfo: \
+    configure-texinfo 
+       @[ -f ./texinfo/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 time" ; \
-       (cd time && \
+       echo "Doing TAGS in texinfo" ; \
+       (cd texinfo && \
           $(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 texinfo
  
-.PHONY: maybe-install-info-time install-info-time
-maybe-install-info-time:
+.PHONY: maybe-install-info-texinfo install-info-texinfo
+maybe-install-info-texinfo:
+@if texinfo
+maybe-install-info-texinfo: install-info-texinfo
  
-install-info-time: \
-    configure-time \
-    info-time 
-       @[ -f ./time/Makefile ] || exit 0; \
+install-info-texinfo: \
+    configure-texinfo \
+    info-texinfo 
+       @[ -f ./texinfo/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 time" ; \
-       (cd time && \
+       echo "Doing install-info in texinfo" ; \
+       (cd texinfo && \
           $(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 texinfo
  
-.PHONY: maybe-installcheck-time installcheck-time
-maybe-installcheck-time:
+.PHONY: maybe-installcheck-texinfo installcheck-texinfo
+maybe-installcheck-texinfo:
+@if texinfo
+maybe-installcheck-texinfo: installcheck-texinfo
  
-installcheck-time: \
-    configure-time 
-       @[ -f ./time/Makefile ] || exit 0; \
+installcheck-texinfo: \
+    configure-texinfo 
+       @[ -f ./texinfo/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 time" ; \
-       (cd time && \
+       echo "Doing installcheck in texinfo" ; \
+       (cd texinfo && \
           $(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 texinfo
  
-.PHONY: maybe-mostlyclean-time mostlyclean-time
-maybe-mostlyclean-time:
+.PHONY: maybe-mostlyclean-texinfo mostlyclean-texinfo
+maybe-mostlyclean-texinfo:
+@if texinfo
+maybe-mostlyclean-texinfo: mostlyclean-texinfo
  
-mostlyclean-time: 
-       @[ -f ./time/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+mostlyclean-texinfo: 
+       @[ -f ./texinfo/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 time" ; \
-       (cd time && \
+       echo "Doing mostlyclean in texinfo" ; \
+       (cd texinfo && \
           $(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 texinfo
  
-.PHONY: maybe-clean-time clean-time
-maybe-clean-time:
+.PHONY: maybe-clean-texinfo clean-texinfo
+maybe-clean-texinfo:
+@if texinfo
+maybe-clean-texinfo: clean-texinfo
  
-clean-time: 
-       @[ -f ./time/Makefile ] || exit 0; \
+clean-texinfo: 
+       @[ -f ./texinfo/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 time" ; \
-       (cd time && \
+       echo "Doing clean in texinfo" ; \
+       (cd texinfo && \
           $(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 texinfo
  
-.PHONY: maybe-distclean-time distclean-time
-maybe-distclean-time:
+.PHONY: maybe-distclean-texinfo distclean-texinfo
+maybe-distclean-texinfo:
+@if texinfo
+maybe-distclean-texinfo: distclean-texinfo
  
-distclean-time: 
-       @[ -f ./time/Makefile ] || exit 0; \
+distclean-texinfo: 
+       @[ -f ./texinfo/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 time" ; \
-       (cd time && \
+       echo "Doing distclean in texinfo" ; \
+       (cd texinfo && \
           $(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 texinfo
  
-.PHONY: maybe-maintainer-clean-time maintainer-clean-time
-maybe-maintainer-clean-time:
+.PHONY: maybe-maintainer-clean-texinfo maintainer-clean-texinfo
+maybe-maintainer-clean-texinfo:
+@if texinfo
+maybe-maintainer-clean-texinfo: maintainer-clean-texinfo
  
-maintainer-clean-time: 
-       @[ -f ./time/Makefile ] || exit 0; \
+maintainer-clean-texinfo: 
+       @[ -f ./texinfo/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 time" ; \
-       (cd time && \
+       echo "Doing maintainer-clean in texinfo" ; \
+       (cd texinfo && \
           $(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 texinfo
  
  
-.PHONY: configure-uudecode maybe-configure-uudecode
-maybe-configure-uudecode:
-configure-uudecode:
-       @test ! -f uudecode/Makefile || exit 0; \
-       [ -d uudecode ] || mkdir uudecode; \
+.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; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in uudecode; \
-       cd uudecode || exit 1; \
+       $(HOST_EXPORTS) \
+       echo Configuring in textutils; \
+       cd textutils || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/uudecode"; \
-           libsrcdir="$$s/uudecode";; \
+           srcdiroption="--srcdir=$(srcdir)/textutils"; \
+           libsrcdir="$$s/textutils";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/uudecode"; \
-           libsrcdir="$$s/uudecode";; \
+           srcdiroption="--srcdir=../$(srcdir)/textutils"; \
+           libsrcdir="$$s/textutils";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif textutils
  
-.PHONY: all-uudecode maybe-all-uudecode
-maybe-all-uudecode:
-all-uudecode: configure-uudecode
+.PHONY: all-textutils maybe-all-textutils
+maybe-all-textutils:
+@if textutils
+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 uudecode && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd textutils && $(MAKE) $(FLAGS_TO_PASS)  all)
+@endif textutils
  
-.PHONY: check-uudecode maybe-check-uudecode
-maybe-check-uudecode:
+.PHONY: check-textutils maybe-check-textutils
+maybe-check-textutils:
+@if textutils
+maybe-check-textutils: check-textutils
  
-check-uudecode:
+check-textutils:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd uudecode && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(HOST_EXPORTS) \
+       (cd textutils && $(MAKE) $(FLAGS_TO_PASS)  check)
  
+@endif textutils
  
-.PHONY: install-uudecode maybe-install-uudecode
-maybe-install-uudecode:
+.PHONY: install-textutils maybe-install-textutils
+maybe-install-textutils:
+@if textutils
+maybe-install-textutils: install-textutils
  
-install-uudecode: installdirs
+install-textutils: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd uudecode && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(HOST_EXPORTS) \
+       (cd textutils && $(MAKE) $(FLAGS_TO_PASS)  install)
  
+@endif textutils
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-uudecode info-uudecode
-maybe-info-uudecode:
+.PHONY: maybe-info-textutils info-textutils
+maybe-info-textutils:
+@if textutils
+maybe-info-textutils: info-textutils
  
-info-uudecode: \
-    configure-uudecode 
-       @[ -f ./uudecode/Makefile ] || exit 0; \
+info-textutils: \
+    configure-textutils 
+       @[ -f ./textutils/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 uudecode" ; \
-       (cd uudecode && \
+       echo "Doing info in textutils" ; \
+       (cd textutils && \
           $(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 textutils
  
-.PHONY: maybe-dvi-uudecode dvi-uudecode
-maybe-dvi-uudecode:
+.PHONY: maybe-dvi-textutils dvi-textutils
+maybe-dvi-textutils:
+@if textutils
+maybe-dvi-textutils: dvi-textutils
  
-dvi-uudecode: \
-    configure-uudecode 
-       @[ -f ./uudecode/Makefile ] || exit 0; \
+dvi-textutils: \
+    configure-textutils 
+       @[ -f ./textutils/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 uudecode" ; \
-       (cd uudecode && \
+       echo "Doing dvi in textutils" ; \
+       (cd textutils && \
           $(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 textutils
  
-.PHONY: maybe-TAGS-uudecode TAGS-uudecode
-maybe-TAGS-uudecode:
+.PHONY: maybe-TAGS-textutils TAGS-textutils
+maybe-TAGS-textutils:
+@if textutils
+maybe-TAGS-textutils: TAGS-textutils
  
-TAGS-uudecode: \
-    configure-uudecode 
-       @[ -f ./uudecode/Makefile ] || exit 0; \
+TAGS-textutils: \
+    configure-textutils 
+       @[ -f ./textutils/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 uudecode" ; \
-       (cd uudecode && \
+       echo "Doing TAGS in textutils" ; \
+       (cd textutils && \
           $(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 textutils
  
-.PHONY: maybe-install-info-uudecode install-info-uudecode
-maybe-install-info-uudecode:
+.PHONY: maybe-install-info-textutils install-info-textutils
+maybe-install-info-textutils:
+@if textutils
+maybe-install-info-textutils: install-info-textutils
  
-install-info-uudecode: \
-    configure-uudecode \
-    info-uudecode 
-       @[ -f ./uudecode/Makefile ] || exit 0; \
+install-info-textutils: \
+    configure-textutils \
+    info-textutils 
+       @[ -f ./textutils/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 uudecode" ; \
-       (cd uudecode && \
+       echo "Doing install-info in textutils" ; \
+       (cd textutils && \
           $(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 textutils
  
-.PHONY: maybe-installcheck-uudecode installcheck-uudecode
-maybe-installcheck-uudecode:
+.PHONY: maybe-installcheck-textutils installcheck-textutils
+maybe-installcheck-textutils:
+@if textutils
+maybe-installcheck-textutils: installcheck-textutils
  
-installcheck-uudecode: \
-    configure-uudecode 
-       @[ -f ./uudecode/Makefile ] || exit 0; \
+installcheck-textutils: \
+    configure-textutils 
+       @[ -f ./textutils/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 uudecode" ; \
-       (cd uudecode && \
+       echo "Doing installcheck in textutils" ; \
+       (cd textutils && \
           $(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 textutils
  
-.PHONY: maybe-mostlyclean-uudecode mostlyclean-uudecode
-maybe-mostlyclean-uudecode:
+.PHONY: maybe-mostlyclean-textutils mostlyclean-textutils
+maybe-mostlyclean-textutils:
+@if textutils
+maybe-mostlyclean-textutils: mostlyclean-textutils
  
-mostlyclean-uudecode: 
-       @[ -f ./uudecode/Makefile ] || exit 0; \
+mostlyclean-textutils: 
+       @[ -f ./textutils/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 uudecode" ; \
-       (cd uudecode && \
+       echo "Doing mostlyclean in textutils" ; \
+       (cd textutils && \
           $(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 textutils
  
-.PHONY: maybe-clean-uudecode clean-uudecode
-maybe-clean-uudecode:
+.PHONY: maybe-clean-textutils clean-textutils
+maybe-clean-textutils:
+@if textutils
+maybe-clean-textutils: clean-textutils
  
-clean-uudecode: 
-       @[ -f ./uudecode/Makefile ] || exit 0; \
+clean-textutils: 
+       @[ -f ./textutils/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 uudecode" ; \
-       (cd uudecode && \
+       echo "Doing clean in textutils" ; \
+       (cd textutils && \
           $(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 textutils
  
-.PHONY: maybe-distclean-uudecode distclean-uudecode
-maybe-distclean-uudecode:
+.PHONY: maybe-distclean-textutils distclean-textutils
+maybe-distclean-textutils:
+@if textutils
+maybe-distclean-textutils: distclean-textutils
  
-distclean-uudecode: 
-       @[ -f ./uudecode/Makefile ] || exit 0; \
+distclean-textutils: 
+       @[ -f ./textutils/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 uudecode" ; \
-       (cd uudecode && \
+       echo "Doing distclean in textutils" ; \
+       (cd textutils && \
           $(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 textutils
  
-.PHONY: maybe-maintainer-clean-uudecode maintainer-clean-uudecode
-maybe-maintainer-clean-uudecode:
+.PHONY: maybe-maintainer-clean-textutils maintainer-clean-textutils
+maybe-maintainer-clean-textutils:
+@if textutils
+maybe-maintainer-clean-textutils: maintainer-clean-textutils
  
-maintainer-clean-uudecode: 
-       @[ -f ./uudecode/Makefile ] || exit 0; \
+maintainer-clean-textutils: 
+       @[ -f ./textutils/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 uudecode" ; \
-       (cd uudecode && \
+       echo "Doing maintainer-clean in textutils" ; \
+       (cd textutils && \
           $(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 textutils
  
  
-.PHONY: configure-wdiff maybe-configure-wdiff
-maybe-configure-wdiff:
-configure-wdiff:
-       @test ! -f wdiff/Makefile || exit 0; \
-       [ -d wdiff ] || mkdir wdiff; \
+.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; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in wdiff; \
-       cd wdiff || exit 1; \
+       $(HOST_EXPORTS) \
+       echo Configuring in time; \
+       cd time || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/wdiff"; \
-           libsrcdir="$$s/wdiff";; \
+           srcdiroption="--srcdir=$(srcdir)/time"; \
+           libsrcdir="$$s/time";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/wdiff"; \
-           libsrcdir="$$s/wdiff";; \
+           srcdiroption="--srcdir=../$(srcdir)/time"; \
+           libsrcdir="$$s/time";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif time
  
-.PHONY: all-wdiff maybe-all-wdiff
-maybe-all-wdiff:
-all-wdiff: configure-wdiff
+.PHONY: all-time maybe-all-time
+maybe-all-time:
+@if time
+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 wdiff && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd time && $(MAKE) $(FLAGS_TO_PASS)  all)
+@endif time
  
-.PHONY: check-wdiff maybe-check-wdiff
-maybe-check-wdiff:
+.PHONY: check-time maybe-check-time
+maybe-check-time:
+@if time
+maybe-check-time: check-time
  
-check-wdiff:
+check-time:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd wdiff && $(MAKE) $(FLAGS_TO_PASS) check)
+       $(HOST_EXPORTS) \
+       (cd time && $(MAKE) $(FLAGS_TO_PASS)  check)
  
+@endif time
  
-.PHONY: install-wdiff maybe-install-wdiff
-maybe-install-wdiff:
+.PHONY: install-time maybe-install-time
+maybe-install-time:
+@if time
+maybe-install-time: install-time
  
-install-wdiff: installdirs
+install-time: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd wdiff && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(HOST_EXPORTS) \
+       (cd time && $(MAKE) $(FLAGS_TO_PASS)  install)
  
+@endif time
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-wdiff info-wdiff
-maybe-info-wdiff:
+.PHONY: maybe-info-time info-time
+maybe-info-time:
+@if time
+maybe-info-time: info-time
  
-info-wdiff: \
-    configure-wdiff 
-       @[ -f ./wdiff/Makefile ] || exit 0; \
+info-time: \
+    configure-time 
+       @[ -f ./time/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 wdiff" ; \
-       (cd wdiff && \
+       echo "Doing info in time" ; \
+       (cd time && \
           $(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 time
  
-.PHONY: maybe-dvi-wdiff dvi-wdiff
-maybe-dvi-wdiff:
+.PHONY: maybe-dvi-time dvi-time
+maybe-dvi-time:
+@if time
+maybe-dvi-time: dvi-time
  
-dvi-wdiff: \
-    configure-wdiff 
-       @[ -f ./wdiff/Makefile ] || exit 0; \
+dvi-time: \
+    configure-time 
+       @[ -f ./time/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 wdiff" ; \
-       (cd wdiff && \
+       echo "Doing dvi in time" ; \
+       (cd time && \
           $(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 time
  
-.PHONY: maybe-TAGS-wdiff TAGS-wdiff
-maybe-TAGS-wdiff:
+.PHONY: maybe-TAGS-time TAGS-time
+maybe-TAGS-time:
+@if time
+maybe-TAGS-time: TAGS-time
  
-TAGS-wdiff: \
-    configure-wdiff 
-       @[ -f ./wdiff/Makefile ] || exit 0; \
+TAGS-time: \
+    configure-time 
+       @[ -f ./time/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 wdiff" ; \
-       (cd wdiff && \
+       echo "Doing TAGS in time" ; \
+       (cd time && \
           $(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 time
  
-.PHONY: maybe-install-info-wdiff install-info-wdiff
-maybe-install-info-wdiff:
+.PHONY: maybe-install-info-time install-info-time
+maybe-install-info-time:
+@if time
+maybe-install-info-time: install-info-time
  
-install-info-wdiff: \
-    configure-wdiff \
-    info-wdiff 
-       @[ -f ./wdiff/Makefile ] || exit 0; \
+install-info-time: \
+    configure-time \
+    info-time 
+       @[ -f ./time/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 wdiff" ; \
-       (cd wdiff && \
+       echo "Doing install-info in time" ; \
+       (cd time && \
           $(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 time
  
-.PHONY: maybe-installcheck-wdiff installcheck-wdiff
-maybe-installcheck-wdiff:
+.PHONY: maybe-installcheck-time installcheck-time
+maybe-installcheck-time:
+@if time
+maybe-installcheck-time: installcheck-time
  
-installcheck-wdiff: \
-    configure-wdiff 
-       @[ -f ./wdiff/Makefile ] || exit 0; \
+installcheck-time: \
+    configure-time 
+       @[ -f ./time/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 wdiff" ; \
-       (cd wdiff && \
+       echo "Doing installcheck in time" ; \
+       (cd time && \
           $(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 time
  
-.PHONY: maybe-mostlyclean-wdiff mostlyclean-wdiff
-maybe-mostlyclean-wdiff:
+.PHONY: maybe-mostlyclean-time mostlyclean-time
+maybe-mostlyclean-time:
+@if time
+maybe-mostlyclean-time: mostlyclean-time
  
-mostlyclean-wdiff: 
-       @[ -f ./wdiff/Makefile ] || exit 0; \
+mostlyclean-time: 
+       @[ -f ./time/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 wdiff" ; \
-       (cd wdiff && \
+       echo "Doing mostlyclean in time" ; \
+       (cd time && \
           $(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 time
  
-.PHONY: maybe-clean-wdiff clean-wdiff
-maybe-clean-wdiff:
+.PHONY: maybe-clean-time clean-time
+maybe-clean-time:
+@if time
+maybe-clean-time: clean-time
  
-clean-wdiff: 
-       @[ -f ./wdiff/Makefile ] || exit 0; \
+clean-time: 
+       @[ -f ./time/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 wdiff" ; \
-       (cd wdiff && \
+       echo "Doing clean in time" ; \
+       (cd time && \
           $(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 time
  
-.PHONY: maybe-distclean-wdiff distclean-wdiff
-maybe-distclean-wdiff:
+.PHONY: maybe-distclean-time distclean-time
+maybe-distclean-time:
+@if time
+maybe-distclean-time: distclean-time
  
-distclean-wdiff: 
-       @[ -f ./wdiff/Makefile ] || exit 0; \
+distclean-time: 
+       @[ -f ./time/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 wdiff" ; \
-       (cd wdiff && \
+       echo "Doing distclean in time" ; \
+       (cd time && \
           $(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 time
  
-.PHONY: maybe-maintainer-clean-wdiff maintainer-clean-wdiff
-maybe-maintainer-clean-wdiff:
+.PHONY: maybe-maintainer-clean-time maintainer-clean-time
+maybe-maintainer-clean-time:
+@if time
+maybe-maintainer-clean-time: maintainer-clean-time
  
-maintainer-clean-wdiff: 
-       @[ -f ./wdiff/Makefile ] || exit 0; \
+maintainer-clean-time: 
+       @[ -f ./time/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 wdiff" ; \
-       (cd wdiff && \
+       echo "Doing maintainer-clean in time" ; \
+       (cd time && \
           $(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 time
  
  
-.PHONY: configure-zip maybe-configure-zip
-maybe-configure-zip:
-configure-zip:
-       @test ! -f zip/Makefile || exit 0; \
-       [ -d zip ] || mkdir zip; \
+.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; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in zip; \
-       cd zip || exit 1; \
+       $(HOST_EXPORTS) \
+       echo Configuring in uudecode; \
+       cd uudecode || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/zip"; \
-           libsrcdir="$$s/zip";; \
+           srcdiroption="--srcdir=$(srcdir)/uudecode"; \
+           libsrcdir="$$s/uudecode";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/zip"; \
-           libsrcdir="$$s/zip";; \
+           srcdiroption="--srcdir=../$(srcdir)/uudecode"; \
+           libsrcdir="$$s/uudecode";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif uudecode
  
-.PHONY: all-zip maybe-all-zip
-maybe-all-zip:
-all-zip: configure-zip
+.PHONY: all-uudecode maybe-all-uudecode
+maybe-all-uudecode:
+@if uudecode
+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 zip && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd uudecode && $(MAKE) $(FLAGS_TO_PASS)  all)
+@endif uudecode
  
-.PHONY: check-zip maybe-check-zip
-maybe-check-zip:
+.PHONY: check-uudecode maybe-check-uudecode
+maybe-check-uudecode:
+@if uudecode
+maybe-check-uudecode: check-uudecode
  
-# This module is only tested in a native toolchain.
-check-zip:
-       @if [ '$(host)' = '$(target)' ] ; then \
-         r=`${PWD_COMMAND}`; export r; \
-         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd zip && $(MAKE) $(FLAGS_TO_PASS) check); \
-       fi
+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-zip maybe-install-zip
-maybe-install-zip:
+.PHONY: install-uudecode maybe-install-uudecode
+maybe-install-uudecode:
+@if uudecode
+maybe-install-uudecode: install-uudecode
  
-install-zip: installdirs
+install-uudecode: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd zip && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(HOST_EXPORTS) \
+       (cd uudecode && $(MAKE) $(FLAGS_TO_PASS)  install)
  
+@endif uudecode
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-zip info-zip
-maybe-info-zip:
+.PHONY: maybe-info-uudecode info-uudecode
+maybe-info-uudecode:
+@if uudecode
+maybe-info-uudecode: info-uudecode
  
-info-zip: \
-    configure-zip 
-       @[ -f ./zip/Makefile ] || exit 0; \
+info-uudecode: \
+    configure-uudecode 
+       @[ -f ./uudecode/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 zip" ; \
-       (cd zip && \
+       echo "Doing info in uudecode" ; \
+       (cd uudecode && \
           $(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 uudecode
  
-.PHONY: maybe-dvi-zip dvi-zip
-maybe-dvi-zip:
+.PHONY: maybe-dvi-uudecode dvi-uudecode
+maybe-dvi-uudecode:
+@if uudecode
+maybe-dvi-uudecode: dvi-uudecode
  
-dvi-zip: \
-    configure-zip 
-       @[ -f ./zip/Makefile ] || exit 0; \
+dvi-uudecode: \
+    configure-uudecode 
+       @[ -f ./uudecode/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 zip" ; \
-       (cd zip && \
+       echo "Doing dvi in uudecode" ; \
+       (cd uudecode && \
           $(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 uudecode
  
-.PHONY: maybe-TAGS-zip TAGS-zip
-maybe-TAGS-zip:
+.PHONY: maybe-TAGS-uudecode TAGS-uudecode
+maybe-TAGS-uudecode:
+@if uudecode
+maybe-TAGS-uudecode: TAGS-uudecode
  
-TAGS-zip: \
-    configure-zip 
-       @[ -f ./zip/Makefile ] || exit 0; \
+TAGS-uudecode: \
+    configure-uudecode 
+       @[ -f ./uudecode/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 zip" ; \
-       (cd zip && \
+       echo "Doing TAGS in uudecode" ; \
+       (cd uudecode && \
           $(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 uudecode
  
-.PHONY: maybe-install-info-zip install-info-zip
-maybe-install-info-zip:
+.PHONY: maybe-install-info-uudecode install-info-uudecode
+maybe-install-info-uudecode:
+@if uudecode
+maybe-install-info-uudecode: install-info-uudecode
  
-install-info-zip: \
-    configure-zip \
-    info-zip 
-       @[ -f ./zip/Makefile ] || exit 0; \
+install-info-uudecode: \
+    configure-uudecode \
+    info-uudecode 
+       @[ -f ./uudecode/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 zip" ; \
-       (cd zip && \
+       echo "Doing install-info in uudecode" ; \
+       (cd uudecode && \
           $(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 uudecode
  
-.PHONY: maybe-installcheck-zip installcheck-zip
-maybe-installcheck-zip:
+.PHONY: maybe-installcheck-uudecode installcheck-uudecode
+maybe-installcheck-uudecode:
+@if uudecode
+maybe-installcheck-uudecode: installcheck-uudecode
  
-installcheck-zip: \
-    configure-zip 
-       @[ -f ./zip/Makefile ] || exit 0; \
+installcheck-uudecode: \
+    configure-uudecode 
+       @[ -f ./uudecode/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 zip" ; \
-       (cd zip && \
+       echo "Doing installcheck in uudecode" ; \
+       (cd uudecode && \
           $(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 uudecode
  
-.PHONY: maybe-mostlyclean-zip mostlyclean-zip
-maybe-mostlyclean-zip:
+.PHONY: maybe-mostlyclean-uudecode mostlyclean-uudecode
+maybe-mostlyclean-uudecode:
+@if uudecode
+maybe-mostlyclean-uudecode: mostlyclean-uudecode
  
-mostlyclean-zip: 
-       @[ -f ./zip/Makefile ] || exit 0; \
+mostlyclean-uudecode: 
+       @[ -f ./uudecode/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 zip" ; \
-       (cd zip && \
+       echo "Doing mostlyclean in uudecode" ; \
+       (cd uudecode && \
           $(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 uudecode
  
-.PHONY: maybe-clean-zip clean-zip
-maybe-clean-zip:
+.PHONY: maybe-clean-uudecode clean-uudecode
+maybe-clean-uudecode:
+@if uudecode
+maybe-clean-uudecode: clean-uudecode
  
-clean-zip: 
-       @[ -f ./zip/Makefile ] || exit 0; \
+clean-uudecode: 
+       @[ -f ./uudecode/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 zip" ; \
-       (cd zip && \
+       echo "Doing clean in uudecode" ; \
+       (cd uudecode && \
           $(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 uudecode
  
-.PHONY: maybe-distclean-zip distclean-zip
-maybe-distclean-zip:
+.PHONY: maybe-distclean-uudecode distclean-uudecode
+maybe-distclean-uudecode:
+@if uudecode
+maybe-distclean-uudecode: distclean-uudecode
  
-distclean-zip: 
-       @[ -f ./zip/Makefile ] || exit 0; \
+distclean-uudecode: 
+       @[ -f ./uudecode/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 zip" ; \
-       (cd zip && \
+       echo "Doing distclean in uudecode" ; \
+       (cd uudecode && \
           $(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 uudecode
  
-.PHONY: maybe-maintainer-clean-zip maintainer-clean-zip
-maybe-maintainer-clean-zip:
+.PHONY: maybe-maintainer-clean-uudecode maintainer-clean-uudecode
+maybe-maintainer-clean-uudecode:
+@if uudecode
+maybe-maintainer-clean-uudecode: maintainer-clean-uudecode
  
-maintainer-clean-zip: 
-       @[ -f ./zip/Makefile ] || exit 0; \
+maintainer-clean-uudecode: 
+       @[ -f ./uudecode/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 zip" ; \
-       (cd zip && \
+       echo "Doing maintainer-clean in uudecode" ; \
+       (cd uudecode && \
           $(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 uudecode
  
  
-.PHONY: configure-zlib maybe-configure-zlib
-maybe-configure-zlib:
-configure-zlib:
-       @test ! -f zlib/Makefile || exit 0; \
-       [ -d zlib ] || mkdir zlib; \
+.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; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in zlib; \
-       cd zlib || exit 1; \
+       $(HOST_EXPORTS) \
+       echo Configuring in wdiff; \
+       cd wdiff || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/zlib"; \
-           libsrcdir="$$s/zlib";; \
+           srcdiroption="--srcdir=$(srcdir)/wdiff"; \
+           libsrcdir="$$s/wdiff";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/zlib"; \
-           libsrcdir="$$s/zlib";; \
+           srcdiroption="--srcdir=../$(srcdir)/wdiff"; \
+           libsrcdir="$$s/wdiff";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif wdiff
  
-.PHONY: all-zlib maybe-all-zlib
-maybe-all-zlib:
-all-zlib: configure-zlib
+.PHONY: all-wdiff maybe-all-wdiff
+maybe-all-wdiff:
+@if wdiff
+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 zlib && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd wdiff && $(MAKE) $(FLAGS_TO_PASS)  all)
+@endif wdiff
  
-.PHONY: check-zlib maybe-check-zlib
-maybe-check-zlib:
+.PHONY: check-wdiff maybe-check-wdiff
+maybe-check-wdiff:
+@if wdiff
+maybe-check-wdiff: check-wdiff
  
-check-zlib:
+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-zlib maybe-install-zlib
-maybe-install-zlib:
+.PHONY: install-wdiff maybe-install-wdiff
+maybe-install-wdiff:
+@if wdiff
+maybe-install-wdiff: install-wdiff
  
-install-zlib:
+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-zlib info-zlib
-maybe-info-zlib:
+.PHONY: maybe-info-wdiff info-wdiff
+maybe-info-wdiff:
+@if wdiff
+maybe-info-wdiff: info-wdiff
  
-info-zlib: \
-    configure-zlib 
-       @[ -f ./zlib/Makefile ] || exit 0; \
+info-wdiff: \
+    configure-wdiff 
+       @[ -f ./wdiff/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 zlib" ; \
-       (cd zlib && \
+       echo "Doing info in wdiff" ; \
+       (cd wdiff && \
           $(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 wdiff
  
-.PHONY: maybe-dvi-zlib dvi-zlib
-maybe-dvi-zlib:
+.PHONY: maybe-dvi-wdiff dvi-wdiff
+maybe-dvi-wdiff:
+@if wdiff
+maybe-dvi-wdiff: dvi-wdiff
  
-dvi-zlib: \
-    configure-zlib 
-       @[ -f ./zlib/Makefile ] || exit 0; \
+dvi-wdiff: \
+    configure-wdiff 
+       @[ -f ./wdiff/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 zlib" ; \
-       (cd zlib && \
+       echo "Doing dvi in wdiff" ; \
+       (cd wdiff && \
           $(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 wdiff
  
-.PHONY: maybe-TAGS-zlib TAGS-zlib
-maybe-TAGS-zlib:
+.PHONY: maybe-TAGS-wdiff TAGS-wdiff
+maybe-TAGS-wdiff:
+@if wdiff
+maybe-TAGS-wdiff: TAGS-wdiff
  
-TAGS-zlib: \
-    configure-zlib 
-       @[ -f ./zlib/Makefile ] || exit 0; \
+TAGS-wdiff: \
+    configure-wdiff 
+       @[ -f ./wdiff/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 zlib" ; \
-       (cd zlib && \
+       echo "Doing TAGS in wdiff" ; \
+       (cd wdiff && \
           $(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 wdiff
  
-.PHONY: maybe-install-info-zlib install-info-zlib
-maybe-install-info-zlib:
+.PHONY: maybe-install-info-wdiff install-info-wdiff
+maybe-install-info-wdiff:
+@if wdiff
+maybe-install-info-wdiff: install-info-wdiff
  
-install-info-zlib: \
-    configure-zlib \
-    info-zlib 
-       @[ -f ./zlib/Makefile ] || exit 0; \
+install-info-wdiff: \
+    configure-wdiff \
+    info-wdiff 
+       @[ -f ./wdiff/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 zlib" ; \
-       (cd zlib && \
+       echo "Doing install-info in wdiff" ; \
+       (cd wdiff && \
           $(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 wdiff
  
-.PHONY: maybe-installcheck-zlib installcheck-zlib
-maybe-installcheck-zlib:
+.PHONY: maybe-installcheck-wdiff installcheck-wdiff
+maybe-installcheck-wdiff:
+@if wdiff
+maybe-installcheck-wdiff: installcheck-wdiff
  
-installcheck-zlib: \
-    configure-zlib 
-       @[ -f ./zlib/Makefile ] || exit 0; \
+installcheck-wdiff: \
+    configure-wdiff 
+       @[ -f ./wdiff/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 zlib" ; \
-       (cd zlib && \
+       echo "Doing installcheck in wdiff" ; \
+       (cd wdiff && \
           $(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 wdiff
  
-.PHONY: maybe-mostlyclean-zlib mostlyclean-zlib
-maybe-mostlyclean-zlib:
+.PHONY: maybe-mostlyclean-wdiff mostlyclean-wdiff
+maybe-mostlyclean-wdiff:
+@if wdiff
+maybe-mostlyclean-wdiff: mostlyclean-wdiff
  
-mostlyclean-zlib: 
-       @[ -f ./zlib/Makefile ] || exit 0; \
+mostlyclean-wdiff: 
+       @[ -f ./wdiff/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 zlib" ; \
-       (cd zlib && \
+       echo "Doing mostlyclean in wdiff" ; \
+       (cd wdiff && \
           $(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 wdiff
  
-.PHONY: maybe-clean-zlib clean-zlib
-maybe-clean-zlib:
+.PHONY: maybe-clean-wdiff clean-wdiff
+maybe-clean-wdiff:
+@if wdiff
+maybe-clean-wdiff: clean-wdiff
  
-clean-zlib: 
-       @[ -f ./zlib/Makefile ] || exit 0; \
+clean-wdiff: 
+       @[ -f ./wdiff/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 zlib" ; \
-       (cd zlib && \
+       echo "Doing clean in wdiff" ; \
+       (cd wdiff && \
           $(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 wdiff
  
-.PHONY: maybe-distclean-zlib distclean-zlib
-maybe-distclean-zlib:
+.PHONY: maybe-distclean-wdiff distclean-wdiff
+maybe-distclean-wdiff:
+@if wdiff
+maybe-distclean-wdiff: distclean-wdiff
  
-distclean-zlib: 
-       @[ -f ./zlib/Makefile ] || exit 0; \
+distclean-wdiff: 
+       @[ -f ./wdiff/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 zlib" ; \
-       (cd zlib && \
+       echo "Doing distclean in wdiff" ; \
+       (cd wdiff && \
           $(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 wdiff
  
-.PHONY: maybe-maintainer-clean-zlib maintainer-clean-zlib
-maybe-maintainer-clean-zlib:
+.PHONY: maybe-maintainer-clean-wdiff maintainer-clean-wdiff
+maybe-maintainer-clean-wdiff:
+@if wdiff
+maybe-maintainer-clean-wdiff: maintainer-clean-wdiff
  
-maintainer-clean-zlib: 
-       @[ -f ./zlib/Makefile ] || exit 0; \
+maintainer-clean-wdiff: 
+       @[ -f ./wdiff/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 zlib" ; \
-       (cd zlib && \
+       echo "Doing maintainer-clean in wdiff" ; \
+       (cd wdiff && \
           $(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 wdiff
  
  
-.PHONY: configure-gdb maybe-configure-gdb
-maybe-configure-gdb:
-configure-gdb:
-       @test ! -f gdb/Makefile || exit 0; \
-       [ -d gdb ] || mkdir gdb; \
+.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; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in gdb; \
-       cd gdb || exit 1; \
+       $(HOST_EXPORTS) \
+       echo Configuring in zip; \
+       cd zip || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/gdb"; \
-           libsrcdir="$$s/gdb";; \
+           srcdiroption="--srcdir=$(srcdir)/zip"; \
+           libsrcdir="$$s/zip";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/gdb"; \
-           libsrcdir="$$s/gdb";; \
+           srcdiroption="--srcdir=../$(srcdir)/zip"; \
+           libsrcdir="$$s/zip";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif zip
  
-.PHONY: all-gdb maybe-all-gdb
-maybe-all-gdb:
-all-gdb: configure-gdb
+.PHONY: all-zip maybe-all-zip
+maybe-all-zip:
+@if zip
+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 gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd zip && $(MAKE) $(FLAGS_TO_PASS)  all)
+@endif zip
  
-.PHONY: check-gdb maybe-check-gdb
-maybe-check-gdb:
+.PHONY: check-zip maybe-check-zip
+maybe-check-zip:
+@if zip
+maybe-check-zip: check-zip
  
-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)
+# This module is only tested in a native toolchain.
+check-zip:
+       @if [ '$(host)' = '$(target)' ] ; then \
+         r=`${PWD_COMMAND}`; export r; \
+         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+         $(SET_LIB_PATH) \
+         $(HOST_EXPORTS) \
+         (cd zip && $(MAKE) $(FLAGS_TO_PASS)  check); \
+       fi
  
+@endif zip
  
-.PHONY: install-gdb maybe-install-gdb
-maybe-install-gdb:
+.PHONY: install-zip maybe-install-zip
+maybe-install-zip:
+@if zip
+maybe-install-zip: install-zip
  
-install-gdb: installdirs
+install-zip: 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 zip && $(MAKE) $(FLAGS_TO_PASS)  install)
  
+@endif zip
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-gdb info-gdb
-maybe-info-gdb:
+.PHONY: maybe-info-zip info-zip
+maybe-info-zip:
+@if zip
+maybe-info-zip: info-zip
  
-info-gdb: \
-    configure-gdb 
-       @[ -f ./gdb/Makefile ] || exit 0; \
+info-zip: \
+    configure-zip 
+       @[ -f ./zip/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 gdb" ; \
-       (cd gdb && \
+       echo "Doing info in zip" ; \
+       (cd zip && \
           $(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 zip
  
-.PHONY: maybe-dvi-gdb dvi-gdb
-maybe-dvi-gdb:
+.PHONY: maybe-dvi-zip dvi-zip
+maybe-dvi-zip:
+@if zip
+maybe-dvi-zip: dvi-zip
  
-dvi-gdb: \
-    configure-gdb 
-       @[ -f ./gdb/Makefile ] || exit 0; \
+dvi-zip: \
+    configure-zip 
+       @[ -f ./zip/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 gdb" ; \
-       (cd gdb && \
+       echo "Doing dvi in zip" ; \
+       (cd zip && \
           $(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 zip
  
-.PHONY: maybe-TAGS-gdb TAGS-gdb
-maybe-TAGS-gdb:
+.PHONY: maybe-TAGS-zip TAGS-zip
+maybe-TAGS-zip:
+@if zip
+maybe-TAGS-zip: TAGS-zip
  
-TAGS-gdb: \
-    configure-gdb 
-       @[ -f ./gdb/Makefile ] || exit 0; \
+TAGS-zip: \
+    configure-zip 
+       @[ -f ./zip/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 gdb" ; \
-       (cd gdb && \
+       echo "Doing TAGS in zip" ; \
+       (cd zip && \
           $(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 zip
  
-.PHONY: maybe-install-info-gdb install-info-gdb
-maybe-install-info-gdb:
+.PHONY: maybe-install-info-zip install-info-zip
+maybe-install-info-zip:
+@if zip
+maybe-install-info-zip: install-info-zip
  
-install-info-gdb: \
-    configure-gdb \
-    info-gdb 
-       @[ -f ./gdb/Makefile ] || exit 0; \
+install-info-zip: \
+    configure-zip \
+    info-zip 
+       @[ -f ./zip/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 gdb" ; \
-       (cd gdb && \
+       echo "Doing install-info in zip" ; \
+       (cd zip && \
           $(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 zip
  
-.PHONY: maybe-installcheck-gdb installcheck-gdb
-maybe-installcheck-gdb:
+.PHONY: maybe-installcheck-zip installcheck-zip
+maybe-installcheck-zip:
+@if zip
+maybe-installcheck-zip: installcheck-zip
  
-installcheck-gdb: \
-    configure-gdb 
-       @[ -f ./gdb/Makefile ] || exit 0; \
+installcheck-zip: \
+    configure-zip 
+       @[ -f ./zip/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 gdb" ; \
-       (cd gdb && \
+       echo "Doing installcheck in zip" ; \
+       (cd zip && \
           $(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 zip
  
-.PHONY: maybe-mostlyclean-gdb mostlyclean-gdb
-maybe-mostlyclean-gdb:
+.PHONY: maybe-mostlyclean-zip mostlyclean-zip
+maybe-mostlyclean-zip:
+@if zip
+maybe-mostlyclean-zip: mostlyclean-zip
  
-mostlyclean-gdb: 
-       @[ -f ./gdb/Makefile ] || exit 0; \
+mostlyclean-zip: 
+       @[ -f ./zip/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 gdb" ; \
-       (cd gdb && \
+       echo "Doing mostlyclean in zip" ; \
+       (cd zip && \
           $(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 zip
  
-.PHONY: maybe-clean-gdb clean-gdb
-maybe-clean-gdb:
+.PHONY: maybe-clean-zip clean-zip
+maybe-clean-zip:
+@if zip
+maybe-clean-zip: clean-zip
  
-clean-gdb: 
-       @[ -f ./gdb/Makefile ] || exit 0; \
+clean-zip: 
+       @[ -f ./zip/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 gdb" ; \
-       (cd gdb && \
+       echo "Doing clean in zip" ; \
+       (cd zip && \
           $(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 zip
  
-.PHONY: maybe-distclean-gdb distclean-gdb
-maybe-distclean-gdb:
+.PHONY: maybe-distclean-zip distclean-zip
+maybe-distclean-zip:
+@if zip
+maybe-distclean-zip: distclean-zip
  
-distclean-gdb: 
-       @[ -f ./gdb/Makefile ] || exit 0; \
+distclean-zip: 
+       @[ -f ./zip/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 gdb" ; \
-       (cd gdb && \
+       echo "Doing distclean in zip" ; \
+       (cd zip && \
           $(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 zip
  
-.PHONY: maybe-maintainer-clean-gdb maintainer-clean-gdb
-maybe-maintainer-clean-gdb:
+.PHONY: maybe-maintainer-clean-zip maintainer-clean-zip
+maybe-maintainer-clean-zip:
+@if zip
+maybe-maintainer-clean-zip: maintainer-clean-zip
  
-maintainer-clean-gdb: 
-       @[ -f ./gdb/Makefile ] || exit 0; \
+maintainer-clean-zip: 
+       @[ -f ./zip/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 gdb" ; \
-       (cd gdb && \
+       echo "Doing maintainer-clean in zip" ; \
+       (cd zip && \
           $(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 zip
  
  
-.PHONY: configure-expect maybe-configure-expect
-maybe-configure-expect:
-configure-expect:
-       @test ! -f expect/Makefile || exit 0; \
-       [ -d expect ] || mkdir expect; \
+.PHONY: configure-zlib maybe-configure-zlib
+maybe-configure-zlib:
+@if zlib
+maybe-configure-zlib: configure-zlib
+configure-zlib:
+       @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; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in expect; \
-       cd expect || exit 1; \
-       case $(srcdir) in \
+       $(HOST_EXPORTS) \
+       echo Configuring in zlib; \
+       cd zlib || exit 1; \
+       case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/expect"; \
-           libsrcdir="$$s/expect";; \
+           srcdiroption="--srcdir=$(srcdir)/zlib"; \
+           libsrcdir="$$s/zlib";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/expect"; \
-           libsrcdir="$$s/expect";; \
+           srcdiroption="--srcdir=../$(srcdir)/zlib"; \
+           libsrcdir="$$s/zlib";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif zlib
  
-.PHONY: all-expect maybe-all-expect
-maybe-all-expect:
-all-expect: configure-expect
+.PHONY: all-zlib maybe-all-zlib
+maybe-all-zlib:
+@if zlib
+maybe-all-zlib: all-zlib
+all-zlib: configure-zlib
         @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 zlib && $(MAKE) $(FLAGS_TO_PASS)  all)
+@endif zlib
  
-.PHONY: check-expect maybe-check-expect
-maybe-check-expect:
+.PHONY: check-zlib maybe-check-zlib
+maybe-check-zlib:
+@if zlib
+maybe-check-zlib: check-zlib
  
-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)
+check-zlib:
  
+@endif zlib
  
-.PHONY: install-expect maybe-install-expect
-maybe-install-expect:
+.PHONY: install-zlib maybe-install-zlib
+maybe-install-zlib:
+@if zlib
+maybe-install-zlib: install-zlib
  
-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)
+install-zlib:
  
+@endif zlib
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-expect info-expect
-maybe-info-expect:
+.PHONY: maybe-info-zlib info-zlib
+maybe-info-zlib:
+@if zlib
+maybe-info-zlib: info-zlib
  
-info-expect: \
-    configure-expect 
-       @[ -f ./expect/Makefile ] || exit 0; \
+info-zlib: \
+    configure-zlib 
+       @[ -f ./zlib/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 expect" ; \
-       (cd expect && \
+       echo "Doing info in zlib" ; \
+       (cd zlib && \
           $(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 zlib
  
-.PHONY: maybe-dvi-expect dvi-expect
-maybe-dvi-expect:
+.PHONY: maybe-dvi-zlib dvi-zlib
+maybe-dvi-zlib:
+@if zlib
+maybe-dvi-zlib: dvi-zlib
  
-dvi-expect: \
-    configure-expect 
-       @[ -f ./expect/Makefile ] || exit 0; \
+dvi-zlib: \
+    configure-zlib 
+       @[ -f ./zlib/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 expect" ; \
-       (cd expect && \
+       echo "Doing dvi in zlib" ; \
+       (cd zlib && \
           $(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 zlib
  
-.PHONY: maybe-TAGS-expect TAGS-expect
-maybe-TAGS-expect:
+.PHONY: maybe-TAGS-zlib TAGS-zlib
+maybe-TAGS-zlib:
+@if zlib
+maybe-TAGS-zlib: TAGS-zlib
  
-TAGS-expect: \
-    configure-expect 
-       @[ -f ./expect/Makefile ] || exit 0; \
+TAGS-zlib: \
+    configure-zlib 
+       @[ -f ./zlib/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 expect" ; \
-       (cd expect && \
+       echo "Doing TAGS in zlib" ; \
+       (cd zlib && \
           $(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 zlib
  
-.PHONY: maybe-install-info-expect install-info-expect
-maybe-install-info-expect:
+.PHONY: maybe-install-info-zlib install-info-zlib
+maybe-install-info-zlib:
+@if zlib
+maybe-install-info-zlib: install-info-zlib
  
-install-info-expect: \
-    configure-expect \
-    info-expect 
-       @[ -f ./expect/Makefile ] || exit 0; \
+install-info-zlib: \
+    configure-zlib \
+    info-zlib 
+       @[ -f ./zlib/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 expect" ; \
-       (cd expect && \
+       echo "Doing install-info in zlib" ; \
+       (cd zlib && \
           $(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 zlib
  
-.PHONY: maybe-installcheck-expect installcheck-expect
-maybe-installcheck-expect:
+.PHONY: maybe-installcheck-zlib installcheck-zlib
+maybe-installcheck-zlib:
+@if zlib
+maybe-installcheck-zlib: installcheck-zlib
  
-installcheck-expect: \
-    configure-expect 
-       @[ -f ./expect/Makefile ] || exit 0; \
+installcheck-zlib: \
+    configure-zlib 
+       @[ -f ./zlib/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 expect" ; \
-       (cd expect && \
+       echo "Doing installcheck in zlib" ; \
+       (cd zlib && \
           $(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 zlib
  
-.PHONY: maybe-mostlyclean-expect mostlyclean-expect
-maybe-mostlyclean-expect:
+.PHONY: maybe-mostlyclean-zlib mostlyclean-zlib
+maybe-mostlyclean-zlib:
+@if zlib
+maybe-mostlyclean-zlib: mostlyclean-zlib
  
-mostlyclean-expect: 
-       @[ -f ./expect/Makefile ] || exit 0; \
+mostlyclean-zlib: 
+       @[ -f ./zlib/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 expect" ; \
-       (cd expect && \
+       echo "Doing mostlyclean in zlib" ; \
+       (cd zlib && \
           $(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 zlib
  
-.PHONY: maybe-clean-expect clean-expect
-maybe-clean-expect:
+.PHONY: maybe-clean-zlib clean-zlib
+maybe-clean-zlib:
+@if zlib
+maybe-clean-zlib: clean-zlib
  
-clean-expect: 
-       @[ -f ./expect/Makefile ] || exit 0; \
+clean-zlib: 
+       @[ -f ./zlib/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 expect" ; \
-       (cd expect && \
+       echo "Doing clean in zlib" ; \
+       (cd zlib && \
           $(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 zlib
  
-.PHONY: maybe-distclean-expect distclean-expect
-maybe-distclean-expect:
+.PHONY: maybe-distclean-zlib distclean-zlib
+maybe-distclean-zlib:
+@if zlib
+maybe-distclean-zlib: distclean-zlib
  
-distclean-expect: 
-       @[ -f ./expect/Makefile ] || exit 0; \
+distclean-zlib: 
+       @[ -f ./zlib/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 expect" ; \
-       (cd expect && \
+       echo "Doing distclean in zlib" ; \
+       (cd zlib && \
           $(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 zlib
  
-.PHONY: maybe-maintainer-clean-expect maintainer-clean-expect
-maybe-maintainer-clean-expect:
+.PHONY: maybe-maintainer-clean-zlib maintainer-clean-zlib
+maybe-maintainer-clean-zlib:
+@if zlib
+maybe-maintainer-clean-zlib: maintainer-clean-zlib
  
-maintainer-clean-expect: 
-       @[ -f ./expect/Makefile ] || exit 0; \
+maintainer-clean-zlib: 
+       @[ -f ./zlib/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 expect" ; \
-       (cd expect && \
+       echo "Doing maintainer-clean in zlib" ; \
+       (cd zlib && \
           $(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 zlib
  
  
-.PHONY: configure-guile maybe-configure-guile
-maybe-configure-guile:
-configure-guile:
-       @test ! -f guile/Makefile || exit 0; \
-       [ -d guile ] || mkdir guile; \
+.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; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in guile; \
-       cd guile || exit 1; \
+       $(HOST_EXPORTS) \
+       echo Configuring in gdb; \
+       cd gdb || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/guile"; \
-           libsrcdir="$$s/guile";; \
+           srcdiroption="--srcdir=$(srcdir)/gdb"; \
+           libsrcdir="$$s/gdb";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/guile"; \
-           libsrcdir="$$s/guile";; \
+           srcdiroption="--srcdir=../$(srcdir)/gdb"; \
+           libsrcdir="$$s/gdb";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif gdb
  
-.PHONY: all-guile maybe-all-guile
-maybe-all-guile:
-all-guile: configure-guile
+.PHONY: all-gdb maybe-all-gdb
+maybe-all-gdb:
+@if gdb
+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 guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS)  all)
+@endif gdb
  
-.PHONY: check-guile maybe-check-guile
-maybe-check-guile:
+.PHONY: check-gdb maybe-check-gdb
+maybe-check-gdb:
+@if gdb
+maybe-check-gdb: check-gdb
  
-check-guile:
+check-gdb:
         @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 gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS)  check)
  
+@endif gdb
  
-.PHONY: install-guile maybe-install-guile
-maybe-install-guile:
+.PHONY: install-gdb maybe-install-gdb
+maybe-install-gdb:
+@if gdb
+maybe-install-gdb: install-gdb
  
-install-guile: installdirs
+install-gdb: 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 gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS)  install)
  
+@endif gdb
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-guile info-guile
-maybe-info-guile:
+.PHONY: maybe-info-gdb info-gdb
+maybe-info-gdb:
+@if gdb
+maybe-info-gdb: info-gdb
  
-info-guile: \
-    configure-guile 
-       @[ -f ./guile/Makefile ] || exit 0; \
+info-gdb: \
+    configure-gdb 
+       @[ -f ./gdb/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 guile" ; \
-       (cd guile && \
+       echo "Doing info in gdb" ; \
+       (cd gdb && \
           $(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 gdb
  
-.PHONY: maybe-dvi-guile dvi-guile
-maybe-dvi-guile:
+.PHONY: maybe-dvi-gdb dvi-gdb
+maybe-dvi-gdb:
+@if gdb
+maybe-dvi-gdb: dvi-gdb
  
-dvi-guile: \
-    configure-guile 
-       @[ -f ./guile/Makefile ] || exit 0; \
+dvi-gdb: \
+    configure-gdb 
+       @[ -f ./gdb/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 guile" ; \
-       (cd guile && \
+       echo "Doing dvi in gdb" ; \
+       (cd gdb && \
           $(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 gdb
  
-.PHONY: maybe-TAGS-guile TAGS-guile
-maybe-TAGS-guile:
+.PHONY: maybe-TAGS-gdb TAGS-gdb
+maybe-TAGS-gdb:
+@if gdb
+maybe-TAGS-gdb: TAGS-gdb
  
-TAGS-guile: \
-    configure-guile 
-       @[ -f ./guile/Makefile ] || exit 0; \
+TAGS-gdb: \
+    configure-gdb 
+       @[ -f ./gdb/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 guile" ; \
-       (cd guile && \
+       echo "Doing TAGS in gdb" ; \
+       (cd gdb && \
           $(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 gdb
  
-.PHONY: maybe-install-info-guile install-info-guile
-maybe-install-info-guile:
+.PHONY: maybe-install-info-gdb install-info-gdb
+maybe-install-info-gdb:
+@if gdb
+maybe-install-info-gdb: install-info-gdb
  
-install-info-guile: \
-    configure-guile \
-    info-guile 
-       @[ -f ./guile/Makefile ] || exit 0; \
+install-info-gdb: \
+    configure-gdb \
+    info-gdb 
+       @[ -f ./gdb/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 guile" ; \
-       (cd guile && \
+       echo "Doing install-info in gdb" ; \
+       (cd gdb && \
           $(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 gdb
  
-.PHONY: maybe-installcheck-guile installcheck-guile
-maybe-installcheck-guile:
+.PHONY: maybe-installcheck-gdb installcheck-gdb
+maybe-installcheck-gdb:
+@if gdb
+maybe-installcheck-gdb: installcheck-gdb
  
-installcheck-guile: \
-    configure-guile 
-       @[ -f ./guile/Makefile ] || exit 0; \
+installcheck-gdb: \
+    configure-gdb 
+       @[ -f ./gdb/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 guile" ; \
-       (cd guile && \
+       echo "Doing installcheck in gdb" ; \
+       (cd gdb && \
           $(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 gdb
  
-.PHONY: maybe-mostlyclean-guile mostlyclean-guile
-maybe-mostlyclean-guile:
+.PHONY: maybe-mostlyclean-gdb mostlyclean-gdb
+maybe-mostlyclean-gdb:
+@if gdb
+maybe-mostlyclean-gdb: mostlyclean-gdb
  
-mostlyclean-guile: 
-       @[ -f ./guile/Makefile ] || exit 0; \
+mostlyclean-gdb: 
+       @[ -f ./gdb/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 guile" ; \
-       (cd guile && \
+       echo "Doing mostlyclean in gdb" ; \
+       (cd gdb && \
           $(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 gdb
  
-.PHONY: maybe-clean-guile clean-guile
-maybe-clean-guile:
+.PHONY: maybe-clean-gdb clean-gdb
+maybe-clean-gdb:
+@if gdb
+maybe-clean-gdb: clean-gdb
  
-clean-guile: 
-       @[ -f ./guile/Makefile ] || exit 0; \
+clean-gdb: 
+       @[ -f ./gdb/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 guile" ; \
-       (cd guile && \
+       echo "Doing clean in gdb" ; \
+       (cd gdb && \
           $(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 gdb
  
-.PHONY: maybe-distclean-guile distclean-guile
-maybe-distclean-guile:
+.PHONY: maybe-distclean-gdb distclean-gdb
+maybe-distclean-gdb:
+@if gdb
+maybe-distclean-gdb: distclean-gdb
  
-distclean-guile: 
-       @[ -f ./guile/Makefile ] || exit 0; \
+distclean-gdb: 
+       @[ -f ./gdb/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 guile" ; \
-       (cd guile && \
+       echo "Doing distclean in gdb" ; \
+       (cd gdb && \
           $(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 gdb
  
-.PHONY: maybe-maintainer-clean-guile maintainer-clean-guile
-maybe-maintainer-clean-guile:
+.PHONY: maybe-maintainer-clean-gdb maintainer-clean-gdb
+maybe-maintainer-clean-gdb:
+@if gdb
+maybe-maintainer-clean-gdb: maintainer-clean-gdb
  
-maintainer-clean-guile: 
-       @[ -f ./guile/Makefile ] || exit 0; \
+maintainer-clean-gdb: 
+       @[ -f ./gdb/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 guile" ; \
-       (cd guile && \
+       echo "Doing maintainer-clean in gdb" ; \
+       (cd gdb && \
           $(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 gdb
  
  
-.PHONY: configure-tk maybe-configure-tk
-maybe-configure-tk:
-configure-tk:
-       @test ! -f tk/Makefile || exit 0; \
-       [ -d tk ] || mkdir tk; \
+.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; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in tk; \
-       cd tk || exit 1; \
+       $(HOST_EXPORTS) \
+       echo Configuring in expect; \
+       cd expect || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/tk"; \
-           libsrcdir="$$s/tk";; \
+           srcdiroption="--srcdir=$(srcdir)/expect"; \
+           libsrcdir="$$s/expect";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/tk"; \
-           libsrcdir="$$s/tk";; \
+           srcdiroption="--srcdir=../$(srcdir)/expect"; \
+           libsrcdir="$$s/expect";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif expect
  
-.PHONY: all-tk maybe-all-tk
-maybe-all-tk:
-all-tk: configure-tk
+.PHONY: all-expect maybe-all-expect
+maybe-all-expect:
+@if expect
+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 tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS)  all)
+@endif expect
  
-.PHONY: check-tk maybe-check-tk
-maybe-check-tk:
+.PHONY: check-expect maybe-check-expect
+maybe-check-expect:
+@if expect
+maybe-check-expect: check-expect
  
-check-tk:
+check-expect:
         @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 expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS)  check)
  
+@endif expect
  
-.PHONY: install-tk maybe-install-tk
-maybe-install-tk:
+.PHONY: install-expect maybe-install-expect
+maybe-install-expect:
+@if expect
+maybe-install-expect: install-expect
  
-install-tk: installdirs
+install-expect: 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 expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS)  install)
  
+@endif expect
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-tk info-tk
-maybe-info-tk:
+.PHONY: maybe-info-expect info-expect
+maybe-info-expect:
+@if expect
+maybe-info-expect: info-expect
  
-info-tk: \
-    configure-tk 
-       @[ -f ./tk/Makefile ] || exit 0; \
+info-expect: \
+    configure-expect 
+       @[ -f ./expect/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 tk" ; \
-       (cd tk && \
+       echo "Doing info in expect" ; \
+       (cd expect && \
           $(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 expect
  
-.PHONY: maybe-dvi-tk dvi-tk
-maybe-dvi-tk:
+.PHONY: maybe-dvi-expect dvi-expect
+maybe-dvi-expect:
+@if expect
+maybe-dvi-expect: dvi-expect
  
-dvi-tk: \
-    configure-tk 
-       @[ -f ./tk/Makefile ] || exit 0; \
+dvi-expect: \
+    configure-expect 
+       @[ -f ./expect/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 tk" ; \
-       (cd tk && \
+       echo "Doing dvi in expect" ; \
+       (cd expect && \
           $(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 expect
  
-.PHONY: maybe-TAGS-tk TAGS-tk
-maybe-TAGS-tk:
+.PHONY: maybe-TAGS-expect TAGS-expect
+maybe-TAGS-expect:
+@if expect
+maybe-TAGS-expect: TAGS-expect
  
-TAGS-tk: \
-    configure-tk 
-       @[ -f ./tk/Makefile ] || exit 0; \
+TAGS-expect: \
+    configure-expect 
+       @[ -f ./expect/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 tk" ; \
-       (cd tk && \
+       echo "Doing TAGS in expect" ; \
+       (cd expect && \
           $(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 expect
  
-.PHONY: maybe-install-info-tk install-info-tk
-maybe-install-info-tk:
+.PHONY: maybe-install-info-expect install-info-expect
+maybe-install-info-expect:
+@if expect
+maybe-install-info-expect: install-info-expect
  
-install-info-tk: \
-    configure-tk \
-    info-tk 
-       @[ -f ./tk/Makefile ] || exit 0; \
+install-info-expect: \
+    configure-expect \
+    info-expect 
+       @[ -f ./expect/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 tk" ; \
-       (cd tk && \
+       echo "Doing install-info in expect" ; \
+       (cd expect && \
           $(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 expect
  
-.PHONY: maybe-installcheck-tk installcheck-tk
-maybe-installcheck-tk:
+.PHONY: maybe-installcheck-expect installcheck-expect
+maybe-installcheck-expect:
+@if expect
+maybe-installcheck-expect: installcheck-expect
  
-installcheck-tk: \
-    configure-tk 
-       @[ -f ./tk/Makefile ] || exit 0; \
+installcheck-expect: \
+    configure-expect 
+       @[ -f ./expect/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 tk" ; \
-       (cd tk && \
+       echo "Doing installcheck in expect" ; \
+       (cd expect && \
           $(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 expect
  
-.PHONY: maybe-mostlyclean-tk mostlyclean-tk
-maybe-mostlyclean-tk:
+.PHONY: maybe-mostlyclean-expect mostlyclean-expect
+maybe-mostlyclean-expect:
+@if expect
+maybe-mostlyclean-expect: mostlyclean-expect
  
-mostlyclean-tk: 
-       @[ -f ./tk/Makefile ] || exit 0; \
+mostlyclean-expect: 
+       @[ -f ./expect/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 tk" ; \
-       (cd tk && \
+       echo "Doing mostlyclean in expect" ; \
+       (cd expect && \
           $(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 expect
  
-.PHONY: maybe-clean-tk clean-tk
-maybe-clean-tk:
+.PHONY: maybe-clean-expect clean-expect
+maybe-clean-expect:
+@if expect
+maybe-clean-expect: clean-expect
  
-clean-tk: 
-       @[ -f ./tk/Makefile ] || exit 0; \
+clean-expect: 
+       @[ -f ./expect/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 tk" ; \
-       (cd tk && \
+       echo "Doing clean in expect" ; \
+       (cd expect && \
           $(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 expect
  
-.PHONY: maybe-distclean-tk distclean-tk
-maybe-distclean-tk:
-
-distclean-tk: 
-       @[ -f ./tk/Makefile ] || exit 0; \
+.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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in tk" ; \
-       (cd tk && \
+       echo "Doing distclean in expect" ; \
+       (cd expect && \
           $(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 expect
  
-.PHONY: maybe-maintainer-clean-tk maintainer-clean-tk
-maybe-maintainer-clean-tk:
+.PHONY: maybe-maintainer-clean-expect maintainer-clean-expect
+maybe-maintainer-clean-expect:
+@if expect
+maybe-maintainer-clean-expect: maintainer-clean-expect
  
-maintainer-clean-tk: 
-       @[ -f ./tk/Makefile ] || exit 0; \
+maintainer-clean-expect: 
+       @[ -f ./expect/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 tk" ; \
-       (cd tk && \
+       echo "Doing maintainer-clean in expect" ; \
+       (cd expect && \
           $(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 expect
  
  
-.PHONY: configure-tix maybe-configure-tix
-maybe-configure-tix:
-configure-tix:
-       @test ! -f tix/Makefile || exit 0; \
-       [ -d tix ] || mkdir tix; \
+.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; \
-       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 guile; \
+       cd guile || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/tix"; \
-           libsrcdir="$$s/tix";; \
+           srcdiroption="--srcdir=$(srcdir)/guile"; \
+           libsrcdir="$$s/guile";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/tix"; \
-           libsrcdir="$$s/tix";; \
+           srcdiroption="--srcdir=../$(srcdir)/guile"; \
+           libsrcdir="$$s/guile";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif guile
  
-.PHONY: all-tix maybe-all-tix
-maybe-all-tix:
-all-tix: configure-tix
+.PHONY: all-guile maybe-all-guile
+maybe-all-guile:
+@if guile
+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 tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS)  all)
+@endif guile
  
-.PHONY: check-tix maybe-check-tix
-maybe-check-tix:
+.PHONY: check-guile maybe-check-guile
+maybe-check-guile:
+@if guile
+maybe-check-guile: check-guile
  
-check-tix:
+check-guile:
         @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)
+       $(HOST_EXPORTS) \
+       (cd guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS)  check)
  
+@endif guile
  
-.PHONY: install-tix maybe-install-tix
-maybe-install-tix:
+.PHONY: install-guile maybe-install-guile
+maybe-install-guile:
+@if guile
+maybe-install-guile: install-guile
  
-install-tix: installdirs
+install-guile: 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 guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS)  install)
  
+@endif guile
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-tix info-tix
-maybe-info-tix:
+.PHONY: maybe-info-guile info-guile
+maybe-info-guile:
+@if guile
+maybe-info-guile: info-guile
  
-info-tix: \
-    configure-tix 
-       @[ -f ./tix/Makefile ] || exit 0; \
+info-guile: \
+    configure-guile 
+       @[ -f ./guile/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 tix" ; \
-       (cd tix && \
+       echo "Doing info in guile" ; \
+       (cd guile && \
           $(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 guile
  
-.PHONY: maybe-dvi-tix dvi-tix
-maybe-dvi-tix:
+.PHONY: maybe-dvi-guile dvi-guile
+maybe-dvi-guile:
+@if guile
+maybe-dvi-guile: dvi-guile
  
-dvi-tix: \
-    configure-tix 
-       @[ -f ./tix/Makefile ] || exit 0; \
+dvi-guile: \
+    configure-guile 
+       @[ -f ./guile/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 tix" ; \
-       (cd tix && \
+       echo "Doing dvi in guile" ; \
+       (cd guile && \
           $(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 guile
  
-.PHONY: maybe-TAGS-tix TAGS-tix
-maybe-TAGS-tix:
+.PHONY: maybe-TAGS-guile TAGS-guile
+maybe-TAGS-guile:
+@if guile
+maybe-TAGS-guile: TAGS-guile
  
-TAGS-tix: \
-    configure-tix 
-       @[ -f ./tix/Makefile ] || exit 0; \
+TAGS-guile: \
+    configure-guile 
+       @[ -f ./guile/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 tix" ; \
-       (cd tix && \
+       echo "Doing TAGS in guile" ; \
+       (cd guile && \
           $(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 guile
  
-.PHONY: maybe-install-info-tix install-info-tix
-maybe-install-info-tix:
+.PHONY: maybe-install-info-guile install-info-guile
+maybe-install-info-guile:
+@if guile
+maybe-install-info-guile: install-info-guile
  
-install-info-tix: \
-    configure-tix \
-    info-tix 
-       @[ -f ./tix/Makefile ] || exit 0; \
+install-info-guile: \
+    configure-guile \
+    info-guile 
+       @[ -f ./guile/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 tix" ; \
-       (cd tix && \
+       echo "Doing install-info in guile" ; \
+       (cd guile && \
           $(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 guile
  
-.PHONY: maybe-installcheck-tix installcheck-tix
-maybe-installcheck-tix:
+.PHONY: maybe-installcheck-guile installcheck-guile
+maybe-installcheck-guile:
+@if guile
+maybe-installcheck-guile: installcheck-guile
  
-installcheck-tix: \
-    configure-tix 
-       @[ -f ./tix/Makefile ] || exit 0; \
+installcheck-guile: \
+    configure-guile 
+       @[ -f ./guile/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 tix" ; \
-       (cd tix && \
+       echo "Doing installcheck in guile" ; \
+       (cd guile && \
           $(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 guile
  
-.PHONY: maybe-mostlyclean-tix mostlyclean-tix
-maybe-mostlyclean-tix:
+.PHONY: maybe-mostlyclean-guile mostlyclean-guile
+maybe-mostlyclean-guile:
+@if guile
+maybe-mostlyclean-guile: mostlyclean-guile
  
-mostlyclean-tix: 
-       @[ -f ./tix/Makefile ] || exit 0; \
+mostlyclean-guile: 
+       @[ -f ./guile/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 tix" ; \
-       (cd tix && \
+       echo "Doing mostlyclean in guile" ; \
+       (cd guile && \
           $(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 guile
  
-.PHONY: maybe-clean-tix clean-tix
-maybe-clean-tix:
+.PHONY: maybe-clean-guile clean-guile
+maybe-clean-guile:
+@if guile
+maybe-clean-guile: clean-guile
  
-clean-tix: 
-       @[ -f ./tix/Makefile ] || exit 0; \
+clean-guile: 
+       @[ -f ./guile/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 tix" ; \
-       (cd tix && \
+       echo "Doing clean in guile" ; \
+       (cd guile && \
           $(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 guile
  
-.PHONY: maybe-distclean-tix distclean-tix
-maybe-distclean-tix:
+.PHONY: maybe-distclean-guile distclean-guile
+maybe-distclean-guile:
+@if guile
+maybe-distclean-guile: distclean-guile
  
-distclean-tix: 
-       @[ -f ./tix/Makefile ] || exit 0; \
+distclean-guile: 
+       @[ -f ./guile/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 tix" ; \
-       (cd tix && \
+       echo "Doing distclean in guile" ; \
+       (cd guile && \
           $(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 guile
  
-.PHONY: maybe-maintainer-clean-tix maintainer-clean-tix
-maybe-maintainer-clean-tix:
+.PHONY: maybe-maintainer-clean-guile maintainer-clean-guile
+maybe-maintainer-clean-guile:
+@if guile
+maybe-maintainer-clean-guile: maintainer-clean-guile
  
-maintainer-clean-tix: 
-       @[ -f ./tix/Makefile ] || exit 0; \
+maintainer-clean-guile: 
+       @[ -f ./guile/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 tix" ; \
-       (cd tix && \
+       echo "Doing maintainer-clean in guile" ; \
+       (cd guile && \
           $(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 guile
  
  
-.PHONY: configure-libtermcap maybe-configure-libtermcap
-maybe-configure-libtermcap:
-configure-libtermcap:
-       @test ! -f libtermcap/Makefile || exit 0; \
-       [ -d libtermcap ] || mkdir libtermcap; \
+.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; \
-       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; \
+       $(HOST_EXPORTS) \
+       echo Configuring in tk; \
+       cd tk || exit 1; \
         case $(srcdir) in \
           \.) \
             srcdiroption="--srcdir=."; \
             libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/libtermcap"; \
-           libsrcdir="$$s/libtermcap";; \
+           srcdiroption="--srcdir=$(srcdir)/tk"; \
+           libsrcdir="$$s/tk";; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/libtermcap"; \
-           libsrcdir="$$s/libtermcap";; \
+           srcdiroption="--srcdir=../$(srcdir)/tk"; \
+           libsrcdir="$$s/tk";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
           || exit 1
+@endif tk
  
-.PHONY: all-libtermcap maybe-all-libtermcap
-maybe-all-libtermcap:
-all-libtermcap: configure-libtermcap
+.PHONY: all-tk maybe-all-tk
+maybe-all-tk:
+@if tk
+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 libtermcap && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(HOST_EXPORTS) \
+       (cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS)  all)
+@endif tk
  
-.PHONY: check-libtermcap maybe-check-libtermcap
-maybe-check-libtermcap:
+.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) \
+       $(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) \
+       $(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 
+       @[ -f ./tk/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 tk" ; \
+       (cd tk && \
+         $(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 tk
+
+.PHONY: maybe-dvi-tk dvi-tk
+maybe-dvi-tk:
+@if tk
+maybe-dvi-tk: dvi-tk
+
+dvi-tk: \
+    configure-tk 
+       @[ -f ./tk/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 tk" ; \
+       (cd tk && \
+         $(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 tk
+
+.PHONY: maybe-TAGS-tk TAGS-tk
+maybe-TAGS-tk:
+@if tk
+maybe-TAGS-tk: TAGS-tk
+
+TAGS-tk: \
+    configure-tk 
+       @[ -f ./tk/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 tk" ; \
+       (cd tk && \
+         $(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 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 \
+    info-tk 
+       @[ -f ./tk/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 tk" ; \
+       (cd tk && \
+         $(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 tk
+
+.PHONY: maybe-installcheck-tk installcheck-tk
+maybe-installcheck-tk:
+@if tk
+maybe-installcheck-tk: installcheck-tk
+
+installcheck-tk: \
+    configure-tk 
+       @[ -f ./tk/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 tk" ; \
+       (cd tk && \
+         $(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 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) \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing mostlyclean in tk" ; \
+       (cd tk && \
+         $(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 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) \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing clean in tk" ; \
+       (cd tk && \
+         $(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 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) \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing distclean in tk" ; \
+       (cd tk && \
+         $(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 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) \
+       $(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 tk" ; \
+       (cd tk && \
+         $(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 tk
+
+
+.PHONY: configure-tix maybe-configure-tix
+maybe-configure-tix:
+@if tix
+maybe-configure-tix: configure-tix
+configure-tix:
+       @test ! -f tix/Makefile || exit 0; \
+       [ -d tix ] || mkdir tix; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       echo Configuring in tix; \
+       cd tix || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/tix"; \
+           libsrcdir="$$s/tix";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/tix"; \
+           libsrcdir="$$s/tix";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
+         || exit 1
+@endif tix
+
+.PHONY: all-tix maybe-all-tix
+maybe-all-tix:
+@if tix
+maybe-all-tix: all-tix
+all-tix: configure-tix
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS)  all)
+@endif tix
+
+.PHONY: check-tix maybe-check-tix
+maybe-check-tix:
+@if tix
+maybe-check-tix: check-tix
+
+check-tix:
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS)  check)
+
+@endif tix
+
+.PHONY: install-tix maybe-install-tix
+maybe-install-tix:
+@if tix
+maybe-install-tix: install-tix
+
+install-tix: installdirs
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS)  install)
+
+@endif tix
+
+# Other targets (info, dvi, etc.)
+
+.PHONY: maybe-info-tix info-tix
+maybe-info-tix:
+@if tix
+maybe-info-tix: info-tix
+
+info-tix: \
+    configure-tix 
+       @[ -f ./tix/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 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}" \
+                  info) \
+         || exit 1
+
+@endif tix
+
+.PHONY: maybe-dvi-tix dvi-tix
+maybe-dvi-tix:
+@if tix
+maybe-dvi-tix: dvi-tix
+
+dvi-tix: \
+    configure-tix 
+       @[ -f ./tix/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 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}" \
+                  dvi) \
+         || exit 1
+
+@endif tix
+
+.PHONY: maybe-TAGS-tix TAGS-tix
+maybe-TAGS-tix:
+@if tix
+maybe-TAGS-tix: TAGS-tix
+
+TAGS-tix: \
+    configure-tix 
+       @[ -f ./tix/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 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}" \
+                  TAGS) \
+         || exit 1
+
+@endif tix
+
+.PHONY: maybe-install-info-tix install-info-tix
+maybe-install-info-tix:
+@if tix
+maybe-install-info-tix: install-info-tix
+
+install-info-tix: \
+    configure-tix \
+    info-tix 
+       @[ -f ./tix/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 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
+
+@endif tix
+
+.PHONY: maybe-installcheck-tix installcheck-tix
+maybe-installcheck-tix:
+@if tix
+maybe-installcheck-tix: 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) \
+       $(HOST_EXPORTS) \
+       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
+
+@endif tix
+
+.PHONY: maybe-mostlyclean-tix mostlyclean-tix
+maybe-mostlyclean-tix:
+@if tix
+maybe-mostlyclean-tix: mostlyclean-tix
+
+mostlyclean-tix: 
+       @[ -f ./tix/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 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
+
+@endif tix
+
+.PHONY: maybe-clean-tix clean-tix
+maybe-clean-tix:
+@if tix
+maybe-clean-tix: clean-tix
+
+clean-tix: 
+       @[ -f ./tix/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 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
+
+@endif tix
+
+.PHONY: maybe-distclean-tix distclean-tix
+maybe-distclean-tix:
+@if tix
+maybe-distclean-tix: distclean-tix
+
+distclean-tix: 
+       @[ -f ./tix/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 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
+
+@endif tix
+
+.PHONY: maybe-maintainer-clean-tix maintainer-clean-tix
+maybe-maintainer-clean-tix:
+@if tix
+maybe-maintainer-clean-tix: 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) \
+       $(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 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
+
+@endif 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; \
+       $(HOST_EXPORTS) \
+       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
+@endif libtermcap
+
+.PHONY: all-libtermcap maybe-all-libtermcap
+maybe-all-libtermcap:
+@if libtermcap
+maybe-all-libtermcap: all-libtermcap
+all-libtermcap: configure-libtermcap
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       (cd libtermcap && $(MAKE) $(FLAGS_TO_PASS)  all)
+@endif libtermcap
+
+.PHONY: check-libtermcap maybe-check-libtermcap
+maybe-check-libtermcap:
+@if libtermcap
+maybe-check-libtermcap: check-libtermcap
  
  check-libtermcap:
  
+@endif libtermcap
+
+.PHONY: install-libtermcap maybe-install-libtermcap
+maybe-install-libtermcap:
+@if libtermcap
+maybe-install-libtermcap: install-libtermcap
+
+install-libtermcap: installdirs
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       (cd libtermcap && $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif libtermcap
+
+# Other targets (info, dvi, etc.)
+
+.PHONY: maybe-info-libtermcap info-libtermcap
+maybe-info-libtermcap:
+@if libtermcap
+maybe-info-libtermcap: 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) \
+       $(HOST_EXPORTS) \
+       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
+
+@endif libtermcap
+
+.PHONY: maybe-dvi-libtermcap dvi-libtermcap
+maybe-dvi-libtermcap:
+@if libtermcap
+maybe-dvi-libtermcap: 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) \
+       $(HOST_EXPORTS) \
+       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
+
+@endif libtermcap
  
-.PHONY: install-libtermcap maybe-install-libtermcap
-maybe-install-libtermcap:
+.PHONY: maybe-TAGS-libtermcap TAGS-libtermcap
+maybe-TAGS-libtermcap:
+@if libtermcap
+maybe-TAGS-libtermcap: TAGS-libtermcap
  
-install-libtermcap: installdirs
-       @r=`${PWD_COMMAND}`; export r; \
+TAGS-libtermcap: \
+    configure-libtermcap 
+       @[ -f ./libtermcap/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd libtermcap && $(MAKE) $(FLAGS_TO_PASS) install)
-
+       $(HOST_EXPORTS) \
+       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
  
-# Other targets (info, dvi, etc.)
+@endif libtermcap
  
-.PHONY: maybe-info-libtermcap info-libtermcap
-maybe-info-libtermcap:
+.PHONY: maybe-install-info-libtermcap install-info-libtermcap
+maybe-install-info-libtermcap:
+@if libtermcap
+maybe-install-info-libtermcap: install-info-libtermcap
  
-info-libtermcap: \
-    configure-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) \
+       $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in libtermcap" ; \
+       echo "Doing install-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) \
+                  install-info) \
           || exit 1
  
+@endif libtermcap
  
-.PHONY: maybe-dvi-libtermcap dvi-libtermcap
-maybe-dvi-libtermcap:
+.PHONY: maybe-installcheck-libtermcap installcheck-libtermcap
+maybe-installcheck-libtermcap:
+@if libtermcap
+maybe-installcheck-libtermcap: installcheck-libtermcap
  
-dvi-libtermcap: \
+installcheck-libtermcap: \
      configure-libtermcap 
         @[ -f ./libtermcap/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 libtermcap" ; \
+       echo "Doing installcheck 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) \
+                  installcheck) \
           || exit 1
  
+@endif libtermcap
  
-.PHONY: maybe-TAGS-libtermcap TAGS-libtermcap
-maybe-TAGS-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; \
+       $(HOST_EXPORTS) \
+       echo Configuring in utils; \
+       cd utils || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/utils"; \
+           libsrcdir="$$s/utils";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/utils"; \
+           libsrcdir="$$s/utils";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
+         || exit 1
+@endif utils
+
+.PHONY: all-utils maybe-all-utils
+maybe-all-utils:
+@if utils
+maybe-all-utils: all-utils
+all-utils: configure-utils
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       (cd utils && $(MAKE) $(FLAGS_TO_PASS)  all)
+@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 
+       @[ -f ./utils/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 utils" ; \
+       (cd utils && \
+         $(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 utils
+
+.PHONY: maybe-dvi-utils dvi-utils
+maybe-dvi-utils:
+@if utils
+maybe-dvi-utils: dvi-utils
+
+dvi-utils: \
+    configure-utils 
+       @[ -f ./utils/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 utils" ; \
+       (cd utils && \
+         $(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 utils
+
+.PHONY: maybe-TAGS-utils TAGS-utils
+maybe-TAGS-utils:
+@if utils
+maybe-TAGS-utils: TAGS-utils
+
+TAGS-utils: \
+    configure-utils 
+       @[ -f ./utils/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 utils" ; \
+       (cd utils && \
+         $(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 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 \
+    info-utils 
+       @[ -f ./utils/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 utils" ; \
+       (cd utils && \
+         $(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 utils
+
+.PHONY: maybe-installcheck-utils installcheck-utils
+maybe-installcheck-utils:
+@if utils
+maybe-installcheck-utils: installcheck-utils
+
+installcheck-utils: \
+    configure-utils 
+       @[ -f ./utils/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 utils" ; \
+       (cd utils && \
+         $(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 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) \
+       $(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" ; \
+       (cd utils && \
+         $(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 utils
+
+.PHONY: maybe-clean-utils clean-utils
+maybe-clean-utils:
+@if utils
+maybe-clean-utils: clean-utils
  
-TAGS-libtermcap: \
-    configure-libtermcap 
-       @[ -f ./libtermcap/Makefile ] || exit 0; \
+clean-utils: 
+       @[ -f ./utils/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 libtermcap" ; \
-       (cd libtermcap && \
+       echo "Doing clean in utils" ; \
+       (cd utils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  clean) \
           || exit 1
  
+@endif utils
  
-.PHONY: maybe-install-info-libtermcap install-info-libtermcap
-maybe-install-info-libtermcap:
+.PHONY: maybe-distclean-utils distclean-utils
+maybe-distclean-utils:
+@if utils
+maybe-distclean-utils: distclean-utils
  
-install-info-libtermcap: \
-    configure-libtermcap \
-    info-libtermcap 
-       @[ -f ./libtermcap/Makefile ] || exit 0; \
+distclean-utils: 
+       @[ -f ./utils/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 libtermcap" ; \
-       (cd libtermcap && \
+       echo "Doing distclean in utils" ; \
+       (cd utils && \
           $(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) \
+                  distclean) \
           || exit 1
  
+@endif utils
  
-.PHONY: maybe-installcheck-libtermcap installcheck-libtermcap
-maybe-installcheck-libtermcap:
+.PHONY: maybe-maintainer-clean-utils maintainer-clean-utils
+maybe-maintainer-clean-utils:
+@if utils
+maybe-maintainer-clean-utils: maintainer-clean-utils
  
-installcheck-libtermcap: \
-    configure-libtermcap 
-       @[ -f ./libtermcap/Makefile ] || exit 0; \
+maintainer-clean-utils: 
+       @[ -f ./utils/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 libtermcap" ; \
-       (cd libtermcap && \
+       echo "Doing maintainer-clean in utils" ; \
+       (cd utils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  maintainer-clean) \
           || exit 1
  
-
-.PHONY: maybe-mostlyclean-libtermcap mostlyclean-libtermcap
-maybe-mostlyclean-libtermcap:
-
-# libtermcap doesn't support mostlyclean.
-mostlyclean-libtermcap:
-
-
-.PHONY: maybe-clean-libtermcap clean-libtermcap
-maybe-clean-libtermcap:
-
-# libtermcap doesn't support clean.
-clean-libtermcap:
-
-
-.PHONY: maybe-distclean-libtermcap distclean-libtermcap
-maybe-distclean-libtermcap:
-
-# libtermcap doesn't support distclean.
-distclean-libtermcap:
+@endif utils
  
  
-.PHONY: maybe-maintainer-clean-libtermcap maintainer-clean-libtermcap
-maybe-maintainer-clean-libtermcap:
  
-# libtermcap doesn't support maintainer-clean.
-maintainer-clean-libtermcap:
+# ---------------------------------------
+# Modules which run on the target machine
+# ---------------------------------------
  
+.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
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
+       rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || : ; \
+       cp multilib.out $(TARGET_SUBDIR)/libstdc++-v3/multilib.out
  
-.PHONY: configure-utils maybe-configure-utils
-maybe-configure-utils:
-configure-utils:
-       @test ! -f utils/Makefile || exit 0; \
-       [ -d utils ] || mkdir utils; \
+configure-target-libstdc++-v3: $(TARGET_SUBDIR)/libstdc++-v3/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
         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; \
-       NM="$(NM)"; export NM; \
-       RANLIB="$(RANLIB)"; export RANLIB; \
-       WINDRES="$(WINDRES)"; export WINDRES; \
-       OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       echo Configuring in utils; \
-       cd utils || exit 1; \
+       $(SET_LIB_PATH) \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo Configuring in $(TARGET_SUBDIR)/libstdc++-v3; \
+       cd "$(TARGET_SUBDIR)/libstdc++-v3" || exit 1; \
         case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
           /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/utils"; \
-           libsrcdir="$$s/utils";; \
+           topdir=$(srcdir) ;; \
           *) \
-           srcdiroption="--srcdir=../$(srcdir)/utils"; \
-           libsrcdir="$$s/utils";; \
+           case "$(TARGET_SUBDIR)" in \
+             .) topdir="../$(srcdir)" ;; \
+             *) topdir="../../$(srcdir)" ;; \
+           esac ;; \
         esac; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
+         libsrcdir="$$s/libstdc++-v3"; \
+       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-libstdc++-v3
  
-.PHONY: all-utils maybe-all-utils
-maybe-all-utils:
-all-utils: configure-utils
+.PHONY: all-target-libstdc++-v3 maybe-all-target-libstdc++-v3
+maybe-all-target-libstdc++-v3:
+@if target-libstdc++-v3
+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) \
-       (cd utils && $(MAKE) $(FLAGS_TO_PASS) all)
+       $(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)
+@endif target-libstdc++-v3
  
-.PHONY: check-utils maybe-check-utils
-maybe-check-utils:
+.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-utils:
+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)
  
+@endif target-libstdc++-v3
  
-.PHONY: install-utils maybe-install-utils
-maybe-install-utils:
+.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-utils: installdirs
+install-target-libstdc++-v3: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd utils && $(MAKE) $(FLAGS_TO_PASS) install)
+       $(RAW_CXX_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
+@endif target-libstdc++-v3
  
  # Other targets (info, dvi, etc.)
  
-.PHONY: maybe-info-utils info-utils
-maybe-info-utils:
+.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-utils: \
-    configure-utils 
-       @[ -f ./utils/Makefile ] || exit 0; \
+info-target-libstdc++-v3: \
+    configure-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) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(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|"`; \
         done; \
-       echo "Doing info in utils" ; \
-       (cd utils && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
           $(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-libstdc++-v3
  
-.PHONY: maybe-dvi-utils dvi-utils
-maybe-dvi-utils:
+.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-utils: \
-    configure-utils 
-       @[ -f ./utils/Makefile ] || exit 0; \
+dvi-target-libstdc++-v3: \
+    configure-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) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(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|"`; \
         done; \
-       echo "Doing dvi in utils" ; \
-       (cd utils && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
           $(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-libstdc++-v3
  
-.PHONY: maybe-TAGS-utils TAGS-utils
-maybe-TAGS-utils:
+.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-utils: \
-    configure-utils 
-       @[ -f ./utils/Makefile ] || exit 0; \
+TAGS-target-libstdc++-v3: \
+    configure-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) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(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|"`; \
         done; \
-       echo "Doing TAGS in utils" ; \
-       (cd utils && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
           $(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-libstdc++-v3
  
-.PHONY: maybe-install-info-utils install-info-utils
-maybe-install-info-utils:
+.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-utils: \
-    configure-utils \
-    info-utils 
-       @[ -f ./utils/Makefile ] || exit 0; \
+install-info-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 \
+    info-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) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(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|"`; \
         done; \
-       echo "Doing install-info in utils" ; \
-       (cd utils && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
           $(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-libstdc++-v3
  
-.PHONY: maybe-installcheck-utils installcheck-utils
-maybe-installcheck-utils:
+.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-utils: \
-    configure-utils 
-       @[ -f ./utils/Makefile ] || exit 0; \
+installcheck-target-libstdc++-v3: \
+    configure-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) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(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|"`; \
         done; \
-       echo "Doing installcheck in utils" ; \
-       (cd utils && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
           $(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-libstdc++-v3
  
-.PHONY: maybe-mostlyclean-utils mostlyclean-utils
-maybe-mostlyclean-utils:
+.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-utils: 
-       @[ -f ./utils/Makefile ] || exit 0; \
+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) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(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|"`; \
         done; \
-       echo "Doing mostlyclean in utils" ; \
-       (cd utils && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
           $(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-libstdc++-v3
  
-.PHONY: maybe-clean-utils clean-utils
-maybe-clean-utils:
+.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-utils: 
-       @[ -f ./utils/Makefile ] || exit 0; \
+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) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(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|"`; \
         done; \
-       echo "Doing clean in utils" ; \
-       (cd utils && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
           $(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-libstdc++-v3
  
-.PHONY: maybe-distclean-utils distclean-utils
-maybe-distclean-utils:
+.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-utils: 
-       @[ -f ./utils/Makefile ] || exit 0; \
+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) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(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|"`; \
         done; \
-       echo "Doing distclean in utils" ; \
-       (cd utils && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
           $(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-libstdc++-v3
  
-.PHONY: maybe-maintainer-clean-utils maintainer-clean-utils
-maybe-maintainer-clean-utils:
+.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-utils: 
-       @[ -f ./utils/Makefile ] || exit 0; \
+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) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       $(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|"`; \
         done; \
-       echo "Doing maintainer-clean in utils" ; \
-       (cd utils && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
           $(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-libstdc++-v3
  
  
-
-# ---------------------------------------
-# Modules which run on the target machine
-# ---------------------------------------
-
-.PHONY: configure-target-libstdc++-v3 maybe-configure-target-libstdc++-v3
-maybe-configure-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)/libstdc++-v3/multilib.out: multilib.out
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
-       rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || : ; \
-       cp multilib.out $(TARGET_SUBDIR)/libstdc++-v3/multilib.out
+$(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-libstdc++-v3: $(TARGET_SUBDIR)/libstdc++-v3/multilib.out
-       @test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
+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) \
-       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; \
-       echo Configuring in $(TARGET_SUBDIR)/libstdc++-v3; \
-       cd "$(TARGET_SUBDIR)/libstdc++-v3" || exit 1; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo Configuring in $(TARGET_SUBDIR)/libmudflap; \
+       cd "$(TARGET_SUBDIR)/libmudflap" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) \
             topdir=$(srcdir) ;; \
@@ -18886,245 +22678,296 @@ configure-target-libstdc++-v3: $(TARGET_SUBDIR)/libstdc++-v3/multilib.out
               *) topdir="../../$(srcdir)" ;; \
             esac ;; \
         esac; \
-         srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
-         libsrcdir="$$s/libstdc++-v3"; \
+         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)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
           || exit 1
+@endif target-libmudflap
  
-.PHONY: all-target-libstdc++-v3 maybe-all-target-libstdc++-v3
-maybe-all-target-libstdc++-v3:
-all-target-libstdc++-v3: configure-target-libstdc++-v3
+.PHONY: all-target-libmudflap maybe-all-target-libmudflap
+maybe-all-target-libmudflap:
+@if target-libmudflap
+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) \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  all)
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libmudflap && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   all)
+@endif target-libmudflap
  
-.PHONY: check-target-libstdc++-v3 maybe-check-target-libstdc++-v3
-maybe-check-target-libstdc++-v3:
+.PHONY: check-target-libmudflap maybe-check-target-libmudflap
+maybe-check-target-libmudflap:
+@if target-libmudflap
+maybe-check-target-libmudflap: check-target-libmudflap
  
-check-target-libstdc++-v3:
+check-target-libmudflap:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  check)
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libmudflap && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
  
+@endif target-libmudflap
  
-.PHONY: install-target-libstdc++-v3 maybe-install-target-libstdc++-v3
-maybe-install-target-libstdc++-v3:
+.PHONY: install-target-libmudflap maybe-install-target-libmudflap
+maybe-install-target-libmudflap:
+@if target-libmudflap
+maybe-install-target-libmudflap: install-target-libmudflap
  
-install-target-libstdc++-v3: installdirs
+install-target-libmudflap: installdirs
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+       $(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-libstdc++-v3 info-target-libstdc++-v3
-maybe-info-target-libstdc++-v3:
+.PHONY: maybe-info-target-libmudflap info-target-libmudflap
+maybe-info-target-libmudflap:
+@if target-libmudflap
+maybe-info-target-libmudflap: info-target-libmudflap
  
-info-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+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) \
-       echo "Doing info in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+       $(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)/libstdc++-v3 && \
+       (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) \
+                  info) \
           || exit 1
  
+@endif target-libmudflap
  
-.PHONY: maybe-dvi-target-libstdc++-v3 dvi-target-libstdc++-v3
-maybe-dvi-target-libstdc++-v3:
+.PHONY: maybe-dvi-target-libmudflap dvi-target-libmudflap
+maybe-dvi-target-libmudflap:
+@if target-libmudflap
+maybe-dvi-target-libmudflap: dvi-target-libmudflap
  
-dvi-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+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) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+       $(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)/libstdc++-v3 && \
+       (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) \
+                  dvi) \
           || exit 1
  
+@endif target-libmudflap
  
-.PHONY: maybe-TAGS-target-libstdc++-v3 TAGS-target-libstdc++-v3
-maybe-TAGS-target-libstdc++-v3:
+.PHONY: maybe-TAGS-target-libmudflap TAGS-target-libmudflap
+maybe-TAGS-target-libmudflap:
+@if target-libmudflap
+maybe-TAGS-target-libmudflap: TAGS-target-libmudflap
  
-TAGS-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+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) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+       $(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)/libstdc++-v3 && \
+       (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) \
+                  TAGS) \
           || exit 1
  
+@endif target-libmudflap
  
-.PHONY: maybe-install-info-target-libstdc++-v3 install-info-target-libstdc++-v3
-maybe-install-info-target-libstdc++-v3:
+.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-libstdc++-v3: \
-    configure-target-libstdc++-v3 \
-    info-target-libstdc++-v3 
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+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) \
-       echo "Doing install-info in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+       $(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)/libstdc++-v3 && \
+       (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) \
+                  install-info) \
           || exit 1
  
+@endif target-libmudflap
  
-.PHONY: maybe-installcheck-target-libstdc++-v3 installcheck-target-libstdc++-v3
-maybe-installcheck-target-libstdc++-v3:
+.PHONY: maybe-installcheck-target-libmudflap installcheck-target-libmudflap
+maybe-installcheck-target-libmudflap:
+@if target-libmudflap
+maybe-installcheck-target-libmudflap: installcheck-target-libmudflap
  
-installcheck-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+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) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+       $(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)/libstdc++-v3 && \
+       (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) \
+                  installcheck) \
           || exit 1
  
+@endif target-libmudflap
  
-.PHONY: maybe-mostlyclean-target-libstdc++-v3 mostlyclean-target-libstdc++-v3
-maybe-mostlyclean-target-libstdc++-v3:
+.PHONY: maybe-mostlyclean-target-libmudflap mostlyclean-target-libmudflap
+maybe-mostlyclean-target-libmudflap:
+@if target-libmudflap
+maybe-mostlyclean-target-libmudflap: mostlyclean-target-libmudflap
  
-mostlyclean-target-libstdc++-v3: 
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+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) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+       $(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)/libstdc++-v3 && \
+       (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) \
+                  mostlyclean) \
           || exit 1
  
+@endif target-libmudflap
  
-.PHONY: maybe-clean-target-libstdc++-v3 clean-target-libstdc++-v3
-maybe-clean-target-libstdc++-v3:
+.PHONY: maybe-clean-target-libmudflap clean-target-libmudflap
+maybe-clean-target-libmudflap:
+@if target-libmudflap
+maybe-clean-target-libmudflap: clean-target-libmudflap
  
-clean-target-libstdc++-v3: 
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+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) \
-       echo "Doing clean in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+       $(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)/libstdc++-v3 && \
+       (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) \
+                  clean) \
           || exit 1
  
+@endif target-libmudflap
  
-.PHONY: maybe-distclean-target-libstdc++-v3 distclean-target-libstdc++-v3
-maybe-distclean-target-libstdc++-v3:
+.PHONY: maybe-distclean-target-libmudflap distclean-target-libmudflap
+maybe-distclean-target-libmudflap:
+@if target-libmudflap
+maybe-distclean-target-libmudflap: distclean-target-libmudflap
  
-distclean-target-libstdc++-v3: 
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+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) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+       $(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)/libstdc++-v3 && \
+       (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) \
+                  distclean) \
           || exit 1
  
+@endif target-libmudflap
  
-.PHONY: maybe-maintainer-clean-target-libstdc++-v3 maintainer-clean-target-libstdc++-v3
-maybe-maintainer-clean-target-libstdc++-v3:
+.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-libstdc++-v3: 
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+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) \
-       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+       $(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)/libstdc++-v3 && \
+       (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) \
+                  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
@@ -19138,21 +22981,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 \
@@ -19169,44 +22998,59 @@ 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
+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)   all)
+@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 
@@ -19214,6 +23058,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|"`; \
@@ -19223,12 +23068,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 
@@ -19236,6 +23084,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|"`; \
@@ -19245,12 +23094,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 
@@ -19258,6 +23110,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|"`; \
@@ -19267,12 +23120,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 \
@@ -19281,6 +23137,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|"`; \
@@ -19290,12 +23147,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 
@@ -19303,6 +23163,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|"`; \
@@ -19312,18 +23173,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|"`; \
@@ -19333,18 +23198,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|"`; \
@@ -19354,18 +23223,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|"`; \
@@ -19375,18 +23248,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|"`; \
@@ -19396,43 +23273,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) ;; \
@@ -19442,245 +23308,296 @@ 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
+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)   all)
+@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
@@ -19694,21 +23611,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 \
@@ -19725,44 +23628,59 @@ 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
+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)   all)
+@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 
@@ -19770,6 +23688,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|"`; \
@@ -19779,12 +23698,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 
@@ -19792,6 +23714,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|"`; \
@@ -19801,12 +23724,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 
@@ -19814,6 +23740,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|"`; \
@@ -19823,12 +23750,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 \
@@ -19837,6 +23767,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|"`; \
@@ -19846,12 +23777,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 
@@ -19859,6 +23793,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|"`; \
@@ -19868,18 +23803,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|"`; \
@@ -19889,18 +23828,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|"`; \
@@ -19910,18 +23853,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|"`; \
@@ -19931,18 +23878,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|"`; \
@@ -19952,13 +23903,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
@@ -19972,21 +23926,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 \
@@ -20025,40 +23965,54 @@ 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
+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)   all)
+@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 
@@ -20066,6 +24020,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|"`; \
@@ -20075,12 +24030,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 
@@ -20088,6 +24046,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|"`; \
@@ -20097,12 +24056,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 
@@ -20110,6 +24072,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|"`; \
@@ -20119,12 +24082,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 \
@@ -20133,6 +24099,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|"`; \
@@ -20142,12 +24109,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 
@@ -20155,6 +24125,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|"`; \
@@ -20164,69 +24135,70 @@ 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
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup ; \
-       rm -f $(TARGET_SUBDIR)/winsup/Makefile || : ; \
-       cp multilib.out $(TARGET_SUBDIR)/winsup/multilib.out
-
-configure-target-winsup: $(TARGET_SUBDIR)/winsup/multilib.out
-       @test ! -f $(TARGET_SUBDIR)/winsup/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup ; \
-       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; \
+$(TARGET_SUBDIR)/winsup/multilib.out: multilib.out
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup ; \
+       rm -f $(TARGET_SUBDIR)/winsup/Makefile || : ; \
+       cp multilib.out $(TARGET_SUBDIR)/winsup/multilib.out
+
+configure-target-winsup: $(TARGET_SUBDIR)/winsup/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/winsup/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo Configuring in $(TARGET_SUBDIR)/winsup; \
         cd "$(TARGET_SUBDIR)/winsup" || exit 1; \
         case $(srcdir) in \
@@ -20243,44 +24215,59 @@ 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
+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)   all)
+@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 
@@ -20288,6 +24275,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|"`; \
@@ -20297,12 +24285,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 
@@ -20310,6 +24301,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|"`; \
@@ -20319,12 +24311,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 
@@ -20332,6 +24327,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|"`; \
@@ -20341,12 +24337,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 \
@@ -20355,6 +24354,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|"`; \
@@ -20364,12 +24364,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 
@@ -20377,6 +24380,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|"`; \
@@ -20386,18 +24390,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|"`; \
@@ -20407,18 +24415,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|"`; \
@@ -20428,18 +24440,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|"`; \
@@ -20449,18 +24465,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|"`; \
@@ -20470,13 +24490,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
@@ -20490,21 +24513,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 \
@@ -20521,40 +24530,54 @@ 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
+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)   all)
+@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 
@@ -20562,6 +24585,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|"`; \
@@ -20571,12 +24595,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 
@@ -20584,6 +24611,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|"`; \
@@ -20593,12 +24621,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 
@@ -20606,6 +24637,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|"`; \
@@ -20615,12 +24647,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 \
@@ -20629,6 +24664,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|"`; \
@@ -20638,12 +24674,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 
@@ -20651,6 +24690,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|"`; \
@@ -20660,18 +24700,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|"`; \
@@ -20681,18 +24725,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|"`; \
@@ -20702,18 +24750,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|"`; \
@@ -20723,18 +24775,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|"`; \
@@ -20744,13 +24800,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
@@ -20764,21 +24823,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 \
@@ -20795,44 +24840,59 @@ 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
+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)   all)
+@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 
@@ -20840,6 +24900,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|"`; \
@@ -20849,12 +24910,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 
@@ -20862,6 +24926,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|"`; \
@@ -20871,12 +24936,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 
@@ -20884,6 +24952,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|"`; \
@@ -20893,12 +24962,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 \
@@ -20907,6 +24979,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|"`; \
@@ -20916,12 +24989,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 
@@ -20929,6 +25005,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|"`; \
@@ -20938,18 +25015,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|"`; \
@@ -20959,18 +25040,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|"`; \
@@ -20980,18 +25065,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|"`; \
@@ -21001,18 +25090,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|"`; \
@@ -21022,13 +25115,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
@@ -21042,21 +25138,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 \
@@ -21073,44 +25155,59 @@ 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
+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)   all)
+@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 
@@ -21118,6 +25215,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|"`; \
@@ -21127,12 +25225,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 
@@ -21140,6 +25241,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|"`; \
@@ -21149,12 +25251,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 
@@ -21162,6 +25267,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|"`; \
@@ -21171,12 +25277,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 \
@@ -21185,6 +25294,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|"`; \
@@ -21194,12 +25304,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 
@@ -21207,6 +25320,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|"`; \
@@ -21216,18 +25330,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|"`; \
@@ -21237,18 +25355,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|"`; \
@@ -21258,18 +25380,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|"`; \
@@ -21279,18 +25405,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|"`; \
@@ -21300,13 +25430,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
@@ -21320,21 +25453,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 \
@@ -21351,36 +25470,49 @@ 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
+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)   all)
+@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 
@@ -21388,6 +25520,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|"`; \
@@ -21397,12 +25530,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 
@@ -21410,6 +25546,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|"`; \
@@ -21419,12 +25556,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 
@@ -21432,6 +25572,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|"`; \
@@ -21441,12 +25582,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 \
@@ -21455,6 +25599,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|"`; \
@@ -21464,12 +25609,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 
@@ -21477,6 +25625,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|"`; \
@@ -21486,18 +25635,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|"`; \
@@ -21507,18 +25660,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|"`; \
@@ -21528,18 +25685,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|"`; \
@@ -21549,18 +25710,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|"`; \
@@ -21570,13 +25735,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
@@ -21590,21 +25758,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 \
@@ -21621,44 +25775,59 @@ 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
+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)   all)
+@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 
@@ -21666,6 +25835,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|"`; \
@@ -21675,12 +25845,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 
@@ -21688,6 +25861,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|"`; \
@@ -21697,12 +25871,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 
@@ -21710,6 +25887,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|"`; \
@@ -21719,12 +25897,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 \
@@ -21733,6 +25914,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|"`; \
@@ -21742,12 +25924,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 
@@ -21755,6 +25940,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|"`; \
@@ -21764,18 +25950,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|"`; \
@@ -21785,18 +25975,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|"`; \
@@ -21806,18 +26000,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|"`; \
@@ -21827,18 +26025,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|"`; \
@@ -21848,13 +26050,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
@@ -21868,22 +26073,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 \
@@ -21900,44 +26090,59 @@ 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
+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)'   all)
+@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 
@@ -21945,6 +26150,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|"`; \
@@ -21954,12 +26160,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 
@@ -21967,6 +26176,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|"`; \
@@ -21976,12 +26186,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 
@@ -21989,6 +26202,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|"`; \
@@ -21998,12 +26212,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 \
@@ -22012,6 +26229,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|"`; \
@@ -22021,12 +26239,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 
@@ -22034,6 +26255,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|"`; \
@@ -22043,18 +26265,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|"`; \
@@ -22064,18 +26290,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|"`; \
@@ -22085,18 +26315,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|"`; \
@@ -22106,18 +26340,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|"`; \
@@ -22127,13 +26365,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
@@ -22147,21 +26388,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 \
@@ -22200,44 +26427,59 @@ 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
+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)   all)
+@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 
@@ -22245,6 +26487,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|"`; \
@@ -22254,12 +26497,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 
@@ -22267,6 +26513,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|"`; \
@@ -22276,12 +26523,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 
@@ -22289,6 +26539,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|"`; \
@@ -22298,12 +26549,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 \
@@ -22312,6 +26566,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|"`; \
@@ -22321,12 +26576,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 
@@ -22334,6 +26592,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|"`; \
@@ -22343,18 +26602,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|"`; \
@@ -22364,18 +26627,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|"`; \
@@ -22385,18 +26652,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|"`; \
@@ -22406,18 +26677,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|"`; \
@@ -22427,13 +26702,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
@@ -22447,21 +26725,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 \
@@ -22478,44 +26742,59 @@ 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
+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)   all)
+@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 
@@ -22523,6 +26802,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|"`; \
@@ -22532,12 +26812,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 
@@ -22545,6 +26828,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|"`; \
@@ -22554,12 +26838,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 
@@ -22567,6 +26854,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|"`; \
@@ -22576,12 +26864,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 \
@@ -22590,6 +26881,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|"`; \
@@ -22599,12 +26891,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 
@@ -22612,6 +26907,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|"`; \
@@ -22621,18 +26917,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|"`; \
@@ -22642,18 +26942,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|"`; \
@@ -22663,18 +26967,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|"`; \
@@ -22684,18 +26992,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|"`; \
@@ -22705,13 +27017,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
@@ -22725,21 +27040,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 \
@@ -22756,44 +27057,59 @@ 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
+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)   all)
+@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 
@@ -22801,6 +27117,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|"`; \
@@ -22810,12 +27127,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 
@@ -22823,6 +27143,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|"`; \
@@ -22832,12 +27153,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 
@@ -22845,6 +27169,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|"`; \
@@ -22854,12 +27179,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 \
@@ -22868,6 +27196,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|"`; \
@@ -22877,12 +27206,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 
@@ -22890,6 +27222,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|"`; \
@@ -22899,18 +27232,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|"`; \
@@ -22920,18 +27257,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|"`; \
@@ -22941,18 +27282,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|"`; \
@@ -22962,18 +27307,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|"`; \
@@ -22983,13 +27332,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
@@ -23003,21 +27355,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 \
@@ -23034,44 +27372,59 @@ 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
+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)   all)
+@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 
@@ -23079,6 +27432,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|"`; \
@@ -23088,12 +27442,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 
@@ -23101,6 +27458,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|"`; \
@@ -23110,12 +27468,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 
@@ -23123,6 +27484,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|"`; \
@@ -23132,12 +27494,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 \
@@ -23146,6 +27511,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|"`; \
@@ -23155,12 +27521,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 
@@ -23168,6 +27537,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|"`; \
@@ -23177,18 +27547,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|"`; \
@@ -23198,18 +27572,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|"`; \
@@ -23219,18 +27597,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|"`; \
@@ -23240,18 +27622,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|"`; \
@@ -23261,13 +27647,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
@@ -23279,23 +27668,9 @@ configure-target-libada: $(TARGET_SUBDIR)/libada/multilib.out
         @test ! -f $(TARGET_SUBDIR)/libada/Makefile || exit 0; \
         $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada ; \
         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; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
         echo Configuring in $(TARGET_SUBDIR)/libada; \
         cd "$(TARGET_SUBDIR)/libada" || exit 1; \
         case $(srcdir) in \
@@ -23312,44 +27687,59 @@ 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
+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)   all)
+@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 
@@ -23357,6 +27747,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|"`; \
@@ -23366,12 +27757,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 
@@ -23379,6 +27773,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|"`; \
@@ -23388,12 +27783,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 
@@ -23401,6 +27799,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|"`; \
@@ -23410,12 +27809,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 \
@@ -23424,6 +27826,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|"`; \
@@ -23433,12 +27836,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 
@@ -23446,6 +27852,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|"`; \
@@ -23455,18 +27862,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|"`; \
@@ -23476,18 +27887,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|"`; \
@@ -23497,18 +27912,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|"`; \
@@ -23518,18 +27937,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|"`; \
@@ -23539,9 +27962,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
  
  
  
@@ -23561,28 +27985,16 @@ maintainer-clean-target-libada:
  # We must skip configuring if toplevel bootstrap is going.
  .PHONY: configure-gcc maybe-configure-gcc
  maybe-configure-gcc:
+@if gcc
+maybe-configure-gcc: configure-gcc
  configure-gcc:
+@endif gcc
+@if gcc-no-bootstrap
         @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; \
-       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 gcc; \
         cd gcc || exit 1; \
         case $(srcdir) in \
@@ -23599,22 +28011,25 @@ configure-gcc:
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
           || exit 1
+@endif gcc-no-bootstrap
  
  # 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:
+@if gcc
+maybe-all-gcc: all-gcc
  all-gcc: configure-gcc
+@endif gcc
+@if gcc-no-bootstrap
         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) \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       if [ -f gcc/stage_last ] ; then \
           (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) quickstrap); \
         else \
-         $(SET_LIB_PATH) \
           (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) all); \
         fi
  
@@ -23634,6 +28049,7 @@ $(GCC_STRAP_TARGETS): all-bootstrap 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; \
@@ -23653,28 +28069,31 @@ $(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
         @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) 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
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) 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
  
@@ -23683,22 +28102,26 @@ cross: all-texinfo all-bison all-byacc all-binutils 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
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) LANGUAGES="c c++" all
+@endif gcc-no-bootstrap
  
  .PHONY: check-gcc maybe-check-gcc
  maybe-check-gcc:
+@if gcc
+maybe-check-gcc: check-gcc
  check-gcc:
         @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); \
         else \
           true; \
@@ -23710,6 +28133,7 @@ check-gcc-c++:
           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; \
@@ -23717,18 +28141,23 @@ check-gcc-c++:
  
  .PHONY: check-c++
  check-c++: check-target-libstdc++-v3 check-gcc-c++
+@endif gcc
  
  .PHONY: install-gcc maybe-install-gcc
  maybe-install-gcc:
+@if gcc
+maybe-install-gcc: install-gcc
  install-gcc:
         @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) install); \
         else \
           true; \
         fi
+@endif gcc
  
  # Install the gcc headers files, but not the fixed include files,
  # which Cygnus is not allowed to distribute.  This rule is very
@@ -23745,6 +28174,7 @@ 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; \
@@ -23755,6 +28185,8 @@ gcc-no-fixedincludes:
  
  .PHONY: maybe-info-gcc info-gcc
  maybe-info-gcc:
+@if gcc
+maybe-info-gcc: info-gcc
  info-gcc: \
      configure-gcc 
         @[ -f ./gcc/Makefile ] || exit 0; \
@@ -23764,6 +28196,7 @@ info-gcc: \
         for flag in $(EXTRA_GCC_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
+       $(HOST_EXPORTS) \
         echo "Doing info in gcc" ; \
         (cd gcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
@@ -23772,10 +28205,13 @@ info-gcc: \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
                   info) \
           || exit 1
+@endif gcc
  
  
  .PHONY: maybe-dvi-gcc dvi-gcc
  maybe-dvi-gcc:
+@if gcc
+maybe-dvi-gcc: dvi-gcc
  dvi-gcc: \
      configure-gcc 
         @[ -f ./gcc/Makefile ] || exit 0; \
@@ -23785,6 +28221,7 @@ dvi-gcc: \
         for flag in $(EXTRA_GCC_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
+       $(HOST_EXPORTS) \
         echo "Doing dvi in gcc" ; \
         (cd gcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
@@ -23793,10 +28230,13 @@ dvi-gcc: \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
                   dvi) \
           || exit 1
+@endif gcc
  
  
  .PHONY: maybe-TAGS-gcc TAGS-gcc
  maybe-TAGS-gcc:
+@if gcc
+maybe-TAGS-gcc: TAGS-gcc
  TAGS-gcc: \
      configure-gcc 
         @[ -f ./gcc/Makefile ] || exit 0; \
@@ -23806,6 +28246,7 @@ TAGS-gcc: \
         for flag in $(EXTRA_GCC_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
+       $(HOST_EXPORTS) \
         echo "Doing TAGS in gcc" ; \
         (cd gcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
@@ -23814,10 +28255,13 @@ TAGS-gcc: \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
                   TAGS) \
           || exit 1
+@endif gcc
  
  
  .PHONY: maybe-install-info-gcc install-info-gcc
  maybe-install-info-gcc:
+@if gcc
+maybe-install-info-gcc: install-info-gcc
  install-info-gcc: \
      configure-gcc \
      info-gcc 
@@ -23828,6 +28272,7 @@ install-info-gcc: \
         for flag in $(EXTRA_GCC_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
+       $(HOST_EXPORTS) \
         echo "Doing install-info in gcc" ; \
         (cd gcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
@@ -23836,10 +28281,13 @@ install-info-gcc: \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
                   install-info) \
           || exit 1
+@endif gcc
  
  
  .PHONY: maybe-installcheck-gcc installcheck-gcc
  maybe-installcheck-gcc:
+@if gcc
+maybe-installcheck-gcc: installcheck-gcc
  installcheck-gcc: \
      configure-gcc 
         @[ -f ./gcc/Makefile ] || exit 0; \
@@ -23849,6 +28297,7 @@ installcheck-gcc: \
         for flag in $(EXTRA_GCC_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
+       $(HOST_EXPORTS) \
         echo "Doing installcheck in gcc" ; \
         (cd gcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
@@ -23857,10 +28306,13 @@ installcheck-gcc: \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
                   installcheck) \
           || exit 1
+@endif gcc
  
  
  .PHONY: maybe-mostlyclean-gcc mostlyclean-gcc
  maybe-mostlyclean-gcc:
+@if gcc
+maybe-mostlyclean-gcc: mostlyclean-gcc
  mostlyclean-gcc: 
         @[ -f ./gcc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
@@ -23869,6 +28321,7 @@ mostlyclean-gcc:
         for flag in $(EXTRA_GCC_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
+       $(HOST_EXPORTS) \
         echo "Doing mostlyclean in gcc" ; \
         (cd gcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
@@ -23877,10 +28330,13 @@ mostlyclean-gcc:
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
                   mostlyclean) \
           || exit 1
+@endif gcc
  
  
  .PHONY: maybe-clean-gcc clean-gcc
  maybe-clean-gcc:
+@if gcc
+maybe-clean-gcc: clean-gcc
  clean-gcc: 
         @[ -f ./gcc/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
@@ -23889,6 +28345,7 @@ clean-gcc:
         for flag in $(EXTRA_GCC_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
+       $(HOST_EXPORTS) \
         echo "Doing clean in gcc" ; \
         (cd gcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
@@ -23897,115 +28354,505 @@ clean-gcc:
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
                   clean) \
           || exit 1
+@endif gcc
+
+
+.PHONY: maybe-distclean-gcc distclean-gcc
+maybe-distclean-gcc:
+@if gcc
+maybe-distclean-gcc: 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; \
+       $(HOST_EXPORTS) \
+       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
+@endif gcc
+
+
+.PHONY: maybe-maintainer-clean-gcc maintainer-clean-gcc
+maybe-maintainer-clean-gcc:
+@if gcc
+maybe-maintainer-clean-gcc: maintainer-clean-gcc
+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_GCC_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       $(HOST_EXPORTS) \
+       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
+@endif gcc
+
+
+
+@if gcc-bootstrap
+# ---------------------
+# GCC bootstrap support
+# ---------------------
+
+# We track the current stage (the one in 'gcc') in the stage_last file.
+# We name the build directories for the various stages "stage1-gcc",
+# "stage2-gcc","stage3-gcc", etc.
+
+# 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!
+
+# 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 almost certainly not parallel-make safe.
+
+# 'touch' doesn't work right on some platforms.
+STAMP = echo timestamp > 
+
+# 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@
+
+# We only want to compare .o files, so set this!
+objext = .o
+
+# Real targets act phony if they depend on phony targets; this hack
+# prevents gratuitous rebuilding of stage 1.
+prebootstrap:
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-bootstrap
+       $(STAMP) prebootstrap
+
+# Flags to pass to stage2 and later makes.
+BOOT_CFLAGS= -g -O2
+POSTSTAGE1_FLAGS_TO_PASS = \
+       CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \
+       STAGE_PREFIX=$$r/stage-gcc/ \
+       CFLAGS="$(BOOT_CFLAGS)" \
+       ADAC="\$$(CC)"
+
+# 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: stage1-start stage1-end
+
+stage1-start::
+       [ -f stage_last ] && $(MAKE) `cat stage_last`-end || :
+       echo stage1 > stage_last ; \
+       [ -d stage1-gcc ] || mkdir stage1-gcc; \
+       set stage1-gcc gcc ; @CREATE_LINK_TO_DIR@ 
+
+stage1-end::
+       rm -f stage_last ; \
+       set gcc stage1-gcc ; @UNDO_LINK_TO_DIR@ 
+
+# 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 [ -f all-stage1-gcc ] ; then \
+         echo Remaking stage 1 ; \
+         rm -f all-stage1-gcc ; \
+       fi ; \
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage1-gcc
+
+
+
+configure-stage1-gcc:  prebootstrap 
+       $(MAKE) stage1-start
+       @if [ -f stage1-gcc/Makefile ] ; then \
+         $(STAMP) configure-stage1-gcc ; \
+         exit 0; \
+       else \
+         true ; \
+       fi ; \
+       r=`${PWD_COMMAND}`; export r; \
+       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)" && \
+         $(STAMP) ../configure-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) $(GCC_FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)" && $(STAMP) ../all-stage1-gcc
+
+
+
+
+
+.PHONY: restage1 touch-stage1 distclean-stage1
+
+# Rules to wipe a stage and all the following ones, used for cleanstrap
+
+distclean-stage1::
+       [ -f stage_last ] && $(MAKE) `cat stage_last`-end || :
+       rm -rf configure-stage1-gcc all-stage1-gcc stage1-gcc 
+
+# Rules to renew the timestamp on a stage and all the following ones
+
+touch-stage1::
+       @[ -f configure-stage1-gcc ] && \
+         echo '$(STAMP) configure-stage1-gcc' && \
+         $(STAMP) configure-stage1-gcc; \
+       [ -f all-stage1-gcc ] && \
+         echo '$(STAMP) all-stage1-gcc' && \
+         $(STAMP) all-stage1-gcc; \
+       :
+
+# After building a stage, touch the following ones
+
+restage1::
+       rm -rf all-stage1-gcc 
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS)  all-stage1-gcc 
+
+
+
+
+.PHONY: stage2-start stage2-end
+
+stage2-start::
+       [ -f stage_last ] && $(MAKE) `cat stage_last`-end || :
+       echo stage2 > stage_last ; \
+       [ -d stage2-gcc ] || mkdir stage2-gcc; \
+       set stage2-gcc gcc ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-gcc prev-gcc ; @CREATE_LINK_TO_DIR@ 
+
+stage2-end::
+       rm -f stage_last ; \
+       set gcc stage2-gcc ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-gcc stage1-gcc ; @UNDO_LINK_TO_DIR@ 
+
+# 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 [ -f all-stage2-gcc ] ; then \
+         echo Remaking stage 2 ; \
+         rm -f all-stage2-gcc ; \
+       fi ; \
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage2-gcc
+
+
+stage1-bubble::
+       @if [ -f configure-stage2-gcc ] ; then \
+         $(STAMP) configure-stage2-gcc ; \
+       fi
+
+
+configure-stage2-gcc:  all-stage1-gcc 
+       $(MAKE) stage2-start
+       @if [ -f stage2-gcc/Makefile ] ; then \
+         $(STAMP) configure-stage2-gcc ; \
+         exit 0; \
+       else \
+         true ; \
+       fi ; \
+       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@ && \
+         $(STAMP) ../configure-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) $(GCC_FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                && $(STAMP) ../all-stage2-gcc
+
+
+
+
+.PHONY: bootstrap2
+bootstrap2:
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage2-bubble  \
+         stage2-start all stage2-end 
+
+
+.PHONY: restage2 touch-stage2 distclean-stage2
+
+# Rules to wipe a stage and all the following ones, used for cleanstrap
+distclean-stage1:: distclean-stage2 
+distclean-stage2::
+       [ -f stage_last ] && $(MAKE) `cat stage_last`-end || :
+       rm -rf configure-stage2-gcc all-stage2-gcc stage2-gcc 
+
+# Rules to renew the timestamp on a stage and all the following ones
+touch-stage1:: touch-stage2 
+touch-stage2::
+       @[ -f configure-stage2-gcc ] && \
+         echo '$(STAMP) configure-stage2-gcc' && \
+         $(STAMP) configure-stage2-gcc; \
+       [ -f all-stage2-gcc ] && \
+         echo '$(STAMP) all-stage2-gcc' && \
+         $(STAMP) all-stage2-gcc; \
+       :
+
+# After building a stage, touch the following ones
+restage1:: touch-stage2 
+restage2::
+       rm -rf all-stage2-gcc 
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS)  all-stage2-gcc 
+
+
+
+
+.PHONY: stage3-start stage3-end
+
+stage3-start::
+       [ -f stage_last ] && $(MAKE) `cat stage_last`-end || :
+       echo stage3 > stage_last ; \
+       [ -d stage3-gcc ] || mkdir stage3-gcc; \
+       set stage3-gcc gcc ; @CREATE_LINK_TO_DIR@  ; \
+       set stage2-gcc prev-gcc ; @CREATE_LINK_TO_DIR@ 
+
+stage3-end::
+       rm -f stage_last ; \
+       set gcc stage3-gcc ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-gcc stage2-gcc ; @UNDO_LINK_TO_DIR@ 
+
+# 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
+       @if [ -f all-stage3-gcc ] ; then \
+         echo Remaking stage 3 ; \
+         rm -f all-stage3-gcc ; \
+       fi ; \
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage3-gcc
+
+
+stage2-bubble::
+       @if [ -f configure-stage3-gcc ] ; then \
+         $(STAMP) configure-stage3-gcc ; \
+       fi
+
+
+configure-stage3-gcc:  all-stage2-gcc 
+       $(MAKE) stage3-start
+       @if [ -f stage3-gcc/Makefile ] ; then \
+         $(STAMP) configure-stage3-gcc ; \
+         exit 0; \
+       else \
+         true ; \
+       fi ; \
+       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@ && \
+         $(STAMP) ../configure-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) $(GCC_FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                && $(STAMP) ../all-stage3-gcc
+
+
+compare: all-stage3-gcc
+       [ -f stage_last ] && $(MAKE) `cat stage_last`-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
  
  
-.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
  
+.PHONY: bootstrap
+bootstrap:
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage3-bubble  compare  \
+         stage3-start all stage3-end 
  
-.PHONY: maybe-maintainer-clean-gcc maintainer-clean-gcc
-maybe-maintainer-clean-gcc:
-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_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
  
+.PHONY: restage3 touch-stage3 distclean-stage3
  
+# Rules to wipe a stage and all the following ones, used for cleanstrap
+distclean-stage2:: distclean-stage3 
+distclean-stage3::
+       [ -f stage_last ] && $(MAKE) `cat stage_last`-end || :
+       rm -rf configure-stage3-gcc all-stage3-gcc stage3-gcc compare 
  
-# ---------------------
-# GCC bootstrap support
-# ---------------------
+# Rules to renew the timestamp on a stage and all the following ones
+touch-stage2:: touch-stage3 
+touch-stage3::
+       @[ -f configure-stage3-gcc ] && \
+         echo '$(STAMP) configure-stage3-gcc' && \
+         $(STAMP) configure-stage3-gcc; \
+       [ -f all-stage3-gcc ] && \
+         echo '$(STAMP) all-stage3-gcc' && \
+         $(STAMP) all-stage3-gcc; \
+       :
  
-# 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!
+# After building a stage, touch the following ones
+restage2:: touch-stage3 
+restage3::
+       rm -rf all-stage3-gcc compare 
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) compare 
  
-# Bugs: This is almost certainly not parallel-make safe.
  
-# 'touch' doesn't work right on some platforms.
-STAMP = echo timestamp > 
+.PHONY: cleanstrap
+cleanstrap: distclean-stage1 bootstrap
  
-# 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@
  
-# 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 ; \
+.PHONY: stage4-start stage4-end
+
+stage4-start::
+       [ -f stage_last ] && $(MAKE) `cat stage_last`-end || :
+       echo stage4 > stage_last ; \
+       [ -d stage4-gcc ] || mkdir stage4-gcc; \
+       set stage4-gcc gcc ; @CREATE_LINK_TO_DIR@  ; \
+       set stage3-gcc prev-gcc ; @CREATE_LINK_TO_DIR@ 
+
+stage4-end::
+       rm -f stage_last ; \
+       set gcc stage4-gcc ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-gcc stage3-gcc ; @UNDO_LINK_TO_DIR@ 
+
+# 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
+       @if [ -f all-stage4-gcc ] ; then \
+         echo Remaking stage 4 ; \
+         rm -f all-stage4-gcc ; \
+       fi ; \
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage4-gcc
+
+
+stage3-bubble::
+       @if [ -f configure-stage4-gcc ] ; then \
+         $(STAMP) configure-stage4-gcc ; \
+       fi
+
+
+configure-stage4-gcc:  all-stage3-gcc 
+       $(MAKE) stage4-start
+       @if [ -f stage4-gcc/Makefile ] ; then \
+         $(STAMP) configure-stage4-gcc ; \
           exit 0; \
         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; \
-       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; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 4 in gcc ; \
         cd gcc || exit 1; \
         case $(srcdir) in \
           \.) \
@@ -24020,64 +28867,122 @@ 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
+         @stage2_werror_flag@ && \
+         $(STAMP) ../configure-stage4-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
+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) $(GCC_FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                && $(STAMP) ../all-stage4-gcc
  
-all-stage1-gcc: configure-stage1-gcc prebootstrap
-       echo all-stage1-gcc > stage_last ; \
-       r=`${PWD_COMMAND}`; export r; \
+
+compare3: all-stage4-gcc
+       [ -f stage_last ] && $(MAKE) `cat stage_last`-end || :
+       @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       mv stage1-gcc gcc ; \
-       cd gcc && \
-       $(MAKE) $(GCC_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE1_CFLAGS)" \
-               || exit 1 ; \
+       rm -f .bad_compare ; \
+       cd stage4-gcc; \
+       files=`find . -name "*$(objext)" -print` ; \
         cd .. ; \
-       mv gcc stage1-gcc ; \
-       $(STAMP) all-stage1-gcc
-
-# 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 ; \
+       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
+
+
+
+.PHONY: bootstrap4
+bootstrap4:
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage4-bubble  compare3  \
+         stage4-start all stage4-end 
+
+
+.PHONY: restage4 touch-stage4 distclean-stage4
+
+# Rules to wipe a stage and all the following ones, used for cleanstrap
+distclean-stage3:: distclean-stage4 
+distclean-stage4::
+       [ -f stage_last ] && $(MAKE) `cat stage_last`-end || :
+       rm -rf configure-stage4-gcc all-stage4-gcc stage4-gcc compare3 
+
+# Rules to renew the timestamp on a stage and all the following ones
+touch-stage3:: touch-stage4 
+touch-stage4::
+       @[ -f configure-stage4-gcc ] && \
+         echo '$(STAMP) configure-stage4-gcc' && \
+         $(STAMP) configure-stage4-gcc; \
+       [ -f all-stage4-gcc ] && \
+         echo '$(STAMP) all-stage4-gcc' && \
+         $(STAMP) all-stage4-gcc; \
+       :
+
+# After building a stage, touch the following ones
+restage3:: touch-stage4 
+restage4::
+       rm -rf all-stage4-gcc compare3 
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) compare3 
+
+
+
+
+.PHONY: stageprofile-start stageprofile-end
+
+stageprofile-start::
+       [ -f stage_last ] && $(MAKE) `cat stage_last`-end || :
+       echo stageprofile > stage_last ; \
+       [ -d stageprofile-gcc ] || mkdir stageprofile-gcc; \
+       set stageprofile-gcc gcc ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-gcc prev-gcc ; @CREATE_LINK_TO_DIR@ 
+
+stageprofile-end::
+       rm -f stage_last ; \
+       set gcc stageprofile-gcc ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-gcc stage1-gcc ; @UNDO_LINK_TO_DIR@ 
+
+# 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 [ -f all-stageprofile-gcc ] ; then \
+         echo Remaking stage profile ; \
+         rm -f all-stageprofile-gcc ; \
+       fi ; \
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stageprofile-gcc
+
+
+stage1-bubble::
+       @if [ -f configure-stageprofile-gcc ] ; then \
+         $(STAMP) configure-stageprofile-gcc ; \
+       fi
+
+
+configure-stageprofile-gcc:  all-stage1-gcc 
+       $(MAKE) stageprofile-start
+       @if [ -f stageprofile-gcc/Makefile ] ; then \
+         $(STAMP) configure-stageprofile-gcc ; \
           exit 0; \
         else \
           true ; \
         fi ; \
-       [ -d stage2-gcc ] || mkdir stage2-gcc; \
-       mv stage2-gcc gcc ; \
-       mv stage1-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; \
-       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; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage profile in gcc ; \
         cd gcc || exit 1; \
         case $(srcdir) in \
           \.) \
@@ -24091,65 +28996,96 @@ configure-stage2-gcc: all-stage1-gcc
             libsrcdir="$$s/gcc";; \
         esac; \
         $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} @stage2_werror_flag@ ; \
-       cd .. ; \
-       mv gcc stage2-gcc ; \
-       mv prev-gcc stage1-gcc ; \
-       $(STAMP) configure-stage2-gcc
-
-# Flags to pass to stage2 and later makes.
-BOOT_CFLAGS= -g -O2
-POSTSTAGE1_FLAGS_TO_PASS = \
-       CFLAGS="$(BOOT_CFLAGS)" \
-       ADAC="\$$(CC)"
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ && \
+         $(STAMP) ../configure-stageprofile-gcc
  
-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 ; \
+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) $(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) || exit 1 ; \
-       cd .. ; \
-       mv prev-gcc stage1-gcc ; \
-       mv gcc stage2-gcc ; \
-       $(STAMP) all-stage2-gcc
+       $(MAKE) $(GCC_FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" && $(STAMP) ../all-stageprofile-gcc
  
-configure-stage3-gcc: all-stage2-gcc
-       echo configure-stage3-gcc > stage_last ; \
-       if [ -f stage3-gcc/Makefile ] ; then \
-         $(STAMP) configure-stage3-gcc ; \
+
+
+
+
+.PHONY: restageprofile touch-stageprofile distclean-stageprofile
+
+# Rules to wipe a stage and all the following ones, used for cleanstrap
+distclean-stage1:: distclean-stageprofile 
+distclean-stageprofile::
+       [ -f stage_last ] && $(MAKE) `cat stage_last`-end || :
+       rm -rf configure-stageprofile-gcc all-stageprofile-gcc stageprofile-gcc 
+
+# Rules to renew the timestamp on a stage and all the following ones
+touch-stage1:: touch-stageprofile 
+touch-stageprofile::
+       @[ -f configure-stageprofile-gcc ] && \
+         echo '$(STAMP) configure-stageprofile-gcc' && \
+         $(STAMP) configure-stageprofile-gcc; \
+       [ -f all-stageprofile-gcc ] && \
+         echo '$(STAMP) all-stageprofile-gcc' && \
+         $(STAMP) all-stageprofile-gcc; \
+       :
+
+# After building a stage, touch the following ones
+restage1:: touch-stageprofile 
+restageprofile::
+       rm -rf all-stageprofile-gcc 
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS)  all-stageprofile-gcc 
+
+
+
+
+.PHONY: stagefeedback-start stagefeedback-end
+
+stagefeedback-start::
+       [ -f stage_last ] && $(MAKE) `cat stage_last`-end || :
+       echo stagefeedback > stage_last ; \
+       [ -d stagefeedback-gcc ] || mkdir stagefeedback-gcc; \
+       set stagefeedback-gcc gcc ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-gcc prev-gcc ; @CREATE_LINK_TO_DIR@ 
+
+stagefeedback-end::
+       rm -f stage_last ; \
+       set gcc stagefeedback-gcc ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-gcc stage1-gcc ; @UNDO_LINK_TO_DIR@ 
+
+# 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 [ -f all-stagefeedback-gcc ] ; then \
+         echo Remaking stage feedback ; \
+         rm -f all-stagefeedback-gcc ; \
+       fi ; \
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stagefeedback-gcc
+
+
+stage1-bubble::
+       @if [ -f configure-stagefeedback-gcc ] ; then \
+         $(STAMP) configure-stagefeedback-gcc ; \
+       fi
+
+
+configure-stagefeedback-gcc:  all-stage1-gcc 
+       $(MAKE) stagefeedback-start
+       @if [ -f stagefeedback-gcc/Makefile ] ; then \
+         $(STAMP) configure-stagefeedback-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; \
-       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; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage feedback in gcc ; \
         cd gcc || exit 1; \
         case $(srcdir) in \
           \.) \
@@ -24163,61 +29099,80 @@ configure-stage3-gcc: all-stage2-gcc
             libsrcdir="$$s/gcc";; \
         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@ && \
+         $(STAMP) ../configure-stagefeedback-gcc
  
-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 ; \
+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) \
-               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) || exit 1 ; \
-       cd .. ; \
-       mv prev-gcc stage2-gcc ; \
-       mv gcc stage3-gcc ; \
-       $(STAMP) all-stage3-gcc
+       $(MAKE) $(GCC_FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" && $(STAMP) ../all-stagefeedback-gcc
  
-# We only want to compare .o files, so set this!
-objext = .o
  
-compare: all-stage3-gcc
-       r=`${PWD_COMMAND}`; export r; \
+
+
+
+.PHONY: restagefeedback touch-stagefeedback distclean-stagefeedback
+
+# Rules to wipe a stage and all the following ones, used for cleanstrap
+distclean-stage1:: distclean-stagefeedback 
+distclean-stagefeedback::
+       [ -f stage_last ] && $(MAKE) `cat stage_last`-end || :
+       rm -rf configure-stagefeedback-gcc all-stagefeedback-gcc stagefeedback-gcc 
+
+# Rules to renew the timestamp on a stage and all the following ones
+touch-stage1:: touch-stagefeedback 
+touch-stagefeedback::
+       @[ -f configure-stagefeedback-gcc ] && \
+         echo '$(STAMP) configure-stagefeedback-gcc' && \
+         $(STAMP) configure-stagefeedback-gcc; \
+       [ -f all-stagefeedback-gcc ] && \
+         echo '$(STAMP) all-stagefeedback-gcc' && \
+         $(STAMP) all-stagefeedback-gcc; \
+       :
+
+# After building a stage, touch the following ones
+restage1:: touch-stagefeedback 
+restagefeedback::
+       rm -rf all-stagefeedback-gcc 
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS)  all-stagefeedback-gcc 
+
+
+
+
+
+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 \
-         cmp --ignore-initial=16 $$r/stage2-gcc/$$file $$r/stage3-gcc/$$file \
-             > /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
+       cd stageprofile-gcc && \
+         { find . -type d | sort | sed 's,.*,$(SHELL) '"$$s"'/mkinstalldirs "../gcc/&",' | $(SHELL); } && \
+         { find . -name '*.*da' | sed 's,.*,$(LN) -f "&" "../gcc/&",' | $(SHELL); }
+
+profiledbootstrap: all-bootstrap configure-gcc
+       @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 stageprofile-start
+       @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
  
-.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
+@endif gcc-bootstrap
  
  # --------------------------------------
  # Dependencies between different modules
@@ -24230,15 +29185,23 @@ new-bootstrap: compare
  # are specified by depending on a 'maybe-' target.  If you're not sure,
  # it's safer to use a soft dependency.
  
+# Build modules
+all-build-bison: maybe-all-build-texinfo
+all-build-flex: maybe-all-build-texinfo
+all-build-libiberty: maybe-all-build-texinfo
+all-build-m4: maybe-all-build-libiberty maybe-all-build-texinfo
+
  # 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
+all-gcc: maybe-all-libiberty maybe-all-intl maybe-all-texinfo maybe-all-bison maybe-all-byacc maybe-all-flex maybe-all-binutils maybe-all-gas maybe-all-ld maybe-all-zlib maybe-all-libbanshee maybe-all-libcpp
+configure-libcpp: maybe-configure-libiberty maybe-configure-intl
+all-libcpp: maybe-all-libiberty maybe-all-intl
  # This is a slightly kludgy method of getting dependencies on 
  # all-build-libiberty correct; it would be better to build it every time.
  all-gcc: maybe-all-build-libiberty
-all-bootstrap: maybe-all-libiberty maybe-all-intl maybe-all-texinfo maybe-all-bison maybe-all-byacc maybe-all-binutils maybe-all-gas maybe-all-ld maybe-all-zlib
+all-bootstrap: maybe-all-binutils maybe-all-bison maybe-all-byacc maybe-all-flex maybe-all-gas maybe-all-intl maybe-all-ld maybe-all-libcpp maybe-all-libbanshee maybe-all-libiberty maybe-all-texinfo maybe-all-zlib 
  
  # Host modules specific to gdb.
  # GDB needs to know that the simulator is being built.
@@ -24311,8 +29274,7 @@ configure-target-boehm-gc: $(ALL_GCC_C) 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-libgfortran: $(ALL_GCC_C)
  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
@@ -24338,10 +29300,6 @@ 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@
-
  # Serialization dependencies.  Host configures don't work well in parallel to
  # each other, due to contention over config.cache.  Target configures and 
  # build configures are similar.