OSDN Git Service

* gcc.dg/c99-flex-array-5.c, gcc.dg/c99-fordecl-3.c,
[pf3gnuchains/gcc-fork.git] / Makefile.in
index b7b0831..f5fb048 100644 (file)
@@ -65,6 +65,8 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_DATA = @INSTALL_DATA@
+LN = @LN@
+LN_S = @LN_S@
 
 # -------------------------------------------------
 # Miscellaneous non-standard autoconf-set variables
@@ -99,20 +101,33 @@ SET_LIB_PATH = @SET_LIB_PATH@
 # Some platforms don't like blank entries, so we remove duplicate,
 # leading and trailing colons.
 REALLY_SET_LIB_PATH = \
+  @SET_GCC_LIB_PATH@ \
   $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH):$(TARGET_LIB_PATH):$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
 
 # This is the list of directories to be built for the build system.
-BUILD_CONFIGDIRS = libiberty libbanshee
+BUILD_CONFIGDIRS = libiberty
 # Build programs are put under this directory.
 BUILD_SUBDIR = @build_subdir@
 # This is set by the configure script to the arguments to use when configuring
 # directories built for the build system.
 BUILD_CONFIGARGS = @build_configargs@
+
+# This is the list of 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.  It must also be
-# exported whenever recursing into a build directory in case that
-# directory's Makefile re-runs configure.
+# 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; \
@@ -135,10 +150,9 @@ SUBDIRS = @configdirs@
 # 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.  It must also be
-# exported whenever recursing into a host directory in case that
-# directory's Makefile re-runs configure.
+# configuring subdirectories for the host system.
 HOST_EXPORTS = \
+       $(BASE_EXPORTS) \
        CC="$(CC)"; export CC; \
        CFLAGS="$(CFLAGS)"; export CFLAGS; \
        CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
@@ -154,18 +168,16 @@ HOST_EXPORTS = \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
        OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-       OBJDUMP="$(OBJDUMP)"; export OBJDUMP;
-
-# Similar, for the gcc directory.
-GCC_HOST_EXPORTS = \
-       $(HOST_EXPORTS) \
+       OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
        TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
        GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
-       GMPINC="$(HOST_GMPINC)"; export GMPINC;
+       GMPINC="$(HOST_GMPINC)"; export GMPINC; \
+       SET_GCC_LIB_PATH_CMD="@SET_GCC_LIB_PATH@"; export SET_GCC_LIB_PATH_CMD; \
+       @SET_GCC_LIB_PATH@
 
 # Similar, for later GCC stages.
 STAGE_HOST_EXPORTS = \
-       $(GCC_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;
 
@@ -178,10 +190,9 @@ TARGET_SUBDIR = @target_subdir@
 # 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.  It must also be
-# exported whenever recursing into a host directory in case that
-# directory's Makefile re-runs configure.
+# 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; \
@@ -196,7 +207,9 @@ BASE_TARGET_EXPORTS = \
        LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
        NM="$(NM_FOR_TARGET)"; export NM; \
        RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
-       WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES;
+       WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
+       SET_GCC_LIB_PATH_CMD="@SET_GCC_LIB_PATH@"; export SET_GCC_LIB_PATH_CMD; \
+       @SET_GCC_LIB_PATH@
 
 RAW_CXX_TARGET_EXPORTS = \
        $(BASE_TARGET_EXPORTS) \
@@ -237,42 +250,51 @@ CXX_FOR_BUILD = $(CXX)
 BUILD_PREFIX = @BUILD_PREFIX@
 BUILD_PREFIX_1 = @BUILD_PREFIX_1@
 
-BISON=@BISON@
-USUAL_BISON = `if [ -f $$r/bison/bison ] ; then \
-           echo $$r/bison/bison -L $$s/bison/ ; \
+# Flags to pass to stage2 and later makes.  They are defined
+# here so that they can be overridden by Makefile fragments.
+BOOT_CFLAGS= -g -O2
+
+CONFIGURED_BISON = @CONFIGURED_BISON@
+BISON = `if [ -f $$r/$(BUILD_SUBDIR)/bison/tests/bison ] ; then \
+           echo $$r/$(BUILD_SUBDIR)/bison/tests/bison ; \
         else \
-           echo bison ; \
+           echo ${CONFIGURED_BISON} ; \
         fi`
 
-DEFAULT_YACC = @DEFAULT_YACC@
-YACC=@YACC@
-USUAL_YACC = `if [ -f $$r/bison/bison ] ; then \
-           echo $$r/bison/bison -y -L $$s/bison/ ; \
-       elif [ -f $$r/byacc/byacc ] ; then \
-           echo $$r/byacc/byacc ; \
+CONFIGURED_YACC = @CONFIGURED_YACC@
+YACC = `if [ -f $$r/$(BUILD_SUBDIR)/bison/tests/bison ] ; then \
+           echo $$r/$(BUILD_SUBDIR)/bison/tests/bison -y ; \
+       elif [ -f $$r/$(BUILD_SUBDIR)/byacc/byacc ] ; then \
+           echo $$r/$(BUILD_SUBDIR)/byacc/byacc ; \
        else \
-           echo ${DEFAULT_YACC} ; \
+           echo ${CONFIGURED_YACC} ; \
        fi`
 
-DEFAULT_LEX = @DEFAULT_LEX@
-LEX=@LEX@
-USUAL_LEX = `if [ -f $$r/flex/flex ] ; \
-       then echo $$r/flex/flex ; \
-       else echo ${DEFAULT_LEX} ; fi`
+CONFIGURED_FLEX = @CONFIGURED_FLEX@
+FLEX = `if [ -f $$r/$(BUILD_SUBDIR)/flex/flex ] ; \
+       then echo $$r/$(BUILD_SUBDIR)/flex/flex ; \
+       else echo ${CONFIGURED_FLEX} ; fi`
+
+CONFIGURED_LEX = @CONFIGURED_LEX@
+LEX = `if [ -f $$r/$(BUILD_SUBDIR)/flex/flex ] ; \
+       then echo $$r/$(BUILD_SUBDIR)/flex/flex ; \
+       else echo ${CONFIGURED_LEX} ; fi`
 
-DEFAULT_M4 = @DEFAULT_M4@
-M4 = `if [ -f $$r/m4/m4 ] ; \
-       then echo $$r/m4/m4 ; \
-       else echo ${DEFAULT_M4} ; fi`
+CONFIGURED_M4 = @CONFIGURED_M4@
+M4 = `if [ -f $$r/$(BUILD_SUBDIR)/m4/m4 ] ; \
+       then echo $$r/$(BUILD_SUBDIR)/m4/m4 ; \
+       else echo ${CONFIGURED_M4} ; fi`
 
 # For an installed makeinfo, we require it to be from texinfo 4.2 or
-# higher, else we use the "missing" dummy.
-MAKEINFO=@MAKEINFO@
-USUAL_MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \
-       then echo $$r/texinfo/makeinfo/makeinfo ; \
-       else if (makeinfo --version \
+# higher, else we use the "missing" dummy.  We also pass the subdirectory
+# makeinfo even if only the Makefile is there, because Texinfo builds its
+# manual when made, and it requires its own version.
+CONFIGURED_MAKEINFO = @CONFIGURED_MAKEINFO@
+MAKEINFO = `if [ -f $$r/$(BUILD_SUBDIR)/texinfo/makeinfo/Makefile ] ; \
+       then echo $$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo ; \
+       else if (${CONFIGURED_MAKEINFO} --version \
          | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])') >/dev/null 2>&1; \
-        then echo makeinfo; else echo $$s/missing makeinfo; fi; fi`
+        then echo ${CONFIGURED_MAKEINFO}; else echo $$s/missing makeinfo; fi; fi`
 
 # This just becomes part of the MAKEINFO definition passed down to
 # sub-makes.  It lets flags be given on the command line while still
@@ -467,8 +489,7 @@ PICFLAG_FOR_TARGET =
 
 # The first rule in the file had better be this one.  Don't put any above it.
 # This lives here to allow makefile fragments to contain dependencies.
-all: all.normal
-.PHONY: all
+@default_target@:
 
 #### host and target specific makefile fragments come in here.
 @target_makefile_frag@
@@ -509,6 +530,7 @@ BASE_FLAGS_TO_PASS = \
        "CC_FOR_BUILD=$(CC_FOR_BUILD)" \
        "CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
        "EXPECT=$(EXPECT)" \
+       "FLEX=$(FLEX)" \
        "INSTALL=$(INSTALL)" \
        "INSTALL_DATA=$(INSTALL_DATA)" \
        "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
@@ -553,6 +575,8 @@ RECURSE_FLAGS = \
        CXX_FOR_TARGET='$(CXX_FOR_TARGET_FOR_RECURSIVE_MAKE)' \
        RAW_CXX_FOR_TARGET='$(RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE)' \
 
+RECURSE_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS)
+
 # Flags to pass down to most sub-makes, in which we're building with
 # the host environment.
 EXTRA_HOST_FLAGS = \
@@ -624,7 +648,7 @@ EXTRA_GCC_FLAGS = \
 GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS)
 
 .PHONY: configure-host
-configure-host: maybe-configure-gcc  \
+configure-host:  \
     maybe-configure-ash \
     maybe-configure-autoconf \
     maybe-configure-automake \
@@ -643,8 +667,10 @@ configure-host: maybe-configure-gcc  \
     maybe-configure-fileutils \
     maybe-configure-findutils \
     maybe-configure-find \
+    maybe-configure-fixincludes \
     maybe-configure-flex \
     maybe-configure-gas \
+    maybe-configure-gcc \
     maybe-configure-gawk \
     maybe-configure-gettext \
     maybe-configure-gnuserv \
@@ -658,7 +684,6 @@ configure-host: maybe-configure-gcc  \
     maybe-configure-ld \
     maybe-configure-libcpp \
     maybe-configure-libgui \
-    maybe-configure-libbanshee \
     maybe-configure-libiberty \
     maybe-configure-libtool \
     maybe-configure-m4 \
@@ -688,7 +713,6 @@ configure-host: maybe-configure-gcc  \
     maybe-configure-expect \
     maybe-configure-guile \
     maybe-configure-tk \
-    maybe-configure-tix \
     maybe-configure-libtermcap \
     maybe-configure-utils
 .PHONY: configure-target
@@ -712,12 +736,21 @@ configure-target:  \
     maybe-configure-target-rda \
     maybe-configure-target-libada
 
-# The target built for a native build.
-.PHONY: all.normal
-all.normal: @all_build_modules@ all-host all-target
-
+# The target built for a native non-bootstrap build.
+.PHONY: all
+all: unstage all-host all-target stage
+
+.PHONY: all-build
+all-build:  \
+    maybe-all-build-libiberty \
+    maybe-all-build-bison \
+    maybe-all-build-byacc \
+    maybe-all-build-flex \
+    maybe-all-build-m4 \
+    maybe-all-build-texinfo \
+    maybe-all-build-fixincludes
 .PHONY: all-host
-all-host: maybe-all-gcc  \
+all-host:  \
     maybe-all-ash \
     maybe-all-autoconf \
     maybe-all-automake \
@@ -736,8 +769,10 @@ all-host: maybe-all-gcc  \
     maybe-all-fileutils \
     maybe-all-findutils \
     maybe-all-find \
+    maybe-all-fixincludes \
     maybe-all-flex \
     maybe-all-gas \
+    maybe-all-gcc \
     maybe-all-gawk \
     maybe-all-gettext \
     maybe-all-gnuserv \
@@ -751,7 +786,6 @@ all-host: maybe-all-gcc  \
     maybe-all-ld \
     maybe-all-libcpp \
     maybe-all-libgui \
-    maybe-all-libbanshee \
     maybe-all-libiberty \
     maybe-all-libtool \
     maybe-all-m4 \
@@ -781,7 +815,6 @@ all-host: maybe-all-gcc  \
     maybe-all-expect \
     maybe-all-guile \
     maybe-all-tk \
-    maybe-all-tix \
     maybe-all-libtermcap \
     maybe-all-utils
 .PHONY: all-target
@@ -811,10 +844,10 @@ all-target:  \
 # but it may do additional work as well).
 
 .PHONY: do-info
-do-info: info-host info-target
+do-info: unstage info-host info-target stage
 
 .PHONY: info-host
-info-host: maybe-info-gcc  \
+info-host:  \
     maybe-info-ash \
     maybe-info-autoconf \
     maybe-info-automake \
@@ -833,8 +866,10 @@ info-host: maybe-info-gcc  \
     maybe-info-fileutils \
     maybe-info-findutils \
     maybe-info-find \
+    maybe-info-fixincludes \
     maybe-info-flex \
     maybe-info-gas \
+    maybe-info-gcc \
     maybe-info-gawk \
     maybe-info-gettext \
     maybe-info-gnuserv \
@@ -848,7 +883,6 @@ info-host: maybe-info-gcc  \
     maybe-info-ld \
     maybe-info-libcpp \
     maybe-info-libgui \
-    maybe-info-libbanshee \
     maybe-info-libiberty \
     maybe-info-libtool \
     maybe-info-m4 \
@@ -878,7 +912,6 @@ info-host: maybe-info-gcc  \
     maybe-info-expect \
     maybe-info-guile \
     maybe-info-tk \
-    maybe-info-tix \
     maybe-info-libtermcap \
     maybe-info-utils
 
@@ -904,10 +937,10 @@ info-target:  \
     maybe-info-target-libada
 
 .PHONY: do-dvi
-do-dvi: dvi-host dvi-target
+do-dvi: unstage dvi-host dvi-target stage
 
 .PHONY: dvi-host
-dvi-host: maybe-dvi-gcc  \
+dvi-host:  \
     maybe-dvi-ash \
     maybe-dvi-autoconf \
     maybe-dvi-automake \
@@ -926,8 +959,10 @@ dvi-host: maybe-dvi-gcc  \
     maybe-dvi-fileutils \
     maybe-dvi-findutils \
     maybe-dvi-find \
+    maybe-dvi-fixincludes \
     maybe-dvi-flex \
     maybe-dvi-gas \
+    maybe-dvi-gcc \
     maybe-dvi-gawk \
     maybe-dvi-gettext \
     maybe-dvi-gnuserv \
@@ -941,7 +976,6 @@ dvi-host: maybe-dvi-gcc  \
     maybe-dvi-ld \
     maybe-dvi-libcpp \
     maybe-dvi-libgui \
-    maybe-dvi-libbanshee \
     maybe-dvi-libiberty \
     maybe-dvi-libtool \
     maybe-dvi-m4 \
@@ -971,7 +1005,6 @@ dvi-host: maybe-dvi-gcc  \
     maybe-dvi-expect \
     maybe-dvi-guile \
     maybe-dvi-tk \
-    maybe-dvi-tix \
     maybe-dvi-libtermcap \
     maybe-dvi-utils
 
@@ -996,11 +1029,104 @@ dvi-target:  \
     maybe-dvi-target-rda \
     maybe-dvi-target-libada
 
+.PHONY: do-html
+do-html: unstage html-host html-target stage
+
+.PHONY: html-host
+html-host:  \
+    maybe-html-ash \
+    maybe-html-autoconf \
+    maybe-html-automake \
+    maybe-html-bash \
+    maybe-html-bfd \
+    maybe-html-opcodes \
+    maybe-html-binutils \
+    maybe-html-bison \
+    maybe-html-byacc \
+    maybe-html-bzip2 \
+    maybe-html-dejagnu \
+    maybe-html-diff \
+    maybe-html-dosutils \
+    maybe-html-etc \
+    maybe-html-fastjar \
+    maybe-html-fileutils \
+    maybe-html-findutils \
+    maybe-html-find \
+    maybe-html-fixincludes \
+    maybe-html-flex \
+    maybe-html-gas \
+    maybe-html-gcc \
+    maybe-html-gawk \
+    maybe-html-gettext \
+    maybe-html-gnuserv \
+    maybe-html-gprof \
+    maybe-html-gzip \
+    maybe-html-hello \
+    maybe-html-indent \
+    maybe-html-intl \
+    maybe-html-tcl \
+    maybe-html-itcl \
+    maybe-html-ld \
+    maybe-html-libcpp \
+    maybe-html-libgui \
+    maybe-html-libiberty \
+    maybe-html-libtool \
+    maybe-html-m4 \
+    maybe-html-make \
+    maybe-html-mmalloc \
+    maybe-html-patch \
+    maybe-html-perl \
+    maybe-html-prms \
+    maybe-html-rcs \
+    maybe-html-readline \
+    maybe-html-release \
+    maybe-html-recode \
+    maybe-html-sed \
+    maybe-html-send-pr \
+    maybe-html-shellutils \
+    maybe-html-sid \
+    maybe-html-sim \
+    maybe-html-tar \
+    maybe-html-texinfo \
+    maybe-html-textutils \
+    maybe-html-time \
+    maybe-html-uudecode \
+    maybe-html-wdiff \
+    maybe-html-zip \
+    maybe-html-zlib \
+    maybe-html-gdb \
+    maybe-html-expect \
+    maybe-html-guile \
+    maybe-html-tk \
+    maybe-html-libtermcap \
+    maybe-html-utils
+
+.PHONY: html-target
+html-target:  \
+    maybe-html-target-libstdc++-v3 \
+    maybe-html-target-libmudflap \
+    maybe-html-target-newlib \
+    maybe-html-target-libgfortran \
+    maybe-html-target-libobjc \
+    maybe-html-target-libtermcap \
+    maybe-html-target-winsup \
+    maybe-html-target-libgloss \
+    maybe-html-target-libiberty \
+    maybe-html-target-gperf \
+    maybe-html-target-examples \
+    maybe-html-target-libffi \
+    maybe-html-target-libjava \
+    maybe-html-target-zlib \
+    maybe-html-target-boehm-gc \
+    maybe-html-target-qthreads \
+    maybe-html-target-rda \
+    maybe-html-target-libada
+
 .PHONY: do-TAGS
-do-TAGS: TAGS-host TAGS-target
+do-TAGS: unstage TAGS-host TAGS-target stage
 
 .PHONY: TAGS-host
-TAGS-host: maybe-TAGS-gcc  \
+TAGS-host:  \
     maybe-TAGS-ash \
     maybe-TAGS-autoconf \
     maybe-TAGS-automake \
@@ -1019,8 +1145,10 @@ TAGS-host: maybe-TAGS-gcc  \
     maybe-TAGS-fileutils \
     maybe-TAGS-findutils \
     maybe-TAGS-find \
+    maybe-TAGS-fixincludes \
     maybe-TAGS-flex \
     maybe-TAGS-gas \
+    maybe-TAGS-gcc \
     maybe-TAGS-gawk \
     maybe-TAGS-gettext \
     maybe-TAGS-gnuserv \
@@ -1034,7 +1162,6 @@ TAGS-host: maybe-TAGS-gcc  \
     maybe-TAGS-ld \
     maybe-TAGS-libcpp \
     maybe-TAGS-libgui \
-    maybe-TAGS-libbanshee \
     maybe-TAGS-libiberty \
     maybe-TAGS-libtool \
     maybe-TAGS-m4 \
@@ -1064,7 +1191,6 @@ TAGS-host: maybe-TAGS-gcc  \
     maybe-TAGS-expect \
     maybe-TAGS-guile \
     maybe-TAGS-tk \
-    maybe-TAGS-tix \
     maybe-TAGS-libtermcap \
     maybe-TAGS-utils
 
@@ -1090,10 +1216,10 @@ TAGS-target:  \
     maybe-TAGS-target-libada
 
 .PHONY: do-install-info
-do-install-info: install-info-host install-info-target
+do-install-info: unstage install-info-host install-info-target stage
 
 .PHONY: install-info-host
-install-info-host: maybe-install-info-gcc  \
+install-info-host:  \
     maybe-install-info-ash \
     maybe-install-info-autoconf \
     maybe-install-info-automake \
@@ -1112,8 +1238,10 @@ install-info-host: maybe-install-info-gcc  \
     maybe-install-info-fileutils \
     maybe-install-info-findutils \
     maybe-install-info-find \
+    maybe-install-info-fixincludes \
     maybe-install-info-flex \
     maybe-install-info-gas \
+    maybe-install-info-gcc \
     maybe-install-info-gawk \
     maybe-install-info-gettext \
     maybe-install-info-gnuserv \
@@ -1127,7 +1255,6 @@ install-info-host: maybe-install-info-gcc  \
     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 \
@@ -1157,7 +1284,6 @@ install-info-host: maybe-install-info-gcc  \
     maybe-install-info-expect \
     maybe-install-info-guile \
     maybe-install-info-tk \
-    maybe-install-info-tix \
     maybe-install-info-libtermcap \
     maybe-install-info-utils
 
@@ -1183,10 +1309,10 @@ install-info-target:  \
     maybe-install-info-target-libada
 
 .PHONY: do-installcheck
-do-installcheck: installcheck-host installcheck-target
+do-installcheck: unstage installcheck-host installcheck-target stage
 
 .PHONY: installcheck-host
-installcheck-host: maybe-installcheck-gcc  \
+installcheck-host:  \
     maybe-installcheck-ash \
     maybe-installcheck-autoconf \
     maybe-installcheck-automake \
@@ -1205,8 +1331,10 @@ installcheck-host: maybe-installcheck-gcc  \
     maybe-installcheck-fileutils \
     maybe-installcheck-findutils \
     maybe-installcheck-find \
+    maybe-installcheck-fixincludes \
     maybe-installcheck-flex \
     maybe-installcheck-gas \
+    maybe-installcheck-gcc \
     maybe-installcheck-gawk \
     maybe-installcheck-gettext \
     maybe-installcheck-gnuserv \
@@ -1220,7 +1348,6 @@ installcheck-host: maybe-installcheck-gcc  \
     maybe-installcheck-ld \
     maybe-installcheck-libcpp \
     maybe-installcheck-libgui \
-    maybe-installcheck-libbanshee \
     maybe-installcheck-libiberty \
     maybe-installcheck-libtool \
     maybe-installcheck-m4 \
@@ -1250,7 +1377,6 @@ installcheck-host: maybe-installcheck-gcc  \
     maybe-installcheck-expect \
     maybe-installcheck-guile \
     maybe-installcheck-tk \
-    maybe-installcheck-tix \
     maybe-installcheck-libtermcap \
     maybe-installcheck-utils
 
@@ -1276,10 +1402,10 @@ installcheck-target:  \
     maybe-installcheck-target-libada
 
 .PHONY: do-mostlyclean
-do-mostlyclean: mostlyclean-host mostlyclean-target
+do-mostlyclean: unstage mostlyclean-host mostlyclean-target stage
 
 .PHONY: mostlyclean-host
-mostlyclean-host: maybe-mostlyclean-gcc  \
+mostlyclean-host:  \
     maybe-mostlyclean-ash \
     maybe-mostlyclean-autoconf \
     maybe-mostlyclean-automake \
@@ -1298,8 +1424,10 @@ mostlyclean-host: maybe-mostlyclean-gcc  \
     maybe-mostlyclean-fileutils \
     maybe-mostlyclean-findutils \
     maybe-mostlyclean-find \
+    maybe-mostlyclean-fixincludes \
     maybe-mostlyclean-flex \
     maybe-mostlyclean-gas \
+    maybe-mostlyclean-gcc \
     maybe-mostlyclean-gawk \
     maybe-mostlyclean-gettext \
     maybe-mostlyclean-gnuserv \
@@ -1313,7 +1441,6 @@ mostlyclean-host: maybe-mostlyclean-gcc  \
     maybe-mostlyclean-ld \
     maybe-mostlyclean-libcpp \
     maybe-mostlyclean-libgui \
-    maybe-mostlyclean-libbanshee \
     maybe-mostlyclean-libiberty \
     maybe-mostlyclean-libtool \
     maybe-mostlyclean-m4 \
@@ -1343,7 +1470,6 @@ mostlyclean-host: maybe-mostlyclean-gcc  \
     maybe-mostlyclean-expect \
     maybe-mostlyclean-guile \
     maybe-mostlyclean-tk \
-    maybe-mostlyclean-tix \
     maybe-mostlyclean-libtermcap \
     maybe-mostlyclean-utils
 
@@ -1369,10 +1495,10 @@ mostlyclean-target:  \
     maybe-mostlyclean-target-libada
 
 .PHONY: do-clean
-do-clean: clean-host clean-target
+do-clean: unstage clean-host clean-target stage
 
 .PHONY: clean-host
-clean-host: maybe-clean-gcc  \
+clean-host:  \
     maybe-clean-ash \
     maybe-clean-autoconf \
     maybe-clean-automake \
@@ -1391,8 +1517,10 @@ clean-host: maybe-clean-gcc  \
     maybe-clean-fileutils \
     maybe-clean-findutils \
     maybe-clean-find \
+    maybe-clean-fixincludes \
     maybe-clean-flex \
     maybe-clean-gas \
+    maybe-clean-gcc \
     maybe-clean-gawk \
     maybe-clean-gettext \
     maybe-clean-gnuserv \
@@ -1406,7 +1534,6 @@ clean-host: maybe-clean-gcc  \
     maybe-clean-ld \
     maybe-clean-libcpp \
     maybe-clean-libgui \
-    maybe-clean-libbanshee \
     maybe-clean-libiberty \
     maybe-clean-libtool \
     maybe-clean-m4 \
@@ -1436,7 +1563,6 @@ clean-host: maybe-clean-gcc  \
     maybe-clean-expect \
     maybe-clean-guile \
     maybe-clean-tk \
-    maybe-clean-tix \
     maybe-clean-libtermcap \
     maybe-clean-utils
 
@@ -1462,10 +1588,10 @@ clean-target:  \
     maybe-clean-target-libada
 
 .PHONY: do-distclean
-do-distclean: distclean-host distclean-target
+do-distclean: unstage distclean-host distclean-target stage
 
 .PHONY: distclean-host
-distclean-host: maybe-distclean-gcc  \
+distclean-host:  \
     maybe-distclean-ash \
     maybe-distclean-autoconf \
     maybe-distclean-automake \
@@ -1484,8 +1610,10 @@ distclean-host: maybe-distclean-gcc  \
     maybe-distclean-fileutils \
     maybe-distclean-findutils \
     maybe-distclean-find \
+    maybe-distclean-fixincludes \
     maybe-distclean-flex \
     maybe-distclean-gas \
+    maybe-distclean-gcc \
     maybe-distclean-gawk \
     maybe-distclean-gettext \
     maybe-distclean-gnuserv \
@@ -1499,7 +1627,6 @@ distclean-host: maybe-distclean-gcc  \
     maybe-distclean-ld \
     maybe-distclean-libcpp \
     maybe-distclean-libgui \
-    maybe-distclean-libbanshee \
     maybe-distclean-libiberty \
     maybe-distclean-libtool \
     maybe-distclean-m4 \
@@ -1529,7 +1656,6 @@ distclean-host: maybe-distclean-gcc  \
     maybe-distclean-expect \
     maybe-distclean-guile \
     maybe-distclean-tk \
-    maybe-distclean-tix \
     maybe-distclean-libtermcap \
     maybe-distclean-utils
 
@@ -1555,10 +1681,10 @@ distclean-target:  \
     maybe-distclean-target-libada
 
 .PHONY: do-maintainer-clean
-do-maintainer-clean: maintainer-clean-host maintainer-clean-target
+do-maintainer-clean: unstage maintainer-clean-host maintainer-clean-target stage
 
 .PHONY: maintainer-clean-host
-maintainer-clean-host: maybe-maintainer-clean-gcc  \
+maintainer-clean-host:  \
     maybe-maintainer-clean-ash \
     maybe-maintainer-clean-autoconf \
     maybe-maintainer-clean-automake \
@@ -1577,8 +1703,10 @@ maintainer-clean-host: maybe-maintainer-clean-gcc  \
     maybe-maintainer-clean-fileutils \
     maybe-maintainer-clean-findutils \
     maybe-maintainer-clean-find \
+    maybe-maintainer-clean-fixincludes \
     maybe-maintainer-clean-flex \
     maybe-maintainer-clean-gas \
+    maybe-maintainer-clean-gcc \
     maybe-maintainer-clean-gawk \
     maybe-maintainer-clean-gettext \
     maybe-maintainer-clean-gnuserv \
@@ -1592,7 +1720,6 @@ maintainer-clean-host: maybe-maintainer-clean-gcc  \
     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 \
@@ -1622,7 +1749,6 @@ maintainer-clean-host: maybe-maintainer-clean-gcc  \
     maybe-maintainer-clean-expect \
     maybe-maintainer-clean-guile \
     maybe-maintainer-clean-tk \
-    maybe-maintainer-clean-tix \
     maybe-maintainer-clean-libtermcap \
     maybe-maintainer-clean-utils
 
@@ -1650,12 +1776,13 @@ maintainer-clean-target:  \
 
 # Here are the targets which correspond to the do-X targets.
 
-.PHONY: info installcheck dvi install-info
+.PHONY: info installcheck dvi html install-info
 .PHONY: clean distclean mostlyclean maintainer-clean realclean
 .PHONY: local-clean local-distclean local-maintainer-clean
 info: do-info
 installcheck: do-installcheck
 dvi: do-dvi
+html: do-html
 
 # Make sure makeinfo is built before we do a `make info', if we're
 # in fact building texinfo.
@@ -1708,7 +1835,7 @@ clean-target-libgcc:
 check: do-check
 
 # Only include modules actually being configured and built.
-do-check: maybe-check-gcc  \
+do-check: unstage  \
     maybe-check-ash \
     maybe-check-autoconf \
     maybe-check-automake \
@@ -1727,8 +1854,10 @@ do-check: maybe-check-gcc  \
     maybe-check-fileutils \
     maybe-check-findutils \
     maybe-check-find \
+    maybe-check-fixincludes \
     maybe-check-flex \
     maybe-check-gas \
+    maybe-check-gcc \
     maybe-check-gawk \
     maybe-check-gettext \
     maybe-check-gnuserv \
@@ -1742,7 +1871,6 @@ do-check: maybe-check-gcc  \
     maybe-check-ld \
     maybe-check-libcpp \
     maybe-check-libgui \
-    maybe-check-libbanshee \
     maybe-check-libiberty \
     maybe-check-libtool \
     maybe-check-m4 \
@@ -1772,7 +1900,6 @@ do-check: maybe-check-gcc  \
     maybe-check-expect \
     maybe-check-guile \
     maybe-check-tk \
-    maybe-check-tix \
     maybe-check-libtermcap \
     maybe-check-utils \
     maybe-check-target-libstdc++-v3 \
@@ -1792,7 +1919,7 @@ do-check: maybe-check-gcc  \
     maybe-check-target-boehm-gc \
     maybe-check-target-qthreads \
     maybe-check-target-rda \
-    maybe-check-target-libada
+    maybe-check-target-libada stage
 
 # Automated reporting of test results.
 
@@ -1840,6 +1967,7 @@ install-host-nogcc:  \
     maybe-install-fileutils \
     maybe-install-findutils \
     maybe-install-find \
+    maybe-install-fixincludes \
     maybe-install-flex \
     maybe-install-gas \
     maybe-install-gawk \
@@ -1855,7 +1983,6 @@ install-host-nogcc:  \
     maybe-install-ld \
     maybe-install-libcpp \
     maybe-install-libgui \
-    maybe-install-libbanshee \
     maybe-install-libiberty \
     maybe-install-libtool \
     maybe-install-m4 \
@@ -1885,12 +2012,11 @@ install-host-nogcc:  \
     maybe-install-expect \
     maybe-install-guile \
     maybe-install-tk \
-    maybe-install-tix \
     maybe-install-libtermcap \
     maybe-install-utils
 
 .PHONY: install-host
-install-host: maybe-install-gcc  \
+install-host:  \
     maybe-install-ash \
     maybe-install-autoconf \
     maybe-install-automake \
@@ -1909,8 +2035,10 @@ install-host: maybe-install-gcc  \
     maybe-install-fileutils \
     maybe-install-findutils \
     maybe-install-find \
+    maybe-install-fixincludes \
     maybe-install-flex \
     maybe-install-gas \
+    maybe-install-gcc \
     maybe-install-gawk \
     maybe-install-gettext \
     maybe-install-gnuserv \
@@ -1924,7 +2052,6 @@ install-host: maybe-install-gcc  \
     maybe-install-ld \
     maybe-install-libcpp \
     maybe-install-libgui \
-    maybe-install-libbanshee \
     maybe-install-libiberty \
     maybe-install-libtool \
     maybe-install-m4 \
@@ -1954,7 +2081,6 @@ install-host: maybe-install-gcc  \
     maybe-install-expect \
     maybe-install-guile \
     maybe-install-tk \
-    maybe-install-tix \
     maybe-install-libtermcap \
     maybe-install-utils
 
@@ -1987,7 +2113,7 @@ install.all: install-no-fixedincludes
        @if [ -f ./gcc/Makefile ] ; then \
                r=`${PWD_COMMAND}` ; export r ; \
                $(SET_LIB_PATH) \
-               $(GCC_HOST_EXPORTS) \
+               $(HOST_EXPORTS) \
                (cd ./gcc && \
                $(MAKE) $(FLAGS_TO_PASS) install-headers) ; \
        else \
@@ -2082,33 +2208,360 @@ configure-build-libiberty:
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(BUILD_CONFIGARGS) $${srcdiroption} \
-         --with-build-subdir="$(BUILD_SUBDIR)" \
+         --with-build-subdir="$(BUILD_SUBDIR)"  \
          || exit 1
 @endif build-libiberty
 
 .PHONY: all-build-libiberty maybe-all-build-libiberty
 maybe-all-build-libiberty:
 @if build-libiberty
+TARGET-build-libiberty=all
 maybe-all-build-libiberty: all-build-libiberty
 all-build-libiberty: configure-build-libiberty
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(BUILD_EXPORTS) \
-       (cd $(BUILD_SUBDIR)/libiberty && $(MAKE) all)
+       (cd $(BUILD_SUBDIR)/libiberty && \
+         $(MAKE)  $(TARGET-build-libiberty))
 @endif build-libiberty
 
-.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 ; \
+.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; \
+       $(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
+
+.PHONY: all-build-bison maybe-all-build-bison
+maybe-all-build-bison:
+@if build-bison
+TARGET-build-bison=all
+maybe-all-build-bison: all-build-bison
+all-build-bison: configure-build-bison
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(BUILD_EXPORTS) \
+       (cd $(BUILD_SUBDIR)/bison && \
+         $(MAKE)  $(TARGET-build-bison))
+@endif build-bison
+
+.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; \
+       $(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
+TARGET-build-byacc=all
+maybe-all-build-byacc: all-build-byacc
+all-build-byacc: configure-build-byacc
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(BUILD_EXPORTS) \
+       (cd $(BUILD_SUBDIR)/byacc && \
+         $(MAKE)  $(TARGET-build-byacc))
+@endif build-byacc
+
+.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; \
+       $(BUILD_EXPORTS) \
+       echo Configuring in $(BUILD_SUBDIR)/flex; \
+       cd "$(BUILD_SUBDIR)/flex" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) \
+           topdir=$(srcdir) ;; \
+         *) \
+           case "$(BUILD_SUBDIR)" in \
+             .) topdir="../$(srcdir)" ;; \
+             *) topdir="../../$(srcdir)" ;; \
+           esac ;; \
+       esac; \
+       if [ "$(srcdir)" = "." ] ; then \
+         if [ "$(BUILD_SUBDIR)" != "." ] ; then \
+           if $(SHELL) $$s/symlink-tree $${topdir}/flex "no-such-file" ; then \
+             if [ -f Makefile ]; then \
+               if $(MAKE) distclean; then \
+                 true; \
+               else \
+                 exit 1; \
+               fi; \
+             else \
+               true; \
+             fi; \
+           else \
+             exit 1; \
+           fi; \
+         else \
+           true; \
+         fi; \
+         srcdiroption="--srcdir=."; \
+         libsrcdir="."; \
+       else \
+         srcdiroption="--srcdir=$${topdir}/flex"; \
+         libsrcdir="$$s/flex"; \
+       fi; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(BUILD_CONFIGARGS) $${srcdiroption} \
+         --with-build-subdir="$(BUILD_SUBDIR)"  \
+         || exit 1
+@endif build-flex
+
+.PHONY: all-build-flex maybe-all-build-flex
+maybe-all-build-flex:
+@if build-flex
+TARGET-build-flex=all
+maybe-all-build-flex: all-build-flex
+all-build-flex: configure-build-flex
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(BUILD_EXPORTS) \
+       (cd $(BUILD_SUBDIR)/flex && \
+         $(MAKE)  $(TARGET-build-flex))
+@endif build-flex
+
+.PHONY: 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
+TARGET-build-m4=all
+maybe-all-build-m4: all-build-m4
+all-build-m4: configure-build-m4
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(BUILD_EXPORTS) \
+       (cd $(BUILD_SUBDIR)/m4 && \
+         $(MAKE)  $(TARGET-build-m4))
+@endif build-m4
+
+.PHONY: configure-build-texinfo maybe-configure-build-texinfo
+maybe-configure-build-texinfo:
+@if build-texinfo
+maybe-configure-build-texinfo: configure-build-texinfo
+configure-build-texinfo:
+       @test ! -f $(BUILD_SUBDIR)/texinfo/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/texinfo ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(BUILD_EXPORTS) \
+       echo Configuring in $(BUILD_SUBDIR)/texinfo; \
+       cd "$(BUILD_SUBDIR)/texinfo" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) \
+           topdir=$(srcdir) ;; \
+         *) \
+           case "$(BUILD_SUBDIR)" in \
+             .) topdir="../$(srcdir)" ;; \
+             *) topdir="../../$(srcdir)" ;; \
+           esac ;; \
+       esac; \
+       if [ "$(srcdir)" = "." ] ; then \
+         if [ "$(BUILD_SUBDIR)" != "." ] ; then \
+           if $(SHELL) $$s/symlink-tree $${topdir}/texinfo "no-such-file" ; then \
+             if [ -f Makefile ]; then \
+               if $(MAKE) distclean; then \
+                 true; \
+               else \
+                 exit 1; \
+               fi; \
+             else \
+               true; \
+             fi; \
+           else \
+             exit 1; \
+           fi; \
+         else \
+           true; \
+         fi; \
+         srcdiroption="--srcdir=."; \
+         libsrcdir="."; \
+       else \
+         srcdiroption="--srcdir=$${topdir}/texinfo"; \
+         libsrcdir="$$s/texinfo"; \
+       fi; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(BUILD_CONFIGARGS) $${srcdiroption} \
+         --with-build-subdir="$(BUILD_SUBDIR)"  \
+         || exit 1
+@endif build-texinfo
+
+.PHONY: all-build-texinfo maybe-all-build-texinfo
+maybe-all-build-texinfo:
+@if build-texinfo
+TARGET-build-texinfo=all
+maybe-all-build-texinfo: all-build-texinfo
+all-build-texinfo: configure-build-texinfo
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(BUILD_EXPORTS) \
+       (cd $(BUILD_SUBDIR)/texinfo && \
+         $(MAKE)  $(TARGET-build-texinfo))
+@endif build-texinfo
+
+.PHONY: configure-build-fixincludes maybe-configure-build-fixincludes
+maybe-configure-build-fixincludes:
+@if build-fixincludes
+maybe-configure-build-fixincludes: configure-build-fixincludes
+configure-build-fixincludes:
+       @test ! -f $(BUILD_SUBDIR)/fixincludes/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/fixincludes ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(BUILD_EXPORTS) \
-       echo Configuring in $(BUILD_SUBDIR)/libbanshee; \
-       cd "$(BUILD_SUBDIR)/libbanshee" || exit 1; \
+       echo Configuring in $(BUILD_SUBDIR)/fixincludes; \
+       cd "$(BUILD_SUBDIR)/fixincludes" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) \
            topdir=$(srcdir) ;; \
@@ -2120,7 +2573,7 @@ configure-build-libbanshee:
        esac; \
        if [ "$(srcdir)" = "." ] ; then \
          if [ "$(BUILD_SUBDIR)" != "." ] ; then \
-           if $(SHELL) $$s/symlink-tree $${topdir}/libbanshee "no-such-file" ; then \
+           if $(SHELL) $$s/symlink-tree $${topdir}/fixincludes "no-such-file" ; then \
              if [ -f Makefile ]; then \
                if $(MAKE) distclean; then \
                  true; \
@@ -2139,26 +2592,28 @@ configure-build-libbanshee:
          srcdiroption="--srcdir=."; \
          libsrcdir="."; \
        else \
-         srcdiroption="--srcdir=$${topdir}/libbanshee"; \
-         libsrcdir="$$s/libbanshee"; \
+         srcdiroption="--srcdir=$${topdir}/fixincludes"; \
+         libsrcdir="$$s/fixincludes"; \
        fi; \
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(BUILD_CONFIGARGS) $${srcdiroption} \
-         --with-build-subdir="$(BUILD_SUBDIR)" \
+         --with-build-subdir="$(BUILD_SUBDIR)"  \
          || exit 1
-@endif build-libbanshee
+@endif build-fixincludes
 
-.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
+.PHONY: all-build-fixincludes maybe-all-build-fixincludes
+maybe-all-build-fixincludes:
+@if build-fixincludes
+TARGET-build-fixincludes=all
+maybe-all-build-fixincludes: all-build-fixincludes
+all-build-fixincludes: configure-build-fixincludes
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(BUILD_EXPORTS) \
-       (cd $(BUILD_SUBDIR)/libbanshee && $(MAKE) all)
-@endif build-libbanshee
+       (cd $(BUILD_SUBDIR)/fixincludes && \
+         $(MAKE)  $(TARGET-build-fixincludes))
+@endif build-fixincludes
 
 
 # --------------------------------------
@@ -2189,20 +2644,22 @@ configure-ash:
            libsrcdir="$$s/ash";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif ash
 
 .PHONY: all-ash maybe-all-ash
 maybe-all-ash:
 @if ash
+TARGET-ash=all
 maybe-all-ash: all-ash
 all-ash: configure-ash
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd ash && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd ash && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-ash))
 @endif ash
 
 .PHONY: check-ash maybe-check-ash
@@ -2247,7 +2704,7 @@ info-ash: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in ash" ; \
@@ -2273,7 +2730,7 @@ dvi-ash: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in ash" ; \
@@ -2287,6 +2744,32 @@ dvi-ash: \
 
 @endif ash
 
+.PHONY: maybe-html-ash html-ash
+maybe-html-ash:
+@if ash
+maybe-html-ash: html-ash
+
+html-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 html 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}" \
+                 html) \
+         || exit 1
+
+@endif ash
+
 .PHONY: maybe-TAGS-ash TAGS-ash
 maybe-TAGS-ash:
 @if ash
@@ -2299,7 +2782,7 @@ TAGS-ash: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in ash" ; \
@@ -2326,7 +2809,7 @@ install-info-ash: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in ash" ; \
@@ -2352,7 +2835,7 @@ installcheck-ash: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in ash" ; \
@@ -2377,7 +2860,7 @@ mostlyclean-ash:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in ash" ; \
@@ -2402,7 +2885,7 @@ clean-ash:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in ash" ; \
@@ -2427,7 +2910,7 @@ distclean-ash:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in ash" ; \
@@ -2452,7 +2935,7 @@ maintainer-clean-ash:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in ash" ; \
@@ -2491,20 +2974,22 @@ configure-autoconf:
            libsrcdir="$$s/autoconf";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif autoconf
 
 .PHONY: all-autoconf maybe-all-autoconf
 maybe-all-autoconf:
 @if autoconf
+TARGET-autoconf=all
 maybe-all-autoconf: all-autoconf
 all-autoconf: configure-autoconf
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd autoconf && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd autoconf && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-autoconf))
 @endif autoconf
 
 .PHONY: check-autoconf maybe-check-autoconf
@@ -2549,7 +3034,7 @@ info-autoconf: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in autoconf" ; \
@@ -2575,7 +3060,7 @@ dvi-autoconf: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in autoconf" ; \
@@ -2589,34 +3074,60 @@ dvi-autoconf: \
 
 @endif autoconf
 
-.PHONY: maybe-TAGS-autoconf TAGS-autoconf
-maybe-TAGS-autoconf:
+.PHONY: maybe-html-autoconf html-autoconf
+maybe-html-autoconf:
 @if autoconf
-maybe-TAGS-autoconf: TAGS-autoconf
+maybe-html-autoconf: html-autoconf
 
-TAGS-autoconf: \
+html-autoconf: \
     configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in autoconf" ; \
+       echo "Doing html in autoconf" ; \
        (cd autoconf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                 html) \
          || exit 1
 
 @endif autoconf
 
-.PHONY: maybe-install-info-autoconf install-info-autoconf
-maybe-install-info-autoconf:
+.PHONY: maybe-TAGS-autoconf TAGS-autoconf
+maybe-TAGS-autoconf:
+@if autoconf
+maybe-TAGS-autoconf: TAGS-autoconf
+
+TAGS-autoconf: \
+    configure-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; \
+       echo "Doing TAGS in autoconf" ; \
+       (cd autoconf && \
+         $(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 autoconf
+
+.PHONY: maybe-install-info-autoconf install-info-autoconf
+maybe-install-info-autoconf:
 @if autoconf
 maybe-install-info-autoconf: install-info-autoconf
 
@@ -2628,7 +3139,7 @@ install-info-autoconf: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in autoconf" ; \
@@ -2654,7 +3165,7 @@ installcheck-autoconf: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in autoconf" ; \
@@ -2679,7 +3190,7 @@ mostlyclean-autoconf:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in autoconf" ; \
@@ -2704,7 +3215,7 @@ clean-autoconf:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in autoconf" ; \
@@ -2729,7 +3240,7 @@ distclean-autoconf:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in autoconf" ; \
@@ -2754,7 +3265,7 @@ maintainer-clean-autoconf:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in autoconf" ; \
@@ -2793,20 +3304,22 @@ configure-automake:
            libsrcdir="$$s/automake";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif automake
 
 .PHONY: all-automake maybe-all-automake
 maybe-all-automake:
 @if automake
+TARGET-automake=all
 maybe-all-automake: all-automake
 all-automake: configure-automake
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd automake && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd automake && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-automake))
 @endif automake
 
 .PHONY: check-automake maybe-check-automake
@@ -2851,7 +3364,7 @@ info-automake: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in automake" ; \
@@ -2877,7 +3390,7 @@ dvi-automake: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in automake" ; \
@@ -2891,6 +3404,32 @@ dvi-automake: \
 
 @endif automake
 
+.PHONY: maybe-html-automake html-automake
+maybe-html-automake:
+@if automake
+maybe-html-automake: html-automake
+
+html-automake: \
+    configure-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; \
+       echo "Doing html in automake" ; \
+       (cd automake && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif automake
+
 .PHONY: maybe-TAGS-automake TAGS-automake
 maybe-TAGS-automake:
 @if automake
@@ -2903,7 +3442,7 @@ TAGS-automake: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in automake" ; \
@@ -2930,7 +3469,7 @@ install-info-automake: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in automake" ; \
@@ -2956,7 +3495,7 @@ installcheck-automake: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in automake" ; \
@@ -2981,7 +3520,7 @@ mostlyclean-automake:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in automake" ; \
@@ -3006,7 +3545,7 @@ clean-automake:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in automake" ; \
@@ -3031,7 +3570,7 @@ distclean-automake:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in automake" ; \
@@ -3056,7 +3595,7 @@ maintainer-clean-automake:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in automake" ; \
@@ -3095,20 +3634,22 @@ configure-bash:
            libsrcdir="$$s/bash";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif bash
 
 .PHONY: all-bash maybe-all-bash
 maybe-all-bash:
 @if bash
+TARGET-bash=all
 maybe-all-bash: all-bash
 all-bash: configure-bash
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd bash && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd bash && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-bash))
 @endif bash
 
 .PHONY: check-bash maybe-check-bash
@@ -3153,7 +3694,7 @@ info-bash: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in bash" ; \
@@ -3179,7 +3720,7 @@ dvi-bash: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in bash" ; \
@@ -3193,6 +3734,32 @@ dvi-bash: \
 
 @endif bash
 
+.PHONY: maybe-html-bash html-bash
+maybe-html-bash:
+@if bash
+maybe-html-bash: html-bash
+
+html-bash: \
+    configure-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; \
+       echo "Doing html in bash" ; \
+       (cd bash && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif bash
+
 .PHONY: maybe-TAGS-bash TAGS-bash
 maybe-TAGS-bash:
 @if bash
@@ -3205,7 +3772,7 @@ TAGS-bash: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in bash" ; \
@@ -3232,7 +3799,7 @@ install-info-bash: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in bash" ; \
@@ -3258,7 +3825,7 @@ installcheck-bash: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in bash" ; \
@@ -3283,7 +3850,7 @@ mostlyclean-bash:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in bash" ; \
@@ -3308,7 +3875,7 @@ clean-bash:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in bash" ; \
@@ -3333,7 +3900,7 @@ distclean-bash:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in bash" ; \
@@ -3358,7 +3925,7 @@ maintainer-clean-bash:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in bash" ; \
@@ -3378,7 +3945,8 @@ maybe-configure-bfd:
 @if bfd
 maybe-configure-bfd: configure-bfd
 configure-bfd:
-       @test ! -f bfd/Makefile || exit 0; \
+       @test -f stage_last && exit 0; \
+       test ! -f bfd/Makefile || exit 0; \
        [ -d bfd ] || mkdir bfd; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3397,20 +3965,23 @@ configure-bfd:
            libsrcdir="$$s/bfd";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif bfd
 
 .PHONY: all-bfd maybe-all-bfd
 maybe-all-bfd:
 @if bfd
+TARGET-bfd=all
 maybe-all-bfd: all-bfd
 all-bfd: configure-bfd
-       @r=`${PWD_COMMAND}`; export r; \
+       @test -f stage_last && exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd bfd && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd bfd && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-bfd))
 @endif bfd
 
 .PHONY: check-bfd maybe-check-bfd
@@ -3455,7 +4026,7 @@ info-bfd: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in bfd" ; \
@@ -3481,7 +4052,7 @@ dvi-bfd: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in bfd" ; \
@@ -3495,6 +4066,32 @@ dvi-bfd: \
 
 @endif bfd
 
+.PHONY: maybe-html-bfd html-bfd
+maybe-html-bfd:
+@if bfd
+maybe-html-bfd: html-bfd
+
+html-bfd: \
+    configure-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; \
+       echo "Doing html in bfd" ; \
+       (cd bfd && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif bfd
+
 .PHONY: maybe-TAGS-bfd TAGS-bfd
 maybe-TAGS-bfd:
 @if bfd
@@ -3507,7 +4104,7 @@ TAGS-bfd: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in bfd" ; \
@@ -3534,7 +4131,7 @@ install-info-bfd: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in bfd" ; \
@@ -3560,7 +4157,7 @@ installcheck-bfd: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in bfd" ; \
@@ -3585,7 +4182,7 @@ mostlyclean-bfd:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in bfd" ; \
@@ -3610,7 +4207,7 @@ clean-bfd:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in bfd" ; \
@@ -3635,7 +4232,7 @@ distclean-bfd:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in bfd" ; \
@@ -3660,7 +4257,7 @@ maintainer-clean-bfd:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in bfd" ; \
@@ -3680,7 +4277,8 @@ maybe-configure-opcodes:
 @if opcodes
 maybe-configure-opcodes: configure-opcodes
 configure-opcodes:
-       @test ! -f opcodes/Makefile || exit 0; \
+       @test -f stage_last && exit 0; \
+       test ! -f opcodes/Makefile || exit 0; \
        [ -d opcodes ] || mkdir opcodes; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3699,20 +4297,23 @@ configure-opcodes:
            libsrcdir="$$s/opcodes";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif opcodes
 
 .PHONY: all-opcodes maybe-all-opcodes
 maybe-all-opcodes:
 @if opcodes
+TARGET-opcodes=all
 maybe-all-opcodes: all-opcodes
 all-opcodes: configure-opcodes
-       @r=`${PWD_COMMAND}`; export r; \
+       @test -f stage_last && exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd opcodes && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd opcodes && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-opcodes))
 @endif opcodes
 
 .PHONY: check-opcodes maybe-check-opcodes
@@ -3757,7 +4358,7 @@ info-opcodes: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in opcodes" ; \
@@ -3783,7 +4384,7 @@ dvi-opcodes: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in opcodes" ; \
@@ -3797,6 +4398,32 @@ dvi-opcodes: \
 
 @endif opcodes
 
+.PHONY: maybe-html-opcodes html-opcodes
+maybe-html-opcodes:
+@if opcodes
+maybe-html-opcodes: html-opcodes
+
+html-opcodes: \
+    configure-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; \
+       echo "Doing html in opcodes" ; \
+       (cd opcodes && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif opcodes
+
 .PHONY: maybe-TAGS-opcodes TAGS-opcodes
 maybe-TAGS-opcodes:
 @if opcodes
@@ -3809,7 +4436,7 @@ TAGS-opcodes: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in opcodes" ; \
@@ -3836,7 +4463,7 @@ install-info-opcodes: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in opcodes" ; \
@@ -3862,7 +4489,7 @@ installcheck-opcodes: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in opcodes" ; \
@@ -3887,7 +4514,7 @@ mostlyclean-opcodes:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in opcodes" ; \
@@ -3912,7 +4539,7 @@ clean-opcodes:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in opcodes" ; \
@@ -3937,7 +4564,7 @@ distclean-opcodes:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in opcodes" ; \
@@ -3962,7 +4589,7 @@ maintainer-clean-opcodes:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in opcodes" ; \
@@ -3982,7 +4609,8 @@ maybe-configure-binutils:
 @if binutils
 maybe-configure-binutils: configure-binutils
 configure-binutils:
-       @test ! -f binutils/Makefile || exit 0; \
+       @test -f stage_last && exit 0; \
+       test ! -f binutils/Makefile || exit 0; \
        [ -d binutils ] || mkdir binutils; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -4001,20 +4629,23 @@ configure-binutils:
            libsrcdir="$$s/binutils";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif binutils
 
 .PHONY: all-binutils maybe-all-binutils
 maybe-all-binutils:
 @if binutils
+TARGET-binutils=all
 maybe-all-binutils: all-binutils
 all-binutils: configure-binutils
-       @r=`${PWD_COMMAND}`; export r; \
+       @test -f stage_last && exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd binutils && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd binutils && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-binutils))
 @endif binutils
 
 .PHONY: check-binutils maybe-check-binutils
@@ -4059,7 +4690,7 @@ info-binutils: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in binutils" ; \
@@ -4085,7 +4716,7 @@ dvi-binutils: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in binutils" ; \
@@ -4099,6 +4730,32 @@ dvi-binutils: \
 
 @endif binutils
 
+.PHONY: maybe-html-binutils html-binutils
+maybe-html-binutils:
+@if binutils
+maybe-html-binutils: html-binutils
+
+html-binutils: \
+    configure-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; \
+       echo "Doing html in binutils" ; \
+       (cd binutils && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif binutils
+
 .PHONY: maybe-TAGS-binutils TAGS-binutils
 maybe-TAGS-binutils:
 @if binutils
@@ -4111,7 +4768,7 @@ TAGS-binutils: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in binutils" ; \
@@ -4138,7 +4795,7 @@ install-info-binutils: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in binutils" ; \
@@ -4164,7 +4821,7 @@ installcheck-binutils: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in binutils" ; \
@@ -4189,7 +4846,7 @@ mostlyclean-binutils:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in binutils" ; \
@@ -4214,7 +4871,7 @@ clean-binutils:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in binutils" ; \
@@ -4239,7 +4896,7 @@ distclean-binutils:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in binutils" ; \
@@ -4264,7 +4921,7 @@ maintainer-clean-binutils:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in binutils" ; \
@@ -4303,20 +4960,22 @@ configure-bison:
            libsrcdir="$$s/bison";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif bison
 
 .PHONY: all-bison maybe-all-bison
 maybe-all-bison:
 @if bison
+TARGET-bison=all
 maybe-all-bison: all-bison
 all-bison: configure-bison
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd bison && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd bison && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-bison))
 @endif bison
 
 .PHONY: check-bison maybe-check-bison
@@ -4331,7 +4990,7 @@ check-bison:
          s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
          $(SET_LIB_PATH) \
          $(HOST_EXPORTS) \
-         (cd bison && $(MAKE) $(FLAGS_TO_PASS) check); \
+         (cd bison && $(MAKE) $(FLAGS_TO_PASS)  check); \
        fi
 
 @endif bison
@@ -4364,7 +5023,7 @@ info-bison: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in bison" ; \
@@ -4390,7 +5049,7 @@ dvi-bison: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in bison" ; \
@@ -4404,6 +5063,32 @@ dvi-bison: \
 
 @endif bison
 
+.PHONY: maybe-html-bison html-bison
+maybe-html-bison:
+@if bison
+maybe-html-bison: html-bison
+
+html-bison: \
+    configure-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; \
+       echo "Doing html in bison" ; \
+       (cd bison && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif bison
+
 .PHONY: maybe-TAGS-bison TAGS-bison
 maybe-TAGS-bison:
 @if bison
@@ -4416,7 +5101,7 @@ TAGS-bison: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in bison" ; \
@@ -4443,7 +5128,7 @@ install-info-bison: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in bison" ; \
@@ -4469,7 +5154,7 @@ installcheck-bison: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in bison" ; \
@@ -4494,7 +5179,7 @@ mostlyclean-bison:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in bison" ; \
@@ -4519,7 +5204,7 @@ clean-bison:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in bison" ; \
@@ -4544,7 +5229,7 @@ distclean-bison:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in bison" ; \
@@ -4569,7 +5254,7 @@ maintainer-clean-bison:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in bison" ; \
@@ -4608,20 +5293,22 @@ configure-byacc:
            libsrcdir="$$s/byacc";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif byacc
 
 .PHONY: all-byacc maybe-all-byacc
 maybe-all-byacc:
 @if byacc
+TARGET-byacc=all
 maybe-all-byacc: all-byacc
 all-byacc: configure-byacc
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd byacc && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd byacc && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-byacc))
 @endif byacc
 
 .PHONY: check-byacc maybe-check-byacc
@@ -4636,7 +5323,7 @@ check-byacc:
          s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
          $(SET_LIB_PATH) \
          $(HOST_EXPORTS) \
-         (cd byacc && $(MAKE) $(FLAGS_TO_PASS) check); \
+         (cd byacc && $(MAKE) $(FLAGS_TO_PASS)  check); \
        fi
 
 @endif byacc
@@ -4669,7 +5356,7 @@ info-byacc: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in byacc" ; \
@@ -4695,7 +5382,7 @@ dvi-byacc: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in byacc" ; \
@@ -4709,6 +5396,32 @@ dvi-byacc: \
 
 @endif byacc
 
+.PHONY: maybe-html-byacc html-byacc
+maybe-html-byacc:
+@if byacc
+maybe-html-byacc: html-byacc
+
+html-byacc: \
+    configure-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; \
+       echo "Doing html in byacc" ; \
+       (cd byacc && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif byacc
+
 .PHONY: maybe-TAGS-byacc TAGS-byacc
 maybe-TAGS-byacc:
 @if byacc
@@ -4721,7 +5434,7 @@ TAGS-byacc: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in byacc" ; \
@@ -4748,7 +5461,7 @@ install-info-byacc: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in byacc" ; \
@@ -4774,7 +5487,7 @@ installcheck-byacc: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in byacc" ; \
@@ -4799,7 +5512,7 @@ mostlyclean-byacc:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in byacc" ; \
@@ -4824,7 +5537,7 @@ clean-byacc:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in byacc" ; \
@@ -4849,7 +5562,7 @@ distclean-byacc:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in byacc" ; \
@@ -4874,7 +5587,7 @@ maintainer-clean-byacc:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in byacc" ; \
@@ -4913,20 +5626,22 @@ configure-bzip2:
            libsrcdir="$$s/bzip2";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif bzip2
 
 .PHONY: all-bzip2 maybe-all-bzip2
 maybe-all-bzip2:
 @if bzip2
+TARGET-bzip2=all
 maybe-all-bzip2: all-bzip2
 all-bzip2: configure-bzip2
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd bzip2 && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd bzip2 && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-bzip2))
 @endif bzip2
 
 .PHONY: check-bzip2 maybe-check-bzip2
@@ -4971,7 +5686,7 @@ info-bzip2: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in bzip2" ; \
@@ -4997,7 +5712,7 @@ dvi-bzip2: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in bzip2" ; \
@@ -5011,6 +5726,32 @@ dvi-bzip2: \
 
 @endif bzip2
 
+.PHONY: maybe-html-bzip2 html-bzip2
+maybe-html-bzip2:
+@if bzip2
+maybe-html-bzip2: html-bzip2
+
+html-bzip2: \
+    configure-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; \
+       echo "Doing html in bzip2" ; \
+       (cd bzip2 && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif bzip2
+
 .PHONY: maybe-TAGS-bzip2 TAGS-bzip2
 maybe-TAGS-bzip2:
 @if bzip2
@@ -5023,7 +5764,7 @@ TAGS-bzip2: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in bzip2" ; \
@@ -5050,7 +5791,7 @@ install-info-bzip2: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in bzip2" ; \
@@ -5076,7 +5817,7 @@ installcheck-bzip2: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in bzip2" ; \
@@ -5101,7 +5842,7 @@ mostlyclean-bzip2:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in bzip2" ; \
@@ -5126,7 +5867,7 @@ clean-bzip2:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in bzip2" ; \
@@ -5151,7 +5892,7 @@ distclean-bzip2:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in bzip2" ; \
@@ -5176,7 +5917,7 @@ maintainer-clean-bzip2:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in bzip2" ; \
@@ -5215,20 +5956,22 @@ configure-dejagnu:
            libsrcdir="$$s/dejagnu";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif dejagnu
 
 .PHONY: all-dejagnu maybe-all-dejagnu
 maybe-all-dejagnu:
 @if dejagnu
+TARGET-dejagnu=all
 maybe-all-dejagnu: all-dejagnu
 all-dejagnu: configure-dejagnu
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd dejagnu && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd dejagnu && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-dejagnu))
 @endif dejagnu
 
 .PHONY: check-dejagnu maybe-check-dejagnu
@@ -5273,7 +6016,7 @@ info-dejagnu: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in dejagnu" ; \
@@ -5299,7 +6042,7 @@ dvi-dejagnu: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in dejagnu" ; \
@@ -5313,6 +6056,32 @@ dvi-dejagnu: \
 
 @endif dejagnu
 
+.PHONY: maybe-html-dejagnu html-dejagnu
+maybe-html-dejagnu:
+@if dejagnu
+maybe-html-dejagnu: html-dejagnu
+
+html-dejagnu: \
+    configure-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; \
+       echo "Doing html in dejagnu" ; \
+       (cd dejagnu && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif dejagnu
+
 .PHONY: maybe-TAGS-dejagnu TAGS-dejagnu
 maybe-TAGS-dejagnu:
 @if dejagnu
@@ -5325,7 +6094,7 @@ TAGS-dejagnu: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in dejagnu" ; \
@@ -5352,7 +6121,7 @@ install-info-dejagnu: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in dejagnu" ; \
@@ -5378,7 +6147,7 @@ installcheck-dejagnu: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in dejagnu" ; \
@@ -5403,7 +6172,7 @@ mostlyclean-dejagnu:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in dejagnu" ; \
@@ -5428,7 +6197,7 @@ clean-dejagnu:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in dejagnu" ; \
@@ -5453,7 +6222,7 @@ distclean-dejagnu:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in dejagnu" ; \
@@ -5478,7 +6247,7 @@ maintainer-clean-dejagnu:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in dejagnu" ; \
@@ -5517,20 +6286,22 @@ configure-diff:
            libsrcdir="$$s/diff";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif diff
 
 .PHONY: all-diff maybe-all-diff
 maybe-all-diff:
 @if diff
+TARGET-diff=all
 maybe-all-diff: all-diff
 all-diff: configure-diff
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd diff && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd diff && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-diff))
 @endif diff
 
 .PHONY: check-diff maybe-check-diff
@@ -5575,7 +6346,7 @@ info-diff: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in diff" ; \
@@ -5601,7 +6372,7 @@ dvi-diff: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in diff" ; \
@@ -5615,6 +6386,32 @@ dvi-diff: \
 
 @endif diff
 
+.PHONY: maybe-html-diff html-diff
+maybe-html-diff:
+@if diff
+maybe-html-diff: html-diff
+
+html-diff: \
+    configure-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; \
+       echo "Doing html in diff" ; \
+       (cd diff && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif diff
+
 .PHONY: maybe-TAGS-diff TAGS-diff
 maybe-TAGS-diff:
 @if diff
@@ -5627,7 +6424,7 @@ TAGS-diff: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in diff" ; \
@@ -5654,7 +6451,7 @@ install-info-diff: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in diff" ; \
@@ -5680,7 +6477,7 @@ installcheck-diff: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in diff" ; \
@@ -5705,7 +6502,7 @@ mostlyclean-diff:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in diff" ; \
@@ -5730,7 +6527,7 @@ clean-diff:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in diff" ; \
@@ -5755,7 +6552,7 @@ distclean-diff:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in diff" ; \
@@ -5780,7 +6577,7 @@ maintainer-clean-diff:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in diff" ; \
@@ -5819,20 +6616,22 @@ configure-dosutils:
            libsrcdir="$$s/dosutils";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif dosutils
 
 .PHONY: all-dosutils maybe-all-dosutils
 maybe-all-dosutils:
 @if dosutils
+TARGET-dosutils=all
 maybe-all-dosutils: all-dosutils
 all-dosutils: configure-dosutils
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd dosutils && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd dosutils && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-dosutils))
 @endif dosutils
 
 .PHONY: check-dosutils maybe-check-dosutils
@@ -5872,7 +6671,7 @@ info-dosutils: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in dosutils" ; \
@@ -5898,7 +6697,7 @@ dvi-dosutils: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in dosutils" ; \
@@ -5912,6 +6711,32 @@ dvi-dosutils: \
 
 @endif dosutils
 
+.PHONY: maybe-html-dosutils html-dosutils
+maybe-html-dosutils:
+@if dosutils
+maybe-html-dosutils: html-dosutils
+
+html-dosutils: \
+    configure-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; \
+       echo "Doing html in dosutils" ; \
+       (cd dosutils && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif dosutils
+
 .PHONY: maybe-TAGS-dosutils TAGS-dosutils
 maybe-TAGS-dosutils:
 @if dosutils
@@ -5924,7 +6749,7 @@ TAGS-dosutils: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in dosutils" ; \
@@ -5951,7 +6776,7 @@ install-info-dosutils: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in dosutils" ; \
@@ -5977,7 +6802,7 @@ installcheck-dosutils: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in dosutils" ; \
@@ -6002,7 +6827,7 @@ mostlyclean-dosutils:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in dosutils" ; \
@@ -6027,7 +6852,7 @@ clean-dosutils:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in dosutils" ; \
@@ -6052,7 +6877,7 @@ distclean-dosutils:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in dosutils" ; \
@@ -6077,7 +6902,7 @@ maintainer-clean-dosutils:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in dosutils" ; \
@@ -6116,20 +6941,22 @@ configure-etc:
            libsrcdir="$$s/etc";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif etc
 
 .PHONY: all-etc maybe-all-etc
 maybe-all-etc:
 @if etc
+TARGET-etc=all
 maybe-all-etc: all-etc
 all-etc: configure-etc
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd etc && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd etc && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-etc))
 @endif etc
 
 .PHONY: check-etc maybe-check-etc
@@ -6174,7 +7001,7 @@ info-etc: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in etc" ; \
@@ -6200,7 +7027,7 @@ dvi-etc: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in etc" ; \
@@ -6214,19 +7041,45 @@ dvi-etc: \
 
 @endif etc
 
-.PHONY: maybe-TAGS-etc TAGS-etc
-maybe-TAGS-etc:
+.PHONY: maybe-html-etc html-etc
+maybe-html-etc:
 @if etc
-maybe-TAGS-etc: TAGS-etc
+maybe-html-etc: html-etc
 
-TAGS-etc: \
+html-etc: \
     configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in etc" ; \
+       (cd etc && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif etc
+
+.PHONY: maybe-TAGS-etc TAGS-etc
+maybe-TAGS-etc:
+@if etc
+maybe-TAGS-etc: TAGS-etc
+
+TAGS-etc: \
+    configure-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; \
        echo "Doing TAGS in etc" ; \
@@ -6253,7 +7106,7 @@ install-info-etc: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in etc" ; \
@@ -6279,7 +7132,7 @@ installcheck-etc: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in etc" ; \
@@ -6304,7 +7157,7 @@ mostlyclean-etc:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in etc" ; \
@@ -6329,7 +7182,7 @@ clean-etc:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in etc" ; \
@@ -6354,7 +7207,7 @@ distclean-etc:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in etc" ; \
@@ -6379,7 +7232,7 @@ maintainer-clean-etc:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in etc" ; \
@@ -6418,20 +7271,22 @@ configure-fastjar:
            libsrcdir="$$s/fastjar";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif fastjar
 
 .PHONY: all-fastjar maybe-all-fastjar
 maybe-all-fastjar:
 @if fastjar
+TARGET-fastjar=all
 maybe-all-fastjar: all-fastjar
 all-fastjar: configure-fastjar
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd fastjar && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd fastjar && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-fastjar))
 @endif fastjar
 
 .PHONY: check-fastjar maybe-check-fastjar
@@ -6446,7 +7301,7 @@ check-fastjar:
          s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
          $(SET_LIB_PATH) \
          $(HOST_EXPORTS) \
-         (cd fastjar && $(MAKE) $(FLAGS_TO_PASS) check); \
+         (cd fastjar && $(MAKE) $(FLAGS_TO_PASS)  check); \
        fi
 
 @endif fastjar
@@ -6479,7 +7334,7 @@ info-fastjar: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in fastjar" ; \
@@ -6505,7 +7360,7 @@ dvi-fastjar: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in fastjar" ; \
@@ -6519,6 +7374,32 @@ dvi-fastjar: \
 
 @endif fastjar
 
+.PHONY: maybe-html-fastjar html-fastjar
+maybe-html-fastjar:
+@if fastjar
+maybe-html-fastjar: html-fastjar
+
+html-fastjar: \
+    configure-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; \
+       echo "Doing html in fastjar" ; \
+       (cd fastjar && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif fastjar
+
 .PHONY: maybe-TAGS-fastjar TAGS-fastjar
 maybe-TAGS-fastjar:
 @if fastjar
@@ -6531,7 +7412,7 @@ TAGS-fastjar: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in fastjar" ; \
@@ -6558,7 +7439,7 @@ install-info-fastjar: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in fastjar" ; \
@@ -6584,7 +7465,7 @@ installcheck-fastjar: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in fastjar" ; \
@@ -6609,7 +7490,7 @@ mostlyclean-fastjar:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in fastjar" ; \
@@ -6634,7 +7515,7 @@ clean-fastjar:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in fastjar" ; \
@@ -6659,7 +7540,7 @@ distclean-fastjar:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in fastjar" ; \
@@ -6684,7 +7565,7 @@ maintainer-clean-fastjar:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in fastjar" ; \
@@ -6723,20 +7604,22 @@ configure-fileutils:
            libsrcdir="$$s/fileutils";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif fileutils
 
 .PHONY: all-fileutils maybe-all-fileutils
 maybe-all-fileutils:
 @if fileutils
+TARGET-fileutils=all
 maybe-all-fileutils: all-fileutils
 all-fileutils: configure-fileutils
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd fileutils && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd fileutils && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-fileutils))
 @endif fileutils
 
 .PHONY: check-fileutils maybe-check-fileutils
@@ -6781,7 +7664,7 @@ info-fileutils: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in fileutils" ; \
@@ -6807,7 +7690,7 @@ dvi-fileutils: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in fileutils" ; \
@@ -6821,6 +7704,32 @@ dvi-fileutils: \
 
 @endif fileutils
 
+.PHONY: maybe-html-fileutils html-fileutils
+maybe-html-fileutils:
+@if fileutils
+maybe-html-fileutils: html-fileutils
+
+html-fileutils: \
+    configure-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; \
+       echo "Doing html in fileutils" ; \
+       (cd fileutils && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif fileutils
+
 .PHONY: maybe-TAGS-fileutils TAGS-fileutils
 maybe-TAGS-fileutils:
 @if fileutils
@@ -6833,7 +7742,7 @@ TAGS-fileutils: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in fileutils" ; \
@@ -6860,7 +7769,7 @@ install-info-fileutils: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in fileutils" ; \
@@ -6886,7 +7795,7 @@ installcheck-fileutils: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in fileutils" ; \
@@ -6911,7 +7820,7 @@ mostlyclean-fileutils:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in fileutils" ; \
@@ -6936,7 +7845,7 @@ clean-fileutils:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in fileutils" ; \
@@ -6961,7 +7870,7 @@ distclean-fileutils:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in fileutils" ; \
@@ -6986,7 +7895,7 @@ maintainer-clean-fileutils:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in fileutils" ; \
@@ -7025,20 +7934,22 @@ configure-findutils:
            libsrcdir="$$s/findutils";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif findutils
 
 .PHONY: all-findutils maybe-all-findutils
 maybe-all-findutils:
 @if findutils
+TARGET-findutils=all
 maybe-all-findutils: all-findutils
 all-findutils: configure-findutils
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd findutils && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd findutils && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-findutils))
 @endif findutils
 
 .PHONY: check-findutils maybe-check-findutils
@@ -7083,7 +7994,7 @@ info-findutils: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in findutils" ; \
@@ -7109,7 +8020,7 @@ dvi-findutils: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in findutils" ; \
@@ -7123,6 +8034,32 @@ dvi-findutils: \
 
 @endif findutils
 
+.PHONY: maybe-html-findutils html-findutils
+maybe-html-findutils:
+@if findutils
+maybe-html-findutils: html-findutils
+
+html-findutils: \
+    configure-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; \
+       echo "Doing html in findutils" ; \
+       (cd findutils && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif findutils
+
 .PHONY: maybe-TAGS-findutils TAGS-findutils
 maybe-TAGS-findutils:
 @if findutils
@@ -7135,7 +8072,7 @@ TAGS-findutils: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in findutils" ; \
@@ -7162,7 +8099,7 @@ install-info-findutils: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in findutils" ; \
@@ -7188,7 +8125,7 @@ installcheck-findutils: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in findutils" ; \
@@ -7213,7 +8150,7 @@ mostlyclean-findutils:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in findutils" ; \
@@ -7238,7 +8175,7 @@ clean-findutils:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in findutils" ; \
@@ -7263,7 +8200,7 @@ distclean-findutils:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in findutils" ; \
@@ -7288,7 +8225,7 @@ maintainer-clean-findutils:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in findutils" ; \
@@ -7327,20 +8264,22 @@ configure-find:
            libsrcdir="$$s/find";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif find
 
 .PHONY: all-find maybe-all-find
 maybe-all-find:
 @if find
+TARGET-find=all
 maybe-all-find: all-find
 all-find: configure-find
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd find && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd find && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-find))
 @endif find
 
 .PHONY: check-find maybe-check-find
@@ -7385,7 +8324,7 @@ info-find: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in find" ; \
@@ -7411,7 +8350,7 @@ dvi-find: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in find" ; \
@@ -7425,6 +8364,32 @@ dvi-find: \
 
 @endif find
 
+.PHONY: maybe-html-find html-find
+maybe-html-find:
+@if find
+maybe-html-find: html-find
+
+html-find: \
+    configure-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; \
+       echo "Doing html in find" ; \
+       (cd find && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif find
+
 .PHONY: maybe-TAGS-find TAGS-find
 maybe-TAGS-find:
 @if find
@@ -7437,7 +8402,7 @@ TAGS-find: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in find" ; \
@@ -7464,7 +8429,7 @@ install-info-find: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in find" ; \
@@ -7490,7 +8455,7 @@ installcheck-find: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in find" ; \
@@ -7515,7 +8480,7 @@ mostlyclean-find:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in find" ; \
@@ -7540,7 +8505,7 @@ clean-find:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in find" ; \
@@ -7565,7 +8530,7 @@ distclean-find:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in find" ; \
@@ -7590,7 +8555,7 @@ maintainer-clean-find:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in find" ; \
@@ -7605,6 +8570,255 @@ maintainer-clean-find:
 @endif find
 
 
+.PHONY: configure-fixincludes maybe-configure-fixincludes
+maybe-configure-fixincludes:
+@if fixincludes
+maybe-configure-fixincludes: configure-fixincludes
+configure-fixincludes:
+       @test ! -f fixincludes/Makefile || exit 0; \
+       [ -d fixincludes ] || mkdir fixincludes; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       echo Configuring in fixincludes; \
+       cd fixincludes || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/fixincludes"; \
+           libsrcdir="$$s/fixincludes";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/fixincludes"; \
+           libsrcdir="$$s/fixincludes";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
+         || exit 1
+@endif fixincludes
+
+.PHONY: all-fixincludes maybe-all-fixincludes
+maybe-all-fixincludes:
+@if fixincludes
+TARGET-fixincludes=all
+maybe-all-fixincludes: all-fixincludes
+all-fixincludes: configure-fixincludes
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       (cd fixincludes && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-fixincludes))
+@endif fixincludes
+
+.PHONY: check-fixincludes maybe-check-fixincludes
+maybe-check-fixincludes:
+@if fixincludes
+maybe-check-fixincludes: check-fixincludes
+
+check-fixincludes:
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       (cd fixincludes && $(MAKE) $(FLAGS_TO_PASS) check)
+
+@endif fixincludes
+
+.PHONY: install-fixincludes maybe-install-fixincludes
+maybe-install-fixincludes:
+@if fixincludes
+maybe-install-fixincludes: install-fixincludes
+
+install-fixincludes: installdirs
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       (cd fixincludes && $(MAKE) $(FLAGS_TO_PASS) install)
+
+@endif fixincludes
+
+# Other targets (info, dvi, etc.)
+
+.PHONY: maybe-info-fixincludes info-fixincludes
+maybe-info-fixincludes:
+@if fixincludes
+maybe-info-fixincludes: info-fixincludes
+
+# fixincludes doesn't support info.
+info-fixincludes:
+
+@endif fixincludes
+
+.PHONY: maybe-dvi-fixincludes dvi-fixincludes
+maybe-dvi-fixincludes:
+@if fixincludes
+maybe-dvi-fixincludes: dvi-fixincludes
+
+# fixincludes doesn't support dvi.
+dvi-fixincludes:
+
+@endif fixincludes
+
+.PHONY: maybe-html-fixincludes html-fixincludes
+maybe-html-fixincludes:
+@if fixincludes
+maybe-html-fixincludes: html-fixincludes
+
+html-fixincludes: \
+    configure-fixincludes 
+       @[ -f ./fixincludes/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in fixincludes" ; \
+       (cd fixincludes && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif fixincludes
+
+.PHONY: maybe-TAGS-fixincludes TAGS-fixincludes
+maybe-TAGS-fixincludes:
+@if fixincludes
+maybe-TAGS-fixincludes: TAGS-fixincludes
+
+# fixincludes doesn't support TAGS.
+TAGS-fixincludes:
+
+@endif fixincludes
+
+.PHONY: maybe-install-info-fixincludes install-info-fixincludes
+maybe-install-info-fixincludes:
+@if fixincludes
+maybe-install-info-fixincludes: install-info-fixincludes
+
+# fixincludes doesn't support install-info.
+install-info-fixincludes:
+
+@endif fixincludes
+
+.PHONY: maybe-installcheck-fixincludes installcheck-fixincludes
+maybe-installcheck-fixincludes:
+@if fixincludes
+maybe-installcheck-fixincludes: installcheck-fixincludes
+
+# fixincludes doesn't support installcheck.
+installcheck-fixincludes:
+
+@endif fixincludes
+
+.PHONY: maybe-mostlyclean-fixincludes mostlyclean-fixincludes
+maybe-mostlyclean-fixincludes:
+@if fixincludes
+maybe-mostlyclean-fixincludes: mostlyclean-fixincludes
+
+mostlyclean-fixincludes: 
+       @[ -f ./fixincludes/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_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 fixincludes" ; \
+       (cd fixincludes && \
+         $(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 fixincludes
+
+.PHONY: maybe-clean-fixincludes clean-fixincludes
+maybe-clean-fixincludes:
+@if fixincludes
+maybe-clean-fixincludes: clean-fixincludes
+
+clean-fixincludes: 
+       @[ -f ./fixincludes/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_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 fixincludes" ; \
+       (cd fixincludes && \
+         $(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 fixincludes
+
+.PHONY: maybe-distclean-fixincludes distclean-fixincludes
+maybe-distclean-fixincludes:
+@if fixincludes
+maybe-distclean-fixincludes: distclean-fixincludes
+
+distclean-fixincludes: 
+       @[ -f ./fixincludes/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_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 fixincludes" ; \
+       (cd fixincludes && \
+         $(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 fixincludes
+
+.PHONY: maybe-maintainer-clean-fixincludes maintainer-clean-fixincludes
+maybe-maintainer-clean-fixincludes:
+@if fixincludes
+maybe-maintainer-clean-fixincludes: maintainer-clean-fixincludes
+
+maintainer-clean-fixincludes: 
+       @[ -f ./fixincludes/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_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 fixincludes" ; \
+       (cd fixincludes && \
+         $(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 fixincludes
+
+
 .PHONY: configure-flex maybe-configure-flex
 maybe-configure-flex:
 @if flex
@@ -7629,20 +8843,22 @@ configure-flex:
            libsrcdir="$$s/flex";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif flex
 
 .PHONY: all-flex maybe-all-flex
 maybe-all-flex:
 @if flex
+TARGET-flex=all
 maybe-all-flex: all-flex
 all-flex: configure-flex
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd flex && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd flex && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-flex))
 @endif flex
 
 .PHONY: check-flex maybe-check-flex
@@ -7657,7 +8873,7 @@ check-flex:
          s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
          $(SET_LIB_PATH) \
          $(HOST_EXPORTS) \
-         (cd flex && $(MAKE) $(FLAGS_TO_PASS) check); \
+         (cd flex && $(MAKE) $(FLAGS_TO_PASS)  check); \
        fi
 
 @endif flex
@@ -7690,7 +8906,7 @@ info-flex: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in flex" ; \
@@ -7716,7 +8932,7 @@ dvi-flex: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in flex" ; \
@@ -7730,6 +8946,32 @@ dvi-flex: \
 
 @endif flex
 
+.PHONY: maybe-html-flex html-flex
+maybe-html-flex:
+@if flex
+maybe-html-flex: html-flex
+
+html-flex: \
+    configure-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; \
+       echo "Doing html in flex" ; \
+       (cd flex && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif flex
+
 .PHONY: maybe-TAGS-flex TAGS-flex
 maybe-TAGS-flex:
 @if flex
@@ -7742,7 +8984,7 @@ TAGS-flex: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in flex" ; \
@@ -7769,7 +9011,7 @@ install-info-flex: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in flex" ; \
@@ -7795,7 +9037,7 @@ installcheck-flex: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in flex" ; \
@@ -7820,7 +9062,7 @@ mostlyclean-flex:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in flex" ; \
@@ -7845,7 +9087,7 @@ clean-flex:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in flex" ; \
@@ -7870,7 +9112,7 @@ distclean-flex:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in flex" ; \
@@ -7895,7 +9137,7 @@ maintainer-clean-flex:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in flex" ; \
@@ -7915,7 +9157,8 @@ maybe-configure-gas:
 @if gas
 maybe-configure-gas: configure-gas
 configure-gas:
-       @test ! -f gas/Makefile || exit 0; \
+       @test -f stage_last && exit 0; \
+       test ! -f gas/Makefile || exit 0; \
        [ -d gas ] || mkdir gas; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7934,20 +9177,23 @@ configure-gas:
            libsrcdir="$$s/gas";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif gas
 
 .PHONY: all-gas maybe-all-gas
 maybe-all-gas:
 @if gas
+TARGET-gas=all
 maybe-all-gas: all-gas
 all-gas: configure-gas
-       @r=`${PWD_COMMAND}`; export r; \
+       @test -f stage_last && exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gas && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd gas && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-gas))
 @endif gas
 
 .PHONY: check-gas maybe-check-gas
@@ -7992,7 +9238,7 @@ info-gas: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in gas" ; \
@@ -8018,7 +9264,7 @@ dvi-gas: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in gas" ; \
@@ -8032,28 +9278,54 @@ dvi-gas: \
 
 @endif gas
 
-.PHONY: maybe-TAGS-gas TAGS-gas
-maybe-TAGS-gas:
+.PHONY: maybe-html-gas html-gas
+maybe-html-gas:
 @if gas
-maybe-TAGS-gas: TAGS-gas
+maybe-html-gas: html-gas
 
-TAGS-gas: \
+html-gas: \
     configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in gas" ; \
+       echo "Doing html in gas" ; \
        (cd gas && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                 html) \
+         || exit 1
+
+@endif gas
+
+.PHONY: maybe-TAGS-gas TAGS-gas
+maybe-TAGS-gas:
+@if gas
+maybe-TAGS-gas: TAGS-gas
+
+TAGS-gas: \
+    configure-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; \
+       echo "Doing TAGS in gas" ; \
+       (cd gas && \
+         $(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 gas
@@ -8071,7 +9343,7 @@ install-info-gas: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in gas" ; \
@@ -8097,7 +9369,7 @@ installcheck-gas: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in gas" ; \
@@ -8122,7 +9394,7 @@ mostlyclean-gas:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in gas" ; \
@@ -8147,7 +9419,7 @@ clean-gas:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in gas" ; \
@@ -8172,7 +9444,7 @@ distclean-gas:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in gas" ; \
@@ -8197,7 +9469,7 @@ maintainer-clean-gas:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in gas" ; \
@@ -8212,93 +9484,97 @@ maintainer-clean-gas:
 @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; \
+.PHONY: configure-gcc maybe-configure-gcc
+maybe-configure-gcc:
+@if gcc
+maybe-configure-gcc: configure-gcc
+configure-gcc:
+       @test -f stage_last && exit 0; \
+       test ! -f gcc/Makefile || exit 0; \
+       [ -d gcc ] || mkdir gcc; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in gawk; \
-       cd gawk || exit 1; \
+       echo Configuring in gcc; \
+       cd gcc || exit 1; \
        case $(srcdir) in \
          \.) \
            srcdiroption="--srcdir=."; \
            libsrcdir=".";; \
          /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/gawk"; \
-           libsrcdir="$$s/gawk";; \
+           srcdiroption="--srcdir=$(srcdir)/gcc"; \
+           libsrcdir="$$s/gcc";; \
          *) \
-           srcdiroption="--srcdir=../$(srcdir)/gawk"; \
-           libsrcdir="$$s/gawk";; \
+           srcdiroption="--srcdir=../$(srcdir)/gcc"; \
+           libsrcdir="$$s/gcc";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
-@endif gawk
+@endif gcc
 
-.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; \
+.PHONY: all-gcc maybe-all-gcc
+maybe-all-gcc:
+@if gcc
+TARGET-gcc=`if [ -f gcc/stage_last ]; then echo quickstrap ; else echo all; fi`
+maybe-all-gcc: all-gcc
+all-gcc: configure-gcc
+       @test -f stage_last && exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gawk && $(MAKE) $(FLAGS_TO_PASS) all)
-@endif gawk
+       (cd gcc && $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
+         $(TARGET-gcc))
+@endif gcc
 
-.PHONY: check-gawk maybe-check-gawk
-maybe-check-gawk:
-@if gawk
-maybe-check-gawk: check-gawk
+.PHONY: check-gcc maybe-check-gcc
+maybe-check-gcc:
+@if gcc
+maybe-check-gcc: check-gcc
 
-check-gawk:
+check-gcc:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gawk && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd gcc && $(MAKE) $(FLAGS_TO_PASS)$(EXTRA_GCC_FLAGS) check)
 
-@endif gawk
+@endif gcc
 
-.PHONY: install-gawk maybe-install-gawk
-maybe-install-gawk:
-@if gawk
-maybe-install-gawk: install-gawk
+.PHONY: install-gcc maybe-install-gcc
+maybe-install-gcc:
+@if gcc
+maybe-install-gcc: install-gcc
 
-install-gawk: installdirs
+install-gcc: installdirs
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gawk && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd gcc && $(MAKE) $(FLAGS_TO_PASS)$(EXTRA_GCC_FLAGS) install)
 
-@endif gawk
+@endif gcc
 
 # Other targets (info, dvi, etc.)
 
-.PHONY: maybe-info-gawk info-gawk
-maybe-info-gawk:
-@if gawk
-maybe-info-gawk: info-gawk
+.PHONY: maybe-info-gcc info-gcc
+maybe-info-gcc:
+@if gcc
+maybe-info-gcc: info-gcc
 
-info-gawk: \
-    configure-gawk 
-       @[ -f ./gawk/Makefile ] || exit 0; \
+info-gcc: \
+    configure-gcc 
+       @[ -f ./gcc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in gawk" ; \
-       (cd gawk && \
+       echo "Doing info in gcc" ; \
+       (cd gcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -8306,25 +9582,25 @@ info-gawk: \
                  info) \
          || exit 1
 
-@endif gawk
+@endif gcc
 
-.PHONY: maybe-dvi-gawk dvi-gawk
-maybe-dvi-gawk:
-@if gawk
-maybe-dvi-gawk: dvi-gawk
+.PHONY: maybe-dvi-gcc dvi-gcc
+maybe-dvi-gcc:
+@if gcc
+maybe-dvi-gcc: dvi-gcc
 
-dvi-gawk: \
-    configure-gawk 
-       @[ -f ./gawk/Makefile ] || exit 0; \
+dvi-gcc: \
+    configure-gcc 
+       @[ -f ./gcc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in gawk" ; \
-       (cd gawk && \
+       echo "Doing dvi in gcc" ; \
+       (cd gcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -8332,178 +9608,204 @@ dvi-gawk: \
                  dvi) \
          || exit 1
 
-@endif gawk
+@endif gcc
 
-.PHONY: maybe-TAGS-gawk TAGS-gawk
-maybe-TAGS-gawk:
-@if gawk
-maybe-TAGS-gawk: TAGS-gawk
+.PHONY: maybe-html-gcc html-gcc
+maybe-html-gcc:
+@if gcc
+maybe-html-gcc: html-gcc
 
-TAGS-gawk: \
-    configure-gawk 
-       @[ -f ./gawk/Makefile ] || exit 0; \
+html-gcc: \
+    configure-gcc 
+       @[ -f ./gcc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in gawk" ; \
-       (cd gawk && \
+       echo "Doing html in gcc" ; \
+       (cd gcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                 html) \
          || exit 1
 
-@endif gawk
+@endif gcc
 
-.PHONY: maybe-install-info-gawk install-info-gawk
-maybe-install-info-gawk:
-@if gawk
-maybe-install-info-gawk: install-info-gawk
+.PHONY: maybe-TAGS-gcc TAGS-gcc
+maybe-TAGS-gcc:
+@if gcc
+maybe-TAGS-gcc: TAGS-gcc
 
-install-info-gawk: \
-    configure-gawk \
-    info-gawk 
-       @[ -f ./gawk/Makefile ] || exit 0; \
+TAGS-gcc: \
+    configure-gcc 
+       @[ -f ./gcc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in gawk" ; \
-       (cd gawk && \
+       echo "Doing TAGS in gcc" ; \
+       (cd gcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                 TAGS) \
          || exit 1
 
-@endif gawk
+@endif gcc
 
-.PHONY: maybe-installcheck-gawk installcheck-gawk
-maybe-installcheck-gawk:
-@if gawk
-maybe-installcheck-gawk: installcheck-gawk
+.PHONY: maybe-install-info-gcc install-info-gcc
+maybe-install-info-gcc:
+@if gcc
+maybe-install-info-gcc: install-info-gcc
 
-installcheck-gawk: \
-    configure-gawk 
-       @[ -f ./gawk/Makefile ] || exit 0; \
+install-info-gcc: \
+    configure-gcc \
+    info-gcc 
+       @[ -f ./gcc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in gawk" ; \
-       (cd gawk && \
+       echo "Doing install-info in gcc" ; \
+       (cd gcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                 install-info) \
          || exit 1
 
-@endif gawk
+@endif gcc
 
-.PHONY: maybe-mostlyclean-gawk mostlyclean-gawk
-maybe-mostlyclean-gawk:
-@if gawk
-maybe-mostlyclean-gawk: mostlyclean-gawk
+.PHONY: maybe-installcheck-gcc installcheck-gcc
+maybe-installcheck-gcc:
+@if gcc
+maybe-installcheck-gcc: installcheck-gcc
 
-mostlyclean-gawk: 
-       @[ -f ./gawk/Makefile ] || exit 0; \
+installcheck-gcc: \
+    configure-gcc 
+       @[ -f ./gcc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in gawk" ; \
-       (cd gawk && \
+       echo "Doing installcheck in gcc" ; \
+       (cd gcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                 installcheck) \
          || exit 1
 
-@endif gawk
+@endif gcc
 
-.PHONY: maybe-clean-gawk clean-gawk
-maybe-clean-gawk:
-@if gawk
-maybe-clean-gawk: clean-gawk
+.PHONY: maybe-mostlyclean-gcc mostlyclean-gcc
+maybe-mostlyclean-gcc:
+@if gcc
+maybe-mostlyclean-gcc: mostlyclean-gcc
 
-clean-gawk
-       @[ -f ./gawk/Makefile ] || exit 0; \
+mostlyclean-gcc
+       @[ -f ./gcc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in gawk" ; \
-       (cd gawk && \
+       echo "Doing mostlyclean in gcc" ; \
+       (cd gcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                 mostlyclean) \
          || exit 1
 
-@endif gawk
+@endif gcc
 
-.PHONY: maybe-distclean-gawk distclean-gawk
-maybe-distclean-gawk:
-@if gawk
-maybe-distclean-gawk: distclean-gawk
+.PHONY: maybe-clean-gcc clean-gcc
+maybe-clean-gcc:
+@if gcc
+maybe-clean-gcc: clean-gcc
 
-distclean-gawk
-       @[ -f ./gawk/Makefile ] || exit 0; \
+clean-gcc
+       @[ -f ./gcc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in gawk" ; \
-       (cd gawk && \
+       echo "Doing 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}" \
-                 distclean) \
+                 clean) \
          || exit 1
 
-@endif gawk
+@endif gcc
 
-.PHONY: maybe-maintainer-clean-gawk maintainer-clean-gawk
-maybe-maintainer-clean-gawk:
-@if gawk
-maybe-maintainer-clean-gawk: maintainer-clean-gawk
+.PHONY: maybe-distclean-gcc distclean-gcc
+maybe-distclean-gcc:
+@if gcc
+maybe-distclean-gcc: distclean-gcc
 
-maintainer-clean-gawk
-       @[ -f ./gawk/Makefile ] || exit 0; \
+distclean-gcc
+       @[ -f ./gcc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in gawk" ; \
-       (cd gawk && \
+       echo "Doing 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) \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing maintainer-clean in gcc" ; \
+       (cd gcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -8511,96 +9813,98 @@ maintainer-clean-gawk:
                  maintainer-clean) \
          || exit 1
 
-@endif gawk
+@endif gcc
 
 
-.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; \
+.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; \
        $(HOST_EXPORTS) \
-       echo Configuring in gettext; \
-       cd gettext || exit 1; \
+       echo Configuring in gawk; \
+       cd gawk || exit 1; \
        case $(srcdir) in \
          \.) \
            srcdiroption="--srcdir=."; \
            libsrcdir=".";; \
          /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/gettext"; \
-           libsrcdir="$$s/gettext";; \
+           srcdiroption="--srcdir=$(srcdir)/gawk"; \
+           libsrcdir="$$s/gawk";; \
          *) \
-           srcdiroption="--srcdir=../$(srcdir)/gettext"; \
-           libsrcdir="$$s/gettext";; \
+           srcdiroption="--srcdir=../$(srcdir)/gawk"; \
+           libsrcdir="$$s/gawk";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
-@endif gettext
+@endif gawk
 
-.PHONY: all-gettext maybe-all-gettext
-maybe-all-gettext:
-@if gettext
-maybe-all-gettext: all-gettext
-all-gettext: configure-gettext
+.PHONY: all-gawk maybe-all-gawk
+maybe-all-gawk:
+@if gawk
+TARGET-gawk=all
+maybe-all-gawk: all-gawk
+all-gawk: configure-gawk
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gettext && $(MAKE) $(FLAGS_TO_PASS) all)
-@endif gettext
+       (cd gawk && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-gawk))
+@endif gawk
 
-.PHONY: check-gettext maybe-check-gettext
-maybe-check-gettext:
-@if gettext
-maybe-check-gettext: check-gettext
+.PHONY: check-gawk maybe-check-gawk
+maybe-check-gawk:
+@if gawk
+maybe-check-gawk: check-gawk
 
-check-gettext:
+check-gawk:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gettext && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd gawk && $(MAKE) $(FLAGS_TO_PASS) check)
 
-@endif gettext
+@endif gawk
 
-.PHONY: install-gettext maybe-install-gettext
-maybe-install-gettext:
-@if gettext
-maybe-install-gettext: install-gettext
+.PHONY: install-gawk maybe-install-gawk
+maybe-install-gawk:
+@if gawk
+maybe-install-gawk: install-gawk
 
-install-gettext: installdirs
+install-gawk: installdirs
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gettext && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd gawk && $(MAKE) $(FLAGS_TO_PASS) install)
 
-@endif gettext
+@endif gawk
 
 # Other targets (info, dvi, etc.)
 
-.PHONY: maybe-info-gettext info-gettext
-maybe-info-gettext:
-@if gettext
-maybe-info-gettext: info-gettext
+.PHONY: maybe-info-gawk info-gawk
+maybe-info-gawk:
+@if gawk
+maybe-info-gawk: info-gawk
 
-info-gettext: \
-    configure-gettext 
-       @[ -f ./gettext/Makefile ] || exit 0; \
+info-gawk: \
+    configure-gawk 
+       @[ -f ./gawk/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in gettext" ; \
-       (cd gettext && \
+       echo "Doing info in gawk" ; \
+       (cd gawk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -8608,25 +9912,25 @@ info-gettext: \
                  info) \
          || exit 1
 
-@endif gettext
+@endif gawk
 
-.PHONY: maybe-dvi-gettext dvi-gettext
-maybe-dvi-gettext:
-@if gettext
-maybe-dvi-gettext: dvi-gettext
+.PHONY: maybe-dvi-gawk dvi-gawk
+maybe-dvi-gawk:
+@if gawk
+maybe-dvi-gawk: dvi-gawk
 
-dvi-gettext: \
-    configure-gettext 
-       @[ -f ./gettext/Makefile ] || exit 0; \
+dvi-gawk: \
+    configure-gawk 
+       @[ -f ./gawk/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in gettext" ; \
-       (cd gettext && \
+       echo "Doing dvi in gawk" ; \
+       (cd gawk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -8634,153 +9938,179 @@ dvi-gettext: \
                  dvi) \
          || exit 1
 
-@endif gettext
+@endif gawk
 
-.PHONY: maybe-TAGS-gettext TAGS-gettext
-maybe-TAGS-gettext:
-@if gettext
-maybe-TAGS-gettext: TAGS-gettext
+.PHONY: maybe-html-gawk html-gawk
+maybe-html-gawk:
+@if gawk
+maybe-html-gawk: html-gawk
 
-TAGS-gettext: \
-    configure-gettext 
-       @[ -f ./gettext/Makefile ] || exit 0; \
+html-gawk: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in gettext" ; \
-       (cd gettext && \
+       echo "Doing html in gawk" ; \
+       (cd gawk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                 html) \
          || exit 1
 
-@endif gettext
+@endif gawk
 
-.PHONY: maybe-install-info-gettext install-info-gettext
-maybe-install-info-gettext:
-@if gettext
-maybe-install-info-gettext: install-info-gettext
+.PHONY: maybe-TAGS-gawk TAGS-gawk
+maybe-TAGS-gawk:
+@if gawk
+maybe-TAGS-gawk: TAGS-gawk
 
-install-info-gettext: \
-    configure-gettext \
-    info-gettext 
-       @[ -f ./gettext/Makefile ] || exit 0; \
+TAGS-gawk: \
+    configure-gawk 
+       @[ -f ./gawk/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in gettext" ; \
-       (cd gettext && \
+       echo "Doing TAGS in gawk" ; \
+       (cd gawk && \
          $(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) \
+                 TAGS) \
          || exit 1
 
-@endif gettext
+@endif gawk
 
-.PHONY: maybe-installcheck-gettext installcheck-gettext
-maybe-installcheck-gettext:
-@if gettext
-maybe-installcheck-gettext: installcheck-gettext
+.PHONY: maybe-install-info-gawk install-info-gawk
+maybe-install-info-gawk:
+@if gawk
+maybe-install-info-gawk: install-info-gawk
 
-installcheck-gettext: \
-    configure-gettext 
-       @[ -f ./gettext/Makefile ] || exit 0; \
+install-info-gawk: \
+    configure-gawk \
+    info-gawk 
+       @[ -f ./gawk/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in gettext" ; \
-       (cd gettext && \
+       echo "Doing install-info in gawk" ; \
+       (cd gawk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                 install-info) \
          || exit 1
 
-@endif gettext
+@endif gawk
 
-.PHONY: maybe-mostlyclean-gettext mostlyclean-gettext
-maybe-mostlyclean-gettext:
-@if gettext
-maybe-mostlyclean-gettext: mostlyclean-gettext
+.PHONY: maybe-installcheck-gawk installcheck-gawk
+maybe-installcheck-gawk:
+@if gawk
+maybe-installcheck-gawk: installcheck-gawk
 
-mostlyclean-gettext: 
-       @[ -f ./gettext/Makefile ] || exit 0; \
+installcheck-gawk: \
+    configure-gawk 
+       @[ -f ./gawk/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in gettext" ; \
-       (cd gettext && \
+       echo "Doing installcheck in gawk" ; \
+       (cd gawk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                 installcheck) \
          || exit 1
 
-@endif gettext
+@endif gawk
 
-.PHONY: maybe-clean-gettext clean-gettext
-maybe-clean-gettext:
-@if gettext
-maybe-clean-gettext: clean-gettext
+.PHONY: maybe-mostlyclean-gawk mostlyclean-gawk
+maybe-mostlyclean-gawk:
+@if gawk
+maybe-mostlyclean-gawk: mostlyclean-gawk
 
-clean-gettext
-       @[ -f ./gettext/Makefile ] || exit 0; \
+mostlyclean-gawk
+       @[ -f ./gawk/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in gettext" ; \
-       (cd gettext && \
+       echo "Doing mostlyclean in gawk" ; \
+       (cd gawk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                 mostlyclean) \
          || exit 1
 
-@endif gettext
+@endif gawk
 
-.PHONY: maybe-distclean-gettext distclean-gettext
-maybe-distclean-gettext:
-@if gettext
-maybe-distclean-gettext: distclean-gettext
+.PHONY: maybe-clean-gawk clean-gawk
+maybe-clean-gawk:
+@if gawk
+maybe-clean-gawk: clean-gawk
 
-distclean-gettext
-       @[ -f ./gettext/Makefile ] || exit 0; \
+clean-gawk
+       @[ -f ./gawk/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in gettext" ; \
-       (cd gettext && \
+       echo "Doing clean in gawk" ; \
+       (cd gawk && \
+         $(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 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; \
+       echo "Doing distclean in gawk" ; \
+       (cd gawk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -8788,24 +10118,24 @@ distclean-gettext:
                  distclean) \
          || exit 1
 
-@endif gettext
+@endif gawk
 
-.PHONY: maybe-maintainer-clean-gettext maintainer-clean-gettext
-maybe-maintainer-clean-gettext:
-@if gettext
-maybe-maintainer-clean-gettext: maintainer-clean-gettext
+.PHONY: maybe-maintainer-clean-gawk maintainer-clean-gawk
+maybe-maintainer-clean-gawk:
+@if gawk
+maybe-maintainer-clean-gawk: maintainer-clean-gawk
 
-maintainer-clean-gettext
-       @[ -f ./gettext/Makefile ] || exit 0; \
+maintainer-clean-gawk
+       @[ -f ./gawk/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in gettext" ; \
-       (cd gettext && \
+       echo "Doing maintainer-clean in gawk" ; \
+       (cd gawk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -8813,96 +10143,98 @@ maintainer-clean-gettext:
                  maintainer-clean) \
          || exit 1
 
-@endif gettext
+@endif gawk
 
 
-.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; \
+.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; \
        $(HOST_EXPORTS) \
-       echo Configuring in gnuserv; \
-       cd gnuserv || exit 1; \
+       echo Configuring in gettext; \
+       cd gettext || exit 1; \
        case $(srcdir) in \
          \.) \
            srcdiroption="--srcdir=."; \
            libsrcdir=".";; \
          /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/gnuserv"; \
-           libsrcdir="$$s/gnuserv";; \
+           srcdiroption="--srcdir=$(srcdir)/gettext"; \
+           libsrcdir="$$s/gettext";; \
          *) \
-           srcdiroption="--srcdir=../$(srcdir)/gnuserv"; \
-           libsrcdir="$$s/gnuserv";; \
+           srcdiroption="--srcdir=../$(srcdir)/gettext"; \
+           libsrcdir="$$s/gettext";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
-@endif gnuserv
+@endif gettext
 
-.PHONY: all-gnuserv maybe-all-gnuserv
-maybe-all-gnuserv:
-@if gnuserv
-maybe-all-gnuserv: all-gnuserv
-all-gnuserv: configure-gnuserv
+.PHONY: all-gettext maybe-all-gettext
+maybe-all-gettext:
+@if gettext
+TARGET-gettext=all
+maybe-all-gettext: all-gettext
+all-gettext: configure-gettext
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS) all)
-@endif gnuserv
+       (cd gettext && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-gettext))
+@endif gettext
 
-.PHONY: check-gnuserv maybe-check-gnuserv
-maybe-check-gnuserv:
-@if gnuserv
-maybe-check-gnuserv: check-gnuserv
+.PHONY: check-gettext maybe-check-gettext
+maybe-check-gettext:
+@if gettext
+maybe-check-gettext: check-gettext
 
-check-gnuserv:
+check-gettext:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd gettext && $(MAKE) $(FLAGS_TO_PASS) check)
 
-@endif gnuserv
+@endif gettext
 
-.PHONY: install-gnuserv maybe-install-gnuserv
-maybe-install-gnuserv:
-@if gnuserv
-maybe-install-gnuserv: install-gnuserv
+.PHONY: install-gettext maybe-install-gettext
+maybe-install-gettext:
+@if gettext
+maybe-install-gettext: install-gettext
 
-install-gnuserv: installdirs
+install-gettext: installdirs
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd gettext && $(MAKE) $(FLAGS_TO_PASS) install)
 
-@endif gnuserv
+@endif gettext
 
 # Other targets (info, dvi, etc.)
 
-.PHONY: maybe-info-gnuserv info-gnuserv
-maybe-info-gnuserv:
-@if gnuserv
-maybe-info-gnuserv: info-gnuserv
+.PHONY: maybe-info-gettext info-gettext
+maybe-info-gettext:
+@if gettext
+maybe-info-gettext: info-gettext
 
-info-gnuserv: \
-    configure-gnuserv 
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
+info-gettext: \
+    configure-gettext 
+       @[ -f ./gettext/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in gnuserv" ; \
-       (cd gnuserv && \
+       echo "Doing info in gettext" ; \
+       (cd gettext && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -8910,25 +10242,25 @@ info-gnuserv: \
                  info) \
          || exit 1
 
-@endif gnuserv
+@endif gettext
 
-.PHONY: maybe-dvi-gnuserv dvi-gnuserv
-maybe-dvi-gnuserv:
-@if gnuserv
-maybe-dvi-gnuserv: dvi-gnuserv
+.PHONY: maybe-dvi-gettext dvi-gettext
+maybe-dvi-gettext:
+@if gettext
+maybe-dvi-gettext: dvi-gettext
 
-dvi-gnuserv: \
-    configure-gnuserv 
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
+dvi-gettext: \
+    configure-gettext 
+       @[ -f ./gettext/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in gnuserv" ; \
-       (cd gnuserv && \
+       echo "Doing dvi in gettext" ; \
+       (cd gettext && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -8936,128 +10268,154 @@ dvi-gnuserv: \
                  dvi) \
          || exit 1
 
-@endif gnuserv
+@endif gettext
 
-.PHONY: maybe-TAGS-gnuserv TAGS-gnuserv
-maybe-TAGS-gnuserv:
-@if gnuserv
-maybe-TAGS-gnuserv: TAGS-gnuserv
+.PHONY: maybe-html-gettext html-gettext
+maybe-html-gettext:
+@if gettext
+maybe-html-gettext: html-gettext
 
-TAGS-gnuserv: \
-    configure-gnuserv 
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
+html-gettext: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in gnuserv" ; \
-       (cd gnuserv && \
+       echo "Doing html in gettext" ; \
+       (cd gettext && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                 html) \
          || exit 1
 
-@endif gnuserv
+@endif gettext
 
-.PHONY: maybe-install-info-gnuserv install-info-gnuserv
-maybe-install-info-gnuserv:
-@if gnuserv
-maybe-install-info-gnuserv: install-info-gnuserv
+.PHONY: maybe-TAGS-gettext TAGS-gettext
+maybe-TAGS-gettext:
+@if gettext
+maybe-TAGS-gettext: TAGS-gettext
 
-install-info-gnuserv: \
-    configure-gnuserv \
-    info-gnuserv 
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
+TAGS-gettext: \
+    configure-gettext 
+       @[ -f ./gettext/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in gnuserv" ; \
-       (cd gnuserv && \
+       echo "Doing TAGS in gettext" ; \
+       (cd gettext && \
          $(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) \
+                 TAGS) \
          || exit 1
 
-@endif gnuserv
+@endif gettext
 
-.PHONY: maybe-installcheck-gnuserv installcheck-gnuserv
-maybe-installcheck-gnuserv:
-@if gnuserv
-maybe-installcheck-gnuserv: installcheck-gnuserv
+.PHONY: maybe-install-info-gettext install-info-gettext
+maybe-install-info-gettext:
+@if gettext
+maybe-install-info-gettext: install-info-gettext
 
-installcheck-gnuserv: \
-    configure-gnuserv 
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
+install-info-gettext: \
+    configure-gettext \
+    info-gettext 
+       @[ -f ./gettext/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in gnuserv" ; \
-       (cd gnuserv && \
+       echo "Doing install-info in gettext" ; \
+       (cd gettext && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                 install-info) \
          || exit 1
 
-@endif gnuserv
+@endif gettext
 
-.PHONY: maybe-mostlyclean-gnuserv mostlyclean-gnuserv
-maybe-mostlyclean-gnuserv:
-@if gnuserv
-maybe-mostlyclean-gnuserv: mostlyclean-gnuserv
+.PHONY: maybe-installcheck-gettext installcheck-gettext
+maybe-installcheck-gettext:
+@if gettext
+maybe-installcheck-gettext: installcheck-gettext
 
-mostlyclean-gnuserv: 
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
+installcheck-gettext: \
+    configure-gettext 
+       @[ -f ./gettext/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in gnuserv" ; \
-       (cd gnuserv && \
+       echo "Doing installcheck in gettext" ; \
+       (cd gettext && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                 installcheck) \
          || exit 1
 
-@endif gnuserv
-
-.PHONY: maybe-clean-gnuserv clean-gnuserv
-maybe-clean-gnuserv:
-@if gnuserv
-maybe-clean-gnuserv: clean-gnuserv
+@endif gettext
 
-clean-gnuserv: 
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
+.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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in gnuserv" ; \
-       (cd gnuserv && \
+       echo "Doing mostlyclean in gettext" ; \
+       (cd gettext && \
+         $(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 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; \
+       echo "Doing clean in gettext" ; \
+       (cd gettext && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -9065,24 +10423,24 @@ clean-gnuserv:
                  clean) \
          || exit 1
 
-@endif gnuserv
+@endif gettext
 
-.PHONY: maybe-distclean-gnuserv distclean-gnuserv
-maybe-distclean-gnuserv:
-@if gnuserv
-maybe-distclean-gnuserv: distclean-gnuserv
+.PHONY: maybe-distclean-gettext distclean-gettext
+maybe-distclean-gettext:
+@if gettext
+maybe-distclean-gettext: distclean-gettext
 
-distclean-gnuserv
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
+distclean-gettext
+       @[ -f ./gettext/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in gnuserv" ; \
-       (cd gnuserv && \
+       echo "Doing distclean in gettext" ; \
+       (cd gettext && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -9090,24 +10448,24 @@ distclean-gnuserv:
                  distclean) \
          || exit 1
 
-@endif gnuserv
+@endif gettext
 
-.PHONY: maybe-maintainer-clean-gnuserv maintainer-clean-gnuserv
-maybe-maintainer-clean-gnuserv:
-@if gnuserv
-maybe-maintainer-clean-gnuserv: maintainer-clean-gnuserv
+.PHONY: maybe-maintainer-clean-gettext maintainer-clean-gettext
+maybe-maintainer-clean-gettext:
+@if gettext
+maybe-maintainer-clean-gettext: maintainer-clean-gettext
 
-maintainer-clean-gnuserv
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
+maintainer-clean-gettext
+       @[ -f ./gettext/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in gnuserv" ; \
-       (cd gnuserv && \
+       echo "Doing maintainer-clean in gettext" ; \
+       (cd gettext && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -9115,96 +10473,98 @@ maintainer-clean-gnuserv:
                  maintainer-clean) \
          || exit 1
 
-@endif gnuserv
+@endif gettext
 
 
-.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; \
+.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; \
        $(HOST_EXPORTS) \
-       echo Configuring in gprof; \
-       cd gprof || exit 1; \
+       echo Configuring in gnuserv; \
+       cd gnuserv || exit 1; \
        case $(srcdir) in \
          \.) \
            srcdiroption="--srcdir=."; \
            libsrcdir=".";; \
          /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/gprof"; \
-           libsrcdir="$$s/gprof";; \
+           srcdiroption="--srcdir=$(srcdir)/gnuserv"; \
+           libsrcdir="$$s/gnuserv";; \
          *) \
-           srcdiroption="--srcdir=../$(srcdir)/gprof"; \
-           libsrcdir="$$s/gprof";; \
+           srcdiroption="--srcdir=../$(srcdir)/gnuserv"; \
+           libsrcdir="$$s/gnuserv";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
-@endif gprof
+@endif gnuserv
 
-.PHONY: all-gprof maybe-all-gprof
-maybe-all-gprof:
-@if gprof
-maybe-all-gprof: all-gprof
-all-gprof: configure-gprof
+.PHONY: all-gnuserv maybe-all-gnuserv
+maybe-all-gnuserv:
+@if gnuserv
+TARGET-gnuserv=all
+maybe-all-gnuserv: all-gnuserv
+all-gnuserv: configure-gnuserv
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gprof && $(MAKE) $(FLAGS_TO_PASS) all)
-@endif gprof
+       (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-gnuserv))
+@endif gnuserv
 
-.PHONY: check-gprof maybe-check-gprof
-maybe-check-gprof:
-@if gprof
-maybe-check-gprof: check-gprof
+.PHONY: check-gnuserv maybe-check-gnuserv
+maybe-check-gnuserv:
+@if gnuserv
+maybe-check-gnuserv: check-gnuserv
 
-check-gprof:
+check-gnuserv:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gprof && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS) check)
 
-@endif gprof
+@endif gnuserv
 
-.PHONY: install-gprof maybe-install-gprof
-maybe-install-gprof:
-@if gprof
-maybe-install-gprof: install-gprof
+.PHONY: install-gnuserv maybe-install-gnuserv
+maybe-install-gnuserv:
+@if gnuserv
+maybe-install-gnuserv: install-gnuserv
 
-install-gprof: installdirs
+install-gnuserv: installdirs
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gprof && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS) install)
 
-@endif gprof
+@endif gnuserv
 
 # Other targets (info, dvi, etc.)
 
-.PHONY: maybe-info-gprof info-gprof
-maybe-info-gprof:
-@if gprof
-maybe-info-gprof: info-gprof
+.PHONY: maybe-info-gnuserv info-gnuserv
+maybe-info-gnuserv:
+@if gnuserv
+maybe-info-gnuserv: info-gnuserv
 
-info-gprof: \
-    configure-gprof 
-       @[ -f ./gprof/Makefile ] || exit 0; \
+info-gnuserv: \
+    configure-gnuserv 
+       @[ -f ./gnuserv/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in gprof" ; \
-       (cd gprof && \
+       echo "Doing info in gnuserv" ; \
+       (cd gnuserv && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -9212,25 +10572,25 @@ info-gprof: \
                  info) \
          || exit 1
 
-@endif gprof
+@endif gnuserv
 
-.PHONY: maybe-dvi-gprof dvi-gprof
-maybe-dvi-gprof:
-@if gprof
-maybe-dvi-gprof: dvi-gprof
+.PHONY: maybe-dvi-gnuserv dvi-gnuserv
+maybe-dvi-gnuserv:
+@if gnuserv
+maybe-dvi-gnuserv: dvi-gnuserv
 
-dvi-gprof: \
-    configure-gprof 
-       @[ -f ./gprof/Makefile ] || exit 0; \
+dvi-gnuserv: \
+    configure-gnuserv 
+       @[ -f ./gnuserv/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in gprof" ; \
-       (cd gprof && \
+       echo "Doing dvi in gnuserv" ; \
+       (cd gnuserv && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -9238,103 +10598,129 @@ dvi-gprof: \
                  dvi) \
          || exit 1
 
-@endif gprof
+@endif gnuserv
 
-.PHONY: maybe-TAGS-gprof TAGS-gprof
-maybe-TAGS-gprof:
-@if gprof
-maybe-TAGS-gprof: TAGS-gprof
+.PHONY: maybe-html-gnuserv html-gnuserv
+maybe-html-gnuserv:
+@if gnuserv
+maybe-html-gnuserv: html-gnuserv
 
-TAGS-gprof: \
-    configure-gprof 
-       @[ -f ./gprof/Makefile ] || exit 0; \
+html-gnuserv: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in gprof" ; \
-       (cd gprof && \
+       echo "Doing html in gnuserv" ; \
+       (cd gnuserv && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                 html) \
          || exit 1
 
-@endif gprof
+@endif gnuserv
 
-.PHONY: maybe-install-info-gprof install-info-gprof
-maybe-install-info-gprof:
-@if gprof
-maybe-install-info-gprof: install-info-gprof
+.PHONY: maybe-TAGS-gnuserv TAGS-gnuserv
+maybe-TAGS-gnuserv:
+@if gnuserv
+maybe-TAGS-gnuserv: TAGS-gnuserv
 
-install-info-gprof: \
-    configure-gprof \
-    info-gprof 
-       @[ -f ./gprof/Makefile ] || exit 0; \
+TAGS-gnuserv: \
+    configure-gnuserv 
+       @[ -f ./gnuserv/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in gprof" ; \
-       (cd gprof && \
+       echo "Doing TAGS in gnuserv" ; \
+       (cd gnuserv && \
          $(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) \
+                 TAGS) \
          || exit 1
 
-@endif gprof
+@endif gnuserv
 
-.PHONY: maybe-installcheck-gprof installcheck-gprof
-maybe-installcheck-gprof:
-@if gprof
-maybe-installcheck-gprof: installcheck-gprof
+.PHONY: maybe-install-info-gnuserv install-info-gnuserv
+maybe-install-info-gnuserv:
+@if gnuserv
+maybe-install-info-gnuserv: install-info-gnuserv
 
-installcheck-gprof: \
-    configure-gprof 
-       @[ -f ./gprof/Makefile ] || exit 0; \
+install-info-gnuserv: \
+    configure-gnuserv \
+    info-gnuserv 
+       @[ -f ./gnuserv/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in gprof" ; \
-       (cd gprof && \
+       echo "Doing install-info in gnuserv" ; \
+       (cd gnuserv && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                 install-info) \
          || exit 1
 
-@endif gprof
+@endif gnuserv
 
-.PHONY: maybe-mostlyclean-gprof mostlyclean-gprof
-maybe-mostlyclean-gprof:
-@if gprof
-maybe-mostlyclean-gprof: mostlyclean-gprof
+.PHONY: maybe-installcheck-gnuserv installcheck-gnuserv
+maybe-installcheck-gnuserv:
+@if gnuserv
+maybe-installcheck-gnuserv: installcheck-gnuserv
 
-mostlyclean-gprof: 
-       @[ -f ./gprof/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+installcheck-gnuserv: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in gprof" ; \
-       (cd gprof && \
+       echo "Doing installcheck in gnuserv" ; \
+       (cd gnuserv && \
+         $(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 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; \
+       echo "Doing mostlyclean in gnuserv" ; \
+       (cd gnuserv && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -9342,24 +10728,24 @@ mostlyclean-gprof:
                  mostlyclean) \
          || exit 1
 
-@endif gprof
+@endif gnuserv
 
-.PHONY: maybe-clean-gprof clean-gprof
-maybe-clean-gprof:
-@if gprof
-maybe-clean-gprof: clean-gprof
+.PHONY: maybe-clean-gnuserv clean-gnuserv
+maybe-clean-gnuserv:
+@if gnuserv
+maybe-clean-gnuserv: clean-gnuserv
 
-clean-gprof
-       @[ -f ./gprof/Makefile ] || exit 0; \
+clean-gnuserv
+       @[ -f ./gnuserv/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in gprof" ; \
-       (cd gprof && \
+       echo "Doing clean in gnuserv" ; \
+       (cd gnuserv && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -9367,24 +10753,24 @@ clean-gprof:
                  clean) \
          || exit 1
 
-@endif gprof
+@endif gnuserv
 
-.PHONY: maybe-distclean-gprof distclean-gprof
-maybe-distclean-gprof:
-@if gprof
-maybe-distclean-gprof: distclean-gprof
+.PHONY: maybe-distclean-gnuserv distclean-gnuserv
+maybe-distclean-gnuserv:
+@if gnuserv
+maybe-distclean-gnuserv: distclean-gnuserv
 
-distclean-gprof
-       @[ -f ./gprof/Makefile ] || exit 0; \
+distclean-gnuserv
+       @[ -f ./gnuserv/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in gprof" ; \
-       (cd gprof && \
+       echo "Doing distclean in gnuserv" ; \
+       (cd gnuserv && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -9392,24 +10778,24 @@ distclean-gprof:
                  distclean) \
          || exit 1
 
-@endif gprof
+@endif gnuserv
 
-.PHONY: maybe-maintainer-clean-gprof maintainer-clean-gprof
-maybe-maintainer-clean-gprof:
-@if gprof
-maybe-maintainer-clean-gprof: maintainer-clean-gprof
+.PHONY: maybe-maintainer-clean-gnuserv maintainer-clean-gnuserv
+maybe-maintainer-clean-gnuserv:
+@if gnuserv
+maybe-maintainer-clean-gnuserv: maintainer-clean-gnuserv
 
-maintainer-clean-gprof
-       @[ -f ./gprof/Makefile ] || exit 0; \
+maintainer-clean-gnuserv
+       @[ -f ./gnuserv/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in gprof" ; \
-       (cd gprof && \
+       echo "Doing maintainer-clean in gnuserv" ; \
+       (cd gnuserv && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -9417,96 +10803,98 @@ maintainer-clean-gprof:
                  maintainer-clean) \
          || exit 1
 
-@endif gprof
+@endif gnuserv
 
 
-.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; \
+.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; \
        $(HOST_EXPORTS) \
-       echo Configuring in gzip; \
-       cd gzip || exit 1; \
+       echo Configuring in gprof; \
+       cd gprof || exit 1; \
        case $(srcdir) in \
          \.) \
            srcdiroption="--srcdir=."; \
            libsrcdir=".";; \
          /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/gzip"; \
-           libsrcdir="$$s/gzip";; \
+           srcdiroption="--srcdir=$(srcdir)/gprof"; \
+           libsrcdir="$$s/gprof";; \
          *) \
-           srcdiroption="--srcdir=../$(srcdir)/gzip"; \
-           libsrcdir="$$s/gzip";; \
+           srcdiroption="--srcdir=../$(srcdir)/gprof"; \
+           libsrcdir="$$s/gprof";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
-@endif gzip
+@endif gprof
 
-.PHONY: all-gzip maybe-all-gzip
-maybe-all-gzip:
-@if gzip
-maybe-all-gzip: all-gzip
-all-gzip: configure-gzip
+.PHONY: all-gprof maybe-all-gprof
+maybe-all-gprof:
+@if gprof
+TARGET-gprof=all
+maybe-all-gprof: all-gprof
+all-gprof: configure-gprof
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gzip && $(MAKE) $(FLAGS_TO_PASS) all)
-@endif gzip
+       (cd gprof && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-gprof))
+@endif gprof
 
-.PHONY: check-gzip maybe-check-gzip
-maybe-check-gzip:
-@if gzip
-maybe-check-gzip: check-gzip
+.PHONY: check-gprof maybe-check-gprof
+maybe-check-gprof:
+@if gprof
+maybe-check-gprof: check-gprof
 
-check-gzip:
+check-gprof:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gzip && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd gprof && $(MAKE) $(FLAGS_TO_PASS) check)
 
-@endif gzip
+@endif gprof
 
-.PHONY: install-gzip maybe-install-gzip
-maybe-install-gzip:
-@if gzip
-maybe-install-gzip: install-gzip
+.PHONY: install-gprof maybe-install-gprof
+maybe-install-gprof:
+@if gprof
+maybe-install-gprof: install-gprof
 
-install-gzip: installdirs
+install-gprof: installdirs
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gzip && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd gprof && $(MAKE) $(FLAGS_TO_PASS) install)
 
-@endif gzip
+@endif gprof
 
 # Other targets (info, dvi, etc.)
 
-.PHONY: maybe-info-gzip info-gzip
-maybe-info-gzip:
-@if gzip
-maybe-info-gzip: info-gzip
+.PHONY: maybe-info-gprof info-gprof
+maybe-info-gprof:
+@if gprof
+maybe-info-gprof: info-gprof
 
-info-gzip: \
-    configure-gzip 
-       @[ -f ./gzip/Makefile ] || exit 0; \
+info-gprof: \
+    configure-gprof 
+       @[ -f ./gprof/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in gzip" ; \
-       (cd gzip && \
+       echo "Doing info in gprof" ; \
+       (cd gprof && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -9514,25 +10902,25 @@ info-gzip: \
                  info) \
          || exit 1
 
-@endif gzip
+@endif gprof
 
-.PHONY: maybe-dvi-gzip dvi-gzip
-maybe-dvi-gzip:
-@if gzip
-maybe-dvi-gzip: dvi-gzip
+.PHONY: maybe-dvi-gprof dvi-gprof
+maybe-dvi-gprof:
+@if gprof
+maybe-dvi-gprof: dvi-gprof
 
-dvi-gzip: \
-    configure-gzip 
-       @[ -f ./gzip/Makefile ] || exit 0; \
+dvi-gprof: \
+    configure-gprof 
+       @[ -f ./gprof/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in gzip" ; \
-       (cd gzip && \
+       echo "Doing dvi in gprof" ; \
+       (cd gprof && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -9540,78 +10928,104 @@ dvi-gzip: \
                  dvi) \
          || exit 1
 
-@endif gzip
+@endif gprof
 
-.PHONY: maybe-TAGS-gzip TAGS-gzip
-maybe-TAGS-gzip:
-@if gzip
-maybe-TAGS-gzip: TAGS-gzip
+.PHONY: maybe-html-gprof html-gprof
+maybe-html-gprof:
+@if gprof
+maybe-html-gprof: html-gprof
 
-TAGS-gzip: \
-    configure-gzip 
-       @[ -f ./gzip/Makefile ] || exit 0; \
+html-gprof: \
+    configure-gprof 
+       @[ -f ./gprof/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in gzip" ; \
-       (cd gzip && \
+       echo "Doing html in gprof" ; \
+       (cd gprof && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                 html) \
          || exit 1
 
-@endif gzip
+@endif gprof
 
-.PHONY: maybe-install-info-gzip install-info-gzip
-maybe-install-info-gzip:
-@if gzip
-maybe-install-info-gzip: install-info-gzip
+.PHONY: maybe-TAGS-gprof TAGS-gprof
+maybe-TAGS-gprof:
+@if gprof
+maybe-TAGS-gprof: TAGS-gprof
 
-install-info-gzip: \
-    configure-gzip \
-    info-gzip 
-       @[ -f ./gzip/Makefile ] || exit 0; \
+TAGS-gprof: \
+    configure-gprof 
+       @[ -f ./gprof/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in gzip" ; \
-       (cd gzip && \
+       echo "Doing TAGS in gprof" ; \
+       (cd gprof && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                 TAGS) \
          || exit 1
 
-@endif gzip
+@endif gprof
 
-.PHONY: maybe-installcheck-gzip installcheck-gzip
-maybe-installcheck-gzip:
-@if gzip
-maybe-installcheck-gzip: installcheck-gzip
+.PHONY: maybe-install-info-gprof install-info-gprof
+maybe-install-info-gprof:
+@if gprof
+maybe-install-info-gprof: install-info-gprof
 
-installcheck-gzip: \
-    configure-gzip 
-       @[ -f ./gzip/Makefile ] || exit 0; \
+install-info-gprof: \
+    configure-gprof \
+    info-gprof 
+       @[ -f ./gprof/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in gzip" ; \
-       (cd gzip && \
+       echo "Doing install-info in gprof" ; \
+       (cd gprof && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 install-info) \
+         || exit 1
+
+@endif gprof
+
+.PHONY: maybe-installcheck-gprof installcheck-gprof
+maybe-installcheck-gprof:
+@if gprof
+maybe-installcheck-gprof: installcheck-gprof
+
+installcheck-gprof: \
+    configure-gprof 
+       @[ -f ./gprof/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing installcheck in gprof" ; \
+       (cd gprof && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -9619,24 +11033,24 @@ installcheck-gzip: \
                  installcheck) \
          || exit 1
 
-@endif gzip
+@endif gprof
 
-.PHONY: maybe-mostlyclean-gzip mostlyclean-gzip
-maybe-mostlyclean-gzip:
-@if gzip
-maybe-mostlyclean-gzip: mostlyclean-gzip
+.PHONY: maybe-mostlyclean-gprof mostlyclean-gprof
+maybe-mostlyclean-gprof:
+@if gprof
+maybe-mostlyclean-gprof: mostlyclean-gprof
 
-mostlyclean-gzip
-       @[ -f ./gzip/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in gzip" ; \
-       (cd gzip && \
+       echo "Doing mostlyclean in gprof" ; \
+       (cd gprof && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -9644,24 +11058,24 @@ mostlyclean-gzip:
                  mostlyclean) \
          || exit 1
 
-@endif gzip
+@endif gprof
 
-.PHONY: maybe-clean-gzip clean-gzip
-maybe-clean-gzip:
-@if gzip
-maybe-clean-gzip: clean-gzip
+.PHONY: maybe-clean-gprof clean-gprof
+maybe-clean-gprof:
+@if gprof
+maybe-clean-gprof: clean-gprof
 
-clean-gzip
-       @[ -f ./gzip/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in gzip" ; \
-       (cd gzip && \
+       echo "Doing clean in gprof" ; \
+       (cd gprof && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -9669,24 +11083,24 @@ clean-gzip:
                  clean) \
          || exit 1
 
-@endif gzip
+@endif gprof
 
-.PHONY: maybe-distclean-gzip distclean-gzip
-maybe-distclean-gzip:
-@if gzip
-maybe-distclean-gzip: distclean-gzip
+.PHONY: maybe-distclean-gprof distclean-gprof
+maybe-distclean-gprof:
+@if gprof
+maybe-distclean-gprof: distclean-gprof
 
-distclean-gzip
-       @[ -f ./gzip/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in gzip" ; \
-       (cd gzip && \
+       echo "Doing distclean in gprof" ; \
+       (cd gprof && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -9694,24 +11108,24 @@ distclean-gzip:
                  distclean) \
          || exit 1
 
-@endif gzip
+@endif gprof
 
-.PHONY: maybe-maintainer-clean-gzip maintainer-clean-gzip
-maybe-maintainer-clean-gzip:
-@if gzip
-maybe-maintainer-clean-gzip: maintainer-clean-gzip
+.PHONY: maybe-maintainer-clean-gprof maintainer-clean-gprof
+maybe-maintainer-clean-gprof:
+@if gprof
+maybe-maintainer-clean-gprof: maintainer-clean-gprof
 
-maintainer-clean-gzip
-       @[ -f ./gzip/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in gzip" ; \
-       (cd gzip && \
+       echo "Doing maintainer-clean in gprof" ; \
+       (cd gprof && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -9719,96 +11133,98 @@ maintainer-clean-gzip:
                  maintainer-clean) \
          || exit 1
 
-@endif gzip
+@endif gprof
 
 
-.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; \
+.PHONY: configure-gzip maybe-configure-gzip
+maybe-configure-gzip:
+@if gzip
+maybe-configure-gzip: configure-gzip
+configure-gzip:
+       @test ! -f gzip/Makefile || exit 0; \
+       [ -d gzip ] || mkdir gzip; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in hello; \
-       cd hello || exit 1; \
+       echo Configuring in gzip; \
+       cd gzip || exit 1; \
        case $(srcdir) in \
          \.) \
            srcdiroption="--srcdir=."; \
            libsrcdir=".";; \
          /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/hello"; \
-           libsrcdir="$$s/hello";; \
+           srcdiroption="--srcdir=$(srcdir)/gzip"; \
+           libsrcdir="$$s/gzip";; \
          *) \
-           srcdiroption="--srcdir=../$(srcdir)/hello"; \
-           libsrcdir="$$s/hello";; \
+           srcdiroption="--srcdir=../$(srcdir)/gzip"; \
+           libsrcdir="$$s/gzip";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
-@endif hello
+@endif gzip
 
-.PHONY: all-hello maybe-all-hello
-maybe-all-hello:
-@if hello
-maybe-all-hello: all-hello
-all-hello: configure-hello
+.PHONY: all-gzip maybe-all-gzip
+maybe-all-gzip:
+@if gzip
+TARGET-gzip=all
+maybe-all-gzip: all-gzip
+all-gzip: configure-gzip
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd hello && $(MAKE) $(FLAGS_TO_PASS) all)
-@endif hello
+       (cd gzip && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-gzip))
+@endif gzip
 
-.PHONY: check-hello maybe-check-hello
-maybe-check-hello:
-@if hello
-maybe-check-hello: check-hello
+.PHONY: check-gzip maybe-check-gzip
+maybe-check-gzip:
+@if gzip
+maybe-check-gzip: check-gzip
 
-check-hello:
+check-gzip:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd hello && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd gzip && $(MAKE) $(FLAGS_TO_PASS) check)
 
-@endif hello
+@endif gzip
 
-.PHONY: install-hello maybe-install-hello
-maybe-install-hello:
-@if hello
-maybe-install-hello: install-hello
+.PHONY: install-gzip maybe-install-gzip
+maybe-install-gzip:
+@if gzip
+maybe-install-gzip: install-gzip
 
-install-hello: installdirs
+install-gzip: installdirs
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd hello && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd gzip && $(MAKE) $(FLAGS_TO_PASS) install)
 
-@endif hello
+@endif gzip
 
 # Other targets (info, dvi, etc.)
 
-.PHONY: maybe-info-hello info-hello
-maybe-info-hello:
-@if hello
-maybe-info-hello: info-hello
+.PHONY: maybe-info-gzip info-gzip
+maybe-info-gzip:
+@if gzip
+maybe-info-gzip: info-gzip
 
-info-hello: \
-    configure-hello 
-       @[ -f ./hello/Makefile ] || exit 0; \
+info-gzip: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in hello" ; \
-       (cd hello && \
+       echo "Doing info in gzip" ; \
+       (cd gzip && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -9816,25 +11232,25 @@ info-hello: \
                  info) \
          || exit 1
 
-@endif hello
+@endif gzip
 
-.PHONY: maybe-dvi-hello dvi-hello
-maybe-dvi-hello:
-@if hello
-maybe-dvi-hello: dvi-hello
+.PHONY: maybe-dvi-gzip dvi-gzip
+maybe-dvi-gzip:
+@if gzip
+maybe-dvi-gzip: dvi-gzip
 
-dvi-hello: \
-    configure-hello 
-       @[ -f ./hello/Makefile ] || exit 0; \
+dvi-gzip: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in hello" ; \
-       (cd hello && \
+       echo "Doing dvi in gzip" ; \
+       (cd gzip && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -9842,78 +11258,104 @@ dvi-hello: \
                  dvi) \
          || exit 1
 
-@endif hello
+@endif gzip
 
-.PHONY: maybe-TAGS-hello TAGS-hello
-maybe-TAGS-hello:
-@if hello
-maybe-TAGS-hello: TAGS-hello
+.PHONY: maybe-html-gzip html-gzip
+maybe-html-gzip:
+@if gzip
+maybe-html-gzip: html-gzip
 
-TAGS-hello: \
-    configure-hello 
-       @[ -f ./hello/Makefile ] || exit 0; \
+html-gzip: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in hello" ; \
-       (cd hello && \
+       echo "Doing html in gzip" ; \
+       (cd gzip && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                 html) \
          || exit 1
 
-@endif hello
+@endif gzip
 
-.PHONY: maybe-install-info-hello install-info-hello
-maybe-install-info-hello:
-@if hello
-maybe-install-info-hello: install-info-hello
+.PHONY: maybe-TAGS-gzip TAGS-gzip
+maybe-TAGS-gzip:
+@if gzip
+maybe-TAGS-gzip: TAGS-gzip
 
-install-info-hello: \
-    configure-hello \
-    info-hello 
-       @[ -f ./hello/Makefile ] || exit 0; \
+TAGS-gzip: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in hello" ; \
-       (cd hello && \
+       echo "Doing TAGS in gzip" ; \
+       (cd gzip && \
          $(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) \
+                 TAGS) \
          || exit 1
 
-@endif hello
+@endif gzip
 
-.PHONY: maybe-installcheck-hello installcheck-hello
-maybe-installcheck-hello:
-@if hello
-maybe-installcheck-hello: installcheck-hello
+.PHONY: maybe-install-info-gzip install-info-gzip
+maybe-install-info-gzip:
+@if gzip
+maybe-install-info-gzip: install-info-gzip
 
-installcheck-hello: \
-    configure-hello 
-       @[ -f ./hello/Makefile ] || exit 0; \
+install-info-gzip: \
+    configure-gzip \
+    info-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in hello" ; \
-       (cd hello && \
+       echo "Doing install-info in gzip" ; \
+       (cd gzip && \
+         $(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 gzip
+
+.PHONY: maybe-installcheck-gzip installcheck-gzip
+maybe-installcheck-gzip:
+@if gzip
+maybe-installcheck-gzip: installcheck-gzip
+
+installcheck-gzip: \
+    configure-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; \
+       echo "Doing installcheck in gzip" ; \
+       (cd gzip && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -9921,24 +11363,24 @@ installcheck-hello: \
                  installcheck) \
          || exit 1
 
-@endif hello
+@endif gzip
 
-.PHONY: maybe-mostlyclean-hello mostlyclean-hello
-maybe-mostlyclean-hello:
-@if hello
-maybe-mostlyclean-hello: mostlyclean-hello
+.PHONY: maybe-mostlyclean-gzip mostlyclean-gzip
+maybe-mostlyclean-gzip:
+@if gzip
+maybe-mostlyclean-gzip: mostlyclean-gzip
 
-mostlyclean-hello
-       @[ -f ./hello/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in hello" ; \
-       (cd hello && \
+       echo "Doing mostlyclean in gzip" ; \
+       (cd gzip && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -9946,24 +11388,24 @@ mostlyclean-hello:
                  mostlyclean) \
          || exit 1
 
-@endif hello
+@endif gzip
 
-.PHONY: maybe-clean-hello clean-hello
-maybe-clean-hello:
-@if hello
-maybe-clean-hello: clean-hello
+.PHONY: maybe-clean-gzip clean-gzip
+maybe-clean-gzip:
+@if gzip
+maybe-clean-gzip: clean-gzip
 
-clean-hello
-       @[ -f ./hello/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in hello" ; \
-       (cd hello && \
+       echo "Doing clean in gzip" ; \
+       (cd gzip && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -9971,24 +11413,24 @@ clean-hello:
                  clean) \
          || exit 1
 
-@endif hello
+@endif gzip
 
-.PHONY: maybe-distclean-hello distclean-hello
-maybe-distclean-hello:
-@if hello
-maybe-distclean-hello: distclean-hello
+.PHONY: maybe-distclean-gzip distclean-gzip
+maybe-distclean-gzip:
+@if gzip
+maybe-distclean-gzip: distclean-gzip
 
-distclean-hello
-       @[ -f ./hello/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in hello" ; \
-       (cd hello && \
+       echo "Doing distclean in gzip" ; \
+       (cd gzip && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -9996,24 +11438,24 @@ distclean-hello:
                  distclean) \
          || exit 1
 
-@endif hello
+@endif gzip
 
-.PHONY: maybe-maintainer-clean-hello maintainer-clean-hello
-maybe-maintainer-clean-hello:
-@if hello
-maybe-maintainer-clean-hello: maintainer-clean-hello
+.PHONY: maybe-maintainer-clean-gzip maintainer-clean-gzip
+maybe-maintainer-clean-gzip:
+@if gzip
+maybe-maintainer-clean-gzip: maintainer-clean-gzip
 
-maintainer-clean-hello
-       @[ -f ./hello/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in hello" ; \
-       (cd hello && \
+       echo "Doing maintainer-clean in gzip" ; \
+       (cd gzip && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -10021,96 +11463,98 @@ maintainer-clean-hello:
                  maintainer-clean) \
          || exit 1
 
-@endif hello
+@endif gzip
 
 
-.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; \
+.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; \
        $(HOST_EXPORTS) \
-       echo Configuring in indent; \
-       cd indent || exit 1; \
+       echo Configuring in hello; \
+       cd hello || exit 1; \
        case $(srcdir) in \
          \.) \
            srcdiroption="--srcdir=."; \
            libsrcdir=".";; \
          /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/indent"; \
-           libsrcdir="$$s/indent";; \
+           srcdiroption="--srcdir=$(srcdir)/hello"; \
+           libsrcdir="$$s/hello";; \
          *) \
-           srcdiroption="--srcdir=../$(srcdir)/indent"; \
-           libsrcdir="$$s/indent";; \
+           srcdiroption="--srcdir=../$(srcdir)/hello"; \
+           libsrcdir="$$s/hello";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
-@endif indent
+@endif hello
 
-.PHONY: all-indent maybe-all-indent
-maybe-all-indent:
-@if indent
-maybe-all-indent: all-indent
-all-indent: configure-indent
+.PHONY: all-hello maybe-all-hello
+maybe-all-hello:
+@if hello
+TARGET-hello=all
+maybe-all-hello: all-hello
+all-hello: configure-hello
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd indent && $(MAKE) $(FLAGS_TO_PASS) all)
-@endif indent
+       (cd hello && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-hello))
+@endif hello
 
-.PHONY: check-indent maybe-check-indent
-maybe-check-indent:
-@if indent
-maybe-check-indent: check-indent
+.PHONY: check-hello maybe-check-hello
+maybe-check-hello:
+@if hello
+maybe-check-hello: check-hello
 
-check-indent:
+check-hello:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd indent && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd hello && $(MAKE) $(FLAGS_TO_PASS) check)
 
-@endif indent
+@endif hello
 
-.PHONY: install-indent maybe-install-indent
-maybe-install-indent:
-@if indent
-maybe-install-indent: install-indent
+.PHONY: install-hello maybe-install-hello
+maybe-install-hello:
+@if hello
+maybe-install-hello: install-hello
 
-install-indent: installdirs
+install-hello: installdirs
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd indent && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd hello && $(MAKE) $(FLAGS_TO_PASS) install)
 
-@endif indent
+@endif hello
 
 # Other targets (info, dvi, etc.)
 
-.PHONY: maybe-info-indent info-indent
-maybe-info-indent:
-@if indent
-maybe-info-indent: info-indent
+.PHONY: maybe-info-hello info-hello
+maybe-info-hello:
+@if hello
+maybe-info-hello: info-hello
 
-info-indent: \
-    configure-indent 
-       @[ -f ./indent/Makefile ] || exit 0; \
+info-hello: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in indent" ; \
-       (cd indent && \
+       echo "Doing info in hello" ; \
+       (cd hello && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -10118,25 +11562,25 @@ info-indent: \
                  info) \
          || exit 1
 
-@endif indent
+@endif hello
 
-.PHONY: maybe-dvi-indent dvi-indent
-maybe-dvi-indent:
-@if indent
-maybe-dvi-indent: dvi-indent
+.PHONY: maybe-dvi-hello dvi-hello
+maybe-dvi-hello:
+@if hello
+maybe-dvi-hello: dvi-hello
 
-dvi-indent: \
-    configure-indent 
-       @[ -f ./indent/Makefile ] || exit 0; \
+dvi-hello: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in indent" ; \
-       (cd indent && \
+       echo "Doing dvi in hello" ; \
+       (cd hello && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -10144,78 +11588,104 @@ dvi-indent: \
                  dvi) \
          || exit 1
 
-@endif indent
+@endif hello
 
-.PHONY: maybe-TAGS-indent TAGS-indent
-maybe-TAGS-indent:
-@if indent
-maybe-TAGS-indent: TAGS-indent
+.PHONY: maybe-html-hello html-hello
+maybe-html-hello:
+@if hello
+maybe-html-hello: html-hello
 
-TAGS-indent: \
-    configure-indent 
-       @[ -f ./indent/Makefile ] || exit 0; \
+html-hello: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in indent" ; \
-       (cd indent && \
+       echo "Doing html in hello" ; \
+       (cd hello && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                 html) \
          || exit 1
 
-@endif indent
+@endif hello
 
-.PHONY: maybe-install-info-indent install-info-indent
-maybe-install-info-indent:
-@if indent
-maybe-install-info-indent: install-info-indent
+.PHONY: maybe-TAGS-hello TAGS-hello
+maybe-TAGS-hello:
+@if hello
+maybe-TAGS-hello: TAGS-hello
 
-install-info-indent: \
-    configure-indent \
-    info-indent 
-       @[ -f ./indent/Makefile ] || exit 0; \
+TAGS-hello: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in indent" ; \
-       (cd indent && \
+       echo "Doing TAGS in hello" ; \
+       (cd hello && \
          $(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) \
+                 TAGS) \
          || exit 1
 
-@endif indent
+@endif hello
 
-.PHONY: maybe-installcheck-indent installcheck-indent
-maybe-installcheck-indent:
-@if indent
-maybe-installcheck-indent: installcheck-indent
+.PHONY: maybe-install-info-hello install-info-hello
+maybe-install-info-hello:
+@if hello
+maybe-install-info-hello: install-info-hello
 
-installcheck-indent: \
-    configure-indent 
-       @[ -f ./indent/Makefile ] || exit 0; \
+install-info-hello: \
+    configure-hello \
+    info-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in indent" ; \
-       (cd indent && \
+       echo "Doing install-info in hello" ; \
+       (cd hello && \
+         $(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 hello
+
+.PHONY: maybe-installcheck-hello installcheck-hello
+maybe-installcheck-hello:
+@if hello
+maybe-installcheck-hello: installcheck-hello
+
+installcheck-hello: \
+    configure-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; \
+       echo "Doing installcheck in hello" ; \
+       (cd hello && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -10223,24 +11693,24 @@ installcheck-indent: \
                  installcheck) \
          || exit 1
 
-@endif indent
+@endif hello
 
-.PHONY: maybe-mostlyclean-indent mostlyclean-indent
-maybe-mostlyclean-indent:
-@if indent
-maybe-mostlyclean-indent: mostlyclean-indent
+.PHONY: maybe-mostlyclean-hello mostlyclean-hello
+maybe-mostlyclean-hello:
+@if hello
+maybe-mostlyclean-hello: mostlyclean-hello
 
-mostlyclean-indent
-       @[ -f ./indent/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in indent" ; \
-       (cd indent && \
+       echo "Doing mostlyclean in hello" ; \
+       (cd hello && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -10248,24 +11718,24 @@ mostlyclean-indent:
                  mostlyclean) \
          || exit 1
 
-@endif indent
+@endif hello
 
-.PHONY: maybe-clean-indent clean-indent
-maybe-clean-indent:
-@if indent
-maybe-clean-indent: clean-indent
+.PHONY: maybe-clean-hello clean-hello
+maybe-clean-hello:
+@if hello
+maybe-clean-hello: clean-hello
 
-clean-indent
-       @[ -f ./indent/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in indent" ; \
-       (cd indent && \
+       echo "Doing clean in hello" ; \
+       (cd hello && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -10273,24 +11743,24 @@ clean-indent:
                  clean) \
          || exit 1
 
-@endif indent
+@endif hello
 
-.PHONY: maybe-distclean-indent distclean-indent
-maybe-distclean-indent:
-@if indent
-maybe-distclean-indent: distclean-indent
+.PHONY: maybe-distclean-hello distclean-hello
+maybe-distclean-hello:
+@if hello
+maybe-distclean-hello: distclean-hello
 
-distclean-indent
-       @[ -f ./indent/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in indent" ; \
-       (cd indent && \
+       echo "Doing distclean in hello" ; \
+       (cd hello && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -10298,24 +11768,24 @@ distclean-indent:
                  distclean) \
          || exit 1
 
-@endif indent
+@endif hello
 
-.PHONY: maybe-maintainer-clean-indent maintainer-clean-indent
-maybe-maintainer-clean-indent:
-@if indent
-maybe-maintainer-clean-indent: maintainer-clean-indent
+.PHONY: maybe-maintainer-clean-hello maintainer-clean-hello
+maybe-maintainer-clean-hello:
+@if hello
+maybe-maintainer-clean-hello: maintainer-clean-hello
 
-maintainer-clean-indent
-       @[ -f ./indent/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in indent" ; \
-       (cd indent && \
+       echo "Doing maintainer-clean in hello" ; \
+       (cd hello && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -10323,96 +11793,98 @@ maintainer-clean-indent:
                  maintainer-clean) \
          || exit 1
 
-@endif indent
+@endif hello
 
 
-.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; \
+.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; \
        $(HOST_EXPORTS) \
-       echo Configuring in intl; \
-       cd intl || exit 1; \
+       echo Configuring in indent; \
+       cd indent || exit 1; \
        case $(srcdir) in \
          \.) \
            srcdiroption="--srcdir=."; \
            libsrcdir=".";; \
          /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/intl"; \
-           libsrcdir="$$s/intl";; \
+           srcdiroption="--srcdir=$(srcdir)/indent"; \
+           libsrcdir="$$s/indent";; \
          *) \
-           srcdiroption="--srcdir=../$(srcdir)/intl"; \
-           libsrcdir="$$s/intl";; \
+           srcdiroption="--srcdir=../$(srcdir)/indent"; \
+           libsrcdir="$$s/indent";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
-@endif intl
+@endif indent
 
-.PHONY: all-intl maybe-all-intl
-maybe-all-intl:
-@if intl
-maybe-all-intl: all-intl
-all-intl: configure-intl
+.PHONY: all-indent maybe-all-indent
+maybe-all-indent:
+@if indent
+TARGET-indent=all
+maybe-all-indent: all-indent
+all-indent: configure-indent
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd intl && $(MAKE) $(FLAGS_TO_PASS) all)
-@endif intl
+       (cd indent && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-indent))
+@endif indent
 
-.PHONY: check-intl maybe-check-intl
-maybe-check-intl:
-@if intl
-maybe-check-intl: check-intl
+.PHONY: check-indent maybe-check-indent
+maybe-check-indent:
+@if indent
+maybe-check-indent: check-indent
 
-check-intl:
+check-indent:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd intl && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd indent && $(MAKE) $(FLAGS_TO_PASS) check)
 
-@endif intl
+@endif indent
 
-.PHONY: install-intl maybe-install-intl
-maybe-install-intl:
-@if intl
-maybe-install-intl: install-intl
+.PHONY: install-indent maybe-install-indent
+maybe-install-indent:
+@if indent
+maybe-install-indent: install-indent
 
-install-intl: installdirs
+install-indent: installdirs
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd intl && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd indent && $(MAKE) $(FLAGS_TO_PASS) install)
 
-@endif intl
+@endif indent
 
 # Other targets (info, dvi, etc.)
 
-.PHONY: maybe-info-intl info-intl
-maybe-info-intl:
-@if intl
-maybe-info-intl: info-intl
+.PHONY: maybe-info-indent info-indent
+maybe-info-indent:
+@if indent
+maybe-info-indent: info-indent
 
-info-intl: \
-    configure-intl 
-       @[ -f ./intl/Makefile ] || exit 0; \
+info-indent: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in intl" ; \
-       (cd intl && \
+       echo "Doing info in indent" ; \
+       (cd indent && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -10420,25 +11892,25 @@ info-intl: \
                  info) \
          || exit 1
 
-@endif intl
+@endif indent
 
-.PHONY: maybe-dvi-intl dvi-intl
-maybe-dvi-intl:
-@if intl
-maybe-dvi-intl: dvi-intl
+.PHONY: maybe-dvi-indent dvi-indent
+maybe-dvi-indent:
+@if indent
+maybe-dvi-indent: dvi-indent
 
-dvi-intl: \
-    configure-intl 
-       @[ -f ./intl/Makefile ] || exit 0; \
+dvi-indent: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in intl" ; \
-       (cd intl && \
+       echo "Doing dvi in indent" ; \
+       (cd indent && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -10446,52 +11918,78 @@ dvi-intl: \
                  dvi) \
          || exit 1
 
-@endif intl
+@endif indent
 
-.PHONY: maybe-TAGS-intl TAGS-intl
-maybe-TAGS-intl:
-@if intl
-maybe-TAGS-intl: TAGS-intl
+.PHONY: maybe-html-indent html-indent
+maybe-html-indent:
+@if indent
+maybe-html-indent: html-indent
 
-TAGS-intl: \
-    configure-intl 
-       @[ -f ./intl/Makefile ] || exit 0; \
+html-indent: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in intl" ; \
-       (cd intl && \
+       echo "Doing html in indent" ; \
+       (cd indent && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                 html) \
          || exit 1
 
-@endif intl
+@endif indent
 
-.PHONY: maybe-install-info-intl install-info-intl
-maybe-install-info-intl:
-@if intl
-maybe-install-info-intl: install-info-intl
+.PHONY: maybe-TAGS-indent TAGS-indent
+maybe-TAGS-indent:
+@if indent
+maybe-TAGS-indent: TAGS-indent
 
-install-info-intl: \
-    configure-intl \
-    info-intl 
-       @[ -f ./intl/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+TAGS-indent: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in intl" ; \
-       (cd intl && \
+       echo "Doing TAGS in indent" ; \
+       (cd indent && \
+         $(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 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 \
+    info-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; \
+       echo "Doing install-info in indent" ; \
+       (cd indent && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -10499,25 +11997,25 @@ install-info-intl: \
                  install-info) \
          || exit 1
 
-@endif intl
+@endif indent
 
-.PHONY: maybe-installcheck-intl installcheck-intl
-maybe-installcheck-intl:
-@if intl
-maybe-installcheck-intl: installcheck-intl
+.PHONY: maybe-installcheck-indent installcheck-indent
+maybe-installcheck-indent:
+@if indent
+maybe-installcheck-indent: installcheck-indent
 
-installcheck-intl: \
-    configure-intl 
-       @[ -f ./intl/Makefile ] || exit 0; \
+installcheck-indent: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in intl" ; \
-       (cd intl && \
+       echo "Doing installcheck in indent" ; \
+       (cd indent && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -10525,24 +12023,24 @@ installcheck-intl: \
                  installcheck) \
          || exit 1
 
-@endif intl
+@endif indent
 
-.PHONY: maybe-mostlyclean-intl mostlyclean-intl
-maybe-mostlyclean-intl:
-@if intl
-maybe-mostlyclean-intl: mostlyclean-intl
+.PHONY: maybe-mostlyclean-indent mostlyclean-indent
+maybe-mostlyclean-indent:
+@if indent
+maybe-mostlyclean-indent: mostlyclean-indent
 
-mostlyclean-intl
-       @[ -f ./intl/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in intl" ; \
-       (cd intl && \
+       echo "Doing mostlyclean in indent" ; \
+       (cd indent && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -10550,24 +12048,24 @@ mostlyclean-intl:
                  mostlyclean) \
          || exit 1
 
-@endif intl
+@endif indent
 
-.PHONY: maybe-clean-intl clean-intl
-maybe-clean-intl:
-@if intl
-maybe-clean-intl: clean-intl
+.PHONY: maybe-clean-indent clean-indent
+maybe-clean-indent:
+@if indent
+maybe-clean-indent: clean-indent
 
-clean-intl
-       @[ -f ./intl/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in intl" ; \
-       (cd intl && \
+       echo "Doing clean in indent" ; \
+       (cd indent && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -10575,24 +12073,24 @@ clean-intl:
                  clean) \
          || exit 1
 
-@endif intl
+@endif indent
 
-.PHONY: maybe-distclean-intl distclean-intl
-maybe-distclean-intl:
-@if intl
-maybe-distclean-intl: distclean-intl
+.PHONY: maybe-distclean-indent distclean-indent
+maybe-distclean-indent:
+@if indent
+maybe-distclean-indent: distclean-indent
 
-distclean-intl
-       @[ -f ./intl/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in intl" ; \
-       (cd intl && \
+       echo "Doing distclean in indent" ; \
+       (cd indent && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -10600,24 +12098,24 @@ distclean-intl:
                  distclean) \
          || exit 1
 
-@endif intl
+@endif indent
 
-.PHONY: maybe-maintainer-clean-intl maintainer-clean-intl
-maybe-maintainer-clean-intl:
-@if intl
-maybe-maintainer-clean-intl: maintainer-clean-intl
+.PHONY: maybe-maintainer-clean-indent maintainer-clean-indent
+maybe-maintainer-clean-indent:
+@if indent
+maybe-maintainer-clean-indent: maintainer-clean-indent
 
-maintainer-clean-intl
-       @[ -f ./intl/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in intl" ; \
-       (cd intl && \
+       echo "Doing maintainer-clean in indent" ; \
+       (cd indent && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -10625,96 +12123,100 @@ maintainer-clean-intl:
                  maintainer-clean) \
          || exit 1
 
-@endif intl
+@endif indent
 
 
-.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; \
+.PHONY: configure-intl maybe-configure-intl
+maybe-configure-intl:
+@if intl
+maybe-configure-intl: configure-intl
+configure-intl:
+       @test -f stage_last && exit 0; \
+       test ! -f intl/Makefile || exit 0; \
+       [ -d intl ] || mkdir intl; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in tcl; \
-       cd tcl || exit 1; \
+       echo Configuring in intl; \
+       cd intl || exit 1; \
        case $(srcdir) in \
          \.) \
            srcdiroption="--srcdir=."; \
            libsrcdir=".";; \
          /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/tcl"; \
-           libsrcdir="$$s/tcl";; \
+           srcdiroption="--srcdir=$(srcdir)/intl"; \
+           libsrcdir="$$s/intl";; \
          *) \
-           srcdiroption="--srcdir=../$(srcdir)/tcl"; \
-           libsrcdir="$$s/tcl";; \
+           srcdiroption="--srcdir=../$(srcdir)/intl"; \
+           libsrcdir="$$s/intl";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
-@endif tcl
+@endif intl
 
-.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; \
+.PHONY: all-intl maybe-all-intl
+maybe-all-intl:
+@if intl
+TARGET-intl=all
+maybe-all-intl: all-intl
+all-intl: configure-intl
+       @test -f stage_last && exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd tcl && $(MAKE) $(FLAGS_TO_PASS) all)
-@endif tcl
+       (cd intl && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-intl))
+@endif intl
 
-.PHONY: check-tcl maybe-check-tcl
-maybe-check-tcl:
-@if tcl
-maybe-check-tcl: check-tcl
+.PHONY: check-intl maybe-check-intl
+maybe-check-intl:
+@if intl
+maybe-check-intl: check-intl
 
-check-tcl:
+check-intl:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd tcl && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd intl && $(MAKE) $(FLAGS_TO_PASS) check)
 
-@endif tcl
+@endif intl
 
-.PHONY: install-tcl maybe-install-tcl
-maybe-install-tcl:
-@if tcl
-maybe-install-tcl: install-tcl
+.PHONY: install-intl maybe-install-intl
+maybe-install-intl:
+@if intl
+maybe-install-intl: install-intl
 
-install-tcl: installdirs
+install-intl: installdirs
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd tcl && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd intl && $(MAKE) $(FLAGS_TO_PASS) install)
 
-@endif tcl
+@endif intl
 
 # Other targets (info, dvi, etc.)
 
-.PHONY: maybe-info-tcl info-tcl
-maybe-info-tcl:
-@if tcl
-maybe-info-tcl: info-tcl
+.PHONY: maybe-info-intl info-intl
+maybe-info-intl:
+@if intl
+maybe-info-intl: info-intl
 
-info-tcl: \
-    configure-tc
-       @[ -f ./tcl/Makefile ] || exit 0; \
+info-intl: \
+    configure-int
+       @[ -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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in tcl" ; \
-       (cd tcl && \
+       echo "Doing info in intl" ; \
+       (cd intl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -10722,25 +12224,25 @@ info-tcl: \
                  info) \
          || exit 1
 
-@endif tcl
+@endif intl
 
-.PHONY: maybe-dvi-tcl dvi-tcl
-maybe-dvi-tcl:
-@if tcl
-maybe-dvi-tcl: dvi-tcl
+.PHONY: maybe-dvi-intl dvi-intl
+maybe-dvi-intl:
+@if intl
+maybe-dvi-intl: dvi-intl
 
-dvi-tcl: \
-    configure-tc
-       @[ -f ./tcl/Makefile ] || exit 0; \
+dvi-intl: \
+    configure-int
+       @[ -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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in tcl" ; \
-       (cd tcl && \
+       echo "Doing dvi in intl" ; \
+       (cd intl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -10748,52 +12250,78 @@ dvi-tcl: \
                  dvi) \
          || exit 1
 
-@endif tcl
+@endif intl
 
-.PHONY: maybe-TAGS-tcl TAGS-tcl
-maybe-TAGS-tcl:
-@if tcl
-maybe-TAGS-tcl: TAGS-tcl
+.PHONY: maybe-html-intl html-intl
+maybe-html-intl:
+@if intl
+maybe-html-intl: html-intl
 
-TAGS-tcl: \
-    configure-tc
-       @[ -f ./tcl/Makefile ] || exit 0; \
+html-intl: \
+    configure-int
+       @[ -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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in tcl" ; \
-       (cd tcl && \
+       echo "Doing html in intl" ; \
+       (cd intl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                 html) \
          || exit 1
 
-@endif tcl
+@endif intl
 
-.PHONY: maybe-install-info-tcl install-info-tcl
-maybe-install-info-tcl:
-@if tcl
-maybe-install-info-tcl: install-info-tcl
+.PHONY: maybe-TAGS-intl TAGS-intl
+maybe-TAGS-intl:
+@if intl
+maybe-TAGS-intl: TAGS-intl
 
-install-info-tcl: \
-    configure-tcl \
-    info-tcl 
-       @[ -f ./tcl/Makefile ] || exit 0; \
+TAGS-intl: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in tcl" ; \
-       (cd tcl && \
+       echo "Doing TAGS in intl" ; \
+       (cd intl && \
+         $(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 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 \
+    info-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; \
+       echo "Doing install-info in intl" ; \
+       (cd intl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -10801,25 +12329,25 @@ install-info-tcl: \
                  install-info) \
          || exit 1
 
-@endif tcl
+@endif intl
 
-.PHONY: maybe-installcheck-tcl installcheck-tcl
-maybe-installcheck-tcl:
-@if tcl
-maybe-installcheck-tcl: installcheck-tcl
+.PHONY: maybe-installcheck-intl installcheck-intl
+maybe-installcheck-intl:
+@if intl
+maybe-installcheck-intl: installcheck-intl
 
-installcheck-tcl: \
-    configure-tc
-       @[ -f ./tcl/Makefile ] || exit 0; \
+installcheck-intl: \
+    configure-int
+       @[ -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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in tcl" ; \
-       (cd tcl && \
+       echo "Doing installcheck in intl" ; \
+       (cd intl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -10827,34 +12355,49 @@ installcheck-tcl: \
                  installcheck) \
          || exit 1
 
-@endif tcl
+@endif intl
 
-.PHONY: maybe-mostlyclean-tcl mostlyclean-tcl
-maybe-mostlyclean-tcl:
-@if tcl
-maybe-mostlyclean-tcl: mostlyclean-tcl
+.PHONY: maybe-mostlyclean-intl mostlyclean-intl
+maybe-mostlyclean-intl:
+@if intl
+maybe-mostlyclean-intl: mostlyclean-intl
 
-# tcl doesn't support mostlyclean.
-mostlyclean-tcl:
+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; \
+       echo "Doing mostlyclean in intl" ; \
+       (cd intl && \
+         $(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 tcl
+@endif intl
 
-.PHONY: maybe-clean-tcl clean-tcl
-maybe-clean-tcl:
-@if tcl
-maybe-clean-tcl: clean-tcl
+.PHONY: maybe-clean-intl clean-intl
+maybe-clean-intl:
+@if intl
+maybe-clean-intl: clean-intl
 
-clean-tcl: 
-       @[ -f ./tcl/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in tcl" ; \
-       (cd tcl && \
+       echo "Doing clean in intl" ; \
+       (cd intl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -10862,24 +12405,24 @@ clean-tcl:
                  clean) \
          || exit 1
 
-@endif tcl
+@endif intl
 
-.PHONY: maybe-distclean-tcl distclean-tcl
-maybe-distclean-tcl:
-@if tcl
-maybe-distclean-tcl: distclean-tcl
+.PHONY: maybe-distclean-intl distclean-intl
+maybe-distclean-intl:
+@if intl
+maybe-distclean-intl: distclean-intl
 
-distclean-tcl: 
-       @[ -f ./tcl/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in tcl" ; \
-       (cd tcl && \
+       echo "Doing distclean in intl" ; \
+       (cd intl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -10887,24 +12430,24 @@ distclean-tcl:
                  distclean) \
          || exit 1
 
-@endif tcl
+@endif intl
 
-.PHONY: maybe-maintainer-clean-tcl maintainer-clean-tcl
-maybe-maintainer-clean-tcl:
-@if tcl
-maybe-maintainer-clean-tcl: maintainer-clean-tcl
+.PHONY: maybe-maintainer-clean-intl maintainer-clean-intl
+maybe-maintainer-clean-intl:
+@if intl
+maybe-maintainer-clean-intl: maintainer-clean-intl
 
-maintainer-clean-tcl: 
-       @[ -f ./tcl/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in tcl" ; \
-       (cd tcl && \
+       echo "Doing maintainer-clean in intl" ; \
+       (cd intl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -10912,96 +12455,98 @@ maintainer-clean-tcl:
                  maintainer-clean) \
          || exit 1
 
-@endif tcl
+@endif intl
 
 
-.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; \
+.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; \
        $(HOST_EXPORTS) \
-       echo Configuring in itcl; \
-       cd itcl || exit 1; \
+       echo Configuring in tcl; \
+       cd tcl || exit 1; \
        case $(srcdir) in \
          \.) \
            srcdiroption="--srcdir=."; \
            libsrcdir=".";; \
          /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/itcl"; \
-           libsrcdir="$$s/itcl";; \
+           srcdiroption="--srcdir=$(srcdir)/tcl"; \
+           libsrcdir="$$s/tcl";; \
          *) \
-           srcdiroption="--srcdir=../$(srcdir)/itcl"; \
-           libsrcdir="$$s/itcl";; \
+           srcdiroption="--srcdir=../$(srcdir)/tcl"; \
+           libsrcdir="$$s/tcl";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
-@endif itcl
+@endif tcl
 
-.PHONY: all-itcl maybe-all-itcl
-maybe-all-itcl:
-@if itcl
-maybe-all-itcl: all-itcl
-all-itcl: configure-itcl
+.PHONY: all-tcl maybe-all-tcl
+maybe-all-tcl:
+@if tcl
+TARGET-tcl=all
+maybe-all-tcl: all-tcl
+all-tcl: configure-tcl
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd itcl && $(MAKE) $(FLAGS_TO_PASS) all)
-@endif itcl
+       (cd tcl && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-tcl))
+@endif tcl
 
-.PHONY: check-itcl maybe-check-itcl
-maybe-check-itcl:
-@if itcl
-maybe-check-itcl: check-itcl
+.PHONY: check-tcl maybe-check-tcl
+maybe-check-tcl:
+@if tcl
+maybe-check-tcl: check-tcl
 
-check-itcl:
+check-tcl:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd itcl && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd tcl && $(MAKE) $(FLAGS_TO_PASS) check)
 
-@endif itcl
+@endif tcl
 
-.PHONY: install-itcl maybe-install-itcl
-maybe-install-itcl:
-@if itcl
-maybe-install-itcl: install-itcl
+.PHONY: install-tcl maybe-install-tcl
+maybe-install-tcl:
+@if tcl
+maybe-install-tcl: install-tcl
 
-install-itcl: installdirs
+install-tcl: installdirs
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd itcl && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd tcl && $(MAKE) $(FLAGS_TO_PASS) install)
 
-@endif itcl
+@endif tcl
 
 # Other targets (info, dvi, etc.)
 
-.PHONY: maybe-info-itcl info-itcl
-maybe-info-itcl:
-@if itcl
-maybe-info-itcl: info-itcl
+.PHONY: maybe-info-tcl info-tcl
+maybe-info-tcl:
+@if tcl
+maybe-info-tcl: info-tcl
 
-info-itcl: \
-    configure-itcl 
-       @[ -f ./itcl/Makefile ] || exit 0; \
+info-tcl: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in itcl" ; \
-       (cd itcl && \
+       echo "Doing info in tcl" ; \
+       (cd tcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -11009,25 +12554,25 @@ info-itcl: \
                  info) \
          || exit 1
 
-@endif itcl
+@endif tcl
 
-.PHONY: maybe-dvi-itcl dvi-itcl
-maybe-dvi-itcl:
-@if itcl
-maybe-dvi-itcl: dvi-itcl
+.PHONY: maybe-dvi-tcl dvi-tcl
+maybe-dvi-tcl:
+@if tcl
+maybe-dvi-tcl: dvi-tcl
 
-dvi-itcl: \
-    configure-itcl 
-       @[ -f ./itcl/Makefile ] || exit 0; \
+dvi-tcl: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in itcl" ; \
-       (cd itcl && \
+       echo "Doing dvi in tcl" ; \
+       (cd tcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -11035,128 +12580,139 @@ dvi-itcl: \
                  dvi) \
          || exit 1
 
-@endif itcl
+@endif tcl
 
-.PHONY: maybe-TAGS-itcl TAGS-itcl
-maybe-TAGS-itcl:
-@if itcl
-maybe-TAGS-itcl: TAGS-itcl
+.PHONY: maybe-html-tcl html-tcl
+maybe-html-tcl:
+@if tcl
+maybe-html-tcl: html-tcl
 
-TAGS-itcl: \
-    configure-itcl 
-       @[ -f ./itcl/Makefile ] || exit 0; \
+html-tcl: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in itcl" ; \
-       (cd itcl && \
+       echo "Doing html in tcl" ; \
+       (cd tcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                 html) \
          || exit 1
 
-@endif itcl
+@endif tcl
 
-.PHONY: maybe-install-info-itcl install-info-itcl
-maybe-install-info-itcl:
-@if itcl
-maybe-install-info-itcl: install-info-itcl
+.PHONY: maybe-TAGS-tcl TAGS-tcl
+maybe-TAGS-tcl:
+@if tcl
+maybe-TAGS-tcl: TAGS-tcl
 
-install-info-itcl: \
-    configure-itcl \
-    info-itcl 
-       @[ -f ./itcl/Makefile ] || exit 0; \
+TAGS-tcl: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in itcl" ; \
-       (cd itcl && \
+       echo "Doing TAGS in tcl" ; \
+       (cd tcl && \
          $(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) \
+                 TAGS) \
          || exit 1
 
-@endif itcl
+@endif tcl
 
-.PHONY: maybe-installcheck-itcl installcheck-itcl
-maybe-installcheck-itcl:
-@if itcl
-maybe-installcheck-itcl: installcheck-itcl
+.PHONY: maybe-install-info-tcl install-info-tcl
+maybe-install-info-tcl:
+@if tcl
+maybe-install-info-tcl: install-info-tcl
 
-installcheck-itcl: \
-    configure-itcl 
-       @[ -f ./itcl/Makefile ] || exit 0; \
+install-info-tcl: \
+    configure-tcl \
+    info-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in itcl" ; \
-       (cd itcl && \
+       echo "Doing install-info in tcl" ; \
+       (cd tcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                 install-info) \
          || exit 1
 
-@endif itcl
+@endif tcl
 
-.PHONY: maybe-mostlyclean-itcl mostlyclean-itcl
-maybe-mostlyclean-itcl:
-@if itcl
-maybe-mostlyclean-itcl: mostlyclean-itcl
+.PHONY: maybe-installcheck-tcl installcheck-tcl
+maybe-installcheck-tcl:
+@if tcl
+maybe-installcheck-tcl: installcheck-tcl
 
-mostlyclean-itcl: 
-       @[ -f ./itcl/Makefile ] || exit 0; \
+installcheck-tcl: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in itcl" ; \
-       (cd itcl && \
+       echo "Doing installcheck in tcl" ; \
+       (cd tcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                 installcheck) \
          || exit 1
 
-@endif itcl
+@endif tcl
 
-.PHONY: maybe-clean-itcl clean-itcl
-maybe-clean-itcl:
-@if itcl
-maybe-clean-itcl: clean-itcl
+.PHONY: maybe-mostlyclean-tcl mostlyclean-tcl
+maybe-mostlyclean-tcl:
+@if tcl
+maybe-mostlyclean-tcl: mostlyclean-tcl
 
-clean-itcl: 
-       @[ -f ./itcl/Makefile ] || exit 0; \
+# 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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in itcl" ; \
-       (cd itcl && \
+       echo "Doing clean in tcl" ; \
+       (cd tcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -11164,24 +12720,24 @@ clean-itcl:
                  clean) \
          || exit 1
 
-@endif itcl
+@endif tcl
 
-.PHONY: maybe-distclean-itcl distclean-itcl
-maybe-distclean-itcl:
-@if itcl
-maybe-distclean-itcl: distclean-itcl
+.PHONY: maybe-distclean-tcl distclean-tcl
+maybe-distclean-tcl:
+@if tcl
+maybe-distclean-tcl: distclean-tcl
 
-distclean-itcl: 
-       @[ -f ./itcl/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in itcl" ; \
-       (cd itcl && \
+       echo "Doing distclean in tcl" ; \
+       (cd tcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -11189,24 +12745,24 @@ distclean-itcl:
                  distclean) \
          || exit 1
 
-@endif itcl
+@endif tcl
 
-.PHONY: maybe-maintainer-clean-itcl maintainer-clean-itcl
-maybe-maintainer-clean-itcl:
-@if itcl
-maybe-maintainer-clean-itcl: maintainer-clean-itcl
+.PHONY: maybe-maintainer-clean-tcl maintainer-clean-tcl
+maybe-maintainer-clean-tcl:
+@if tcl
+maybe-maintainer-clean-tcl: maintainer-clean-tcl
 
-maintainer-clean-itcl: 
-       @[ -f ./itcl/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in itcl" ; \
-       (cd itcl && \
+       echo "Doing maintainer-clean in tcl" ; \
+       (cd tcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -11214,96 +12770,98 @@ maintainer-clean-itcl:
                  maintainer-clean) \
          || exit 1
 
-@endif itcl
+@endif tcl
 
 
-.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; \
+.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; \
        $(HOST_EXPORTS) \
-       echo Configuring in ld; \
-       cd ld || exit 1; \
+       echo Configuring in itcl; \
+       cd itcl || exit 1; \
        case $(srcdir) in \
          \.) \
            srcdiroption="--srcdir=."; \
            libsrcdir=".";; \
          /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/ld"; \
-           libsrcdir="$$s/ld";; \
+           srcdiroption="--srcdir=$(srcdir)/itcl"; \
+           libsrcdir="$$s/itcl";; \
          *) \
-           srcdiroption="--srcdir=../$(srcdir)/ld"; \
-           libsrcdir="$$s/ld";; \
+           srcdiroption="--srcdir=../$(srcdir)/itcl"; \
+           libsrcdir="$$s/itcl";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
-@endif ld
+@endif itcl
 
-.PHONY: all-ld maybe-all-ld
-maybe-all-ld:
-@if ld
-maybe-all-ld: all-ld
-all-ld: configure-ld
+.PHONY: all-itcl maybe-all-itcl
+maybe-all-itcl:
+@if itcl
+TARGET-itcl=all
+maybe-all-itcl: all-itcl
+all-itcl: configure-itcl
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd ld && $(MAKE) $(FLAGS_TO_PASS) all)
-@endif ld
+       (cd itcl && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-itcl))
+@endif itcl
 
-.PHONY: check-ld maybe-check-ld
-maybe-check-ld:
-@if ld
-maybe-check-ld: check-ld
+.PHONY: check-itcl maybe-check-itcl
+maybe-check-itcl:
+@if itcl
+maybe-check-itcl: check-itcl
 
-check-ld:
+check-itcl:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd ld && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd itcl && $(MAKE) $(FLAGS_TO_PASS) check)
 
-@endif ld
+@endif itcl
 
-.PHONY: install-ld maybe-install-ld
-maybe-install-ld:
-@if ld
-maybe-install-ld: install-ld
+.PHONY: install-itcl maybe-install-itcl
+maybe-install-itcl:
+@if itcl
+maybe-install-itcl: install-itcl
 
-install-ld: installdirs
+install-itcl: installdirs
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd ld && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd itcl && $(MAKE) $(FLAGS_TO_PASS) install)
 
-@endif ld
+@endif itcl
 
 # Other targets (info, dvi, etc.)
 
-.PHONY: maybe-info-ld info-ld
-maybe-info-ld:
-@if ld
-maybe-info-ld: info-ld
+.PHONY: maybe-info-itcl info-itcl
+maybe-info-itcl:
+@if itcl
+maybe-info-itcl: info-itcl
 
-info-ld: \
-    configure-ld 
-       @[ -f ./ld/Makefile ] || exit 0; \
+info-itcl: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in ld" ; \
-       (cd ld && \
+       echo "Doing info in itcl" ; \
+       (cd itcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -11311,25 +12869,25 @@ info-ld: \
                  info) \
          || exit 1
 
-@endif ld
+@endif itcl
 
-.PHONY: maybe-dvi-ld dvi-ld
-maybe-dvi-ld:
-@if ld
-maybe-dvi-ld: dvi-ld
+.PHONY: maybe-dvi-itcl dvi-itcl
+maybe-dvi-itcl:
+@if itcl
+maybe-dvi-itcl: dvi-itcl
 
-dvi-ld: \
-    configure-ld 
-       @[ -f ./ld/Makefile ] || exit 0; \
+dvi-itcl: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in ld" ; \
-       (cd ld && \
+       echo "Doing dvi in itcl" ; \
+       (cd itcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -11337,25 +12895,51 @@ dvi-ld: \
                  dvi) \
          || exit 1
 
-@endif ld
+@endif itcl
 
-.PHONY: maybe-TAGS-ld TAGS-ld
-maybe-TAGS-ld:
-@if ld
-maybe-TAGS-ld: TAGS-ld
+.PHONY: maybe-html-itcl html-itcl
+maybe-html-itcl:
+@if itcl
+maybe-html-itcl: html-itcl
 
-TAGS-ld: \
-    configure-ld 
-       @[ -f ./ld/Makefile ] || exit 0; \
+html-itcl: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in ld" ; \
-       (cd ld && \
+       echo "Doing html in itcl" ; \
+       (cd itcl && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif itcl
+
+.PHONY: maybe-TAGS-itcl TAGS-itcl
+maybe-TAGS-itcl:
+@if itcl
+maybe-TAGS-itcl: TAGS-itcl
+
+TAGS-itcl: \
+    configure-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; \
+       echo "Doing TAGS in itcl" ; \
+       (cd itcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -11363,26 +12947,26 @@ TAGS-ld: \
                  TAGS) \
          || exit 1
 
-@endif ld
+@endif itcl
 
-.PHONY: maybe-install-info-ld install-info-ld
-maybe-install-info-ld:
-@if ld
-maybe-install-info-ld: install-info-ld
+.PHONY: maybe-install-info-itcl install-info-itcl
+maybe-install-info-itcl:
+@if itcl
+maybe-install-info-itcl: install-info-itcl
 
-install-info-ld: \
-    configure-ld \
-    info-ld 
-       @[ -f ./ld/Makefile ] || exit 0; \
+install-info-itcl: \
+    configure-itcl \
+    info-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in ld" ; \
-       (cd ld && \
+       echo "Doing install-info in itcl" ; \
+       (cd itcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -11390,25 +12974,25 @@ install-info-ld: \
                  install-info) \
          || exit 1
 
-@endif ld
+@endif itcl
 
-.PHONY: maybe-installcheck-ld installcheck-ld
-maybe-installcheck-ld:
-@if ld
-maybe-installcheck-ld: installcheck-ld
+.PHONY: maybe-installcheck-itcl installcheck-itcl
+maybe-installcheck-itcl:
+@if itcl
+maybe-installcheck-itcl: installcheck-itcl
 
-installcheck-ld: \
-    configure-ld 
-       @[ -f ./ld/Makefile ] || exit 0; \
+installcheck-itcl: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in ld" ; \
-       (cd ld && \
+       echo "Doing installcheck in itcl" ; \
+       (cd itcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -11416,24 +13000,24 @@ installcheck-ld: \
                  installcheck) \
          || exit 1
 
-@endif ld
+@endif itcl
 
-.PHONY: maybe-mostlyclean-ld mostlyclean-ld
-maybe-mostlyclean-ld:
-@if ld
-maybe-mostlyclean-ld: mostlyclean-ld
+.PHONY: maybe-mostlyclean-itcl mostlyclean-itcl
+maybe-mostlyclean-itcl:
+@if itcl
+maybe-mostlyclean-itcl: mostlyclean-itcl
 
-mostlyclean-ld
-       @[ -f ./ld/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in ld" ; \
-       (cd ld && \
+       echo "Doing mostlyclean in itcl" ; \
+       (cd itcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -11441,24 +13025,24 @@ mostlyclean-ld:
                  mostlyclean) \
          || exit 1
 
-@endif ld
+@endif itcl
 
-.PHONY: maybe-clean-ld clean-ld
-maybe-clean-ld:
-@if ld
-maybe-clean-ld: clean-ld
+.PHONY: maybe-clean-itcl clean-itcl
+maybe-clean-itcl:
+@if itcl
+maybe-clean-itcl: clean-itcl
 
-clean-ld
-       @[ -f ./ld/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in ld" ; \
-       (cd ld && \
+       echo "Doing clean in itcl" ; \
+       (cd itcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -11466,24 +13050,24 @@ clean-ld:
                  clean) \
          || exit 1
 
-@endif ld
+@endif itcl
 
-.PHONY: maybe-distclean-ld distclean-ld
-maybe-distclean-ld:
-@if ld
-maybe-distclean-ld: distclean-ld
+.PHONY: maybe-distclean-itcl distclean-itcl
+maybe-distclean-itcl:
+@if itcl
+maybe-distclean-itcl: distclean-itcl
 
-distclean-ld
-       @[ -f ./ld/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in ld" ; \
-       (cd ld && \
+       echo "Doing distclean in itcl" ; \
+       (cd itcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -11491,24 +13075,24 @@ distclean-ld:
                  distclean) \
          || exit 1
 
-@endif ld
+@endif itcl
 
-.PHONY: maybe-maintainer-clean-ld maintainer-clean-ld
-maybe-maintainer-clean-ld:
-@if ld
-maybe-maintainer-clean-ld: maintainer-clean-ld
+.PHONY: maybe-maintainer-clean-itcl maintainer-clean-itcl
+maybe-maintainer-clean-itcl:
+@if itcl
+maybe-maintainer-clean-itcl: maintainer-clean-itcl
 
-maintainer-clean-ld
-       @[ -f ./ld/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in ld" ; \
-       (cd ld && \
+       echo "Doing maintainer-clean in itcl" ; \
+       (cd itcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -11516,96 +13100,100 @@ maintainer-clean-ld:
                  maintainer-clean) \
          || exit 1
 
-@endif ld
+@endif itcl
 
 
-.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; \
+.PHONY: configure-ld maybe-configure-ld
+maybe-configure-ld:
+@if ld
+maybe-configure-ld: configure-ld
+configure-ld:
+       @test -f stage_last && exit 0; \
+       test ! -f ld/Makefile || exit 0; \
+       [ -d ld ] || mkdir ld; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in libcpp; \
-       cd libcpp || exit 1; \
+       echo Configuring in ld; \
+       cd ld || exit 1; \
        case $(srcdir) in \
          \.) \
            srcdiroption="--srcdir=."; \
            libsrcdir=".";; \
          /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/libcpp"; \
-           libsrcdir="$$s/libcpp";; \
+           srcdiroption="--srcdir=$(srcdir)/ld"; \
+           libsrcdir="$$s/ld";; \
          *) \
-           srcdiroption="--srcdir=../$(srcdir)/libcpp"; \
-           libsrcdir="$$s/libcpp";; \
+           srcdiroption="--srcdir=../$(srcdir)/ld"; \
+           libsrcdir="$$s/ld";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
-@endif libcpp
+@endif ld
 
-.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; \
+.PHONY: all-ld maybe-all-ld
+maybe-all-ld:
+@if ld
+TARGET-ld=all
+maybe-all-ld: all-ld
+all-ld: configure-ld
+       @test -f stage_last && exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd libcpp && $(MAKE) $(FLAGS_TO_PASS) all)
-@endif libcpp
+       (cd ld && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-ld))
+@endif ld
 
-.PHONY: check-libcpp maybe-check-libcpp
-maybe-check-libcpp:
-@if libcpp
-maybe-check-libcpp: check-libcpp
+.PHONY: check-ld maybe-check-ld
+maybe-check-ld:
+@if ld
+maybe-check-ld: check-ld
 
-check-libcpp:
+check-ld:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd libcpp && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd ld && $(MAKE) $(FLAGS_TO_PASS) check)
 
-@endif libcpp
+@endif ld
 
-.PHONY: install-libcpp maybe-install-libcpp
-maybe-install-libcpp:
-@if libcpp
-maybe-install-libcpp: install-libcpp
+.PHONY: install-ld maybe-install-ld
+maybe-install-ld:
+@if ld
+maybe-install-ld: install-ld
 
-install-libcpp: installdirs
+install-ld: installdirs
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd libcpp && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd ld && $(MAKE) $(FLAGS_TO_PASS) install)
 
-@endif libcpp
+@endif ld
 
 # Other targets (info, dvi, etc.)
 
-.PHONY: maybe-info-libcpp info-libcpp
-maybe-info-libcpp:
-@if libcpp
-maybe-info-libcpp: info-libcpp
+.PHONY: maybe-info-ld info-ld
+maybe-info-ld:
+@if ld
+maybe-info-ld: info-ld
 
-info-libcpp: \
-    configure-libcpp 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+info-ld: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in libcpp" ; \
-       (cd libcpp && \
+       echo "Doing info in ld" ; \
+       (cd ld && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -11613,25 +13201,25 @@ info-libcpp: \
                  info) \
          || exit 1
 
-@endif libcpp
+@endif ld
 
-.PHONY: maybe-dvi-libcpp dvi-libcpp
-maybe-dvi-libcpp:
-@if libcpp
-maybe-dvi-libcpp: dvi-libcpp
+.PHONY: maybe-dvi-ld dvi-ld
+maybe-dvi-ld:
+@if ld
+maybe-dvi-ld: dvi-ld
 
-dvi-libcpp: \
-    configure-libcpp 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+dvi-ld: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in libcpp" ; \
-       (cd libcpp && \
+       echo "Doing dvi in ld" ; \
+       (cd ld && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -11639,25 +13227,51 @@ dvi-libcpp: \
                  dvi) \
          || exit 1
 
-@endif libcpp
+@endif ld
 
-.PHONY: maybe-TAGS-libcpp TAGS-libcpp
-maybe-TAGS-libcpp:
-@if libcpp
-maybe-TAGS-libcpp: TAGS-libcpp
+.PHONY: maybe-html-ld html-ld
+maybe-html-ld:
+@if ld
+maybe-html-ld: html-ld
 
-TAGS-libcpp: \
-    configure-libcpp 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+html-ld: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in libcpp" ; \
-       (cd libcpp && \
+       echo "Doing html in ld" ; \
+       (cd ld && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 html) \
+         || exit 1
+
+@endif ld
+
+.PHONY: maybe-TAGS-ld TAGS-ld
+maybe-TAGS-ld:
+@if ld
+maybe-TAGS-ld: TAGS-ld
+
+TAGS-ld: \
+    configure-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; \
+       echo "Doing TAGS in ld" ; \
+       (cd ld && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -11665,26 +13279,26 @@ TAGS-libcpp: \
                  TAGS) \
          || exit 1
 
-@endif libcpp
+@endif ld
 
-.PHONY: maybe-install-info-libcpp install-info-libcpp
-maybe-install-info-libcpp:
-@if libcpp
-maybe-install-info-libcpp: install-info-libcpp
+.PHONY: maybe-install-info-ld install-info-ld
+maybe-install-info-ld:
+@if ld
+maybe-install-info-ld: install-info-ld
 
-install-info-libcpp: \
-    configure-libcpp \
-    info-libcpp 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+install-info-ld: \
+    configure-ld \
+    info-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in libcpp" ; \
-       (cd libcpp && \
+       echo "Doing install-info in ld" ; \
+       (cd ld && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -11692,25 +13306,25 @@ install-info-libcpp: \
                  install-info) \
          || exit 1
 
-@endif libcpp
+@endif ld
 
-.PHONY: maybe-installcheck-libcpp installcheck-libcpp
-maybe-installcheck-libcpp:
-@if libcpp
-maybe-installcheck-libcpp: installcheck-libcpp
+.PHONY: maybe-installcheck-ld installcheck-ld
+maybe-installcheck-ld:
+@if ld
+maybe-installcheck-ld: installcheck-ld
 
-installcheck-libcpp: \
-    configure-libcpp 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+installcheck-ld: \
+    configure-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in libcpp" ; \
-       (cd libcpp && \
+       echo "Doing installcheck in ld" ; \
+       (cd ld && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -11718,24 +13332,24 @@ installcheck-libcpp: \
                  installcheck) \
          || exit 1
 
-@endif libcpp
+@endif ld
 
-.PHONY: maybe-mostlyclean-libcpp mostlyclean-libcpp
-maybe-mostlyclean-libcpp:
-@if libcpp
-maybe-mostlyclean-libcpp: mostlyclean-libcpp
+.PHONY: maybe-mostlyclean-ld mostlyclean-ld
+maybe-mostlyclean-ld:
+@if ld
+maybe-mostlyclean-ld: mostlyclean-ld
 
-mostlyclean-libcpp
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in libcpp" ; \
-       (cd libcpp && \
+       echo "Doing mostlyclean in ld" ; \
+       (cd ld && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -11743,24 +13357,24 @@ mostlyclean-libcpp:
                  mostlyclean) \
          || exit 1
 
-@endif libcpp
+@endif ld
 
-.PHONY: maybe-clean-libcpp clean-libcpp
-maybe-clean-libcpp:
-@if libcpp
-maybe-clean-libcpp: clean-libcpp
+.PHONY: maybe-clean-ld clean-ld
+maybe-clean-ld:
+@if ld
+maybe-clean-ld: clean-ld
 
-clean-libcpp
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in libcpp" ; \
-       (cd libcpp && \
+       echo "Doing clean in ld" ; \
+       (cd ld && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -11768,24 +13382,24 @@ clean-libcpp:
                  clean) \
          || exit 1
 
-@endif libcpp
+@endif ld
 
-.PHONY: maybe-distclean-libcpp distclean-libcpp
-maybe-distclean-libcpp:
-@if libcpp
-maybe-distclean-libcpp: distclean-libcpp
+.PHONY: maybe-distclean-ld distclean-ld
+maybe-distclean-ld:
+@if ld
+maybe-distclean-ld: distclean-ld
 
-distclean-libcpp
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in libcpp" ; \
-       (cd libcpp && \
+       echo "Doing distclean in ld" ; \
+       (cd ld && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -11793,24 +13407,24 @@ distclean-libcpp:
                  distclean) \
          || exit 1
 
-@endif libcpp
+@endif ld
 
-.PHONY: maybe-maintainer-clean-libcpp maintainer-clean-libcpp
-maybe-maintainer-clean-libcpp:
-@if libcpp
-maybe-maintainer-clean-libcpp: maintainer-clean-libcpp
+.PHONY: maybe-maintainer-clean-ld maintainer-clean-ld
+maybe-maintainer-clean-ld:
+@if ld
+maybe-maintainer-clean-ld: maintainer-clean-ld
 
-maintainer-clean-libcpp
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in libcpp" ; \
-       (cd libcpp && \
+       echo "Doing maintainer-clean in ld" ; \
+       (cd ld && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -11818,96 +13432,100 @@ maintainer-clean-libcpp:
                  maintainer-clean) \
          || exit 1
 
-@endif libcpp
+@endif ld
 
 
-.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; \
+.PHONY: configure-libcpp maybe-configure-libcpp
+maybe-configure-libcpp:
+@if libcpp
+maybe-configure-libcpp: configure-libcpp
+configure-libcpp:
+       @test -f stage_last && exit 0; \
+       test ! -f libcpp/Makefile || exit 0; \
+       [ -d libcpp ] || mkdir libcpp; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       echo Configuring in libgui; \
-       cd libgui || exit 1; \
+       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 libgui
+@endif libcpp
 
-.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; \
+.PHONY: all-libcpp maybe-all-libcpp
+maybe-all-libcpp:
+@if libcpp
+TARGET-libcpp=all
+maybe-all-libcpp: all-libcpp
+all-libcpp: configure-libcpp
+       @test -f stage_last && exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd libgui && $(MAKE) $(FLAGS_TO_PASS) all)
-@endif libgui
+       (cd libcpp && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-libcpp))
+@endif libcpp
 
-.PHONY: check-libgui maybe-check-libgui
-maybe-check-libgui:
-@if libgui
-maybe-check-libgui: 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) \
        $(HOST_EXPORTS) \
-       (cd libgui && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd libcpp && $(MAKE) $(FLAGS_TO_PASS) check)
 
-@endif libgui
+@endif libcpp
 
-.PHONY: install-libgui maybe-install-libgui
-maybe-install-libgui:
-@if libgui
-maybe-install-libgui: 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) \
        $(HOST_EXPORTS) \
-       (cd libgui && $(MAKE) $(FLAGS_TO_PASS) install)
+       (cd libcpp && $(MAKE) $(FLAGS_TO_PASS) install)
 
-@endif libgui
+@endif libcpp
 
 # Other targets (info, dvi, etc.)
 
-.PHONY: maybe-info-libgui info-libgui
-maybe-info-libgui:
-@if libgui
-maybe-info-libgui: 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 \
+       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}" \
@@ -11915,25 +13533,25 @@ info-libgui: \
                  info) \
          || exit 1
 
-@endif libgui
+@endif libcpp
 
-.PHONY: maybe-dvi-libgui dvi-libgui
-maybe-dvi-libgui:
-@if libgui
-maybe-dvi-libgui: 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 \
+       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}" \
@@ -11941,25 +13559,51 @@ dvi-libgui: \
                  dvi) \
          || exit 1
 
-@endif libgui
+@endif libcpp
 
-.PHONY: maybe-TAGS-libgui TAGS-libgui
-maybe-TAGS-libgui:
-@if libgui
-maybe-TAGS-libgui: TAGS-libgui
+.PHONY: maybe-html-libcpp html-libcpp
+maybe-html-libcpp:
+@if libcpp
+maybe-html-libcpp: html-libcpp
 
-TAGS-libgui: \
-    configure-libgui 
-       @[ -f ./libgui/Makefile ] || exit 0; \
+html-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 \
+       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 html 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}" \
+                 html) \
+         || exit 1
+
+@endif libcpp
+
+.PHONY: maybe-TAGS-libcpp TAGS-libcpp
+maybe-TAGS-libcpp:
+@if libcpp
+maybe-TAGS-libcpp: TAGS-libcpp
+
+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 libcpp" ; \
+       (cd libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -11967,26 +13611,26 @@ TAGS-libgui: \
                  TAGS) \
          || exit 1
 
-@endif libgui
+@endif libcpp
 
-.PHONY: maybe-install-info-libgui install-info-libgui
-maybe-install-info-libgui:
-@if libgui
-maybe-install-info-libgui: 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 \
+       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}" \
@@ -11994,25 +13638,25 @@ install-info-libgui: \
                  install-info) \
          || exit 1
 
-@endif libgui
+@endif libcpp
 
-.PHONY: maybe-installcheck-libgui installcheck-libgui
-maybe-installcheck-libgui:
-@if libgui
-maybe-installcheck-libgui: 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 \
+       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}" \
@@ -12020,24 +13664,24 @@ installcheck-libgui: \
                  installcheck) \
          || exit 1
 
-@endif libgui
+@endif libcpp
 
-.PHONY: maybe-mostlyclean-libgui mostlyclean-libgui
-maybe-mostlyclean-libgui:
-@if libgui
-maybe-mostlyclean-libgui: 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 \
+       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}" \
@@ -12045,24 +13689,24 @@ mostlyclean-libgui:
                  mostlyclean) \
          || exit 1
 
-@endif libgui
+@endif libcpp
 
-.PHONY: maybe-clean-libgui clean-libgui
-maybe-clean-libgui:
-@if libgui
-maybe-clean-libgui: 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 \
+       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}" \
@@ -12070,24 +13714,24 @@ clean-libgui:
                  clean) \
          || exit 1
 
-@endif libgui
+@endif libcpp
 
-.PHONY: maybe-distclean-libgui distclean-libgui
-maybe-distclean-libgui:
-@if libgui
-maybe-distclean-libgui: 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 \
+       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}" \
@@ -12095,24 +13739,24 @@ distclean-libgui:
                  distclean) \
          || exit 1
 
-@endif libgui
+@endif libcpp
 
-.PHONY: maybe-maintainer-clean-libgui maintainer-clean-libgui
-maybe-maintainer-clean-libgui:
-@if libgui
-maybe-maintainer-clean-libgui: 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 \
+       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}" \
@@ -12120,91 +13764,98 @@ maintainer-clean-libgui:
                  maintainer-clean) \
          || exit 1
 
-@endif libgui
+@endif libcpp
 
 
-.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; \
+.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; \
        $(HOST_EXPORTS) \
-       echo Configuring in libbanshee; \
-       cd libbanshee || exit 1; \
+       echo Configuring in libgui; \
+       cd libgui || exit 1; \
        case $(srcdir) in \
          \.) \
            srcdiroption="--srcdir=."; \
            libsrcdir=".";; \
          /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/libbanshee"; \
-           libsrcdir="$$s/libbanshee";; \
+           srcdiroption="--srcdir=$(srcdir)/libgui"; \
+           libsrcdir="$$s/libgui";; \
          *) \
-           srcdiroption="--srcdir=../$(srcdir)/libbanshee"; \
-           libsrcdir="$$s/libbanshee";; \
+           srcdiroption="--srcdir=../$(srcdir)/libgui"; \
+           libsrcdir="$$s/libgui";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
-@endif libbanshee
+@endif libgui
 
-.PHONY: all-libbanshee maybe-all-libbanshee
-maybe-all-libbanshee:
-@if libbanshee
-maybe-all-libbanshee: all-libbanshee
-all-libbanshee: configure-libbanshee
+.PHONY: all-libgui maybe-all-libgui
+maybe-all-libgui:
+@if libgui
+TARGET-libgui=all
+maybe-all-libgui: all-libgui
+all-libgui: configure-libgui
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd libbanshee && $(MAKE) $(FLAGS_TO_PASS) all)
-@endif libbanshee
+       (cd libgui && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-libgui))
+@endif libgui
 
-.PHONY: check-libbanshee maybe-check-libbanshee
-maybe-check-libbanshee:
-@if libbanshee
-maybe-check-libbanshee: check-libbanshee
+.PHONY: check-libgui maybe-check-libgui
+maybe-check-libgui:
+@if libgui
+maybe-check-libgui: check-libgui
 
-check-libbanshee:
+check-libgui:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd libbanshee && $(MAKE) $(FLAGS_TO_PASS) check)
+       (cd libgui && $(MAKE) $(FLAGS_TO_PASS) check)
 
-@endif libbanshee
+@endif libgui
 
-.PHONY: install-libbanshee maybe-install-libbanshee
-maybe-install-libbanshee:
-@if libbanshee
-maybe-install-libbanshee: install-libbanshee
+.PHONY: install-libgui maybe-install-libgui
+maybe-install-libgui:
+@if libgui
+maybe-install-libgui: install-libgui
 
-install-libbanshee:
+install-libgui: installdirs
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       (cd libgui && $(MAKE) $(FLAGS_TO_PASS) install)
 
-@endif libbanshee
+@endif libgui
 
 # Other targets (info, dvi, etc.)
 
-.PHONY: maybe-info-libbanshee info-libbanshee
-maybe-info-libbanshee:
-@if libbanshee
-maybe-info-libbanshee: info-libbanshee
+.PHONY: maybe-info-libgui info-libgui
+maybe-info-libgui:
+@if libgui
+maybe-info-libgui: info-libgui
 
-info-libbanshee: \
-    configure-libbanshee 
-       @[ -f ./libbanshee/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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in libbanshee" ; \
-       (cd libbanshee && \
+       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}" \
@@ -12212,25 +13863,25 @@ info-libbanshee: \
                  info) \
          || exit 1
 
-@endif libbanshee
+@endif libgui
 
-.PHONY: maybe-dvi-libbanshee dvi-libbanshee
-maybe-dvi-libbanshee:
-@if libbanshee
-maybe-dvi-libbanshee: dvi-libbanshee
+.PHONY: maybe-dvi-libgui dvi-libgui
+maybe-dvi-libgui:
+@if libgui
+maybe-dvi-libgui: dvi-libgui
 
-dvi-libbanshee: \
-    configure-libbanshee 
-       @[ -f ./libbanshee/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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in libbanshee" ; \
-       (cd libbanshee && \
+       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}" \
@@ -12238,103 +13889,129 @@ dvi-libbanshee: \
                  dvi) \
          || exit 1
 
-@endif libbanshee
+@endif libgui
 
-.PHONY: maybe-TAGS-libbanshee TAGS-libbanshee
-maybe-TAGS-libbanshee:
-@if libbanshee
-maybe-TAGS-libbanshee: TAGS-libbanshee
+.PHONY: maybe-html-libgui html-libgui
+maybe-html-libgui:
+@if libgui
+maybe-html-libgui: html-libgui
 
-TAGS-libbanshee: \
-    configure-libbanshee 
-       @[ -f ./libbanshee/Makefile ] || exit 0; \
+html-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in libbanshee" ; \
-       (cd libbanshee && \
+       echo "Doing html 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) \
+                 html) \
          || exit 1
 
-@endif libbanshee
+@endif libgui
 
-.PHONY: maybe-install-info-libbanshee install-info-libbanshee
-maybe-install-info-libbanshee:
-@if libbanshee
-maybe-install-info-libbanshee: install-info-libbanshee
+.PHONY: maybe-TAGS-libgui TAGS-libgui
+maybe-TAGS-libgui:
+@if libgui
+maybe-TAGS-libgui: TAGS-libgui
 
-install-info-libbanshee: \
-    configure-libbanshee \
-    info-libbanshee 
-       @[ -f ./libbanshee/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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in libbanshee" ; \
-       (cd libbanshee && \
+       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}" \
-                 install-info) \
+                 TAGS) \
          || exit 1
 
-@endif libbanshee
+@endif libgui
 
-.PHONY: maybe-installcheck-libbanshee installcheck-libbanshee
-maybe-installcheck-libbanshee:
-@if libbanshee
-maybe-installcheck-libbanshee: installcheck-libbanshee
+.PHONY: maybe-install-info-libgui install-info-libgui
+maybe-install-info-libgui:
+@if libgui
+maybe-install-info-libgui: install-info-libgui
 
-installcheck-libbanshee: \
-    configure-libbanshee 
-       @[ -f ./libbanshee/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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in libbanshee" ; \
-       (cd libbanshee && \
+       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}" \
-                 installcheck) \
+                 install-info) \
          || exit 1
 
-@endif libbanshee
-
-.PHONY: maybe-mostlyclean-libbanshee mostlyclean-libbanshee
-maybe-mostlyclean-libbanshee:
-@if libbanshee
-maybe-mostlyclean-libbanshee: mostlyclean-libbanshee
+@endif libgui
 
-mostlyclean-libbanshee: 
-       @[ -f ./libbanshee/Makefile ] || exit 0; \
+.PHONY: maybe-installcheck-libgui installcheck-libgui
+maybe-installcheck-libgui:
+@if libgui
+maybe-installcheck-libgui: installcheck-libgui
+
+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 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) \
+         || exit 1
+
+@endif libgui
+
+.PHONY: maybe-mostlyclean-libgui mostlyclean-libgui
+maybe-mostlyclean-libgui:
+@if libgui
+maybe-mostlyclean-libgui: mostlyclean-libgui
+
+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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in libbanshee" ; \
-       (cd libbanshee && \
+       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}" \
@@ -12342,24 +14019,24 @@ mostlyclean-libbanshee:
                  mostlyclean) \
          || exit 1
 
-@endif libbanshee
+@endif libgui
 
-.PHONY: maybe-clean-libbanshee clean-libbanshee
-maybe-clean-libbanshee:
-@if libbanshee
-maybe-clean-libbanshee: clean-libbanshee
+.PHONY: maybe-clean-libgui clean-libgui
+maybe-clean-libgui:
+@if libgui
+maybe-clean-libgui: clean-libgui
 
-clean-libbanshee
-       @[ -f ./libbanshee/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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in libbanshee" ; \
-       (cd libbanshee && \
+       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}" \
@@ -12367,24 +14044,24 @@ clean-libbanshee:
                  clean) \
          || exit 1
 
-@endif libbanshee
+@endif libgui
 
-.PHONY: maybe-distclean-libbanshee distclean-libbanshee
-maybe-distclean-libbanshee:
-@if libbanshee
-maybe-distclean-libbanshee: distclean-libbanshee
+.PHONY: maybe-distclean-libgui distclean-libgui
+maybe-distclean-libgui:
+@if libgui
+maybe-distclean-libgui: distclean-libgui
 
-distclean-libbanshee
-       @[ -f ./libbanshee/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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in libbanshee" ; \
-       (cd libbanshee && \
+       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}" \
@@ -12392,24 +14069,24 @@ distclean-libbanshee:
                  distclean) \
          || exit 1
 
-@endif libbanshee
+@endif libgui
 
-.PHONY: maybe-maintainer-clean-libbanshee maintainer-clean-libbanshee
-maybe-maintainer-clean-libbanshee:
-@if libbanshee
-maybe-maintainer-clean-libbanshee: maintainer-clean-libbanshee
+.PHONY: maybe-maintainer-clean-libgui maintainer-clean-libgui
+maybe-maintainer-clean-libgui:
+@if libgui
+maybe-maintainer-clean-libgui: maintainer-clean-libgui
 
-maintainer-clean-libbanshee
-       @[ -f ./libbanshee/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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in libbanshee" ; \
-       (cd libbanshee && \
+       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}" \
@@ -12417,7 +14094,7 @@ maintainer-clean-libbanshee:
                  maintainer-clean) \
          || exit 1
 
-@endif libbanshee
+@endif libgui
 
 
 .PHONY: configure-libiberty maybe-configure-libiberty
@@ -12425,7 +14102,8 @@ maybe-configure-libiberty:
 @if libiberty
 maybe-configure-libiberty: configure-libiberty
 configure-libiberty:
-       @test ! -f libiberty/Makefile || exit 0; \
+       @test -f stage_last && exit 0; \
+       test ! -f libiberty/Makefile || exit 0; \
        [ -d libiberty ] || mkdir libiberty; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12444,20 +14122,23 @@ configure-libiberty:
            libsrcdir="$$s/libiberty";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif libiberty
 
 .PHONY: all-libiberty maybe-all-libiberty
 maybe-all-libiberty:
 @if libiberty
+TARGET-libiberty=all
 maybe-all-libiberty: all-libiberty
 all-libiberty: configure-libiberty
-       @r=`${PWD_COMMAND}`; export r; \
+       @test -f stage_last && exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd libiberty && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd libiberty && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-libiberty))
 @endif libiberty
 
 .PHONY: check-libiberty maybe-check-libiberty
@@ -12502,7 +14183,7 @@ info-libiberty: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in libiberty" ; \
@@ -12528,7 +14209,7 @@ dvi-libiberty: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in libiberty" ; \
@@ -12542,6 +14223,32 @@ dvi-libiberty: \
 
 @endif libiberty
 
+.PHONY: maybe-html-libiberty html-libiberty
+maybe-html-libiberty:
+@if libiberty
+maybe-html-libiberty: html-libiberty
+
+html-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 html 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}" \
+                 html) \
+         || exit 1
+
+@endif libiberty
+
 .PHONY: maybe-TAGS-libiberty TAGS-libiberty
 maybe-TAGS-libiberty:
 @if libiberty
@@ -12554,7 +14261,7 @@ TAGS-libiberty: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in libiberty" ; \
@@ -12581,7 +14288,7 @@ install-info-libiberty: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in libiberty" ; \
@@ -12607,7 +14314,7 @@ installcheck-libiberty: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in libiberty" ; \
@@ -12632,7 +14339,7 @@ mostlyclean-libiberty:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in libiberty" ; \
@@ -12657,7 +14364,7 @@ clean-libiberty:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in libiberty" ; \
@@ -12682,7 +14389,7 @@ distclean-libiberty:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in libiberty" ; \
@@ -12707,7 +14414,7 @@ maintainer-clean-libiberty:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in libiberty" ; \
@@ -12746,20 +14453,22 @@ configure-libtool:
            libsrcdir="$$s/libtool";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif libtool
 
 .PHONY: all-libtool maybe-all-libtool
 maybe-all-libtool:
 @if libtool
+TARGET-libtool=all
 maybe-all-libtool: all-libtool
 all-libtool: configure-libtool
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd libtool && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd libtool && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-libtool))
 @endif libtool
 
 .PHONY: check-libtool maybe-check-libtool
@@ -12804,7 +14513,7 @@ info-libtool: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in libtool" ; \
@@ -12830,7 +14539,7 @@ dvi-libtool: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in libtool" ; \
@@ -12844,6 +14553,32 @@ dvi-libtool: \
 
 @endif libtool
 
+.PHONY: maybe-html-libtool html-libtool
+maybe-html-libtool:
+@if libtool
+maybe-html-libtool: html-libtool
+
+html-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 html 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}" \
+                 html) \
+         || exit 1
+
+@endif libtool
+
 .PHONY: maybe-TAGS-libtool TAGS-libtool
 maybe-TAGS-libtool:
 @if libtool
@@ -12856,7 +14591,7 @@ TAGS-libtool: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in libtool" ; \
@@ -12883,7 +14618,7 @@ install-info-libtool: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in libtool" ; \
@@ -12909,7 +14644,7 @@ installcheck-libtool: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in libtool" ; \
@@ -12934,7 +14669,7 @@ mostlyclean-libtool:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in libtool" ; \
@@ -12959,7 +14694,7 @@ clean-libtool:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in libtool" ; \
@@ -12984,7 +14719,7 @@ distclean-libtool:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in libtool" ; \
@@ -13009,7 +14744,7 @@ maintainer-clean-libtool:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in libtool" ; \
@@ -13048,20 +14783,22 @@ configure-m4:
            libsrcdir="$$s/m4";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif m4
 
 .PHONY: all-m4 maybe-all-m4
 maybe-all-m4:
 @if m4
+TARGET-m4=all
 maybe-all-m4: all-m4
 all-m4: configure-m4
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd m4 && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd m4 && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-m4))
 @endif m4
 
 .PHONY: check-m4 maybe-check-m4
@@ -13106,7 +14843,7 @@ info-m4: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in m4" ; \
@@ -13132,7 +14869,7 @@ dvi-m4: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in m4" ; \
@@ -13146,6 +14883,32 @@ dvi-m4: \
 
 @endif m4
 
+.PHONY: maybe-html-m4 html-m4
+maybe-html-m4:
+@if m4
+maybe-html-m4: html-m4
+
+html-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 html 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}" \
+                 html) \
+         || exit 1
+
+@endif m4
+
 .PHONY: maybe-TAGS-m4 TAGS-m4
 maybe-TAGS-m4:
 @if m4
@@ -13158,7 +14921,7 @@ TAGS-m4: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in m4" ; \
@@ -13185,7 +14948,7 @@ install-info-m4: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in m4" ; \
@@ -13211,7 +14974,7 @@ installcheck-m4: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in m4" ; \
@@ -13236,7 +14999,7 @@ mostlyclean-m4:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in m4" ; \
@@ -13261,7 +15024,7 @@ clean-m4:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in m4" ; \
@@ -13286,7 +15049,7 @@ distclean-m4:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in m4" ; \
@@ -13311,7 +15074,7 @@ maintainer-clean-m4:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in m4" ; \
@@ -13350,20 +15113,22 @@ configure-make:
            libsrcdir="$$s/make";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif make
 
 .PHONY: all-make maybe-all-make
 maybe-all-make:
 @if make
+TARGET-make=all
 maybe-all-make: all-make
 all-make: configure-make
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd make && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd make && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-make))
 @endif make
 
 .PHONY: check-make maybe-check-make
@@ -13408,7 +15173,7 @@ info-make: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in make" ; \
@@ -13434,7 +15199,7 @@ dvi-make: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in make" ; \
@@ -13448,6 +15213,32 @@ dvi-make: \
 
 @endif make
 
+.PHONY: maybe-html-make html-make
+maybe-html-make:
+@if make
+maybe-html-make: html-make
+
+html-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 html 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}" \
+                 html) \
+         || exit 1
+
+@endif make
+
 .PHONY: maybe-TAGS-make TAGS-make
 maybe-TAGS-make:
 @if make
@@ -13460,7 +15251,7 @@ TAGS-make: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in make" ; \
@@ -13487,7 +15278,7 @@ install-info-make: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in make" ; \
@@ -13513,7 +15304,7 @@ installcheck-make: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in make" ; \
@@ -13538,7 +15329,7 @@ mostlyclean-make:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in make" ; \
@@ -13563,7 +15354,7 @@ clean-make:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in make" ; \
@@ -13588,7 +15379,7 @@ distclean-make:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in make" ; \
@@ -13613,7 +15404,7 @@ maintainer-clean-make:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in make" ; \
@@ -13652,20 +15443,22 @@ configure-mmalloc:
            libsrcdir="$$s/mmalloc";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif mmalloc
 
 .PHONY: all-mmalloc maybe-all-mmalloc
 maybe-all-mmalloc:
 @if mmalloc
+TARGET-mmalloc=all
 maybe-all-mmalloc: all-mmalloc
 all-mmalloc: configure-mmalloc
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd mmalloc && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd mmalloc && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-mmalloc))
 @endif mmalloc
 
 .PHONY: check-mmalloc maybe-check-mmalloc
@@ -13705,7 +15498,7 @@ info-mmalloc: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in mmalloc" ; \
@@ -13731,7 +15524,7 @@ dvi-mmalloc: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in mmalloc" ; \
@@ -13745,6 +15538,32 @@ dvi-mmalloc: \
 
 @endif mmalloc
 
+.PHONY: maybe-html-mmalloc html-mmalloc
+maybe-html-mmalloc:
+@if mmalloc
+maybe-html-mmalloc: html-mmalloc
+
+html-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 html 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}" \
+                 html) \
+         || exit 1
+
+@endif mmalloc
+
 .PHONY: maybe-TAGS-mmalloc TAGS-mmalloc
 maybe-TAGS-mmalloc:
 @if mmalloc
@@ -13757,7 +15576,7 @@ TAGS-mmalloc: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in mmalloc" ; \
@@ -13784,7 +15603,7 @@ install-info-mmalloc: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in mmalloc" ; \
@@ -13810,7 +15629,7 @@ installcheck-mmalloc: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in mmalloc" ; \
@@ -13835,7 +15654,7 @@ mostlyclean-mmalloc:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in mmalloc" ; \
@@ -13860,7 +15679,7 @@ clean-mmalloc:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in mmalloc" ; \
@@ -13885,7 +15704,7 @@ distclean-mmalloc:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in mmalloc" ; \
@@ -13910,7 +15729,7 @@ maintainer-clean-mmalloc:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in mmalloc" ; \
@@ -13949,20 +15768,22 @@ configure-patch:
            libsrcdir="$$s/patch";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif patch
 
 .PHONY: all-patch maybe-all-patch
 maybe-all-patch:
 @if patch
+TARGET-patch=all
 maybe-all-patch: all-patch
 all-patch: configure-patch
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd patch && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd patch && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-patch))
 @endif patch
 
 .PHONY: check-patch maybe-check-patch
@@ -14007,7 +15828,7 @@ info-patch: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in patch" ; \
@@ -14033,7 +15854,7 @@ dvi-patch: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in patch" ; \
@@ -14047,6 +15868,32 @@ dvi-patch: \
 
 @endif patch
 
+.PHONY: maybe-html-patch html-patch
+maybe-html-patch:
+@if patch
+maybe-html-patch: html-patch
+
+html-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 html 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}" \
+                 html) \
+         || exit 1
+
+@endif patch
+
 .PHONY: maybe-TAGS-patch TAGS-patch
 maybe-TAGS-patch:
 @if patch
@@ -14059,7 +15906,7 @@ TAGS-patch: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in patch" ; \
@@ -14086,7 +15933,7 @@ install-info-patch: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in patch" ; \
@@ -14112,7 +15959,7 @@ installcheck-patch: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in patch" ; \
@@ -14137,7 +15984,7 @@ mostlyclean-patch:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in patch" ; \
@@ -14162,7 +16009,7 @@ clean-patch:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in patch" ; \
@@ -14187,7 +16034,7 @@ distclean-patch:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in patch" ; \
@@ -14212,7 +16059,7 @@ maintainer-clean-patch:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in patch" ; \
@@ -14251,20 +16098,22 @@ configure-perl:
            libsrcdir="$$s/perl";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif perl
 
 .PHONY: all-perl maybe-all-perl
 maybe-all-perl:
 @if perl
+TARGET-perl=all
 maybe-all-perl: all-perl
 all-perl: configure-perl
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd perl && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd perl && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-perl))
 @endif perl
 
 .PHONY: check-perl maybe-check-perl
@@ -14309,7 +16158,7 @@ info-perl: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in perl" ; \
@@ -14335,7 +16184,7 @@ dvi-perl: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in perl" ; \
@@ -14349,6 +16198,32 @@ dvi-perl: \
 
 @endif perl
 
+.PHONY: maybe-html-perl html-perl
+maybe-html-perl:
+@if perl
+maybe-html-perl: html-perl
+
+html-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 html 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}" \
+                 html) \
+         || exit 1
+
+@endif perl
+
 .PHONY: maybe-TAGS-perl TAGS-perl
 maybe-TAGS-perl:
 @if perl
@@ -14361,7 +16236,7 @@ TAGS-perl: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in perl" ; \
@@ -14388,7 +16263,7 @@ install-info-perl: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in perl" ; \
@@ -14414,7 +16289,7 @@ installcheck-perl: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in perl" ; \
@@ -14439,7 +16314,7 @@ mostlyclean-perl:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in perl" ; \
@@ -14464,7 +16339,7 @@ clean-perl:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in perl" ; \
@@ -14489,7 +16364,7 @@ distclean-perl:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in perl" ; \
@@ -14514,7 +16389,7 @@ maintainer-clean-perl:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in perl" ; \
@@ -14553,20 +16428,22 @@ configure-prms:
            libsrcdir="$$s/prms";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif prms
 
 .PHONY: all-prms maybe-all-prms
 maybe-all-prms:
 @if prms
+TARGET-prms=all
 maybe-all-prms: all-prms
 all-prms: configure-prms
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd prms && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd prms && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-prms))
 @endif prms
 
 .PHONY: check-prms maybe-check-prms
@@ -14611,7 +16488,7 @@ info-prms: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in prms" ; \
@@ -14637,7 +16514,7 @@ dvi-prms: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in prms" ; \
@@ -14651,6 +16528,32 @@ dvi-prms: \
 
 @endif prms
 
+.PHONY: maybe-html-prms html-prms
+maybe-html-prms:
+@if prms
+maybe-html-prms: html-prms
+
+html-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 html 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}" \
+                 html) \
+         || exit 1
+
+@endif prms
+
 .PHONY: maybe-TAGS-prms TAGS-prms
 maybe-TAGS-prms:
 @if prms
@@ -14663,7 +16566,7 @@ TAGS-prms: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in prms" ; \
@@ -14690,7 +16593,7 @@ install-info-prms: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in prms" ; \
@@ -14716,7 +16619,7 @@ installcheck-prms: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in prms" ; \
@@ -14741,7 +16644,7 @@ mostlyclean-prms:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in prms" ; \
@@ -14766,7 +16669,7 @@ clean-prms:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in prms" ; \
@@ -14791,7 +16694,7 @@ distclean-prms:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in prms" ; \
@@ -14816,7 +16719,7 @@ maintainer-clean-prms:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in prms" ; \
@@ -14855,20 +16758,22 @@ configure-rcs:
            libsrcdir="$$s/rcs";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif rcs
 
 .PHONY: all-rcs maybe-all-rcs
 maybe-all-rcs:
 @if rcs
+TARGET-rcs=all
 maybe-all-rcs: all-rcs
 all-rcs: configure-rcs
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd rcs && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd rcs && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-rcs))
 @endif rcs
 
 .PHONY: check-rcs maybe-check-rcs
@@ -14913,7 +16818,7 @@ info-rcs: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in rcs" ; \
@@ -14939,7 +16844,7 @@ dvi-rcs: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in rcs" ; \
@@ -14953,6 +16858,32 @@ dvi-rcs: \
 
 @endif rcs
 
+.PHONY: maybe-html-rcs html-rcs
+maybe-html-rcs:
+@if rcs
+maybe-html-rcs: html-rcs
+
+html-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 html 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}" \
+                 html) \
+         || exit 1
+
+@endif rcs
+
 .PHONY: maybe-TAGS-rcs TAGS-rcs
 maybe-TAGS-rcs:
 @if rcs
@@ -14965,7 +16896,7 @@ TAGS-rcs: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in rcs" ; \
@@ -14992,7 +16923,7 @@ install-info-rcs: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in rcs" ; \
@@ -15018,7 +16949,7 @@ installcheck-rcs: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in rcs" ; \
@@ -15043,7 +16974,7 @@ mostlyclean-rcs:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in rcs" ; \
@@ -15068,7 +16999,7 @@ clean-rcs:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in rcs" ; \
@@ -15093,7 +17024,7 @@ distclean-rcs:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in rcs" ; \
@@ -15118,7 +17049,7 @@ maintainer-clean-rcs:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in rcs" ; \
@@ -15157,20 +17088,22 @@ configure-readline:
            libsrcdir="$$s/readline";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif readline
 
 .PHONY: all-readline maybe-all-readline
 maybe-all-readline:
 @if readline
+TARGET-readline=all
 maybe-all-readline: all-readline
 all-readline: configure-readline
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd readline && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd readline && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-readline))
 @endif readline
 
 .PHONY: check-readline maybe-check-readline
@@ -15215,7 +17148,7 @@ info-readline: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in readline" ; \
@@ -15241,7 +17174,7 @@ dvi-readline: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in readline" ; \
@@ -15255,36 +17188,62 @@ dvi-readline: \
 
 @endif readline
 
-.PHONY: maybe-TAGS-readline TAGS-readline
-maybe-TAGS-readline:
+.PHONY: maybe-html-readline html-readline
+maybe-html-readline:
 @if readline
-maybe-TAGS-readline: TAGS-readline
+maybe-html-readline: html-readline
 
-TAGS-readline: \
+html-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in readline" ; \
+       echo "Doing html 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) \
+                 html) \
          || exit 1
 
 @endif readline
 
-.PHONY: maybe-install-info-readline install-info-readline
-maybe-install-info-readline:
+.PHONY: maybe-TAGS-readline TAGS-readline
+maybe-TAGS-readline:
 @if readline
-maybe-install-info-readline: install-info-readline
+maybe-TAGS-readline: TAGS-readline
+
+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 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) \
+         || exit 1
+
+@endif readline
+
+.PHONY: maybe-install-info-readline install-info-readline
+maybe-install-info-readline:
+@if readline
+maybe-install-info-readline: install-info-readline
 
 install-info-readline: \
     configure-readline \
@@ -15294,7 +17253,7 @@ install-info-readline: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in readline" ; \
@@ -15320,7 +17279,7 @@ installcheck-readline: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in readline" ; \
@@ -15345,7 +17304,7 @@ mostlyclean-readline:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in readline" ; \
@@ -15370,7 +17329,7 @@ clean-readline:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in readline" ; \
@@ -15395,7 +17354,7 @@ distclean-readline:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in readline" ; \
@@ -15420,7 +17379,7 @@ maintainer-clean-readline:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in readline" ; \
@@ -15459,20 +17418,22 @@ configure-release:
            libsrcdir="$$s/release";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif release
 
 .PHONY: all-release maybe-all-release
 maybe-all-release:
 @if release
+TARGET-release=all
 maybe-all-release: all-release
 all-release: configure-release
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd release && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd release && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-release))
 @endif release
 
 .PHONY: check-release maybe-check-release
@@ -15507,7 +17468,7 @@ info-release: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in release" ; \
@@ -15533,7 +17494,7 @@ dvi-release: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in release" ; \
@@ -15547,6 +17508,32 @@ dvi-release: \
 
 @endif release
 
+.PHONY: maybe-html-release html-release
+maybe-html-release:
+@if release
+maybe-html-release: html-release
+
+html-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 html 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}" \
+                 html) \
+         || exit 1
+
+@endif release
+
 .PHONY: maybe-TAGS-release TAGS-release
 maybe-TAGS-release:
 @if release
@@ -15559,7 +17546,7 @@ TAGS-release: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in release" ; \
@@ -15586,7 +17573,7 @@ install-info-release: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in release" ; \
@@ -15612,7 +17599,7 @@ installcheck-release: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in release" ; \
@@ -15637,7 +17624,7 @@ mostlyclean-release:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in release" ; \
@@ -15662,7 +17649,7 @@ clean-release:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in release" ; \
@@ -15687,7 +17674,7 @@ distclean-release:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in release" ; \
@@ -15712,7 +17699,7 @@ maintainer-clean-release:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in release" ; \
@@ -15751,20 +17738,22 @@ configure-recode:
            libsrcdir="$$s/recode";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif recode
 
 .PHONY: all-recode maybe-all-recode
 maybe-all-recode:
 @if recode
+TARGET-recode=all
 maybe-all-recode: all-recode
 all-recode: configure-recode
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd recode && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd recode && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-recode))
 @endif recode
 
 .PHONY: check-recode maybe-check-recode
@@ -15809,7 +17798,7 @@ info-recode: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in recode" ; \
@@ -15835,7 +17824,7 @@ dvi-recode: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in recode" ; \
@@ -15849,6 +17838,32 @@ dvi-recode: \
 
 @endif recode
 
+.PHONY: maybe-html-recode html-recode
+maybe-html-recode:
+@if recode
+maybe-html-recode: html-recode
+
+html-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 html 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}" \
+                 html) \
+         || exit 1
+
+@endif recode
+
 .PHONY: maybe-TAGS-recode TAGS-recode
 maybe-TAGS-recode:
 @if recode
@@ -15861,7 +17876,7 @@ TAGS-recode: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in recode" ; \
@@ -15888,7 +17903,7 @@ install-info-recode: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in recode" ; \
@@ -15914,7 +17929,7 @@ installcheck-recode: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in recode" ; \
@@ -15939,7 +17954,7 @@ mostlyclean-recode:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in recode" ; \
@@ -15964,7 +17979,7 @@ clean-recode:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in recode" ; \
@@ -15989,7 +18004,7 @@ distclean-recode:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in recode" ; \
@@ -16014,7 +18029,7 @@ maintainer-clean-recode:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in recode" ; \
@@ -16053,20 +18068,22 @@ configure-sed:
            libsrcdir="$$s/sed";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif sed
 
 .PHONY: all-sed maybe-all-sed
 maybe-all-sed:
 @if sed
+TARGET-sed=all
 maybe-all-sed: all-sed
 all-sed: configure-sed
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd sed && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd sed && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-sed))
 @endif sed
 
 .PHONY: check-sed maybe-check-sed
@@ -16111,7 +18128,7 @@ info-sed: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in sed" ; \
@@ -16137,7 +18154,7 @@ dvi-sed: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in sed" ; \
@@ -16151,6 +18168,32 @@ dvi-sed: \
 
 @endif sed
 
+.PHONY: maybe-html-sed html-sed
+maybe-html-sed:
+@if sed
+maybe-html-sed: html-sed
+
+html-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 html 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}" \
+                 html) \
+         || exit 1
+
+@endif sed
+
 .PHONY: maybe-TAGS-sed TAGS-sed
 maybe-TAGS-sed:
 @if sed
@@ -16163,7 +18206,7 @@ TAGS-sed: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in sed" ; \
@@ -16190,7 +18233,7 @@ install-info-sed: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in sed" ; \
@@ -16216,7 +18259,7 @@ installcheck-sed: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in sed" ; \
@@ -16241,7 +18284,7 @@ mostlyclean-sed:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in sed" ; \
@@ -16266,7 +18309,7 @@ clean-sed:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in sed" ; \
@@ -16291,7 +18334,7 @@ distclean-sed:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in sed" ; \
@@ -16316,7 +18359,7 @@ maintainer-clean-sed:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in sed" ; \
@@ -16355,20 +18398,22 @@ configure-send-pr:
            libsrcdir="$$s/send-pr";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif send-pr
 
 .PHONY: all-send-pr maybe-all-send-pr
 maybe-all-send-pr:
 @if send-pr
+TARGET-send-pr=all
 maybe-all-send-pr: all-send-pr
 all-send-pr: configure-send-pr
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd send-pr && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd send-pr && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-send-pr))
 @endif send-pr
 
 .PHONY: check-send-pr maybe-check-send-pr
@@ -16413,7 +18458,7 @@ info-send-pr: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in send-pr" ; \
@@ -16439,7 +18484,7 @@ dvi-send-pr: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in send-pr" ; \
@@ -16453,6 +18498,32 @@ dvi-send-pr: \
 
 @endif send-pr
 
+.PHONY: maybe-html-send-pr html-send-pr
+maybe-html-send-pr:
+@if send-pr
+maybe-html-send-pr: html-send-pr
+
+html-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 html 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}" \
+                 html) \
+         || exit 1
+
+@endif send-pr
+
 .PHONY: maybe-TAGS-send-pr TAGS-send-pr
 maybe-TAGS-send-pr:
 @if send-pr
@@ -16465,7 +18536,7 @@ TAGS-send-pr: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in send-pr" ; \
@@ -16492,7 +18563,7 @@ install-info-send-pr: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       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" ; \
@@ -16518,7 +18589,7 @@ installcheck-send-pr: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in send-pr" ; \
@@ -16543,7 +18614,7 @@ mostlyclean-send-pr:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in send-pr" ; \
@@ -16568,7 +18639,7 @@ clean-send-pr:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in send-pr" ; \
@@ -16593,7 +18664,7 @@ distclean-send-pr:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in send-pr" ; \
@@ -16618,7 +18689,7 @@ maintainer-clean-send-pr:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       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" ; \
@@ -16657,20 +18728,22 @@ configure-shellutils:
            libsrcdir="$$s/shellutils";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif shellutils
 
 .PHONY: all-shellutils maybe-all-shellutils
 maybe-all-shellutils:
 @if shellutils
+TARGET-shellutils=all
 maybe-all-shellutils: all-shellutils
 all-shellutils: configure-shellutils
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd shellutils && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd shellutils && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-shellutils))
 @endif shellutils
 
 .PHONY: check-shellutils maybe-check-shellutils
@@ -16715,7 +18788,7 @@ info-shellutils: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in shellutils" ; \
@@ -16741,7 +18814,7 @@ dvi-shellutils: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in shellutils" ; \
@@ -16755,6 +18828,32 @@ dvi-shellutils: \
 
 @endif shellutils
 
+.PHONY: maybe-html-shellutils html-shellutils
+maybe-html-shellutils:
+@if shellutils
+maybe-html-shellutils: html-shellutils
+
+html-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 html 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}" \
+                 html) \
+         || exit 1
+
+@endif shellutils
+
 .PHONY: maybe-TAGS-shellutils TAGS-shellutils
 maybe-TAGS-shellutils:
 @if shellutils
@@ -16767,7 +18866,7 @@ TAGS-shellutils: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in shellutils" ; \
@@ -16794,7 +18893,7 @@ install-info-shellutils: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in shellutils" ; \
@@ -16820,7 +18919,7 @@ installcheck-shellutils: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in shellutils" ; \
@@ -16845,7 +18944,7 @@ mostlyclean-shellutils:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in shellutils" ; \
@@ -16870,7 +18969,7 @@ clean-shellutils:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in shellutils" ; \
@@ -16895,7 +18994,7 @@ distclean-shellutils:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in shellutils" ; \
@@ -16920,7 +19019,7 @@ maintainer-clean-shellutils:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in shellutils" ; \
@@ -16959,20 +19058,22 @@ configure-sid:
            libsrcdir="$$s/sid";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif sid
 
 .PHONY: all-sid maybe-all-sid
 maybe-all-sid:
 @if sid
+TARGET-sid=all
 maybe-all-sid: all-sid
 all-sid: configure-sid
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd sid && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd sid && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-sid))
 @endif sid
 
 .PHONY: check-sid maybe-check-sid
@@ -17017,7 +19118,7 @@ info-sid: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in sid" ; \
@@ -17043,7 +19144,7 @@ dvi-sid: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in sid" ; \
@@ -17057,6 +19158,32 @@ dvi-sid: \
 
 @endif sid
 
+.PHONY: maybe-html-sid html-sid
+maybe-html-sid:
+@if sid
+maybe-html-sid: html-sid
+
+html-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 html 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}" \
+                 html) \
+         || exit 1
+
+@endif sid
+
 .PHONY: maybe-TAGS-sid TAGS-sid
 maybe-TAGS-sid:
 @if sid
@@ -17069,7 +19196,7 @@ TAGS-sid: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in sid" ; \
@@ -17096,7 +19223,7 @@ install-info-sid: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in sid" ; \
@@ -17122,7 +19249,7 @@ installcheck-sid: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in sid" ; \
@@ -17147,7 +19274,7 @@ mostlyclean-sid:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in sid" ; \
@@ -17172,7 +19299,7 @@ clean-sid:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in sid" ; \
@@ -17197,7 +19324,7 @@ distclean-sid:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in sid" ; \
@@ -17222,7 +19349,7 @@ maintainer-clean-sid:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in sid" ; \
@@ -17261,20 +19388,22 @@ configure-sim:
            libsrcdir="$$s/sim";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif sim
 
 .PHONY: all-sim maybe-all-sim
 maybe-all-sim:
 @if sim
+TARGET-sim=all
 maybe-all-sim: all-sim
 all-sim: configure-sim
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd sim && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd sim && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-sim))
 @endif sim
 
 .PHONY: check-sim maybe-check-sim
@@ -17319,7 +19448,7 @@ info-sim: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in sim" ; \
@@ -17345,7 +19474,7 @@ dvi-sim: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in sim" ; \
@@ -17359,6 +19488,32 @@ dvi-sim: \
 
 @endif sim
 
+.PHONY: maybe-html-sim html-sim
+maybe-html-sim:
+@if sim
+maybe-html-sim: html-sim
+
+html-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 html 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}" \
+                 html) \
+         || exit 1
+
+@endif sim
+
 .PHONY: maybe-TAGS-sim TAGS-sim
 maybe-TAGS-sim:
 @if sim
@@ -17371,7 +19526,7 @@ TAGS-sim: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in sim" ; \
@@ -17398,7 +19553,7 @@ install-info-sim: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in sim" ; \
@@ -17424,7 +19579,7 @@ installcheck-sim: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in sim" ; \
@@ -17449,7 +19604,7 @@ mostlyclean-sim:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in sim" ; \
@@ -17474,7 +19629,7 @@ clean-sim:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in sim" ; \
@@ -17499,7 +19654,7 @@ distclean-sim:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in sim" ; \
@@ -17524,7 +19679,7 @@ maintainer-clean-sim:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in sim" ; \
@@ -17563,20 +19718,22 @@ configure-tar:
            libsrcdir="$$s/tar";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif tar
 
 .PHONY: all-tar maybe-all-tar
 maybe-all-tar:
 @if tar
+TARGET-tar=all
 maybe-all-tar: all-tar
 all-tar: configure-tar
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd tar && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd tar && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-tar))
 @endif tar
 
 .PHONY: check-tar maybe-check-tar
@@ -17621,7 +19778,7 @@ info-tar: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in tar" ; \
@@ -17647,7 +19804,7 @@ dvi-tar: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in tar" ; \
@@ -17661,6 +19818,32 @@ dvi-tar: \
 
 @endif tar
 
+.PHONY: maybe-html-tar html-tar
+maybe-html-tar:
+@if tar
+maybe-html-tar: html-tar
+
+html-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 html 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}" \
+                 html) \
+         || exit 1
+
+@endif tar
+
 .PHONY: maybe-TAGS-tar TAGS-tar
 maybe-TAGS-tar:
 @if tar
@@ -17673,7 +19856,7 @@ TAGS-tar: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in tar" ; \
@@ -17700,7 +19883,7 @@ install-info-tar: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in tar" ; \
@@ -17726,7 +19909,7 @@ installcheck-tar: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in tar" ; \
@@ -17751,7 +19934,7 @@ mostlyclean-tar:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in tar" ; \
@@ -17776,7 +19959,7 @@ clean-tar:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in tar" ; \
@@ -17801,7 +19984,7 @@ distclean-tar:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in tar" ; \
@@ -17826,7 +20009,7 @@ maintainer-clean-tar:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in tar" ; \
@@ -17865,20 +20048,22 @@ configure-texinfo:
            libsrcdir="$$s/texinfo";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif texinfo
 
 .PHONY: all-texinfo maybe-all-texinfo
 maybe-all-texinfo:
 @if texinfo
+TARGET-texinfo=all
 maybe-all-texinfo: all-texinfo
 all-texinfo: configure-texinfo
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd texinfo && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd texinfo && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-texinfo))
 @endif texinfo
 
 .PHONY: check-texinfo maybe-check-texinfo
@@ -17918,7 +20103,7 @@ info-texinfo: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in texinfo" ; \
@@ -17944,7 +20129,7 @@ dvi-texinfo: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in texinfo" ; \
@@ -17958,6 +20143,32 @@ dvi-texinfo: \
 
 @endif texinfo
 
+.PHONY: maybe-html-texinfo html-texinfo
+maybe-html-texinfo:
+@if texinfo
+maybe-html-texinfo: html-texinfo
+
+html-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 html 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}" \
+                 html) \
+         || exit 1
+
+@endif texinfo
+
 .PHONY: maybe-TAGS-texinfo TAGS-texinfo
 maybe-TAGS-texinfo:
 @if texinfo
@@ -17970,7 +20181,7 @@ TAGS-texinfo: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in texinfo" ; \
@@ -17997,7 +20208,7 @@ install-info-texinfo: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in texinfo" ; \
@@ -18023,7 +20234,7 @@ installcheck-texinfo: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in texinfo" ; \
@@ -18048,7 +20259,7 @@ mostlyclean-texinfo:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in texinfo" ; \
@@ -18073,7 +20284,7 @@ clean-texinfo:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in texinfo" ; \
@@ -18098,7 +20309,7 @@ distclean-texinfo:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in texinfo" ; \
@@ -18123,7 +20334,7 @@ maintainer-clean-texinfo:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in texinfo" ; \
@@ -18162,20 +20373,22 @@ configure-textutils:
            libsrcdir="$$s/textutils";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif textutils
 
 .PHONY: all-textutils maybe-all-textutils
 maybe-all-textutils:
 @if textutils
+TARGET-textutils=all
 maybe-all-textutils: all-textutils
 all-textutils: configure-textutils
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd textutils && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd textutils && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-textutils))
 @endif textutils
 
 .PHONY: check-textutils maybe-check-textutils
@@ -18220,7 +20433,7 @@ info-textutils: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in textutils" ; \
@@ -18246,7 +20459,7 @@ dvi-textutils: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in textutils" ; \
@@ -18260,6 +20473,32 @@ dvi-textutils: \
 
 @endif textutils
 
+.PHONY: maybe-html-textutils html-textutils
+maybe-html-textutils:
+@if textutils
+maybe-html-textutils: html-textutils
+
+html-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 html 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}" \
+                 html) \
+         || exit 1
+
+@endif textutils
+
 .PHONY: maybe-TAGS-textutils TAGS-textutils
 maybe-TAGS-textutils:
 @if textutils
@@ -18272,7 +20511,7 @@ TAGS-textutils: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in textutils" ; \
@@ -18299,7 +20538,7 @@ install-info-textutils: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in textutils" ; \
@@ -18325,7 +20564,7 @@ installcheck-textutils: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in textutils" ; \
@@ -18350,7 +20589,7 @@ mostlyclean-textutils:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in textutils" ; \
@@ -18375,7 +20614,7 @@ clean-textutils:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in textutils" ; \
@@ -18400,7 +20639,7 @@ distclean-textutils:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in textutils" ; \
@@ -18425,7 +20664,7 @@ maintainer-clean-textutils:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in textutils" ; \
@@ -18464,20 +20703,22 @@ configure-time:
            libsrcdir="$$s/time";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif time
 
 .PHONY: all-time maybe-all-time
 maybe-all-time:
 @if time
+TARGET-time=all
 maybe-all-time: all-time
 all-time: configure-time
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd time && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd time && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-time))
 @endif time
 
 .PHONY: check-time maybe-check-time
@@ -18522,7 +20763,7 @@ info-time: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in time" ; \
@@ -18548,7 +20789,7 @@ dvi-time: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in time" ; \
@@ -18562,6 +20803,32 @@ dvi-time: \
 
 @endif time
 
+.PHONY: maybe-html-time html-time
+maybe-html-time:
+@if time
+maybe-html-time: html-time
+
+html-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 html 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}" \
+                 html) \
+         || exit 1
+
+@endif time
+
 .PHONY: maybe-TAGS-time TAGS-time
 maybe-TAGS-time:
 @if time
@@ -18574,7 +20841,7 @@ TAGS-time: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in time" ; \
@@ -18601,7 +20868,7 @@ install-info-time: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in time" ; \
@@ -18627,7 +20894,7 @@ installcheck-time: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in time" ; \
@@ -18652,7 +20919,7 @@ mostlyclean-time:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in time" ; \
@@ -18677,7 +20944,7 @@ clean-time:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in time" ; \
@@ -18702,7 +20969,7 @@ distclean-time:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in time" ; \
@@ -18727,7 +20994,7 @@ maintainer-clean-time:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in time" ; \
@@ -18766,20 +21033,22 @@ configure-uudecode:
            libsrcdir="$$s/uudecode";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif uudecode
 
 .PHONY: all-uudecode maybe-all-uudecode
 maybe-all-uudecode:
 @if uudecode
+TARGET-uudecode=all
 maybe-all-uudecode: all-uudecode
 all-uudecode: configure-uudecode
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd uudecode && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd uudecode && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-uudecode))
 @endif uudecode
 
 .PHONY: check-uudecode maybe-check-uudecode
@@ -18824,7 +21093,7 @@ info-uudecode: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in uudecode" ; \
@@ -18850,7 +21119,7 @@ dvi-uudecode: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in uudecode" ; \
@@ -18864,35 +21133,61 @@ dvi-uudecode: \
 
 @endif uudecode
 
-.PHONY: maybe-TAGS-uudecode TAGS-uudecode
-maybe-TAGS-uudecode:
+.PHONY: maybe-html-uudecode html-uudecode
+maybe-html-uudecode:
 @if uudecode
-maybe-TAGS-uudecode: TAGS-uudecode
+maybe-html-uudecode: html-uudecode
 
-TAGS-uudecode: \
+html-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 \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in uudecode" ; \
+       echo "Doing html 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) \
+                 html) \
          || exit 1
 
 @endif uudecode
 
-.PHONY: maybe-install-info-uudecode install-info-uudecode
-maybe-install-info-uudecode:
-@if uudecode
+.PHONY: maybe-TAGS-uudecode TAGS-uudecode
+maybe-TAGS-uudecode:
+@if uudecode
+maybe-TAGS-uudecode: TAGS-uudecode
+
+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 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) \
+         || exit 1
+
+@endif uudecode
+
+.PHONY: maybe-install-info-uudecode install-info-uudecode
+maybe-install-info-uudecode:
+@if uudecode
 maybe-install-info-uudecode: install-info-uudecode
 
 install-info-uudecode: \
@@ -18903,7 +21198,7 @@ install-info-uudecode: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in uudecode" ; \
@@ -18929,7 +21224,7 @@ installcheck-uudecode: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in uudecode" ; \
@@ -18954,7 +21249,7 @@ mostlyclean-uudecode:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in uudecode" ; \
@@ -18979,7 +21274,7 @@ clean-uudecode:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in uudecode" ; \
@@ -19004,7 +21299,7 @@ distclean-uudecode:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in uudecode" ; \
@@ -19029,7 +21324,7 @@ maintainer-clean-uudecode:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in uudecode" ; \
@@ -19068,20 +21363,22 @@ configure-wdiff:
            libsrcdir="$$s/wdiff";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif wdiff
 
 .PHONY: all-wdiff maybe-all-wdiff
 maybe-all-wdiff:
 @if wdiff
+TARGET-wdiff=all
 maybe-all-wdiff: all-wdiff
 all-wdiff: configure-wdiff
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd wdiff && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd wdiff && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-wdiff))
 @endif wdiff
 
 .PHONY: check-wdiff maybe-check-wdiff
@@ -19126,7 +21423,7 @@ info-wdiff: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in wdiff" ; \
@@ -19152,7 +21449,7 @@ dvi-wdiff: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in wdiff" ; \
@@ -19166,6 +21463,32 @@ dvi-wdiff: \
 
 @endif wdiff
 
+.PHONY: maybe-html-wdiff html-wdiff
+maybe-html-wdiff:
+@if wdiff
+maybe-html-wdiff: html-wdiff
+
+html-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 html 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}" \
+                 html) \
+         || exit 1
+
+@endif wdiff
+
 .PHONY: maybe-TAGS-wdiff TAGS-wdiff
 maybe-TAGS-wdiff:
 @if wdiff
@@ -19178,7 +21501,7 @@ TAGS-wdiff: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in wdiff" ; \
@@ -19205,7 +21528,7 @@ install-info-wdiff: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in wdiff" ; \
@@ -19231,7 +21554,7 @@ installcheck-wdiff: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in wdiff" ; \
@@ -19256,7 +21579,7 @@ mostlyclean-wdiff:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in wdiff" ; \
@@ -19281,7 +21604,7 @@ clean-wdiff:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in wdiff" ; \
@@ -19306,7 +21629,7 @@ distclean-wdiff:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in wdiff" ; \
@@ -19331,7 +21654,7 @@ maintainer-clean-wdiff:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in wdiff" ; \
@@ -19370,20 +21693,22 @@ configure-zip:
            libsrcdir="$$s/zip";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif zip
 
 .PHONY: all-zip maybe-all-zip
 maybe-all-zip:
 @if zip
+TARGET-zip=all
 maybe-all-zip: all-zip
 all-zip: configure-zip
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd zip && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd zip && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-zip))
 @endif zip
 
 .PHONY: check-zip maybe-check-zip
@@ -19398,7 +21723,7 @@ check-zip:
          s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
          $(SET_LIB_PATH) \
          $(HOST_EXPORTS) \
-         (cd zip && $(MAKE) $(FLAGS_TO_PASS) check); \
+         (cd zip && $(MAKE) $(FLAGS_TO_PASS)  check); \
        fi
 
 @endif zip
@@ -19431,7 +21756,7 @@ info-zip: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in zip" ; \
@@ -19457,7 +21782,7 @@ dvi-zip: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in zip" ; \
@@ -19471,6 +21796,32 @@ dvi-zip: \
 
 @endif zip
 
+.PHONY: maybe-html-zip html-zip
+maybe-html-zip:
+@if zip
+maybe-html-zip: html-zip
+
+html-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 html 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}" \
+                 html) \
+         || exit 1
+
+@endif zip
+
 .PHONY: maybe-TAGS-zip TAGS-zip
 maybe-TAGS-zip:
 @if zip
@@ -19483,7 +21834,7 @@ TAGS-zip: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in zip" ; \
@@ -19510,7 +21861,7 @@ install-info-zip: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in zip" ; \
@@ -19536,7 +21887,7 @@ installcheck-zip: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in zip" ; \
@@ -19561,7 +21912,7 @@ mostlyclean-zip:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in zip" ; \
@@ -19586,7 +21937,7 @@ clean-zip:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in zip" ; \
@@ -19611,7 +21962,7 @@ distclean-zip:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in zip" ; \
@@ -19636,7 +21987,7 @@ maintainer-clean-zip:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in zip" ; \
@@ -19656,7 +22007,8 @@ maybe-configure-zlib:
 @if zlib
 maybe-configure-zlib: configure-zlib
 configure-zlib:
-       @test ! -f zlib/Makefile || exit 0; \
+       @test -f stage_last && exit 0; \
+       test ! -f zlib/Makefile || exit 0; \
        [ -d zlib ] || mkdir zlib; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19675,20 +22027,23 @@ configure-zlib:
            libsrcdir="$$s/zlib";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif zlib
 
 .PHONY: all-zlib maybe-all-zlib
 maybe-all-zlib:
 @if zlib
+TARGET-zlib=all
 maybe-all-zlib: all-zlib
 all-zlib: configure-zlib
-       @r=`${PWD_COMMAND}`; export r; \
+       @test -f stage_last && exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd zlib && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd zlib && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-zlib))
 @endif zlib
 
 .PHONY: check-zlib maybe-check-zlib
@@ -19723,7 +22078,7 @@ info-zlib: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in zlib" ; \
@@ -19749,7 +22104,7 @@ dvi-zlib: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in zlib" ; \
@@ -19763,6 +22118,32 @@ dvi-zlib: \
 
 @endif zlib
 
+.PHONY: maybe-html-zlib html-zlib
+maybe-html-zlib:
+@if zlib
+maybe-html-zlib: html-zlib
+
+html-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 html 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}" \
+                 html) \
+         || exit 1
+
+@endif zlib
+
 .PHONY: maybe-TAGS-zlib TAGS-zlib
 maybe-TAGS-zlib:
 @if zlib
@@ -19775,7 +22156,7 @@ TAGS-zlib: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in zlib" ; \
@@ -19802,7 +22183,7 @@ install-info-zlib: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in zlib" ; \
@@ -19828,7 +22209,7 @@ installcheck-zlib: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in zlib" ; \
@@ -19853,7 +22234,7 @@ mostlyclean-zlib:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in zlib" ; \
@@ -19878,7 +22259,7 @@ clean-zlib:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in zlib" ; \
@@ -19903,7 +22284,7 @@ distclean-zlib:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in zlib" ; \
@@ -19928,7 +22309,7 @@ maintainer-clean-zlib:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in zlib" ; \
@@ -19967,20 +22348,22 @@ configure-gdb:
            libsrcdir="$$s/gdb";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif gdb
 
 .PHONY: all-gdb maybe-all-gdb
 maybe-all-gdb:
 @if gdb
+TARGET-gdb=all
 maybe-all-gdb: all-gdb
 all-gdb: configure-gdb
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
+       (cd gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) \
+         $(TARGET-gdb))
 @endif gdb
 
 .PHONY: check-gdb maybe-check-gdb
@@ -19993,7 +22376,7 @@ check-gdb:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+       (cd gdb && $(MAKE) $(FLAGS_TO_PASS)$(X11_FLAGS_TO_PASS) check)
 
 @endif gdb
 
@@ -20007,7 +22390,7 @@ install-gdb: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
+       (cd gdb && $(MAKE) $(FLAGS_TO_PASS)$(X11_FLAGS_TO_PASS) install)
 
 @endif gdb
 
@@ -20025,7 +22408,7 @@ info-gdb: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in gdb" ; \
@@ -20051,7 +22434,7 @@ dvi-gdb: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in gdb" ; \
@@ -20065,6 +22448,32 @@ dvi-gdb: \
 
 @endif gdb
 
+.PHONY: maybe-html-gdb html-gdb
+maybe-html-gdb:
+@if gdb
+maybe-html-gdb: html-gdb
+
+html-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) $(X11_FLAGS_TO_PASS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html 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}" \
+                 html) \
+         || exit 1
+
+@endif gdb
+
 .PHONY: maybe-TAGS-gdb TAGS-gdb
 maybe-TAGS-gdb:
 @if gdb
@@ -20077,7 +22486,7 @@ TAGS-gdb: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in gdb" ; \
@@ -20104,7 +22513,7 @@ install-info-gdb: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in gdb" ; \
@@ -20130,7 +22539,7 @@ installcheck-gdb: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in gdb" ; \
@@ -20155,7 +22564,7 @@ mostlyclean-gdb:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in gdb" ; \
@@ -20180,7 +22589,7 @@ clean-gdb:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in gdb" ; \
@@ -20205,7 +22614,7 @@ distclean-gdb:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in gdb" ; \
@@ -20230,7 +22639,7 @@ maintainer-clean-gdb:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in gdb" ; \
@@ -20269,20 +22678,22 @@ configure-expect:
            libsrcdir="$$s/expect";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif expect
 
 .PHONY: all-expect maybe-all-expect
 maybe-all-expect:
 @if expect
+TARGET-expect=all
 maybe-all-expect: all-expect
 all-expect: configure-expect
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
+       (cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) \
+         $(TARGET-expect))
 @endif expect
 
 .PHONY: check-expect maybe-check-expect
@@ -20295,7 +22706,7 @@ check-expect:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+       (cd expect && $(MAKE) $(FLAGS_TO_PASS)$(X11_FLAGS_TO_PASS) check)
 
 @endif expect
 
@@ -20309,7 +22720,7 @@ install-expect: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
+       (cd expect && $(MAKE) $(FLAGS_TO_PASS)$(X11_FLAGS_TO_PASS) install)
 
 @endif expect
 
@@ -20327,7 +22738,7 @@ info-expect: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in expect" ; \
@@ -20353,7 +22764,7 @@ dvi-expect: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in expect" ; \
@@ -20367,6 +22778,32 @@ dvi-expect: \
 
 @endif expect
 
+.PHONY: maybe-html-expect html-expect
+maybe-html-expect:
+@if expect
+maybe-html-expect: html-expect
+
+html-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) $(X11_FLAGS_TO_PASS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html 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}" \
+                 html) \
+         || exit 1
+
+@endif expect
+
 .PHONY: maybe-TAGS-expect TAGS-expect
 maybe-TAGS-expect:
 @if expect
@@ -20379,7 +22816,7 @@ TAGS-expect: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in expect" ; \
@@ -20406,7 +22843,7 @@ install-info-expect: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in expect" ; \
@@ -20432,7 +22869,7 @@ installcheck-expect: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in expect" ; \
@@ -20457,7 +22894,7 @@ mostlyclean-expect:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in expect" ; \
@@ -20482,7 +22919,7 @@ clean-expect:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in expect" ; \
@@ -20507,7 +22944,7 @@ distclean-expect:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in expect" ; \
@@ -20532,7 +22969,7 @@ maintainer-clean-expect:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in expect" ; \
@@ -20571,20 +23008,22 @@ configure-guile:
            libsrcdir="$$s/guile";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif guile
 
 .PHONY: all-guile maybe-all-guile
 maybe-all-guile:
 @if guile
+TARGET-guile=all
 maybe-all-guile: all-guile
 all-guile: configure-guile
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
+       (cd guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) \
+         $(TARGET-guile))
 @endif guile
 
 .PHONY: check-guile maybe-check-guile
@@ -20597,7 +23036,7 @@ check-guile:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+       (cd guile && $(MAKE) $(FLAGS_TO_PASS)$(X11_FLAGS_TO_PASS) check)
 
 @endif guile
 
@@ -20611,7 +23050,7 @@ install-guile: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
+       (cd guile && $(MAKE) $(FLAGS_TO_PASS)$(X11_FLAGS_TO_PASS) install)
 
 @endif guile
 
@@ -20629,7 +23068,7 @@ info-guile: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in guile" ; \
@@ -20655,7 +23094,7 @@ dvi-guile: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in guile" ; \
@@ -20669,6 +23108,32 @@ dvi-guile: \
 
 @endif guile
 
+.PHONY: maybe-html-guile html-guile
+maybe-html-guile:
+@if guile
+maybe-html-guile: html-guile
+
+html-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) $(X11_FLAGS_TO_PASS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html 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}" \
+                 html) \
+         || exit 1
+
+@endif guile
+
 .PHONY: maybe-TAGS-guile TAGS-guile
 maybe-TAGS-guile:
 @if guile
@@ -20681,7 +23146,7 @@ TAGS-guile: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in guile" ; \
@@ -20708,7 +23173,7 @@ install-info-guile: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in guile" ; \
@@ -20734,7 +23199,7 @@ installcheck-guile: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in guile" ; \
@@ -20759,7 +23224,7 @@ mostlyclean-guile:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in guile" ; \
@@ -20784,7 +23249,7 @@ clean-guile:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in guile" ; \
@@ -20809,7 +23274,7 @@ distclean-guile:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in guile" ; \
@@ -20834,7 +23299,7 @@ maintainer-clean-guile:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in guile" ; \
@@ -20873,20 +23338,22 @@ configure-tk:
            libsrcdir="$$s/tk";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif tk
 
 .PHONY: all-tk maybe-all-tk
 maybe-all-tk:
 @if tk
+TARGET-tk=all
 maybe-all-tk: all-tk
 all-tk: configure-tk
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
+       (cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) \
+         $(TARGET-tk))
 @endif tk
 
 .PHONY: check-tk maybe-check-tk
@@ -20899,7 +23366,7 @@ check-tk:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+       (cd tk && $(MAKE) $(FLAGS_TO_PASS)$(X11_FLAGS_TO_PASS) check)
 
 @endif tk
 
@@ -20913,7 +23380,7 @@ install-tk: installdirs
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
+       (cd tk && $(MAKE) $(FLAGS_TO_PASS)$(X11_FLAGS_TO_PASS) install)
 
 @endif tk
 
@@ -20931,7 +23398,7 @@ info-tk: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in tk" ; \
@@ -20957,7 +23424,7 @@ dvi-tk: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in tk" ; \
@@ -20971,6 +23438,32 @@ dvi-tk: \
 
 @endif tk
 
+.PHONY: maybe-html-tk html-tk
+maybe-html-tk:
+@if tk
+maybe-html-tk: html-tk
+
+html-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) $(X11_FLAGS_TO_PASS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html 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}" \
+                 html) \
+         || exit 1
+
+@endif tk
+
 .PHONY: maybe-TAGS-tk TAGS-tk
 maybe-TAGS-tk:
 @if tk
@@ -20983,7 +23476,7 @@ TAGS-tk: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in tk" ; \
@@ -21010,7 +23503,7 @@ install-info-tk: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in tk" ; \
@@ -21036,7 +23529,7 @@ installcheck-tk: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in tk" ; \
@@ -21061,7 +23554,7 @@ mostlyclean-tk:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in tk" ; \
@@ -21086,7 +23579,7 @@ clean-tk:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in tk" ; \
@@ -21111,7 +23604,7 @@ distclean-tk:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in tk" ; \
@@ -21136,7 +23629,7 @@ maintainer-clean-tk:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in tk" ; \
@@ -21151,93 +23644,90 @@ maintainer-clean-tk:
 @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; \
+.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 tix; \
-       cd tix || exit 1; \
+       echo Configuring in libtermcap; \
+       cd libtermcap || exit 1; \
        case $(srcdir) in \
          \.) \
            srcdiroption="--srcdir=."; \
            libsrcdir=".";; \
          /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/tix"; \
-           libsrcdir="$$s/tix";; \
+           srcdiroption="--srcdir=$(srcdir)/libtermcap"; \
+           libsrcdir="$$s/libtermcap";; \
          *) \
-           srcdiroption="--srcdir=../$(srcdir)/tix"; \
-           libsrcdir="$$s/tix";; \
+           srcdiroption="--srcdir=../$(srcdir)/libtermcap"; \
+           libsrcdir="$$s/libtermcap";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
-@endif tix
+@endif libtermcap
 
-.PHONY: all-tix maybe-all-tix
-maybe-all-tix:
-@if tix
-maybe-all-tix: all-tix
-all-tix: configure-tix
+.PHONY: all-libtermcap maybe-all-libtermcap
+maybe-all-libtermcap:
+@if libtermcap
+TARGET-libtermcap=all
+maybe-all-libtermcap: all-libtermcap
+all-libtermcap: configure-libtermcap
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
-@endif tix
+       (cd libtermcap && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-libtermcap))
+@endif libtermcap
 
-.PHONY: check-tix maybe-check-tix
-maybe-check-tix:
-@if tix
-maybe-check-tix: check-tix
+.PHONY: check-libtermcap maybe-check-libtermcap
+maybe-check-libtermcap:
+@if libtermcap
+maybe-check-libtermcap: check-libtermcap
 
-check-tix:
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       $(HOST_EXPORTS) \
-       (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+check-libtermcap:
 
-@endif tix
+@endif libtermcap
 
-.PHONY: install-tix maybe-install-tix
-maybe-install-tix:
-@if tix
-maybe-install-tix: install-tix
+.PHONY: install-libtermcap maybe-install-libtermcap
+maybe-install-libtermcap:
+@if libtermcap
+maybe-install-libtermcap: install-libtermcap
 
-install-tix: installdirs
+install-libtermcap: installdirs
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
+       (cd libtermcap && $(MAKE) $(FLAGS_TO_PASS) install)
 
-@endif tix
+@endif libtermcap
 
 # Other targets (info, dvi, etc.)
 
-.PHONY: maybe-info-tix info-tix
-maybe-info-tix:
-@if tix
-maybe-info-tix: info-tix
+.PHONY: maybe-info-libtermcap info-libtermcap
+maybe-info-libtermcap:
+@if libtermcap
+maybe-info-libtermcap: info-libtermcap
 
-info-tix: \
-    configure-tix 
-       @[ -f ./tix/Makefile ] || exit 0; \
+info-libtermcap: \
+    configure-libtermcap 
+       @[ -f ./libtermcap/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in tix" ; \
-       (cd tix && \
+       echo "Doing info in libtermcap" ; \
+       (cd libtermcap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -21245,25 +23735,25 @@ info-tix: \
                  info) \
          || exit 1
 
-@endif tix
+@endif libtermcap
 
-.PHONY: maybe-dvi-tix dvi-tix
-maybe-dvi-tix:
-@if tix
-maybe-dvi-tix: dvi-tix
+.PHONY: maybe-dvi-libtermcap dvi-libtermcap
+maybe-dvi-libtermcap:
+@if libtermcap
+maybe-dvi-libtermcap: dvi-libtermcap
 
-dvi-tix: \
-    configure-tix 
-       @[ -f ./tix/Makefile ] || exit 0; \
+dvi-libtermcap: \
+    configure-libtermcap 
+       @[ -f ./libtermcap/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in tix" ; \
-       (cd tix && \
+       echo "Doing dvi in libtermcap" ; \
+       (cd libtermcap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -21271,349 +23761,78 @@ dvi-tix: \
                  dvi) \
          || exit 1
 
-@endif tix
+@endif libtermcap
 
-.PHONY: maybe-TAGS-tix TAGS-tix
-maybe-TAGS-tix:
-@if tix
-maybe-TAGS-tix: TAGS-tix
+.PHONY: maybe-html-libtermcap html-libtermcap
+maybe-html-libtermcap:
+@if libtermcap
+maybe-html-libtermcap: html-libtermcap
 
-TAGS-tix: \
-    configure-tix 
-       @[ -f ./tix/Makefile ] || exit 0; \
+html-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 \
+       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 html 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) \
+                 html) \
          || exit 1
 
-@endif tix
+@endif libtermcap
 
-.PHONY: maybe-install-info-tix install-info-tix
-maybe-install-info-tix:
-@if tix
-maybe-install-info-tix: install-info-tix
+.PHONY: maybe-TAGS-libtermcap TAGS-libtermcap
+maybe-TAGS-libtermcap:
+@if libtermcap
+maybe-TAGS-libtermcap: TAGS-libtermcap
 
-install-info-tix: \
-    configure-tix \
-    info-tix 
-       @[ -f ./tix/Makefile ] || exit 0; \
+TAGS-libtermcap: \
+    configure-libtermcap 
+       @[ -f ./libtermcap/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       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 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}" \
-                 install-info) \
+                 TAGS) \
          || exit 1
 
-@endif tix
+@endif libtermcap
 
-.PHONY: maybe-installcheck-tix installcheck-tix
-maybe-installcheck-tix:
-@if tix
-maybe-installcheck-tix: installcheck-tix
+.PHONY: maybe-install-info-libtermcap install-info-libtermcap
+maybe-install-info-libtermcap:
+@if libtermcap
+maybe-install-info-libtermcap: install-info-libtermcap
 
-installcheck-tix: \
-    configure-tix 
-       @[ -f ./tix/Makefile ] || exit 0; \
+install-info-libtermcap: \
+    configure-libtermcap \
+    info-libtermcap 
+       @[ -f ./libtermcap/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       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: maybe-TAGS-libtermcap TAGS-libtermcap
-maybe-TAGS-libtermcap:
-@if libtermcap
-maybe-TAGS-libtermcap: TAGS-libtermcap
-
-TAGS-libtermcap: \
-    configure-libtermcap 
-       @[ -f ./libtermcap/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       $(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
-
-@endif libtermcap
-
-.PHONY: maybe-install-info-libtermcap install-info-libtermcap
-maybe-install-info-libtermcap:
-@if libtermcap
-maybe-install-info-libtermcap: install-info-libtermcap
-
-install-info-libtermcap: \
-    configure-libtermcap \
-    info-libtermcap 
-       @[ -f ./libtermcap/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       $(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 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}" \
@@ -21635,7 +23854,7 @@ installcheck-libtermcap: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in libtermcap" ; \
@@ -21714,20 +23933,22 @@ configure-utils:
            libsrcdir="$$s/utils";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
+         $(HOST_CONFIGARGS) $${srcdiroption}  \
          || exit 1
 @endif utils
 
 .PHONY: all-utils maybe-all-utils
 maybe-all-utils:
 @if utils
+TARGET-utils=all
 maybe-all-utils: all-utils
 all-utils: configure-utils
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd utils && $(MAKE) $(FLAGS_TO_PASS) all)
+       (cd utils && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-utils))
 @endif utils
 
 .PHONY: check-utils maybe-check-utils
@@ -21767,7 +23988,7 @@ info-utils: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing info in utils" ; \
@@ -21793,7 +24014,7 @@ dvi-utils: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing dvi in utils" ; \
@@ -21807,6 +24028,32 @@ dvi-utils: \
 
 @endif utils
 
+.PHONY: maybe-html-utils html-utils
+maybe-html-utils:
+@if utils
+maybe-html-utils: html-utils
+
+html-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 html 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}" \
+                 html) \
+         || exit 1
+
+@endif utils
+
 .PHONY: maybe-TAGS-utils TAGS-utils
 maybe-TAGS-utils:
 @if utils
@@ -21819,7 +24066,7 @@ TAGS-utils: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing TAGS in utils" ; \
@@ -21846,7 +24093,7 @@ install-info-utils: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing install-info in utils" ; \
@@ -21872,7 +24119,7 @@ installcheck-utils: \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing installcheck in utils" ; \
@@ -21897,7 +24144,7 @@ mostlyclean-utils:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing mostlyclean in utils" ; \
@@ -21922,7 +24169,7 @@ clean-utils:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing clean in utils" ; \
@@ -21947,7 +24194,7 @@ distclean-utils:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing distclean in utils" ; \
@@ -21972,7 +24219,7 @@ maintainer-clean-utils:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
        echo "Doing maintainer-clean in utils" ; \
@@ -22026,13 +24273,14 @@ configure-target-libstdc++-v3: $(TARGET_SUBDIR)/libstdc++-v3/multilib.out
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-libstdc++-v3
 
 .PHONY: all-target-libstdc++-v3 maybe-all-target-libstdc++-v3
 maybe-all-target-libstdc++-v3:
 @if target-libstdc++-v3
+TARGET-target-libstdc++-v3=all
 maybe-all-target-libstdc++-v3: all-target-libstdc++-v3
 all-target-libstdc++-v3: configure-target-libstdc++-v3
        @r=`${PWD_COMMAND}`; export r; \
@@ -22040,7 +24288,7 @@ all-target-libstdc++-v3: configure-target-libstdc++-v3
        $(SET_LIB_PATH) \
        $(RAW_CXX_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   $(TARGET-target-libstdc++-v3))
 @endif target-libstdc++-v3
 
 .PHONY: check-target-libstdc++-v3 maybe-check-target-libstdc++-v3
@@ -22054,7 +24302,7 @@ check-target-libstdc++-v3:
        $(SET_LIB_PATH) \
        $(RAW_CXX_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  check)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   check)
 
 @endif target-libstdc++-v3
 
@@ -22069,7 +24317,7 @@ install-target-libstdc++-v3: installdirs
        $(SET_LIB_PATH) \
        $(RAW_CXX_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
 @endif target-libstdc++-v3
 
@@ -22096,7 +24344,7 @@ info-target-libstdc++-v3: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif target-libstdc++-v3
@@ -22122,24 +24370,24 @@ dvi-target-libstdc++-v3: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
 @endif target-libstdc++-v3
 
-.PHONY: maybe-TAGS-target-libstdc++-v3 TAGS-target-libstdc++-v3
-maybe-TAGS-target-libstdc++-v3:
+.PHONY: maybe-html-target-libstdc++-v3 html-target-libstdc++-v3
+maybe-html-target-libstdc++-v3:
 @if target-libstdc++-v3
-maybe-TAGS-target-libstdc++-v3: TAGS-target-libstdc++-v3
+maybe-html-target-libstdc++-v3: html-target-libstdc++-v3
 
-TAGS-target-libstdc++-v3: \
+html-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) \
        $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+       echo "Doing html in $(TARGET_SUBDIR)/libstdc++-v3" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -22148,14 +24396,40 @@ TAGS-target-libstdc++-v3: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  html) \
          || exit 1
 
 @endif target-libstdc++-v3
 
-.PHONY: maybe-install-info-target-libstdc++-v3 install-info-target-libstdc++-v3
-maybe-install-info-target-libstdc++-v3:
-@if target-libstdc++-v3
+.PHONY: maybe-TAGS-target-libstdc++-v3 TAGS-target-libstdc++-v3
+maybe-TAGS-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-TAGS-target-libstdc++-v3: TAGS-target-libstdc++-v3
+
+TAGS-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (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) \
+         || exit 1
+
+@endif target-libstdc++-v3
+
+.PHONY: maybe-install-info-target-libstdc++-v3 install-info-target-libstdc++-v3
+maybe-install-info-target-libstdc++-v3:
+@if target-libstdc++-v3
 maybe-install-info-target-libstdc++-v3: install-info-target-libstdc++-v3
 
 install-info-target-libstdc++-v3: \
@@ -22175,7 +24449,7 @@ install-info-target-libstdc++-v3: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif target-libstdc++-v3
@@ -22201,7 +24475,7 @@ installcheck-target-libstdc++-v3: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif target-libstdc++-v3
@@ -22226,7 +24500,7 @@ mostlyclean-target-libstdc++-v3:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif target-libstdc++-v3
@@ -22251,7 +24525,7 @@ clean-target-libstdc++-v3:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif target-libstdc++-v3
@@ -22276,7 +24550,7 @@ distclean-target-libstdc++-v3:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif target-libstdc++-v3
@@ -22301,7 +24575,7 @@ maintainer-clean-target-libstdc++-v3:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif target-libstdc++-v3
@@ -22341,13 +24615,14 @@ configure-target-libmudflap: $(TARGET_SUBDIR)/libmudflap/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-libmudflap
 
 .PHONY: all-target-libmudflap maybe-all-target-libmudflap
 maybe-all-target-libmudflap:
 @if target-libmudflap
+TARGET-target-libmudflap=all
 maybe-all-target-libmudflap: all-target-libmudflap
 all-target-libmudflap: configure-target-libmudflap
        @r=`${PWD_COMMAND}`; export r; \
@@ -22355,7 +24630,7 @@ all-target-libmudflap: configure-target-libmudflap
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libmudflap && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libmudflap))
 @endif target-libmudflap
 
 .PHONY: check-target-libmudflap maybe-check-target-libmudflap
@@ -22369,7 +24644,7 @@ check-target-libmudflap:
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libmudflap && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
 @endif target-libmudflap
 
@@ -22384,7 +24659,7 @@ install-target-libmudflap: installdirs
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libmudflap && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
 @endif target-libmudflap
 
@@ -22411,7 +24686,7 @@ info-target-libmudflap: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif target-libmudflap
@@ -22437,7 +24712,33 @@ dvi-target-libmudflap: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
+         || exit 1
+
+@endif target-libmudflap
+
+.PHONY: maybe-html-target-libmudflap html-target-libmudflap
+maybe-html-target-libmudflap:
+@if target-libmudflap
+maybe-html-target-libmudflap: html-target-libmudflap
+
+html-target-libmudflap: \
+    configure-target-libmudflap 
+       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing html in $(TARGET_SUBDIR)/libmudflap" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libmudflap && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  html) \
          || exit 1
 
 @endif target-libmudflap
@@ -22463,7 +24764,7 @@ TAGS-target-libmudflap: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif target-libmudflap
@@ -22490,7 +24791,7 @@ install-info-target-libmudflap: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif target-libmudflap
@@ -22516,7 +24817,7 @@ installcheck-target-libmudflap: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif target-libmudflap
@@ -22541,7 +24842,7 @@ mostlyclean-target-libmudflap:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif target-libmudflap
@@ -22566,7 +24867,7 @@ clean-target-libmudflap:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif target-libmudflap
@@ -22591,7 +24892,7 @@ distclean-target-libmudflap:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif target-libmudflap
@@ -22616,7 +24917,7 @@ maintainer-clean-target-libmudflap:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif target-libmudflap
@@ -22656,13 +24957,14 @@ configure-target-newlib: $(TARGET_SUBDIR)/newlib/multilib.out
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-newlib
 
 .PHONY: all-target-newlib maybe-all-target-newlib
 maybe-all-target-newlib:
 @if target-newlib
+TARGET-target-newlib=all
 maybe-all-target-newlib: all-target-newlib
 all-target-newlib: configure-target-newlib
        @r=`${PWD_COMMAND}`; export r; \
@@ -22670,7 +24972,7 @@ all-target-newlib: configure-target-newlib
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/newlib && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-newlib))
 @endif target-newlib
 
 .PHONY: check-target-newlib maybe-check-target-newlib
@@ -22684,7 +24986,7 @@ check-target-newlib:
        $(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
 
@@ -22699,7 +25001,7 @@ install-target-newlib: installdirs
        $(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
 
@@ -22726,7 +25028,7 @@ info-target-newlib: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif target-newlib
@@ -22752,7 +25054,33 @@ 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-html-target-newlib html-target-newlib
+maybe-html-target-newlib:
+@if target-newlib
+maybe-html-target-newlib: html-target-newlib
+
+html-target-newlib: \
+    configure-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 html in $(TARGET_SUBDIR)/newlib" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/newlib && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  html) \
          || exit 1
 
 @endif target-newlib
@@ -22778,7 +25106,7 @@ TAGS-target-newlib: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif target-newlib
@@ -22805,7 +25133,7 @@ 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
@@ -22831,7 +25159,7 @@ installcheck-target-newlib: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif target-newlib
@@ -22856,7 +25184,7 @@ mostlyclean-target-newlib:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif target-newlib
@@ -22881,7 +25209,7 @@ clean-target-newlib:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif target-newlib
@@ -22906,7 +25234,7 @@ distclean-target-newlib:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif target-newlib
@@ -22931,7 +25259,7 @@ 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
@@ -22971,13 +25299,14 @@ configure-target-libgfortran: $(TARGET_SUBDIR)/libgfortran/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-libgfortran
 
 .PHONY: all-target-libgfortran maybe-all-target-libgfortran
 maybe-all-target-libgfortran:
 @if target-libgfortran
+TARGET-target-libgfortran=all
 maybe-all-target-libgfortran: all-target-libgfortran
 all-target-libgfortran: configure-target-libgfortran
        @r=`${PWD_COMMAND}`; export r; \
@@ -22985,7 +25314,7 @@ all-target-libgfortran: configure-target-libgfortran
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libgfortran && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libgfortran))
 @endif target-libgfortran
 
 .PHONY: check-target-libgfortran maybe-check-target-libgfortran
@@ -22999,7 +25328,7 @@ check-target-libgfortran:
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libgfortran && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
 @endif target-libgfortran
 
@@ -23014,7 +25343,7 @@ install-target-libgfortran: installdirs
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libgfortran && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
 @endif target-libgfortran
 
@@ -23041,7 +25370,7 @@ info-target-libgfortran: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif target-libgfortran
@@ -23067,7 +25396,33 @@ dvi-target-libgfortran: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
+                  dvi) \
+         || exit 1
+
+@endif target-libgfortran
+
+.PHONY: maybe-html-target-libgfortran html-target-libgfortran
+maybe-html-target-libgfortran:
+@if target-libgfortran
+maybe-html-target-libgfortran: html-target-libgfortran
+
+html-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) \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing html 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)/libgfortran && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  html) \
          || exit 1
 
 @endif target-libgfortran
@@ -23093,7 +25448,7 @@ TAGS-target-libgfortran: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif target-libgfortran
@@ -23120,7 +25475,7 @@ install-info-target-libgfortran: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
 @endif target-libgfortran
@@ -23146,7 +25501,7 @@ installcheck-target-libgfortran: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif target-libgfortran
@@ -23171,7 +25526,7 @@ mostlyclean-target-libgfortran:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif target-libgfortran
@@ -23196,7 +25551,7 @@ clean-target-libgfortran:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif target-libgfortran
@@ -23221,7 +25576,7 @@ distclean-target-libgfortran:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif target-libgfortran
@@ -23246,7 +25601,7 @@ maintainer-clean-target-libgfortran:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
 @endif target-libgfortran
@@ -23286,13 +25641,14 @@ configure-target-libobjc: $(TARGET_SUBDIR)/libobjc/multilib.out
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-libobjc
 
 .PHONY: all-target-libobjc maybe-all-target-libobjc
 maybe-all-target-libobjc:
 @if target-libobjc
+TARGET-target-libobjc=all
 maybe-all-target-libobjc: all-target-libobjc
 all-target-libobjc: configure-target-libobjc
        @r=`${PWD_COMMAND}`; export r; \
@@ -23300,7 +25656,7 @@ all-target-libobjc: configure-target-libobjc
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libobjc && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libobjc))
 @endif target-libobjc
 
 .PHONY: check-target-libobjc maybe-check-target-libobjc
@@ -23314,7 +25670,7 @@ check-target-libobjc:
        $(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
 
@@ -23329,7 +25685,7 @@ install-target-libobjc: installdirs
        $(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
 
@@ -23356,7 +25712,7 @@ info-target-libobjc: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif target-libobjc
@@ -23382,7 +25738,33 @@ 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-html-target-libobjc html-target-libobjc
+maybe-html-target-libobjc:
+@if target-libobjc
+maybe-html-target-libobjc: html-target-libobjc
+
+html-target-libobjc: \
+    configure-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 html in $(TARGET_SUBDIR)/libobjc" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libobjc && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  html) \
          || exit 1
 
 @endif target-libobjc
@@ -23408,7 +25790,7 @@ TAGS-target-libobjc: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif target-libobjc
@@ -23435,7 +25817,7 @@ 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
@@ -23461,7 +25843,7 @@ installcheck-target-libobjc: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif target-libobjc
@@ -23486,7 +25868,7 @@ mostlyclean-target-libobjc:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif target-libobjc
@@ -23511,7 +25893,7 @@ clean-target-libobjc:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif target-libobjc
@@ -23536,7 +25918,7 @@ distclean-target-libobjc:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif target-libobjc
@@ -23561,7 +25943,7 @@ 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
@@ -23623,13 +26005,14 @@ configure-target-libtermcap: $(TARGET_SUBDIR)/libtermcap/multilib.out
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-libtermcap
 
 .PHONY: all-target-libtermcap maybe-all-target-libtermcap
 maybe-all-target-libtermcap:
 @if target-libtermcap
+TARGET-target-libtermcap=all
 maybe-all-target-libtermcap: all-target-libtermcap
 all-target-libtermcap: configure-target-libtermcap
        @r=`${PWD_COMMAND}`; export r; \
@@ -23637,7 +26020,7 @@ all-target-libtermcap: configure-target-libtermcap
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libtermcap && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libtermcap))
 @endif target-libtermcap
 
 .PHONY: check-target-libtermcap maybe-check-target-libtermcap
@@ -23661,7 +26044,7 @@ install-target-libtermcap: installdirs
        $(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
 
@@ -23688,7 +26071,7 @@ info-target-libtermcap: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif target-libtermcap
@@ -23714,7 +26097,33 @@ 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-html-target-libtermcap html-target-libtermcap
+maybe-html-target-libtermcap:
+@if target-libtermcap
+maybe-html-target-libtermcap: html-target-libtermcap
+
+html-target-libtermcap: \
+    configure-target-libtermcap 
+       @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing html in $(TARGET_SUBDIR)/libtermcap" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libtermcap && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  html) \
          || exit 1
 
 @endif target-libtermcap
@@ -23740,7 +26149,7 @@ TAGS-target-libtermcap: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif target-libtermcap
@@ -23767,7 +26176,7 @@ 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
@@ -23793,7 +26202,7 @@ installcheck-target-libtermcap: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif target-libtermcap
@@ -23873,13 +26282,14 @@ configure-target-winsup: $(TARGET_SUBDIR)/winsup/multilib.out
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-winsup
 
 .PHONY: all-target-winsup maybe-all-target-winsup
 maybe-all-target-winsup:
 @if target-winsup
+TARGET-target-winsup=all
 maybe-all-target-winsup: all-target-winsup
 all-target-winsup: configure-target-winsup
        @r=`${PWD_COMMAND}`; export r; \
@@ -23887,7 +26297,7 @@ all-target-winsup: configure-target-winsup
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/winsup && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-winsup))
 @endif target-winsup
 
 .PHONY: check-target-winsup maybe-check-target-winsup
@@ -23901,7 +26311,7 @@ check-target-winsup:
        $(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
 
@@ -23916,7 +26326,7 @@ install-target-winsup: installdirs
        $(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
 
@@ -23943,7 +26353,7 @@ info-target-winsup: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif target-winsup
@@ -23969,7 +26379,33 @@ 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-html-target-winsup html-target-winsup
+maybe-html-target-winsup:
+@if target-winsup
+maybe-html-target-winsup: html-target-winsup
+
+html-target-winsup: \
+    configure-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 html in $(TARGET_SUBDIR)/winsup" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/winsup && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  html) \
          || exit 1
 
 @endif target-winsup
@@ -23995,7 +26431,7 @@ TAGS-target-winsup: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif target-winsup
@@ -24022,7 +26458,7 @@ 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
@@ -24048,7 +26484,7 @@ installcheck-target-winsup: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif target-winsup
@@ -24073,7 +26509,7 @@ mostlyclean-target-winsup:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif target-winsup
@@ -24098,7 +26534,7 @@ clean-target-winsup:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif target-winsup
@@ -24123,7 +26559,7 @@ distclean-target-winsup:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif target-winsup
@@ -24148,7 +26584,7 @@ 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
@@ -24188,13 +26624,14 @@ configure-target-libgloss: $(TARGET_SUBDIR)/libgloss/multilib.out
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-libgloss
 
 .PHONY: all-target-libgloss maybe-all-target-libgloss
 maybe-all-target-libgloss:
 @if target-libgloss
+TARGET-target-libgloss=all
 maybe-all-target-libgloss: all-target-libgloss
 all-target-libgloss: configure-target-libgloss
        @r=`${PWD_COMMAND}`; export r; \
@@ -24202,7 +26639,7 @@ all-target-libgloss: configure-target-libgloss
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libgloss && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libgloss))
 @endif target-libgloss
 
 .PHONY: check-target-libgloss maybe-check-target-libgloss
@@ -24226,7 +26663,7 @@ install-target-libgloss: installdirs
        $(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
 
@@ -24253,7 +26690,7 @@ info-target-libgloss: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif target-libgloss
@@ -24279,7 +26716,33 @@ 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-html-target-libgloss html-target-libgloss
+maybe-html-target-libgloss:
+@if target-libgloss
+maybe-html-target-libgloss: html-target-libgloss
+
+html-target-libgloss: \
+    configure-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 html in $(TARGET_SUBDIR)/libgloss" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libgloss && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  html) \
          || exit 1
 
 @endif target-libgloss
@@ -24305,7 +26768,7 @@ TAGS-target-libgloss: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif target-libgloss
@@ -24332,7 +26795,7 @@ 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
@@ -24358,7 +26821,7 @@ installcheck-target-libgloss: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif target-libgloss
@@ -24383,7 +26846,7 @@ mostlyclean-target-libgloss:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif target-libgloss
@@ -24408,7 +26871,7 @@ clean-target-libgloss:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif target-libgloss
@@ -24433,7 +26896,7 @@ distclean-target-libgloss:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif target-libgloss
@@ -24458,7 +26921,7 @@ 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
@@ -24498,13 +26961,14 @@ configure-target-libiberty: $(TARGET_SUBDIR)/libiberty/multilib.out
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-libiberty
 
 .PHONY: all-target-libiberty maybe-all-target-libiberty
 maybe-all-target-libiberty:
 @if target-libiberty
+TARGET-target-libiberty=all
 maybe-all-target-libiberty: all-target-libiberty
 all-target-libiberty: configure-target-libiberty
        @r=`${PWD_COMMAND}`; export r; \
@@ -24512,7 +26976,7 @@ all-target-libiberty: configure-target-libiberty
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libiberty && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libiberty))
 @endif target-libiberty
 
 .PHONY: check-target-libiberty maybe-check-target-libiberty
@@ -24526,7 +26990,7 @@ check-target-libiberty:
        $(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
 
@@ -24541,7 +27005,7 @@ install-target-libiberty: installdirs
        $(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
 
@@ -24568,7 +27032,7 @@ info-target-libiberty: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif target-libiberty
@@ -24594,7 +27058,33 @@ 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-html-target-libiberty html-target-libiberty
+maybe-html-target-libiberty:
+@if target-libiberty
+maybe-html-target-libiberty: html-target-libiberty
+
+html-target-libiberty: \
+    configure-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 html in $(TARGET_SUBDIR)/libiberty" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libiberty && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  html) \
          || exit 1
 
 @endif target-libiberty
@@ -24620,7 +27110,7 @@ TAGS-target-libiberty: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif target-libiberty
@@ -24647,7 +27137,7 @@ 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
@@ -24673,7 +27163,7 @@ installcheck-target-libiberty: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif target-libiberty
@@ -24698,7 +27188,7 @@ mostlyclean-target-libiberty:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif target-libiberty
@@ -24723,7 +27213,7 @@ clean-target-libiberty:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif target-libiberty
@@ -24748,7 +27238,7 @@ distclean-target-libiberty:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif target-libiberty
@@ -24773,7 +27263,7 @@ 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
@@ -24813,13 +27303,14 @@ configure-target-gperf: $(TARGET_SUBDIR)/gperf/multilib.out
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-gperf
 
 .PHONY: all-target-gperf maybe-all-target-gperf
 maybe-all-target-gperf:
 @if target-gperf
+TARGET-target-gperf=all
 maybe-all-target-gperf: all-target-gperf
 all-target-gperf: configure-target-gperf
        @r=`${PWD_COMMAND}`; export r; \
@@ -24827,7 +27318,7 @@ all-target-gperf: configure-target-gperf
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/gperf && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-gperf))
 @endif target-gperf
 
 .PHONY: check-target-gperf maybe-check-target-gperf
@@ -24841,7 +27332,7 @@ check-target-gperf:
        $(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
 
@@ -24856,7 +27347,7 @@ install-target-gperf: installdirs
        $(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
 
@@ -24883,7 +27374,7 @@ info-target-gperf: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif target-gperf
@@ -24909,7 +27400,33 @@ 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-html-target-gperf html-target-gperf
+maybe-html-target-gperf:
+@if target-gperf
+maybe-html-target-gperf: html-target-gperf
+
+html-target-gperf: \
+    configure-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 html in $(TARGET_SUBDIR)/gperf" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/gperf && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  html) \
          || exit 1
 
 @endif target-gperf
@@ -24935,7 +27452,7 @@ TAGS-target-gperf: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif target-gperf
@@ -24962,7 +27479,7 @@ 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
@@ -24988,7 +27505,7 @@ installcheck-target-gperf: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif target-gperf
@@ -25013,7 +27530,7 @@ mostlyclean-target-gperf:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif target-gperf
@@ -25038,7 +27555,7 @@ clean-target-gperf:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif target-gperf
@@ -25063,7 +27580,7 @@ distclean-target-gperf:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif target-gperf
@@ -25088,7 +27605,7 @@ 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
@@ -25128,13 +27645,14 @@ configure-target-examples: $(TARGET_SUBDIR)/examples/multilib.out
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-examples
 
 .PHONY: all-target-examples maybe-all-target-examples
 maybe-all-target-examples:
 @if target-examples
+TARGET-target-examples=all
 maybe-all-target-examples: all-target-examples
 all-target-examples: configure-target-examples
        @r=`${PWD_COMMAND}`; export r; \
@@ -25142,7 +27660,7 @@ all-target-examples: configure-target-examples
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/examples && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-examples))
 @endif target-examples
 
 .PHONY: check-target-examples maybe-check-target-examples
@@ -25188,7 +27706,7 @@ info-target-examples: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif target-examples
@@ -25214,7 +27732,33 @@ 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-html-target-examples html-target-examples
+maybe-html-target-examples:
+@if target-examples
+maybe-html-target-examples: html-target-examples
+
+html-target-examples: \
+    configure-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 html in $(TARGET_SUBDIR)/examples" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/examples && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  html) \
          || exit 1
 
 @endif target-examples
@@ -25240,7 +27784,7 @@ TAGS-target-examples: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif target-examples
@@ -25267,7 +27811,7 @@ 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
@@ -25293,7 +27837,7 @@ installcheck-target-examples: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif target-examples
@@ -25318,7 +27862,7 @@ mostlyclean-target-examples:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif target-examples
@@ -25343,7 +27887,7 @@ clean-target-examples:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif target-examples
@@ -25368,7 +27912,7 @@ distclean-target-examples:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif target-examples
@@ -25393,7 +27937,7 @@ 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
@@ -25433,13 +27977,14 @@ configure-target-libffi: $(TARGET_SUBDIR)/libffi/multilib.out
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-libffi
 
 .PHONY: all-target-libffi maybe-all-target-libffi
 maybe-all-target-libffi:
 @if target-libffi
+TARGET-target-libffi=all
 maybe-all-target-libffi: all-target-libffi
 all-target-libffi: configure-target-libffi
        @r=`${PWD_COMMAND}`; export r; \
@@ -25447,7 +27992,7 @@ all-target-libffi: configure-target-libffi
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libffi && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libffi))
 @endif target-libffi
 
 .PHONY: check-target-libffi maybe-check-target-libffi
@@ -25461,7 +28006,7 @@ check-target-libffi:
        $(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
 
@@ -25476,7 +28021,7 @@ install-target-libffi: installdirs
        $(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
 
@@ -25503,7 +28048,7 @@ info-target-libffi: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif target-libffi
@@ -25529,7 +28074,33 @@ 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-html-target-libffi html-target-libffi
+maybe-html-target-libffi:
+@if target-libffi
+maybe-html-target-libffi: html-target-libffi
+
+html-target-libffi: \
+    configure-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 html in $(TARGET_SUBDIR)/libffi" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libffi && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  html) \
          || exit 1
 
 @endif target-libffi
@@ -25555,7 +28126,7 @@ TAGS-target-libffi: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif target-libffi
@@ -25582,7 +28153,7 @@ 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
@@ -25608,7 +28179,7 @@ installcheck-target-libffi: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif target-libffi
@@ -25633,7 +28204,7 @@ mostlyclean-target-libffi:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif target-libffi
@@ -25658,7 +28229,7 @@ clean-target-libffi:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif target-libffi
@@ -25683,7 +28254,7 @@ distclean-target-libffi:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif target-libffi
@@ -25708,7 +28279,7 @@ 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
@@ -25748,13 +28319,14 @@ configure-target-libjava: $(TARGET_SUBDIR)/libjava/multilib.out
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-libjava
 
 .PHONY: all-target-libjava maybe-all-target-libjava
 maybe-all-target-libjava:
 @if target-libjava
+TARGET-target-libjava=all
 maybe-all-target-libjava: all-target-libjava
 all-target-libjava: configure-target-libjava
        @r=`${PWD_COMMAND}`; export r; \
@@ -25762,7 +28334,7 @@ all-target-libjava: configure-target-libjava
        $(SET_LIB_PATH) \
        $(RAW_CXX_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libjava && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   $(TARGET-target-libjava))
 @endif target-libjava
 
 .PHONY: check-target-libjava maybe-check-target-libjava
@@ -25776,7 +28348,7 @@ check-target-libjava:
        $(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
 
@@ -25791,7 +28363,7 @@ install-target-libjava: installdirs
        $(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
 
@@ -25818,7 +28390,7 @@ info-target-libjava: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif target-libjava
@@ -25844,7 +28416,33 @@ 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-html-target-libjava html-target-libjava
+maybe-html-target-libjava:
+@if target-libjava
+maybe-html-target-libjava: html-target-libjava
+
+html-target-libjava: \
+    configure-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 html in $(TARGET_SUBDIR)/libjava" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libjava && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  html) \
          || exit 1
 
 @endif target-libjava
@@ -25870,7 +28468,7 @@ TAGS-target-libjava: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif target-libjava
@@ -25897,7 +28495,7 @@ 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
@@ -25923,7 +28521,7 @@ installcheck-target-libjava: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif target-libjava
@@ -25948,7 +28546,7 @@ mostlyclean-target-libjava:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif target-libjava
@@ -25973,7 +28571,7 @@ clean-target-libjava:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif target-libjava
@@ -25998,7 +28596,7 @@ distclean-target-libjava:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif target-libjava
@@ -26023,7 +28621,7 @@ 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
@@ -26085,13 +28683,14 @@ configure-target-zlib: $(TARGET_SUBDIR)/zlib/multilib.out
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-zlib
 
 .PHONY: all-target-zlib maybe-all-target-zlib
 maybe-all-target-zlib:
 @if target-zlib
+TARGET-target-zlib=all
 maybe-all-target-zlib: all-target-zlib
 all-target-zlib: configure-target-zlib
        @r=`${PWD_COMMAND}`; export r; \
@@ -26099,7 +28698,7 @@ all-target-zlib: configure-target-zlib
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/zlib && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-zlib))
 @endif target-zlib
 
 .PHONY: check-target-zlib maybe-check-target-zlib
@@ -26113,7 +28712,7 @@ check-target-zlib:
        $(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
 
@@ -26128,7 +28727,7 @@ install-target-zlib: installdirs
        $(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
 
@@ -26155,7 +28754,7 @@ info-target-zlib: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif target-zlib
@@ -26181,7 +28780,33 @@ 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-html-target-zlib html-target-zlib
+maybe-html-target-zlib:
+@if target-zlib
+maybe-html-target-zlib: html-target-zlib
+
+html-target-zlib: \
+    configure-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 html in $(TARGET_SUBDIR)/zlib" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/zlib && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  html) \
          || exit 1
 
 @endif target-zlib
@@ -26207,7 +28832,7 @@ TAGS-target-zlib: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif target-zlib
@@ -26234,7 +28859,7 @@ 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
@@ -26260,7 +28885,7 @@ installcheck-target-zlib: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif target-zlib
@@ -26285,7 +28910,7 @@ mostlyclean-target-zlib:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif target-zlib
@@ -26310,7 +28935,7 @@ clean-target-zlib:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif target-zlib
@@ -26335,7 +28960,7 @@ distclean-target-zlib:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif target-zlib
@@ -26360,7 +28985,7 @@ 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
@@ -26400,13 +29025,14 @@ configure-target-boehm-gc: $(TARGET_SUBDIR)/boehm-gc/multilib.out
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-boehm-gc
 
 .PHONY: all-target-boehm-gc maybe-all-target-boehm-gc
 maybe-all-target-boehm-gc:
 @if target-boehm-gc
+TARGET-target-boehm-gc=all
 maybe-all-target-boehm-gc: all-target-boehm-gc
 all-target-boehm-gc: configure-target-boehm-gc
        @r=`${PWD_COMMAND}`; export r; \
@@ -26414,7 +29040,7 @@ all-target-boehm-gc: configure-target-boehm-gc
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/boehm-gc && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-boehm-gc))
 @endif target-boehm-gc
 
 .PHONY: check-target-boehm-gc maybe-check-target-boehm-gc
@@ -26428,7 +29054,7 @@ check-target-boehm-gc:
        $(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
 
@@ -26443,7 +29069,7 @@ install-target-boehm-gc: installdirs
        $(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
 
@@ -26470,7 +29096,7 @@ 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
@@ -26496,7 +29122,33 @@ 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-html-target-boehm-gc html-target-boehm-gc
+maybe-html-target-boehm-gc:
+@if target-boehm-gc
+maybe-html-target-boehm-gc: html-target-boehm-gc
+
+html-target-boehm-gc: \
+    configure-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 html in $(TARGET_SUBDIR)/boehm-gc" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/boehm-gc && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  html) \
          || exit 1
 
 @endif target-boehm-gc
@@ -26522,7 +29174,7 @@ 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
@@ -26549,7 +29201,7 @@ 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
@@ -26575,7 +29227,7 @@ 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
@@ -26600,7 +29252,7 @@ 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
@@ -26625,7 +29277,7 @@ 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
@@ -26650,7 +29302,7 @@ 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
@@ -26675,7 +29327,7 @@ 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
@@ -26715,13 +29367,14 @@ configure-target-qthreads: $(TARGET_SUBDIR)/qthreads/multilib.out
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-qthreads
 
 .PHONY: all-target-qthreads maybe-all-target-qthreads
 maybe-all-target-qthreads:
 @if target-qthreads
+TARGET-target-qthreads=all
 maybe-all-target-qthreads: all-target-qthreads
 all-target-qthreads: configure-target-qthreads
        @r=`${PWD_COMMAND}`; export r; \
@@ -26729,7 +29382,7 @@ all-target-qthreads: configure-target-qthreads
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/qthreads && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-qthreads))
 @endif target-qthreads
 
 .PHONY: check-target-qthreads maybe-check-target-qthreads
@@ -26743,7 +29396,7 @@ check-target-qthreads:
        $(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
 
@@ -26758,7 +29411,7 @@ install-target-qthreads: installdirs
        $(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
 
@@ -26785,7 +29438,7 @@ info-target-qthreads: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif target-qthreads
@@ -26811,7 +29464,33 @@ 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-html-target-qthreads html-target-qthreads
+maybe-html-target-qthreads:
+@if target-qthreads
+maybe-html-target-qthreads: html-target-qthreads
+
+html-target-qthreads: \
+    configure-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 html in $(TARGET_SUBDIR)/qthreads" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/qthreads && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  html) \
          || exit 1
 
 @endif target-qthreads
@@ -26837,7 +29516,7 @@ TAGS-target-qthreads: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif target-qthreads
@@ -26864,7 +29543,7 @@ 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
@@ -26890,7 +29569,7 @@ installcheck-target-qthreads: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif target-qthreads
@@ -26915,7 +29594,7 @@ mostlyclean-target-qthreads:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif target-qthreads
@@ -26940,7 +29619,7 @@ clean-target-qthreads:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif target-qthreads
@@ -26965,7 +29644,7 @@ distclean-target-qthreads:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif target-qthreads
@@ -26990,7 +29669,7 @@ 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
@@ -27030,13 +29709,14 @@ configure-target-rda: $(TARGET_SUBDIR)/rda/multilib.out
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-rda
 
 .PHONY: all-target-rda maybe-all-target-rda
 maybe-all-target-rda:
 @if target-rda
+TARGET-target-rda=all
 maybe-all-target-rda: all-target-rda
 all-target-rda: configure-target-rda
        @r=`${PWD_COMMAND}`; export r; \
@@ -27044,7 +29724,7 @@ all-target-rda: configure-target-rda
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/rda && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-rda))
 @endif target-rda
 
 .PHONY: check-target-rda maybe-check-target-rda
@@ -27058,7 +29738,7 @@ check-target-rda:
        $(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
 
@@ -27073,7 +29753,7 @@ install-target-rda: installdirs
        $(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
 
@@ -27100,7 +29780,7 @@ info-target-rda: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif target-rda
@@ -27126,7 +29806,33 @@ 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-html-target-rda html-target-rda
+maybe-html-target-rda:
+@if target-rda
+maybe-html-target-rda: html-target-rda
+
+html-target-rda: \
+    configure-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 html in $(TARGET_SUBDIR)/rda" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/rda && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  html) \
          || exit 1
 
 @endif target-rda
@@ -27152,7 +29858,7 @@ TAGS-target-rda: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
 @endif target-rda
@@ -27179,7 +29885,7 @@ 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
@@ -27205,7 +29911,7 @@ installcheck-target-rda: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif target-rda
@@ -27230,7 +29936,7 @@ mostlyclean-target-rda:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif target-rda
@@ -27255,7 +29961,7 @@ clean-target-rda:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif target-rda
@@ -27280,7 +29986,7 @@ distclean-target-rda:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif target-rda
@@ -27305,7 +30011,7 @@ 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
@@ -27345,13 +30051,14 @@ configure-target-libada: $(TARGET_SUBDIR)/libada/multilib.out
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) $${srcdiroption} \
-         --with-target-subdir="$(TARGET_SUBDIR)" \
+         --with-target-subdir="$(TARGET_SUBDIR)"  \
          || exit 1
 @endif target-libada
 
 .PHONY: all-target-libada maybe-all-target-libada
 maybe-all-target-libada:
 @if target-libada
+TARGET-target-libada=all
 maybe-all-target-libada: all-target-libada
 all-target-libada: configure-target-libada
        @r=`${PWD_COMMAND}`; export r; \
@@ -27359,7 +30066,7 @@ all-target-libada: configure-target-libada
        $(SET_LIB_PATH) \
        $(NORMAL_TARGET_EXPORTS) \
        (cd $(TARGET_SUBDIR)/libada && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libada))
 @endif target-libada
 
 .PHONY: check-target-libada maybe-check-target-libada
@@ -27373,7 +30080,7 @@ check-target-libada:
        $(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
 
@@ -27388,7 +30095,7 @@ install-target-libada: installdirs
        $(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
 
@@ -27415,7 +30122,7 @@ info-target-libada: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
+                  info) \
          || exit 1
 
 @endif target-libada
@@ -27441,24 +30148,24 @@ 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:
+.PHONY: maybe-html-target-libada html-target-libada
+maybe-html-target-libada:
 @if target-libada
-maybe-TAGS-target-libada: TAGS-target-libada
+maybe-html-target-libada: html-target-libada
 
-TAGS-target-libada: \
+html-target-libada: \
     configure-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 TAGS in $(TARGET_SUBDIR)/libada" ; \
+       echo "Doing html in $(TARGET_SUBDIR)/libada" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -27467,20 +30174,46 @@ TAGS-target-libada: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
+                  html) \
          || exit 1
 
 @endif target-libada
 
-.PHONY: maybe-install-info-target-libada install-info-target-libada
-maybe-install-info-target-libada:
+.PHONY: maybe-TAGS-target-libada TAGS-target-libada
+maybe-TAGS-target-libada:
 @if target-libada
-maybe-install-info-target-libada: install-info-target-libada
+maybe-TAGS-target-libada: TAGS-target-libada
 
-install-info-target-libada: \
-    configure-target-libada \
-    info-target-libada 
-       @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+TAGS-target-libada: \
+    configure-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 TAGS in $(TARGET_SUBDIR)/libada" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libada && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                  TAGS) \
+         || exit 1
+
+@endif target-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 \
+    info-target-libada 
+       @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
@@ -27494,7 +30227,7 @@ 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
@@ -27520,7 +30253,7 @@ installcheck-target-libada: \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
 @endif target-libada
@@ -27545,7 +30278,7 @@ mostlyclean-target-libada:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
 @endif target-libada
@@ -27570,7 +30303,7 @@ clean-target-libada:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
+                  clean) \
          || exit 1
 
 @endif target-libada
@@ -27595,7 +30328,7 @@ distclean-target-libada:
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
 @endif target-libada
@@ -27620,7 +30353,7 @@ 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
@@ -27631,84 +30364,18 @@ maintainer-clean-target-libada:
 # GCC module
 # ----------
 
-# Unfortunately, while gcc _should_ be a host module,
-# libgcc is a target module, and gen* programs are
-# build modules.  So GCC is a sort of hybrid.
-
-# gcc is the only module which uses GCC_FLAGS_TO_PASS.
-# Don't use shared host config.cache, as it will confuse later
-# directories; GCC wants slightly different values for some
-# precious variables.  *sigh*
-
-# We must skip configuring if toplevel bootstrap is going.
-.PHONY: configure-gcc maybe-configure-gcc
-maybe-configure-gcc:
-@if gcc
-maybe-configure-gcc: configure-gcc
-configure-gcc:
-       @test ! -f gcc/Makefile || exit 0; \
-       [ -f stage_last ] && exit 0; \
-       [ -d gcc ] || mkdir gcc; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(GCC_HOST_EXPORTS) \
-       echo Configuring in gcc; \
-       cd gcc || exit 1; \
-       case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/gcc"; \
-           libsrcdir="$$s/gcc";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/gcc"; \
-           libsrcdir="$$s/gcc";; \
-       esac; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         || exit 1
-@endif gcc
-
-# 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
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(GCC_HOST_EXPORTS) \
-       if [ -f stage_last ] ; then \
-         true ; \
-       elif [ -f gcc/stage_last ] ; then \
-         $(SET_LIB_PATH) \
-         (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) quickstrap); \
-       else \
-         $(SET_LIB_PATH) \
-         (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) all); \
-       fi
-@endif gcc
+@if gcc-no-bootstrap
+# GCC has some more recursive targets, which trigger the old
+# (but still current, until the toplevel bootstrap project
+# is finished) compiler bootstrapping rules.
 
-# Building GCC uses some tools for rebuilding "source" files
-# like texinfo, bison/byacc, etc.  So we must depend on those.
-#
-# While building GCC, it may be necessary to run various target
-# programs like the assembler, linker, etc.  So we depend on
-# those too.
-#
-# In theory, on an SMP all those dependencies can be resolved
-# in parallel.
-#
 GCC_STRAP_TARGETS = bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean bubblestrap quickstrap cleanstrap restrap
 .PHONY: $(GCC_STRAP_TARGETS)
-$(GCC_STRAP_TARGETS): all-bootstrap configure-gcc
+$(GCC_STRAP_TARGETS): all-prebootstrap configure-gcc
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
-       $(GCC_HOST_EXPORTS) \
+       $(HOST_EXPORTS) \
        echo "Bootstrapping the compiler"; \
        cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $@
        @r=`${PWD_COMMAND}`; export r; \
@@ -27728,71 +30395,57 @@ $(GCC_STRAP_TARGETS): all-bootstrap configure-gcc
            compare=compare ;; \
        esac; \
        $(SET_LIB_PATH) \
-       $(GCC_HOST_EXPORTS) \
+       $(HOST_EXPORTS) \
        echo "$$msg"; \
        cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $$compare
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
        $(SET_LIB_PATH) \
        echo "Building runtime libraries"; \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) all
 
-profiledbootstrap: all-bootstrap configure-gcc
+profiledbootstrap: all-prebootstrap configure-gcc
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
-       $(GCC_HOST_EXPORTS) \
-       echo "Bootstrapping the compiler"; \
+       $(HOST_EXPORTS) \
+       echo "Bootstrapping training compiler"; \
        cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stageprofile_build
        @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
-       $(SET_LIB_PATH) \
-       echo "Building runtime libraries and training compiler"; \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all
-       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
-       $(GCC_HOST_EXPORTS) \
+       $(HOST_EXPORTS) \
        echo "Building feedback based compiler"; \
        cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stagefeedback_build
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
+       $(SET_LIB_PATH) \
+       echo "Building runtime libraries"; \
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) all
 
 .PHONY: cross
-cross: all-texinfo all-bison all-byacc all-binutils all-gas all-ld
+cross: all-build all-gas all-ld
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
-       $(GCC_HOST_EXPORTS) \
+       $(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) \
-         $(GCC_HOST_EXPORTS) \
-         (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check); \
-       else \
-         true; \
-       fi
-
 .PHONY: check-gcc-c++
 check-gcc-c++:
        @if [ -f ./gcc/Makefile ] ; then \
          r=`${PWD_COMMAND}`; export r; \
          s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
          $(SET_LIB_PATH) \
-         $(GCC_HOST_EXPORTS) \
+         $(HOST_EXPORTS) \
          (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); \
        else \
          true; \
@@ -27800,23 +30453,6 @@ 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) \
-         $(GCC_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
@@ -27833,267 +30469,60 @@ gcc-no-fixedincludes:
          r=`${PWD_COMMAND}`; export r; \
          s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
          $(SET_LIB_PATH) \
-         $(GCC_HOST_EXPORTS) \
+         $(HOST_EXPORTS) \
          (cd ./gcc && \
           $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
          rm -rf gcc/include; \
          mv gcc/tmp-include gcc/include 2>/dev/null; \
        else true; fi
+@endif gcc
 
-# Other targets (dvi, info, etc.)
+# ---------------------
+# GCC bootstrap support
+# ---------------------
 
-.PHONY: maybe-info-gcc info-gcc
-maybe-info-gcc:
-@if gcc
-maybe-info-gcc: info-gcc
-info-gcc: \
-    configure-gcc 
-       @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       for flag in $(EXTRA_GCC_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       $(GCC_HOST_EXPORTS) \
-       echo "Doing info in gcc" ; \
-       (cd gcc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
-         || exit 1
-@endif gcc
+# We track the current stage (the one in 'gcc') in the stage_current file.
+# stage_last instead tracks the stage that was built last.  These targets
+# are dummy when toplevel bootstrap is not active.
 
+.PHONY: unstage
+unstage:
+@if gcc-bootstrap
+       @[ -f stage_current ] || $(MAKE) `cat stage_last`-start
+@endif gcc-bootstrap
 
-.PHONY: maybe-dvi-gcc dvi-gcc
-maybe-dvi-gcc:
-@if gcc
-maybe-dvi-gcc: dvi-gcc
-dvi-gcc: \
-    configure-gcc 
-       @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       for flag in $(EXTRA_GCC_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       $(GCC_HOST_EXPORTS) \
-       echo "Doing dvi in gcc" ; \
-       (cd gcc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
-         || exit 1
-@endif gcc
+.PHONY: stage
+stage:
+@if gcc-bootstrap
+       @$(MAKE) `cat stage_current`-end
+@endif gcc-bootstrap
 
+# We name the build directories for the various stages "stage1-gcc",
+# "stage2-gcc","stage3-gcc", etc.
 
-.PHONY: maybe-TAGS-gcc TAGS-gcc
-maybe-TAGS-gcc:
-@if gcc
-maybe-TAGS-gcc: TAGS-gcc
-TAGS-gcc: \
-    configure-gcc 
-       @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       for flag in $(EXTRA_GCC_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       $(GCC_HOST_EXPORTS) \
-       echo "Doing TAGS in gcc" ; \
-       (cd gcc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
-         || exit 1
-@endif gcc
+# Since the 'compare' process will fail (on debugging information) if any
+# directory names are different, we need to link the gcc directory for
+# the previous stage to a constant name ('gcc-prev'), and to make the name of
+# the build directories constant as well. For the latter, we use naked names
+# like 'gcc', because the scripts in that directory assume it.  We use
+# mv on platforms where symlinks to directories do not work or are not
+# reliable.
 
+# At the end of the bootstrap, a symlink to 'stage3-gcc' named 'gcc' must
+# be kept, so that libraries can find it.  Ick!
 
-.PHONY: maybe-install-info-gcc install-info-gcc
-maybe-install-info-gcc:
-@if gcc
-maybe-install-info-gcc: install-info-gcc
-install-info-gcc: \
-    configure-gcc \
-    info-gcc 
-       @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       for flag in $(EXTRA_GCC_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       $(GCC_HOST_EXPORTS) \
-       echo "Doing install-info in gcc" ; \
-       (cd gcc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
-         || exit 1
-@endif gcc
+# It would be best to preinstall gcc into a staging area (and in the
+# future, gather there all prebootstrap packages).  This would allow
+# assemblers and linkers can be bootstrapped as well as the compiler
+# (both in a combined tree, or separately).  This however requires some
+# change to the gcc driver, again in order to avoid comparison failures.
 
+# Bugs: This is crippled when doing parallel make, the `make all-host'
+# and `make all-target' phases can be parallelized.
 
-.PHONY: maybe-installcheck-gcc installcheck-gcc
-maybe-installcheck-gcc:
-@if gcc
-maybe-installcheck-gcc: installcheck-gcc
-installcheck-gcc: \
-    configure-gcc 
-       @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       for flag in $(EXTRA_GCC_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       $(GCC_HOST_EXPORTS) \
-       echo "Doing installcheck in gcc" ; \
-       (cd gcc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
-         || exit 1
-@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; \
-       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; \
-       $(GCC_HOST_EXPORTS) \
-       echo "Doing mostlyclean in gcc" ; \
-       (cd gcc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
-         || exit 1
-@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; \
-       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; \
-       $(GCC_HOST_EXPORTS) \
-       echo "Doing clean in gcc" ; \
-       (cd gcc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
-         || exit 1
-@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; \
-       $(GCC_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; \
-       $(GCC_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
-
-
-
-# ---------------------
-# 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 > 
+# '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
@@ -28107,15 +30536,10 @@ 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) 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)"
 
@@ -28129,131 +30553,3998 @@ POSTSTAGE1_FLAGS_TO_PASS = \
 # * We build only C (and possibly Ada).
 
 
-.PHONY: new-stage1-start new-stage1-end
+.PHONY: stage1-start stage1-end
 
-new-stage1-start:
-       [ -f stage_last ] && $(MAKE) new-`cat stage_last`-end || :
-       echo stage1 > stage_last ; \
-       [ -d stage1-gcc ] || mkdir stage1-gcc; \
+stage1-start::
+       @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
+       echo stage1 > stage_current ; \
+       echo stage1 > stage_last
+@if bfd
+       @[ -d stage1-bfd ] || mkdir stage1-bfd; \
+       set stage1-bfd bfd ; @CREATE_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @[ -d stage1-opcodes ] || mkdir stage1-opcodes; \
+       set stage1-opcodes opcodes ; @CREATE_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @[ -d stage1-binutils ] || mkdir stage1-binutils; \
+       set stage1-binutils binutils ; @CREATE_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @[ -d stage1-gas ] || mkdir stage1-gas; \
+       set stage1-gas gas ; @CREATE_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @[ -d stage1-gcc ] || mkdir stage1-gcc; \
        set stage1-gcc gcc ; @CREATE_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @[ -d stage1-intl ] || mkdir stage1-intl; \
+       set stage1-intl intl ; @CREATE_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @[ -d stage1-ld ] || mkdir stage1-ld; \
+       set stage1-ld ld ; @CREATE_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @[ -d stage1-libcpp ] || mkdir stage1-libcpp; \
+       set stage1-libcpp libcpp ; @CREATE_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @[ -d stage1-libiberty ] || mkdir stage1-libiberty; \
+       set stage1-libiberty libiberty ; @CREATE_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @[ -d stage1-zlib ] || mkdir stage1-zlib; \
+       set stage1-zlib zlib ; @CREATE_LINK_TO_DIR@ 
+@endif zlib
 
-new-stage1-end:
-       rm -f stage_last ; \
-       set gcc stage1-gcc ; @UNDO_LINK_TO_DIR@ 
+stage1-end::
+       @rm -f stage_current
+@if bfd
+       @set bfd stage1-bfd ; @UNDO_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @set opcodes stage1-opcodes ; @UNDO_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @set binutils stage1-binutils ; @UNDO_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @set gas stage1-gas ; @UNDO_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @set gcc stage1-gcc ; @UNDO_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @set intl stage1-intl ; @UNDO_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @set ld stage1-ld ; @UNDO_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @set libcpp stage1-libcpp ; @UNDO_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @set libiberty stage1-libiberty ; @UNDO_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @set zlib stage1-zlib ; @UNDO_LINK_TO_DIR@ 
+@endif zlib
 
 # Bubble a bugfix through all the stages up to stage 1.  They
 # are remade, but not reconfigured.  The next stage (if any) will not
 # be reconfigured as well.
-.PHONY: new-stage1-bubble
-new-stage1-bubble: 
-       @if [ -f all-stage1-gcc ] ; then \
-         echo Remaking stage 1 ; \
-         rm -f all-stage1-gcc ; \
-         $(MAKE) all-stage1-gcc  && \
-         if [ -f configure-stage2-gcc ] ; then \
-           $(STAMP) configure-stage2-gcc ; \
-         fi ; \
+.PHONY: stage1-bubble
+stage1-bubble:: 
+       @if test -f stage1-lean  ; then \
+         echo Skipping rebuild of stage1 ; \
        else \
-         $(MAKE) all-stage1-gcc ; \
+         $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage1; \
        fi
 
-configure-stage1-gcc:  prebootstrap 
-       $(MAKE) new-stage1-start
-       @if [ -f stage1-gcc/Makefile ] ; then \
-         $(STAMP) configure-stage1-gcc ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+.PHONY: all-stage1 clean-stage1
+all-stage1:     \
+  maybe-all-stage1-bfd \
+  maybe-all-stage1-opcodes \
+  maybe-all-stage1-binutils              \
+  maybe-all-stage1-gas \
+  maybe-all-stage1-gcc        \
+  maybe-all-stage1-intl   \
+  maybe-all-stage1-ld \
+  maybe-all-stage1-libcpp  \
+  maybe-all-stage1-libiberty                        \
+  maybe-all-stage1-zlib       
+
+do-clean: clean-stage1
+clean-stage1:     \
+  maybe-clean-stage1-bfd \
+  maybe-clean-stage1-opcodes \
+  maybe-clean-stage1-binutils              \
+  maybe-clean-stage1-gas \
+  maybe-clean-stage1-gcc        \
+  maybe-clean-stage1-intl   \
+  maybe-clean-stage1-ld \
+  maybe-clean-stage1-libcpp  \
+  maybe-clean-stage1-libiberty                        \
+  maybe-clean-stage1-zlib       
+
+
+.PHONY: configure-stage1-bfd maybe-configure-stage1-bfd
+.PHONY: all-stage1-bfd maybe-all-stage1-bfd
+.PHONY: clean-stage1-bfd maybe-clean-stage1-bfd
+
+maybe-configure-stage1-bfd:
+maybe-all-stage1-bfd:
+maybe-clean-stage1-bfd:
+
+@if bfd-bootstrap
+maybe-configure-stage1-bfd: configure-stage1-bfd
+configure-stage1-bfd:
+       @$(MAKE) stage1-start
+       @[ -f bfd/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       echo Configuring stage 1 in bfd ; \
+       cd bfd || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/bfd"; \
+           libsrcdir="$$s/bfd";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/bfd"; \
+           libsrcdir="$$s/bfd";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+
+maybe-all-stage1-bfd: all-stage1-bfd
+all-stage1-bfd: configure-stage1-bfd
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       cd bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-bfd: clean-stage1-bfd
+clean-stage1-bfd:
+       @[ -f bfd/Makefile ] || [ -f stage1-bfd/Makefile ] \
+         || exit 0 ; \
+       [ -f bfd/Makefile ] || $(MAKE) stage1-start ; \
+       cd bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif bfd-bootstrap
+
+
+.PHONY: configure-stage1-opcodes maybe-configure-stage1-opcodes
+.PHONY: all-stage1-opcodes maybe-all-stage1-opcodes
+.PHONY: clean-stage1-opcodes maybe-clean-stage1-opcodes
+
+maybe-configure-stage1-opcodes:
+maybe-all-stage1-opcodes:
+maybe-clean-stage1-opcodes:
+
+@if opcodes-bootstrap
+maybe-configure-stage1-opcodes: configure-stage1-opcodes
+configure-stage1-opcodes:
+       @$(MAKE) stage1-start
+       @[ -f opcodes/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       echo Configuring stage 1 in opcodes ; \
+       cd opcodes || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/opcodes"; \
+           libsrcdir="$$s/opcodes";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/opcodes"; \
+           libsrcdir="$$s/opcodes";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+
+maybe-all-stage1-opcodes: all-stage1-opcodes
+all-stage1-opcodes: configure-stage1-opcodes
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       cd opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-opcodes: clean-stage1-opcodes
+clean-stage1-opcodes:
+       @[ -f opcodes/Makefile ] || [ -f stage1-opcodes/Makefile ] \
+         || exit 0 ; \
+       [ -f opcodes/Makefile ] || $(MAKE) stage1-start ; \
+       cd opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif opcodes-bootstrap
+
+
+.PHONY: configure-stage1-binutils maybe-configure-stage1-binutils
+.PHONY: all-stage1-binutils maybe-all-stage1-binutils
+.PHONY: clean-stage1-binutils maybe-clean-stage1-binutils
+
+maybe-configure-stage1-binutils:
+maybe-all-stage1-binutils:
+maybe-clean-stage1-binutils:
+
+@if binutils-bootstrap
+maybe-configure-stage1-binutils: configure-stage1-binutils
+configure-stage1-binutils:
+       @$(MAKE) stage1-start
+       @[ -f binutils/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       echo Configuring stage 1 in binutils ; \
+       cd binutils || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/binutils"; \
+           libsrcdir="$$s/binutils";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/binutils"; \
+           libsrcdir="$$s/binutils";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+
+maybe-all-stage1-binutils: all-stage1-binutils
+all-stage1-binutils: configure-stage1-binutils
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       cd binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-binutils: clean-stage1-binutils
+clean-stage1-binutils:
+       @[ -f binutils/Makefile ] || [ -f stage1-binutils/Makefile ] \
+         || exit 0 ; \
+       [ -f binutils/Makefile ] || $(MAKE) stage1-start ; \
+       cd binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif binutils-bootstrap
+
+
+.PHONY: configure-stage1-gas maybe-configure-stage1-gas
+.PHONY: all-stage1-gas maybe-all-stage1-gas
+.PHONY: clean-stage1-gas maybe-clean-stage1-gas
+
+maybe-configure-stage1-gas:
+maybe-all-stage1-gas:
+maybe-clean-stage1-gas:
+
+@if gas-bootstrap
+maybe-configure-stage1-gas: configure-stage1-gas
+configure-stage1-gas:
+       @$(MAKE) stage1-start
+       @[ -f gas/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       echo Configuring stage 1 in gas ; \
+       cd gas || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/gas"; \
+           libsrcdir="$$s/gas";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/gas"; \
+           libsrcdir="$$s/gas";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+
+maybe-all-stage1-gas: all-stage1-gas
+all-stage1-gas: configure-stage1-gas
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       cd gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-gas: clean-stage1-gas
+clean-stage1-gas:
+       @[ -f gas/Makefile ] || [ -f stage1-gas/Makefile ] \
+         || exit 0 ; \
+       [ -f gas/Makefile ] || $(MAKE) stage1-start ; \
+       cd gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif gas-bootstrap
+
+
+.PHONY: configure-stage1-gcc maybe-configure-stage1-gcc
+.PHONY: all-stage1-gcc maybe-all-stage1-gcc
+.PHONY: clean-stage1-gcc maybe-clean-stage1-gcc
+
+maybe-configure-stage1-gcc:
+maybe-all-stage1-gcc:
+maybe-clean-stage1-gcc:
+
+@if gcc-bootstrap
+maybe-configure-stage1-gcc: configure-stage1-gcc
+configure-stage1-gcc:
+       @$(MAKE) stage1-start
+       @[ -f gcc/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       echo Configuring stage 1 in gcc ; \
+       cd gcc || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/gcc"; \
+           libsrcdir="$$s/gcc";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/gcc"; \
+           libsrcdir="$$s/gcc";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+
+maybe-all-stage1-gcc: all-stage1-gcc
+all-stage1-gcc: configure-stage1-gcc
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       cd gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS)
+
+maybe-clean-stage1-gcc: clean-stage1-gcc
+clean-stage1-gcc:
+       @[ -f gcc/Makefile ] || [ -f stage1-gcc/Makefile ] \
+         || exit 0 ; \
+       [ -f gcc/Makefile ] || $(MAKE) stage1-start ; \
+       cd gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+.PHONY: configure-stage1-intl maybe-configure-stage1-intl
+.PHONY: all-stage1-intl maybe-all-stage1-intl
+.PHONY: clean-stage1-intl maybe-clean-stage1-intl
+
+maybe-configure-stage1-intl:
+maybe-all-stage1-intl:
+maybe-clean-stage1-intl:
+
+@if intl-bootstrap
+maybe-configure-stage1-intl: configure-stage1-intl
+configure-stage1-intl:
+       @$(MAKE) stage1-start
+       @[ -f intl/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       echo Configuring stage 1 in intl ; \
+       cd intl || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/intl"; \
+           libsrcdir="$$s/intl";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/intl"; \
+           libsrcdir="$$s/intl";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+
+maybe-all-stage1-intl: all-stage1-intl
+all-stage1-intl: configure-stage1-intl
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       cd intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-intl: clean-stage1-intl
+clean-stage1-intl:
+       @[ -f intl/Makefile ] || [ -f stage1-intl/Makefile ] \
+         || exit 0 ; \
+       [ -f intl/Makefile ] || $(MAKE) stage1-start ; \
+       cd intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif intl-bootstrap
+
+
+.PHONY: configure-stage1-ld maybe-configure-stage1-ld
+.PHONY: all-stage1-ld maybe-all-stage1-ld
+.PHONY: clean-stage1-ld maybe-clean-stage1-ld
+
+maybe-configure-stage1-ld:
+maybe-all-stage1-ld:
+maybe-clean-stage1-ld:
+
+@if ld-bootstrap
+maybe-configure-stage1-ld: configure-stage1-ld
+configure-stage1-ld:
+       @$(MAKE) stage1-start
+       @[ -f ld/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       echo Configuring stage 1 in ld ; \
+       cd ld || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/ld"; \
+           libsrcdir="$$s/ld";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/ld"; \
+           libsrcdir="$$s/ld";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+
+maybe-all-stage1-ld: all-stage1-ld
+all-stage1-ld: configure-stage1-ld
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       cd ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-ld: clean-stage1-ld
+clean-stage1-ld:
+       @[ -f ld/Makefile ] || [ -f stage1-ld/Makefile ] \
+         || exit 0 ; \
+       [ -f ld/Makefile ] || $(MAKE) stage1-start ; \
+       cd ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif ld-bootstrap
+
+
+.PHONY: configure-stage1-libcpp maybe-configure-stage1-libcpp
+.PHONY: all-stage1-libcpp maybe-all-stage1-libcpp
+.PHONY: clean-stage1-libcpp maybe-clean-stage1-libcpp
+
+maybe-configure-stage1-libcpp:
+maybe-all-stage1-libcpp:
+maybe-clean-stage1-libcpp:
+
+@if libcpp-bootstrap
+maybe-configure-stage1-libcpp: configure-stage1-libcpp
+configure-stage1-libcpp:
+       @$(MAKE) stage1-start
+       @[ -f libcpp/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       echo Configuring stage 1 in libcpp ; \
+       cd libcpp || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/libcpp"; \
+           libsrcdir="$$s/libcpp";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/libcpp"; \
+           libsrcdir="$$s/libcpp";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+
+maybe-all-stage1-libcpp: all-stage1-libcpp
+all-stage1-libcpp: configure-stage1-libcpp
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       cd libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-libcpp: clean-stage1-libcpp
+clean-stage1-libcpp:
+       @[ -f libcpp/Makefile ] || [ -f stage1-libcpp/Makefile ] \
+         || exit 0 ; \
+       [ -f libcpp/Makefile ] || $(MAKE) stage1-start ; \
+       cd libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif libcpp-bootstrap
+
+
+.PHONY: configure-stage1-libiberty maybe-configure-stage1-libiberty
+.PHONY: all-stage1-libiberty maybe-all-stage1-libiberty
+.PHONY: clean-stage1-libiberty maybe-clean-stage1-libiberty
+
+maybe-configure-stage1-libiberty:
+maybe-all-stage1-libiberty:
+maybe-clean-stage1-libiberty:
+
+@if libiberty-bootstrap
+maybe-configure-stage1-libiberty: configure-stage1-libiberty
+configure-stage1-libiberty:
+       @$(MAKE) stage1-start
+       @[ -f libiberty/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       echo Configuring stage 1 in libiberty ; \
+       cd libiberty || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/libiberty"; \
+           libsrcdir="$$s/libiberty";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/libiberty"; \
+           libsrcdir="$$s/libiberty";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+
+maybe-all-stage1-libiberty: all-stage1-libiberty
+all-stage1-libiberty: configure-stage1-libiberty
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       cd libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-libiberty: clean-stage1-libiberty
+clean-stage1-libiberty:
+       @[ -f libiberty/Makefile ] || [ -f stage1-libiberty/Makefile ] \
+         || exit 0 ; \
+       [ -f libiberty/Makefile ] || $(MAKE) stage1-start ; \
+       cd libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif libiberty-bootstrap
+
+
+.PHONY: configure-stage1-zlib maybe-configure-stage1-zlib
+.PHONY: all-stage1-zlib maybe-all-stage1-zlib
+.PHONY: clean-stage1-zlib maybe-clean-stage1-zlib
+
+maybe-configure-stage1-zlib:
+maybe-all-stage1-zlib:
+maybe-clean-stage1-zlib:
+
+@if zlib-bootstrap
+maybe-configure-stage1-zlib: configure-stage1-zlib
+configure-stage1-zlib:
+       @$(MAKE) stage1-start
+       @[ -f zlib/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       echo Configuring stage 1 in zlib ; \
+       cd zlib || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/zlib"; \
+           libsrcdir="$$s/zlib";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/zlib"; \
+           libsrcdir="$$s/zlib";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+
+maybe-all-stage1-zlib: all-stage1-zlib
+all-stage1-zlib: configure-stage1-zlib
+       @$(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(HOST_EXPORTS)  \
+       cd zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-zlib: clean-stage1-zlib
+clean-stage1-zlib:
+       @[ -f zlib/Makefile ] || [ -f stage1-zlib/Makefile ] \
+         || exit 0 ; \
+       [ -f zlib/Makefile ] || $(MAKE) stage1-start ; \
+       cd zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif zlib-bootstrap
+
+
+
+# FIXME: Will not need to be conditional when toplevel bootstrap is the
+# only possibility, but now it conflicts with no-bootstrap rules
+@if gcc-bootstrap
+
+
+
+
+# Rules to wipe a stage and all the following ones, also used for cleanstrap
+
+.PHONY: distclean-stage1
+distclean-stage1::
+       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+       rm -rf stage1-* 
+
+
+@endif gcc-bootstrap
+
+
+.PHONY: stage2-start stage2-end
+
+stage2-start::
+       @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
+       echo stage2 > stage_current ; \
+       echo stage2 > stage_last
+@if bfd
+       @[ -d stage2-bfd ] || mkdir stage2-bfd; \
+       set stage2-bfd bfd ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-bfd prev-bfd ; @CREATE_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @[ -d stage2-opcodes ] || mkdir stage2-opcodes; \
+       set stage2-opcodes opcodes ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-opcodes prev-opcodes ; @CREATE_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @[ -d stage2-binutils ] || mkdir stage2-binutils; \
+       set stage2-binutils binutils ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-binutils prev-binutils ; @CREATE_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @[ -d stage2-gas ] || mkdir stage2-gas; \
+       set stage2-gas gas ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-gas prev-gas ; @CREATE_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @[ -d stage2-gcc ] || mkdir stage2-gcc; \
+       set stage2-gcc gcc ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-gcc prev-gcc ; @CREATE_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @[ -d stage2-intl ] || mkdir stage2-intl; \
+       set stage2-intl intl ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-intl prev-intl ; @CREATE_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @[ -d stage2-ld ] || mkdir stage2-ld; \
+       set stage2-ld ld ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-ld prev-ld ; @CREATE_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @[ -d stage2-libcpp ] || mkdir stage2-libcpp; \
+       set stage2-libcpp libcpp ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-libcpp prev-libcpp ; @CREATE_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @[ -d stage2-libiberty ] || mkdir stage2-libiberty; \
+       set stage2-libiberty libiberty ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-libiberty prev-libiberty ; @CREATE_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @[ -d stage2-zlib ] || mkdir stage2-zlib; \
+       set stage2-zlib zlib ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-zlib prev-zlib ; @CREATE_LINK_TO_DIR@ 
+@endif zlib
+
+stage2-end::
+       @rm -f stage_current
+@if bfd
+       @set bfd stage2-bfd ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-bfd stage1-bfd ; @UNDO_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @set opcodes stage2-opcodes ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-opcodes stage1-opcodes ; @UNDO_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @set binutils stage2-binutils ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-binutils stage1-binutils ; @UNDO_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @set gas stage2-gas ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-gas stage1-gas ; @UNDO_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @set gcc stage2-gcc ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-gcc stage1-gcc ; @UNDO_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @set intl stage2-intl ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-intl stage1-intl ; @UNDO_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @set ld stage2-ld ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-ld stage1-ld ; @UNDO_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @set libcpp stage2-libcpp ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-libcpp stage1-libcpp ; @UNDO_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @set libiberty stage2-libiberty ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-libiberty stage1-libiberty ; @UNDO_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @set zlib stage2-zlib ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-zlib stage1-zlib ; @UNDO_LINK_TO_DIR@ 
+@endif zlib
+
+# Bubble a bugfix through all the stages up to stage 2.  They
+# are remade, but not reconfigured.  The next stage (if any) will not
+# be reconfigured as well.
+.PHONY: stage2-bubble
+stage2-bubble:: stage1-bubble
+       @if test -f stage2-lean || test -f stage1-lean  ; then \
+         echo Skipping rebuild of stage2 ; \
+       else \
+         $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage2; \
+       fi
+
+.PHONY: all-stage2 clean-stage2
+all-stage2:     \
+  maybe-all-stage2-bfd \
+  maybe-all-stage2-opcodes \
+  maybe-all-stage2-binutils              \
+  maybe-all-stage2-gas \
+  maybe-all-stage2-gcc        \
+  maybe-all-stage2-intl   \
+  maybe-all-stage2-ld \
+  maybe-all-stage2-libcpp  \
+  maybe-all-stage2-libiberty                        \
+  maybe-all-stage2-zlib       
+
+do-clean: clean-stage2
+clean-stage2:     \
+  maybe-clean-stage2-bfd \
+  maybe-clean-stage2-opcodes \
+  maybe-clean-stage2-binutils              \
+  maybe-clean-stage2-gas \
+  maybe-clean-stage2-gcc        \
+  maybe-clean-stage2-intl   \
+  maybe-clean-stage2-ld \
+  maybe-clean-stage2-libcpp  \
+  maybe-clean-stage2-libiberty                        \
+  maybe-clean-stage2-zlib       
+
+
+.PHONY: configure-stage2-bfd maybe-configure-stage2-bfd
+.PHONY: all-stage2-bfd maybe-all-stage2-bfd
+.PHONY: clean-stage2-bfd maybe-clean-stage2-bfd
+
+maybe-configure-stage2-bfd:
+maybe-all-stage2-bfd:
+maybe-clean-stage2-bfd:
+
+@if bfd-bootstrap
+maybe-configure-stage2-bfd: configure-stage2-bfd
+configure-stage2-bfd:
+       @$(MAKE) stage2-start
+       @[ -f bfd/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 2 in bfd ; \
+       cd bfd || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/bfd"; \
+           libsrcdir="$$s/bfd";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/bfd"; \
+           libsrcdir="$$s/bfd";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage2-bfd: all-stage2-bfd
+all-stage2-bfd: configure-stage2-bfd
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage2-bfd: clean-stage2-bfd
+clean-stage2-bfd:
+       @[ -f bfd/Makefile ] || [ -f stage2-bfd/Makefile ] \
+         || exit 0 ; \
+       [ -f bfd/Makefile ] || $(MAKE) stage2-start ; \
+       cd bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif bfd-bootstrap
+
+
+.PHONY: configure-stage2-opcodes maybe-configure-stage2-opcodes
+.PHONY: all-stage2-opcodes maybe-all-stage2-opcodes
+.PHONY: clean-stage2-opcodes maybe-clean-stage2-opcodes
+
+maybe-configure-stage2-opcodes:
+maybe-all-stage2-opcodes:
+maybe-clean-stage2-opcodes:
+
+@if opcodes-bootstrap
+maybe-configure-stage2-opcodes: configure-stage2-opcodes
+configure-stage2-opcodes:
+       @$(MAKE) stage2-start
+       @[ -f opcodes/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 2 in opcodes ; \
+       cd opcodes || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/opcodes"; \
+           libsrcdir="$$s/opcodes";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/opcodes"; \
+           libsrcdir="$$s/opcodes";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage2-opcodes: all-stage2-opcodes
+all-stage2-opcodes: configure-stage2-opcodes
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage2-opcodes: clean-stage2-opcodes
+clean-stage2-opcodes:
+       @[ -f opcodes/Makefile ] || [ -f stage2-opcodes/Makefile ] \
+         || exit 0 ; \
+       [ -f opcodes/Makefile ] || $(MAKE) stage2-start ; \
+       cd opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif opcodes-bootstrap
+
+
+.PHONY: configure-stage2-binutils maybe-configure-stage2-binutils
+.PHONY: all-stage2-binutils maybe-all-stage2-binutils
+.PHONY: clean-stage2-binutils maybe-clean-stage2-binutils
+
+maybe-configure-stage2-binutils:
+maybe-all-stage2-binutils:
+maybe-clean-stage2-binutils:
+
+@if binutils-bootstrap
+maybe-configure-stage2-binutils: configure-stage2-binutils
+configure-stage2-binutils:
+       @$(MAKE) stage2-start
+       @[ -f binutils/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 2 in binutils ; \
+       cd binutils || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/binutils"; \
+           libsrcdir="$$s/binutils";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/binutils"; \
+           libsrcdir="$$s/binutils";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage2-binutils: all-stage2-binutils
+all-stage2-binutils: configure-stage2-binutils
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage2-binutils: clean-stage2-binutils
+clean-stage2-binutils:
+       @[ -f binutils/Makefile ] || [ -f stage2-binutils/Makefile ] \
+         || exit 0 ; \
+       [ -f binutils/Makefile ] || $(MAKE) stage2-start ; \
+       cd binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif binutils-bootstrap
+
+
+.PHONY: configure-stage2-gas maybe-configure-stage2-gas
+.PHONY: all-stage2-gas maybe-all-stage2-gas
+.PHONY: clean-stage2-gas maybe-clean-stage2-gas
+
+maybe-configure-stage2-gas:
+maybe-all-stage2-gas:
+maybe-clean-stage2-gas:
+
+@if gas-bootstrap
+maybe-configure-stage2-gas: configure-stage2-gas
+configure-stage2-gas:
+       @$(MAKE) stage2-start
+       @[ -f gas/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 2 in gas ; \
+       cd gas || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/gas"; \
+           libsrcdir="$$s/gas";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/gas"; \
+           libsrcdir="$$s/gas";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage2-gas: all-stage2-gas
+all-stage2-gas: configure-stage2-gas
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage2-gas: clean-stage2-gas
+clean-stage2-gas:
+       @[ -f gas/Makefile ] || [ -f stage2-gas/Makefile ] \
+         || exit 0 ; \
+       [ -f gas/Makefile ] || $(MAKE) stage2-start ; \
+       cd gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif gas-bootstrap
+
+
+.PHONY: configure-stage2-gcc maybe-configure-stage2-gcc
+.PHONY: all-stage2-gcc maybe-all-stage2-gcc
+.PHONY: clean-stage2-gcc maybe-clean-stage2-gcc
+
+maybe-configure-stage2-gcc:
+maybe-all-stage2-gcc:
+maybe-clean-stage2-gcc:
+
+@if gcc-bootstrap
+maybe-configure-stage2-gcc: configure-stage2-gcc
+configure-stage2-gcc:
+       @$(MAKE) stage2-start
+       @[ -f gcc/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 2 in gcc ; \
+       cd gcc || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/gcc"; \
+           libsrcdir="$$s/gcc";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/gcc"; \
+           libsrcdir="$$s/gcc";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage2-gcc: all-stage2-gcc
+all-stage2-gcc: configure-stage2-gcc
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                $(EXTRA_GCC_FLAGS)
+
+maybe-clean-stage2-gcc: clean-stage2-gcc
+clean-stage2-gcc:
+       @[ -f gcc/Makefile ] || [ -f stage2-gcc/Makefile ] \
+         || exit 0 ; \
+       [ -f gcc/Makefile ] || $(MAKE) stage2-start ; \
+       cd gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                $(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+.PHONY: configure-stage2-intl maybe-configure-stage2-intl
+.PHONY: all-stage2-intl maybe-all-stage2-intl
+.PHONY: clean-stage2-intl maybe-clean-stage2-intl
+
+maybe-configure-stage2-intl:
+maybe-all-stage2-intl:
+maybe-clean-stage2-intl:
+
+@if intl-bootstrap
+maybe-configure-stage2-intl: configure-stage2-intl
+configure-stage2-intl:
+       @$(MAKE) stage2-start
+       @[ -f intl/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 2 in intl ; \
+       cd intl || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/intl"; \
+           libsrcdir="$$s/intl";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/intl"; \
+           libsrcdir="$$s/intl";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage2-intl: all-stage2-intl
+all-stage2-intl: configure-stage2-intl
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage2-intl: clean-stage2-intl
+clean-stage2-intl:
+       @[ -f intl/Makefile ] || [ -f stage2-intl/Makefile ] \
+         || exit 0 ; \
+       [ -f intl/Makefile ] || $(MAKE) stage2-start ; \
+       cd intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif intl-bootstrap
+
+
+.PHONY: configure-stage2-ld maybe-configure-stage2-ld
+.PHONY: all-stage2-ld maybe-all-stage2-ld
+.PHONY: clean-stage2-ld maybe-clean-stage2-ld
+
+maybe-configure-stage2-ld:
+maybe-all-stage2-ld:
+maybe-clean-stage2-ld:
+
+@if ld-bootstrap
+maybe-configure-stage2-ld: configure-stage2-ld
+configure-stage2-ld:
+       @$(MAKE) stage2-start
+       @[ -f ld/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 2 in ld ; \
+       cd ld || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/ld"; \
+           libsrcdir="$$s/ld";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/ld"; \
+           libsrcdir="$$s/ld";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage2-ld: all-stage2-ld
+all-stage2-ld: configure-stage2-ld
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage2-ld: clean-stage2-ld
+clean-stage2-ld:
+       @[ -f ld/Makefile ] || [ -f stage2-ld/Makefile ] \
+         || exit 0 ; \
+       [ -f ld/Makefile ] || $(MAKE) stage2-start ; \
+       cd ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif ld-bootstrap
+
+
+.PHONY: configure-stage2-libcpp maybe-configure-stage2-libcpp
+.PHONY: all-stage2-libcpp maybe-all-stage2-libcpp
+.PHONY: clean-stage2-libcpp maybe-clean-stage2-libcpp
+
+maybe-configure-stage2-libcpp:
+maybe-all-stage2-libcpp:
+maybe-clean-stage2-libcpp:
+
+@if libcpp-bootstrap
+maybe-configure-stage2-libcpp: configure-stage2-libcpp
+configure-stage2-libcpp:
+       @$(MAKE) stage2-start
+       @[ -f libcpp/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 2 in libcpp ; \
+       cd libcpp || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/libcpp"; \
+           libsrcdir="$$s/libcpp";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/libcpp"; \
+           libsrcdir="$$s/libcpp";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage2-libcpp: all-stage2-libcpp
+all-stage2-libcpp: configure-stage2-libcpp
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage2-libcpp: clean-stage2-libcpp
+clean-stage2-libcpp:
+       @[ -f libcpp/Makefile ] || [ -f stage2-libcpp/Makefile ] \
+         || exit 0 ; \
+       [ -f libcpp/Makefile ] || $(MAKE) stage2-start ; \
+       cd libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif libcpp-bootstrap
+
+
+.PHONY: configure-stage2-libiberty maybe-configure-stage2-libiberty
+.PHONY: all-stage2-libiberty maybe-all-stage2-libiberty
+.PHONY: clean-stage2-libiberty maybe-clean-stage2-libiberty
+
+maybe-configure-stage2-libiberty:
+maybe-all-stage2-libiberty:
+maybe-clean-stage2-libiberty:
+
+@if libiberty-bootstrap
+maybe-configure-stage2-libiberty: configure-stage2-libiberty
+configure-stage2-libiberty:
+       @$(MAKE) stage2-start
+       @[ -f libiberty/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 2 in libiberty ; \
+       cd libiberty || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/libiberty"; \
+           libsrcdir="$$s/libiberty";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/libiberty"; \
+           libsrcdir="$$s/libiberty";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage2-libiberty: all-stage2-libiberty
+all-stage2-libiberty: configure-stage2-libiberty
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage2-libiberty: clean-stage2-libiberty
+clean-stage2-libiberty:
+       @[ -f libiberty/Makefile ] || [ -f stage2-libiberty/Makefile ] \
+         || exit 0 ; \
+       [ -f libiberty/Makefile ] || $(MAKE) stage2-start ; \
+       cd libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif libiberty-bootstrap
+
+
+.PHONY: configure-stage2-zlib maybe-configure-stage2-zlib
+.PHONY: all-stage2-zlib maybe-all-stage2-zlib
+.PHONY: clean-stage2-zlib maybe-clean-stage2-zlib
+
+maybe-configure-stage2-zlib:
+maybe-all-stage2-zlib:
+maybe-clean-stage2-zlib:
+
+@if zlib-bootstrap
+maybe-configure-stage2-zlib: configure-stage2-zlib
+configure-stage2-zlib:
+       @$(MAKE) stage2-start
+       @[ -f zlib/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 2 in zlib ; \
+       cd zlib || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/zlib"; \
+           libsrcdir="$$s/zlib";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/zlib"; \
+           libsrcdir="$$s/zlib";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage2-zlib: all-stage2-zlib
+all-stage2-zlib: configure-stage2-zlib
+       @$(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage2-zlib: clean-stage2-zlib
+clean-stage2-zlib:
+       @[ -f zlib/Makefile ] || [ -f stage2-zlib/Makefile ] \
+         || exit 0 ; \
+       [ -f zlib/Makefile ] || $(MAKE) stage2-start ; \
+       cd zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif zlib-bootstrap
+
+
+
+# FIXME: Will not need to be conditional when toplevel bootstrap is the
+# only possibility, but now it conflicts with no-bootstrap rules
+@if gcc-bootstrap
+
+
+
+.PHONY: bootstrap2
+bootstrap2: stage2-bubble  all
+
+
+# Rules to wipe a stage and all the following ones, also used for cleanstrap
+distclean-stage1:: distclean-stage2 
+.PHONY: distclean-stage2
+distclean-stage2::
+       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+       rm -rf stage2-* 
+
+
+@endif gcc-bootstrap
+
+
+.PHONY: stage3-start stage3-end
+
+stage3-start::
+       @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
+       echo stage3 > stage_current ; \
+       echo stage3 > stage_last
+@if bfd
+       @[ -d stage3-bfd ] || mkdir stage3-bfd; \
+       set stage3-bfd bfd ; @CREATE_LINK_TO_DIR@  ; \
+       set stage2-bfd prev-bfd ; @CREATE_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @[ -d stage3-opcodes ] || mkdir stage3-opcodes; \
+       set stage3-opcodes opcodes ; @CREATE_LINK_TO_DIR@  ; \
+       set stage2-opcodes prev-opcodes ; @CREATE_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @[ -d stage3-binutils ] || mkdir stage3-binutils; \
+       set stage3-binutils binutils ; @CREATE_LINK_TO_DIR@  ; \
+       set stage2-binutils prev-binutils ; @CREATE_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @[ -d stage3-gas ] || mkdir stage3-gas; \
+       set stage3-gas gas ; @CREATE_LINK_TO_DIR@  ; \
+       set stage2-gas prev-gas ; @CREATE_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @[ -d stage3-gcc ] || mkdir stage3-gcc; \
+       set stage3-gcc gcc ; @CREATE_LINK_TO_DIR@  ; \
+       set stage2-gcc prev-gcc ; @CREATE_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @[ -d stage3-intl ] || mkdir stage3-intl; \
+       set stage3-intl intl ; @CREATE_LINK_TO_DIR@  ; \
+       set stage2-intl prev-intl ; @CREATE_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @[ -d stage3-ld ] || mkdir stage3-ld; \
+       set stage3-ld ld ; @CREATE_LINK_TO_DIR@  ; \
+       set stage2-ld prev-ld ; @CREATE_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @[ -d stage3-libcpp ] || mkdir stage3-libcpp; \
+       set stage3-libcpp libcpp ; @CREATE_LINK_TO_DIR@  ; \
+       set stage2-libcpp prev-libcpp ; @CREATE_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @[ -d stage3-libiberty ] || mkdir stage3-libiberty; \
+       set stage3-libiberty libiberty ; @CREATE_LINK_TO_DIR@  ; \
+       set stage2-libiberty prev-libiberty ; @CREATE_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @[ -d stage3-zlib ] || mkdir stage3-zlib; \
+       set stage3-zlib zlib ; @CREATE_LINK_TO_DIR@  ; \
+       set stage2-zlib prev-zlib ; @CREATE_LINK_TO_DIR@ 
+@endif zlib
+
+stage3-end::
+       @rm -f stage_current
+@if bfd
+       @set bfd stage3-bfd ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-bfd stage2-bfd ; @UNDO_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @set opcodes stage3-opcodes ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-opcodes stage2-opcodes ; @UNDO_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @set binutils stage3-binutils ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-binutils stage2-binutils ; @UNDO_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @set gas stage3-gas ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-gas stage2-gas ; @UNDO_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @set gcc stage3-gcc ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-gcc stage2-gcc ; @UNDO_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @set intl stage3-intl ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-intl stage2-intl ; @UNDO_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @set ld stage3-ld ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-ld stage2-ld ; @UNDO_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @set libcpp stage3-libcpp ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-libcpp stage2-libcpp ; @UNDO_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @set libiberty stage3-libiberty ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-libiberty stage2-libiberty ; @UNDO_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @set zlib stage3-zlib ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-zlib stage2-zlib ; @UNDO_LINK_TO_DIR@ 
+@endif zlib
+
+# Bubble a bugfix through all the stages up to stage 3.  They
+# are remade, but not reconfigured.  The next stage (if any) will not
+# be reconfigured as well.
+.PHONY: stage3-bubble
+stage3-bubble:: stage2-bubble
+       @bootstrap_lean@-rm -rf stage1-* ; $(STAMP) stage1-lean
+       @if test -f stage3-lean || test -f stage2-lean  ; then \
+         echo Skipping rebuild of stage3 ; \
+       else \
+         $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage3; \
+       fi
+
+.PHONY: all-stage3 clean-stage3
+all-stage3:     \
+  maybe-all-stage3-bfd \
+  maybe-all-stage3-opcodes \
+  maybe-all-stage3-binutils              \
+  maybe-all-stage3-gas \
+  maybe-all-stage3-gcc        \
+  maybe-all-stage3-intl   \
+  maybe-all-stage3-ld \
+  maybe-all-stage3-libcpp  \
+  maybe-all-stage3-libiberty                        \
+  maybe-all-stage3-zlib       
+
+do-clean: clean-stage3
+clean-stage3:     \
+  maybe-clean-stage3-bfd \
+  maybe-clean-stage3-opcodes \
+  maybe-clean-stage3-binutils              \
+  maybe-clean-stage3-gas \
+  maybe-clean-stage3-gcc        \
+  maybe-clean-stage3-intl   \
+  maybe-clean-stage3-ld \
+  maybe-clean-stage3-libcpp  \
+  maybe-clean-stage3-libiberty                        \
+  maybe-clean-stage3-zlib       
+
+
+.PHONY: configure-stage3-bfd maybe-configure-stage3-bfd
+.PHONY: all-stage3-bfd maybe-all-stage3-bfd
+.PHONY: clean-stage3-bfd maybe-clean-stage3-bfd
+
+maybe-configure-stage3-bfd:
+maybe-all-stage3-bfd:
+maybe-clean-stage3-bfd:
+
+@if bfd-bootstrap
+maybe-configure-stage3-bfd: configure-stage3-bfd
+configure-stage3-bfd:
+       @$(MAKE) stage3-start
+       @[ -f bfd/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 3 in bfd ; \
+       cd bfd || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/bfd"; \
+           libsrcdir="$$s/bfd";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/bfd"; \
+           libsrcdir="$$s/bfd";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage3-bfd: all-stage3-bfd
+all-stage3-bfd: configure-stage3-bfd
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage3-bfd: clean-stage3-bfd
+clean-stage3-bfd:
+       @[ -f bfd/Makefile ] || [ -f stage3-bfd/Makefile ] \
+         || exit 0 ; \
+       [ -f bfd/Makefile ] || $(MAKE) stage3-start ; \
+       cd bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif bfd-bootstrap
+
+
+.PHONY: configure-stage3-opcodes maybe-configure-stage3-opcodes
+.PHONY: all-stage3-opcodes maybe-all-stage3-opcodes
+.PHONY: clean-stage3-opcodes maybe-clean-stage3-opcodes
+
+maybe-configure-stage3-opcodes:
+maybe-all-stage3-opcodes:
+maybe-clean-stage3-opcodes:
+
+@if opcodes-bootstrap
+maybe-configure-stage3-opcodes: configure-stage3-opcodes
+configure-stage3-opcodes:
+       @$(MAKE) stage3-start
+       @[ -f opcodes/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 3 in opcodes ; \
+       cd opcodes || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/opcodes"; \
+           libsrcdir="$$s/opcodes";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/opcodes"; \
+           libsrcdir="$$s/opcodes";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage3-opcodes: all-stage3-opcodes
+all-stage3-opcodes: configure-stage3-opcodes
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage3-opcodes: clean-stage3-opcodes
+clean-stage3-opcodes:
+       @[ -f opcodes/Makefile ] || [ -f stage3-opcodes/Makefile ] \
+         || exit 0 ; \
+       [ -f opcodes/Makefile ] || $(MAKE) stage3-start ; \
+       cd opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif opcodes-bootstrap
+
+
+.PHONY: configure-stage3-binutils maybe-configure-stage3-binutils
+.PHONY: all-stage3-binutils maybe-all-stage3-binutils
+.PHONY: clean-stage3-binutils maybe-clean-stage3-binutils
+
+maybe-configure-stage3-binutils:
+maybe-all-stage3-binutils:
+maybe-clean-stage3-binutils:
+
+@if binutils-bootstrap
+maybe-configure-stage3-binutils: configure-stage3-binutils
+configure-stage3-binutils:
+       @$(MAKE) stage3-start
+       @[ -f binutils/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 3 in binutils ; \
+       cd binutils || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/binutils"; \
+           libsrcdir="$$s/binutils";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/binutils"; \
+           libsrcdir="$$s/binutils";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage3-binutils: all-stage3-binutils
+all-stage3-binutils: configure-stage3-binutils
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage3-binutils: clean-stage3-binutils
+clean-stage3-binutils:
+       @[ -f binutils/Makefile ] || [ -f stage3-binutils/Makefile ] \
+         || exit 0 ; \
+       [ -f binutils/Makefile ] || $(MAKE) stage3-start ; \
+       cd binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif binutils-bootstrap
+
+
+.PHONY: configure-stage3-gas maybe-configure-stage3-gas
+.PHONY: all-stage3-gas maybe-all-stage3-gas
+.PHONY: clean-stage3-gas maybe-clean-stage3-gas
+
+maybe-configure-stage3-gas:
+maybe-all-stage3-gas:
+maybe-clean-stage3-gas:
+
+@if gas-bootstrap
+maybe-configure-stage3-gas: configure-stage3-gas
+configure-stage3-gas:
+       @$(MAKE) stage3-start
+       @[ -f gas/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 3 in gas ; \
+       cd gas || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/gas"; \
+           libsrcdir="$$s/gas";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/gas"; \
+           libsrcdir="$$s/gas";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage3-gas: all-stage3-gas
+all-stage3-gas: configure-stage3-gas
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage3-gas: clean-stage3-gas
+clean-stage3-gas:
+       @[ -f gas/Makefile ] || [ -f stage3-gas/Makefile ] \
+         || exit 0 ; \
+       [ -f gas/Makefile ] || $(MAKE) stage3-start ; \
+       cd gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif gas-bootstrap
+
+
+.PHONY: configure-stage3-gcc maybe-configure-stage3-gcc
+.PHONY: all-stage3-gcc maybe-all-stage3-gcc
+.PHONY: clean-stage3-gcc maybe-clean-stage3-gcc
+
+maybe-configure-stage3-gcc:
+maybe-all-stage3-gcc:
+maybe-clean-stage3-gcc:
+
+@if gcc-bootstrap
+maybe-configure-stage3-gcc: configure-stage3-gcc
+configure-stage3-gcc:
+       @$(MAKE) stage3-start
+       @[ -f gcc/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 3 in gcc ; \
+       cd gcc || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/gcc"; \
+           libsrcdir="$$s/gcc";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/gcc"; \
+           libsrcdir="$$s/gcc";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage3-gcc: all-stage3-gcc
+all-stage3-gcc: configure-stage3-gcc
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                $(EXTRA_GCC_FLAGS)
+
+maybe-clean-stage3-gcc: clean-stage3-gcc
+clean-stage3-gcc:
+       @[ -f gcc/Makefile ] || [ -f stage3-gcc/Makefile ] \
+         || exit 0 ; \
+       [ -f gcc/Makefile ] || $(MAKE) stage3-start ; \
+       cd gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                $(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+.PHONY: configure-stage3-intl maybe-configure-stage3-intl
+.PHONY: all-stage3-intl maybe-all-stage3-intl
+.PHONY: clean-stage3-intl maybe-clean-stage3-intl
+
+maybe-configure-stage3-intl:
+maybe-all-stage3-intl:
+maybe-clean-stage3-intl:
+
+@if intl-bootstrap
+maybe-configure-stage3-intl: configure-stage3-intl
+configure-stage3-intl:
+       @$(MAKE) stage3-start
+       @[ -f intl/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 3 in intl ; \
+       cd intl || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/intl"; \
+           libsrcdir="$$s/intl";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/intl"; \
+           libsrcdir="$$s/intl";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage3-intl: all-stage3-intl
+all-stage3-intl: configure-stage3-intl
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage3-intl: clean-stage3-intl
+clean-stage3-intl:
+       @[ -f intl/Makefile ] || [ -f stage3-intl/Makefile ] \
+         || exit 0 ; \
+       [ -f intl/Makefile ] || $(MAKE) stage3-start ; \
+       cd intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif intl-bootstrap
+
+
+.PHONY: configure-stage3-ld maybe-configure-stage3-ld
+.PHONY: all-stage3-ld maybe-all-stage3-ld
+.PHONY: clean-stage3-ld maybe-clean-stage3-ld
+
+maybe-configure-stage3-ld:
+maybe-all-stage3-ld:
+maybe-clean-stage3-ld:
+
+@if ld-bootstrap
+maybe-configure-stage3-ld: configure-stage3-ld
+configure-stage3-ld:
+       @$(MAKE) stage3-start
+       @[ -f ld/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 3 in ld ; \
+       cd ld || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/ld"; \
+           libsrcdir="$$s/ld";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/ld"; \
+           libsrcdir="$$s/ld";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage3-ld: all-stage3-ld
+all-stage3-ld: configure-stage3-ld
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage3-ld: clean-stage3-ld
+clean-stage3-ld:
+       @[ -f ld/Makefile ] || [ -f stage3-ld/Makefile ] \
+         || exit 0 ; \
+       [ -f ld/Makefile ] || $(MAKE) stage3-start ; \
+       cd ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif ld-bootstrap
+
+
+.PHONY: configure-stage3-libcpp maybe-configure-stage3-libcpp
+.PHONY: all-stage3-libcpp maybe-all-stage3-libcpp
+.PHONY: clean-stage3-libcpp maybe-clean-stage3-libcpp
+
+maybe-configure-stage3-libcpp:
+maybe-all-stage3-libcpp:
+maybe-clean-stage3-libcpp:
+
+@if libcpp-bootstrap
+maybe-configure-stage3-libcpp: configure-stage3-libcpp
+configure-stage3-libcpp:
+       @$(MAKE) stage3-start
+       @[ -f libcpp/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 3 in libcpp ; \
+       cd libcpp || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/libcpp"; \
+           libsrcdir="$$s/libcpp";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/libcpp"; \
+           libsrcdir="$$s/libcpp";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage3-libcpp: all-stage3-libcpp
+all-stage3-libcpp: configure-stage3-libcpp
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage3-libcpp: clean-stage3-libcpp
+clean-stage3-libcpp:
+       @[ -f libcpp/Makefile ] || [ -f stage3-libcpp/Makefile ] \
+         || exit 0 ; \
+       [ -f libcpp/Makefile ] || $(MAKE) stage3-start ; \
+       cd libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif libcpp-bootstrap
+
+
+.PHONY: configure-stage3-libiberty maybe-configure-stage3-libiberty
+.PHONY: all-stage3-libiberty maybe-all-stage3-libiberty
+.PHONY: clean-stage3-libiberty maybe-clean-stage3-libiberty
+
+maybe-configure-stage3-libiberty:
+maybe-all-stage3-libiberty:
+maybe-clean-stage3-libiberty:
+
+@if libiberty-bootstrap
+maybe-configure-stage3-libiberty: configure-stage3-libiberty
+configure-stage3-libiberty:
+       @$(MAKE) stage3-start
+       @[ -f libiberty/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 3 in libiberty ; \
+       cd libiberty || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/libiberty"; \
+           libsrcdir="$$s/libiberty";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/libiberty"; \
+           libsrcdir="$$s/libiberty";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage3-libiberty: all-stage3-libiberty
+all-stage3-libiberty: configure-stage3-libiberty
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage3-libiberty: clean-stage3-libiberty
+clean-stage3-libiberty:
+       @[ -f libiberty/Makefile ] || [ -f stage3-libiberty/Makefile ] \
+         || exit 0 ; \
+       [ -f libiberty/Makefile ] || $(MAKE) stage3-start ; \
+       cd libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif libiberty-bootstrap
+
+
+.PHONY: configure-stage3-zlib maybe-configure-stage3-zlib
+.PHONY: all-stage3-zlib maybe-all-stage3-zlib
+.PHONY: clean-stage3-zlib maybe-clean-stage3-zlib
+
+maybe-configure-stage3-zlib:
+maybe-all-stage3-zlib:
+maybe-clean-stage3-zlib:
+
+@if zlib-bootstrap
+maybe-configure-stage3-zlib: configure-stage3-zlib
+configure-stage3-zlib:
+       @$(MAKE) stage3-start
+       @[ -f zlib/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 3 in zlib ; \
+       cd zlib || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/zlib"; \
+           libsrcdir="$$s/zlib";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/zlib"; \
+           libsrcdir="$$s/zlib";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage3-zlib: all-stage3-zlib
+all-stage3-zlib: configure-stage3-zlib
+       @$(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage3-zlib: clean-stage3-zlib
+clean-stage3-zlib:
+       @[ -f zlib/Makefile ] || [ -f stage3-zlib/Makefile ] \
+         || exit 0 ; \
+       [ -f zlib/Makefile ] || $(MAKE) stage3-start ; \
+       cd zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif zlib-bootstrap
+
+
+
+# FIXME: Will not need to be conditional when toplevel bootstrap is the
+# only possibility, but now it conflicts with no-bootstrap rules
+@if gcc-bootstrap
+
+compare:
+       @if test -f stage2-lean; then \
+         echo Cannot compare object files as stage 2 was deleted. ; \
+         exit 0 ; \
+       fi; \
+       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       rm -f .bad_compare ; \
+       cd stage3-gcc; \
+       files=`find . -name "*$(objext)" -print` ; \
+       cd .. ; \
+       for file in $${files} ; do \
+         f1=$$r/stage2-gcc/$$file; f2=$$r/stage3-gcc/$$file; \
+         @do_compare@ > /dev/null 2>&1; \
+         test $$? -eq 1 && echo $$file differs >> .bad_compare || true; \
+       done ; \
+       if [ -f .bad_compare ]; then \
+         echo "Bootstrap comparison failure!"; \
+         cat .bad_compare; \
+         exit 1; \
+       else \
+         true; \
+       fi ; \
+       $(STAMP) compare
+       @bootstrap_lean@-rm -rf stage2-* ; $(STAMP) stage2-lean
+
+
+
+.PHONY: bootstrap
+bootstrap: stage3-bubble compare all
+
+
+# Rules to wipe a stage and all the following ones, also used for cleanstrap
+distclean-stage2:: distclean-stage3 
+.PHONY: distclean-stage3
+distclean-stage3::
+       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+       rm -rf stage3-* compare 
+
+
+.PHONY: cleanstrap
+cleanstrap: distclean bootstrap
+
+@endif gcc-bootstrap
+
+
+.PHONY: stage4-start stage4-end
+
+stage4-start::
+       @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
+       echo stage4 > stage_current ; \
+       echo stage4 > stage_last
+@if bfd
+       @[ -d stage4-bfd ] || mkdir stage4-bfd; \
+       set stage4-bfd bfd ; @CREATE_LINK_TO_DIR@  ; \
+       set stage3-bfd prev-bfd ; @CREATE_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @[ -d stage4-opcodes ] || mkdir stage4-opcodes; \
+       set stage4-opcodes opcodes ; @CREATE_LINK_TO_DIR@  ; \
+       set stage3-opcodes prev-opcodes ; @CREATE_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @[ -d stage4-binutils ] || mkdir stage4-binutils; \
+       set stage4-binutils binutils ; @CREATE_LINK_TO_DIR@  ; \
+       set stage3-binutils prev-binutils ; @CREATE_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @[ -d stage4-gas ] || mkdir stage4-gas; \
+       set stage4-gas gas ; @CREATE_LINK_TO_DIR@  ; \
+       set stage3-gas prev-gas ; @CREATE_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @[ -d stage4-gcc ] || mkdir stage4-gcc; \
+       set stage4-gcc gcc ; @CREATE_LINK_TO_DIR@  ; \
+       set stage3-gcc prev-gcc ; @CREATE_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @[ -d stage4-intl ] || mkdir stage4-intl; \
+       set stage4-intl intl ; @CREATE_LINK_TO_DIR@  ; \
+       set stage3-intl prev-intl ; @CREATE_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @[ -d stage4-ld ] || mkdir stage4-ld; \
+       set stage4-ld ld ; @CREATE_LINK_TO_DIR@  ; \
+       set stage3-ld prev-ld ; @CREATE_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @[ -d stage4-libcpp ] || mkdir stage4-libcpp; \
+       set stage4-libcpp libcpp ; @CREATE_LINK_TO_DIR@  ; \
+       set stage3-libcpp prev-libcpp ; @CREATE_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @[ -d stage4-libiberty ] || mkdir stage4-libiberty; \
+       set stage4-libiberty libiberty ; @CREATE_LINK_TO_DIR@  ; \
+       set stage3-libiberty prev-libiberty ; @CREATE_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @[ -d stage4-zlib ] || mkdir stage4-zlib; \
+       set stage4-zlib zlib ; @CREATE_LINK_TO_DIR@  ; \
+       set stage3-zlib prev-zlib ; @CREATE_LINK_TO_DIR@ 
+@endif zlib
+
+stage4-end::
+       @rm -f stage_current
+@if bfd
+       @set bfd stage4-bfd ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-bfd stage3-bfd ; @UNDO_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @set opcodes stage4-opcodes ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-opcodes stage3-opcodes ; @UNDO_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @set binutils stage4-binutils ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-binutils stage3-binutils ; @UNDO_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @set gas stage4-gas ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-gas stage3-gas ; @UNDO_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @set gcc stage4-gcc ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-gcc stage3-gcc ; @UNDO_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @set intl stage4-intl ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-intl stage3-intl ; @UNDO_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @set ld stage4-ld ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-ld stage3-ld ; @UNDO_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @set libcpp stage4-libcpp ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-libcpp stage3-libcpp ; @UNDO_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @set libiberty stage4-libiberty ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-libiberty stage3-libiberty ; @UNDO_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @set zlib stage4-zlib ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-zlib stage3-zlib ; @UNDO_LINK_TO_DIR@ 
+@endif zlib
+
+# Bubble a bugfix through all the stages up to stage 4.  They
+# are remade, but not reconfigured.  The next stage (if any) will not
+# be reconfigured as well.
+.PHONY: stage4-bubble
+stage4-bubble:: stage3-bubble
+       @bootstrap_lean@-rm -rf stage2-* ; $(STAMP) stage2-lean
+       @if test -f stage4-lean || test -f stage3-lean  ; then \
+         echo Skipping rebuild of stage4 ; \
+       else \
+         $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage4; \
+       fi
+
+.PHONY: all-stage4 clean-stage4
+all-stage4:     \
+  maybe-all-stage4-bfd \
+  maybe-all-stage4-opcodes \
+  maybe-all-stage4-binutils              \
+  maybe-all-stage4-gas \
+  maybe-all-stage4-gcc        \
+  maybe-all-stage4-intl   \
+  maybe-all-stage4-ld \
+  maybe-all-stage4-libcpp  \
+  maybe-all-stage4-libiberty                        \
+  maybe-all-stage4-zlib       
+
+do-clean: clean-stage4
+clean-stage4:     \
+  maybe-clean-stage4-bfd \
+  maybe-clean-stage4-opcodes \
+  maybe-clean-stage4-binutils              \
+  maybe-clean-stage4-gas \
+  maybe-clean-stage4-gcc        \
+  maybe-clean-stage4-intl   \
+  maybe-clean-stage4-ld \
+  maybe-clean-stage4-libcpp  \
+  maybe-clean-stage4-libiberty                        \
+  maybe-clean-stage4-zlib       
+
+
+.PHONY: configure-stage4-bfd maybe-configure-stage4-bfd
+.PHONY: all-stage4-bfd maybe-all-stage4-bfd
+.PHONY: clean-stage4-bfd maybe-clean-stage4-bfd
+
+maybe-configure-stage4-bfd:
+maybe-all-stage4-bfd:
+maybe-clean-stage4-bfd:
+
+@if bfd-bootstrap
+maybe-configure-stage4-bfd: configure-stage4-bfd
+configure-stage4-bfd:
+       @$(MAKE) stage4-start
+       @[ -f bfd/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 4 in bfd ; \
+       cd bfd || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/bfd"; \
+           libsrcdir="$$s/bfd";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/bfd"; \
+           libsrcdir="$$s/bfd";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage4-bfd: all-stage4-bfd
+all-stage4-bfd: configure-stage4-bfd
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage4-bfd: clean-stage4-bfd
+clean-stage4-bfd:
+       @[ -f bfd/Makefile ] || [ -f stage4-bfd/Makefile ] \
+         || exit 0 ; \
+       [ -f bfd/Makefile ] || $(MAKE) stage4-start ; \
+       cd bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif bfd-bootstrap
+
+
+.PHONY: configure-stage4-opcodes maybe-configure-stage4-opcodes
+.PHONY: all-stage4-opcodes maybe-all-stage4-opcodes
+.PHONY: clean-stage4-opcodes maybe-clean-stage4-opcodes
+
+maybe-configure-stage4-opcodes:
+maybe-all-stage4-opcodes:
+maybe-clean-stage4-opcodes:
+
+@if opcodes-bootstrap
+maybe-configure-stage4-opcodes: configure-stage4-opcodes
+configure-stage4-opcodes:
+       @$(MAKE) stage4-start
+       @[ -f opcodes/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 4 in opcodes ; \
+       cd opcodes || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/opcodes"; \
+           libsrcdir="$$s/opcodes";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/opcodes"; \
+           libsrcdir="$$s/opcodes";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage4-opcodes: all-stage4-opcodes
+all-stage4-opcodes: configure-stage4-opcodes
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage4-opcodes: clean-stage4-opcodes
+clean-stage4-opcodes:
+       @[ -f opcodes/Makefile ] || [ -f stage4-opcodes/Makefile ] \
+         || exit 0 ; \
+       [ -f opcodes/Makefile ] || $(MAKE) stage4-start ; \
+       cd opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif opcodes-bootstrap
+
+
+.PHONY: configure-stage4-binutils maybe-configure-stage4-binutils
+.PHONY: all-stage4-binutils maybe-all-stage4-binutils
+.PHONY: clean-stage4-binutils maybe-clean-stage4-binutils
+
+maybe-configure-stage4-binutils:
+maybe-all-stage4-binutils:
+maybe-clean-stage4-binutils:
+
+@if binutils-bootstrap
+maybe-configure-stage4-binutils: configure-stage4-binutils
+configure-stage4-binutils:
+       @$(MAKE) stage4-start
+       @[ -f binutils/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 4 in binutils ; \
+       cd binutils || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/binutils"; \
+           libsrcdir="$$s/binutils";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/binutils"; \
+           libsrcdir="$$s/binutils";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage4-binutils: all-stage4-binutils
+all-stage4-binutils: configure-stage4-binutils
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage4-binutils: clean-stage4-binutils
+clean-stage4-binutils:
+       @[ -f binutils/Makefile ] || [ -f stage4-binutils/Makefile ] \
+         || exit 0 ; \
+       [ -f binutils/Makefile ] || $(MAKE) stage4-start ; \
+       cd binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif binutils-bootstrap
+
+
+.PHONY: configure-stage4-gas maybe-configure-stage4-gas
+.PHONY: all-stage4-gas maybe-all-stage4-gas
+.PHONY: clean-stage4-gas maybe-clean-stage4-gas
+
+maybe-configure-stage4-gas:
+maybe-all-stage4-gas:
+maybe-clean-stage4-gas:
+
+@if gas-bootstrap
+maybe-configure-stage4-gas: configure-stage4-gas
+configure-stage4-gas:
+       @$(MAKE) stage4-start
+       @[ -f gas/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 4 in gas ; \
+       cd gas || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/gas"; \
+           libsrcdir="$$s/gas";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/gas"; \
+           libsrcdir="$$s/gas";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage4-gas: all-stage4-gas
+all-stage4-gas: configure-stage4-gas
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage4-gas: clean-stage4-gas
+clean-stage4-gas:
+       @[ -f gas/Makefile ] || [ -f stage4-gas/Makefile ] \
+         || exit 0 ; \
+       [ -f gas/Makefile ] || $(MAKE) stage4-start ; \
+       cd gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif gas-bootstrap
+
+
+.PHONY: configure-stage4-gcc maybe-configure-stage4-gcc
+.PHONY: all-stage4-gcc maybe-all-stage4-gcc
+.PHONY: clean-stage4-gcc maybe-clean-stage4-gcc
+
+maybe-configure-stage4-gcc:
+maybe-all-stage4-gcc:
+maybe-clean-stage4-gcc:
+
+@if gcc-bootstrap
+maybe-configure-stage4-gcc: configure-stage4-gcc
+configure-stage4-gcc:
+       @$(MAKE) stage4-start
+       @[ -f gcc/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 4 in gcc ; \
+       cd gcc || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/gcc"; \
+           libsrcdir="$$s/gcc";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/gcc"; \
+           libsrcdir="$$s/gcc";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage4-gcc: all-stage4-gcc
+all-stage4-gcc: configure-stage4-gcc
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                $(EXTRA_GCC_FLAGS)
+
+maybe-clean-stage4-gcc: clean-stage4-gcc
+clean-stage4-gcc:
+       @[ -f gcc/Makefile ] || [ -f stage4-gcc/Makefile ] \
+         || exit 0 ; \
+       [ -f gcc/Makefile ] || $(MAKE) stage4-start ; \
+       cd gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                $(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+.PHONY: configure-stage4-intl maybe-configure-stage4-intl
+.PHONY: all-stage4-intl maybe-all-stage4-intl
+.PHONY: clean-stage4-intl maybe-clean-stage4-intl
+
+maybe-configure-stage4-intl:
+maybe-all-stage4-intl:
+maybe-clean-stage4-intl:
+
+@if intl-bootstrap
+maybe-configure-stage4-intl: configure-stage4-intl
+configure-stage4-intl:
+       @$(MAKE) stage4-start
+       @[ -f intl/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 4 in intl ; \
+       cd intl || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/intl"; \
+           libsrcdir="$$s/intl";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/intl"; \
+           libsrcdir="$$s/intl";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage4-intl: all-stage4-intl
+all-stage4-intl: configure-stage4-intl
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage4-intl: clean-stage4-intl
+clean-stage4-intl:
+       @[ -f intl/Makefile ] || [ -f stage4-intl/Makefile ] \
+         || exit 0 ; \
+       [ -f intl/Makefile ] || $(MAKE) stage4-start ; \
+       cd intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif intl-bootstrap
+
+
+.PHONY: configure-stage4-ld maybe-configure-stage4-ld
+.PHONY: all-stage4-ld maybe-all-stage4-ld
+.PHONY: clean-stage4-ld maybe-clean-stage4-ld
+
+maybe-configure-stage4-ld:
+maybe-all-stage4-ld:
+maybe-clean-stage4-ld:
+
+@if ld-bootstrap
+maybe-configure-stage4-ld: configure-stage4-ld
+configure-stage4-ld:
+       @$(MAKE) stage4-start
+       @[ -f ld/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 4 in ld ; \
+       cd ld || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/ld"; \
+           libsrcdir="$$s/ld";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/ld"; \
+           libsrcdir="$$s/ld";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage4-ld: all-stage4-ld
+all-stage4-ld: configure-stage4-ld
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage4-ld: clean-stage4-ld
+clean-stage4-ld:
+       @[ -f ld/Makefile ] || [ -f stage4-ld/Makefile ] \
+         || exit 0 ; \
+       [ -f ld/Makefile ] || $(MAKE) stage4-start ; \
+       cd ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif ld-bootstrap
+
+
+.PHONY: configure-stage4-libcpp maybe-configure-stage4-libcpp
+.PHONY: all-stage4-libcpp maybe-all-stage4-libcpp
+.PHONY: clean-stage4-libcpp maybe-clean-stage4-libcpp
+
+maybe-configure-stage4-libcpp:
+maybe-all-stage4-libcpp:
+maybe-clean-stage4-libcpp:
+
+@if libcpp-bootstrap
+maybe-configure-stage4-libcpp: configure-stage4-libcpp
+configure-stage4-libcpp:
+       @$(MAKE) stage4-start
+       @[ -f libcpp/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 4 in libcpp ; \
+       cd libcpp || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/libcpp"; \
+           libsrcdir="$$s/libcpp";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/libcpp"; \
+           libsrcdir="$$s/libcpp";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage4-libcpp: all-stage4-libcpp
+all-stage4-libcpp: configure-stage4-libcpp
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage4-libcpp: clean-stage4-libcpp
+clean-stage4-libcpp:
+       @[ -f libcpp/Makefile ] || [ -f stage4-libcpp/Makefile ] \
+         || exit 0 ; \
+       [ -f libcpp/Makefile ] || $(MAKE) stage4-start ; \
+       cd libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif libcpp-bootstrap
+
+
+.PHONY: configure-stage4-libiberty maybe-configure-stage4-libiberty
+.PHONY: all-stage4-libiberty maybe-all-stage4-libiberty
+.PHONY: clean-stage4-libiberty maybe-clean-stage4-libiberty
+
+maybe-configure-stage4-libiberty:
+maybe-all-stage4-libiberty:
+maybe-clean-stage4-libiberty:
+
+@if libiberty-bootstrap
+maybe-configure-stage4-libiberty: configure-stage4-libiberty
+configure-stage4-libiberty:
+       @$(MAKE) stage4-start
+       @[ -f libiberty/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 4 in libiberty ; \
+       cd libiberty || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/libiberty"; \
+           libsrcdir="$$s/libiberty";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/libiberty"; \
+           libsrcdir="$$s/libiberty";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage4-libiberty: all-stage4-libiberty
+all-stage4-libiberty: configure-stage4-libiberty
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage4-libiberty: clean-stage4-libiberty
+clean-stage4-libiberty:
+       @[ -f libiberty/Makefile ] || [ -f stage4-libiberty/Makefile ] \
+         || exit 0 ; \
+       [ -f libiberty/Makefile ] || $(MAKE) stage4-start ; \
+       cd libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif libiberty-bootstrap
+
+
+.PHONY: configure-stage4-zlib maybe-configure-stage4-zlib
+.PHONY: all-stage4-zlib maybe-all-stage4-zlib
+.PHONY: clean-stage4-zlib maybe-clean-stage4-zlib
+
+maybe-configure-stage4-zlib:
+maybe-all-stage4-zlib:
+maybe-clean-stage4-zlib:
+
+@if zlib-bootstrap
+maybe-configure-stage4-zlib: configure-stage4-zlib
+configure-stage4-zlib:
+       @$(MAKE) stage4-start
+       @[ -f zlib/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage 4 in zlib ; \
+       cd zlib || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/zlib"; \
+           libsrcdir="$$s/zlib";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/zlib"; \
+           libsrcdir="$$s/zlib";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stage4-zlib: all-stage4-zlib
+all-stage4-zlib: configure-stage4-zlib
+       @$(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                
+
+maybe-clean-stage4-zlib: clean-stage4-zlib
+clean-stage4-zlib:
+       @[ -f zlib/Makefile ] || [ -f stage4-zlib/Makefile ] \
+         || exit 0 ; \
+       [ -f zlib/Makefile ] || $(MAKE) stage4-start ; \
+       cd zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                 clean
+@endif zlib-bootstrap
+
+
+
+# FIXME: Will not need to be conditional when toplevel bootstrap is the
+# only possibility, but now it conflicts with no-bootstrap rules
+@if gcc-bootstrap
+
+compare3:
+       @if test -f stage3-lean; then \
+         echo Cannot compare object files as stage 3 was deleted. ; \
+         exit 0 ; \
+       fi; \
+       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       rm -f .bad_compare ; \
+       cd stage4-gcc; \
+       files=`find . -name "*$(objext)" -print` ; \
+       cd .. ; \
+       for file in $${files} ; do \
+         f1=$$r/stage3-gcc/$$file; f2=$$r/stage4-gcc/$$file; \
+         @do_compare@ > /dev/null 2>&1; \
+         test $$? -eq 1 && echo $$file differs >> .bad_compare || true; \
+       done ; \
+       if [ -f .bad_compare ]; then \
+         echo "Bootstrap comparison failure!"; \
+         cat .bad_compare; \
+         exit 1; \
+       else \
+         true; \
+       fi ; \
+       $(STAMP) compare3
+       @bootstrap_lean@-rm -rf stage3-* ; $(STAMP) stage3-lean
+
+
+
+.PHONY: bootstrap4
+bootstrap4: stage4-bubble compare3 all
+
+
+# Rules to wipe a stage and all the following ones, also used for cleanstrap
+distclean-stage3:: distclean-stage4 
+.PHONY: distclean-stage4
+distclean-stage4::
+       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+       rm -rf stage4-* compare3 
+
+
+@endif gcc-bootstrap
+
+
+.PHONY: stageprofile-start stageprofile-end
+
+stageprofile-start::
+       @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
+       echo stageprofile > stage_current ; \
+       echo stageprofile > stage_last
+@if bfd
+       @[ -d stageprofile-bfd ] || mkdir stageprofile-bfd; \
+       set stageprofile-bfd bfd ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-bfd prev-bfd ; @CREATE_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @[ -d stageprofile-opcodes ] || mkdir stageprofile-opcodes; \
+       set stageprofile-opcodes opcodes ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-opcodes prev-opcodes ; @CREATE_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @[ -d stageprofile-binutils ] || mkdir stageprofile-binutils; \
+       set stageprofile-binutils binutils ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-binutils prev-binutils ; @CREATE_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @[ -d stageprofile-gas ] || mkdir stageprofile-gas; \
+       set stageprofile-gas gas ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-gas prev-gas ; @CREATE_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @[ -d stageprofile-gcc ] || mkdir stageprofile-gcc; \
+       set stageprofile-gcc gcc ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-gcc prev-gcc ; @CREATE_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @[ -d stageprofile-intl ] || mkdir stageprofile-intl; \
+       set stageprofile-intl intl ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-intl prev-intl ; @CREATE_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @[ -d stageprofile-ld ] || mkdir stageprofile-ld; \
+       set stageprofile-ld ld ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-ld prev-ld ; @CREATE_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @[ -d stageprofile-libcpp ] || mkdir stageprofile-libcpp; \
+       set stageprofile-libcpp libcpp ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-libcpp prev-libcpp ; @CREATE_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @[ -d stageprofile-libiberty ] || mkdir stageprofile-libiberty; \
+       set stageprofile-libiberty libiberty ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-libiberty prev-libiberty ; @CREATE_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @[ -d stageprofile-zlib ] || mkdir stageprofile-zlib; \
+       set stageprofile-zlib zlib ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-zlib prev-zlib ; @CREATE_LINK_TO_DIR@ 
+@endif zlib
+
+stageprofile-end::
+       @rm -f stage_current
+@if bfd
+       @set bfd stageprofile-bfd ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-bfd stage1-bfd ; @UNDO_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @set opcodes stageprofile-opcodes ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-opcodes stage1-opcodes ; @UNDO_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @set binutils stageprofile-binutils ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-binutils stage1-binutils ; @UNDO_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @set gas stageprofile-gas ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-gas stage1-gas ; @UNDO_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @set gcc stageprofile-gcc ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-gcc stage1-gcc ; @UNDO_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @set intl stageprofile-intl ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-intl stage1-intl ; @UNDO_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @set ld stageprofile-ld ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-ld stage1-ld ; @UNDO_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @set libcpp stageprofile-libcpp ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-libcpp stage1-libcpp ; @UNDO_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @set libiberty stageprofile-libiberty ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-libiberty stage1-libiberty ; @UNDO_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @set zlib stageprofile-zlib ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-zlib stage1-zlib ; @UNDO_LINK_TO_DIR@ 
+@endif zlib
+
+# Bubble a bugfix through all the stages up to stage profile.  They
+# are remade, but not reconfigured.  The next stage (if any) will not
+# be reconfigured as well.
+.PHONY: stageprofile-bubble
+stageprofile-bubble:: stage1-bubble
+       @if test -f stageprofile-lean || test -f stage1-lean  ; then \
+         echo Skipping rebuild of stageprofile ; \
+       else \
+         $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stageprofile; \
+       fi
+
+.PHONY: all-stageprofile clean-stageprofile
+all-stageprofile:     \
+  maybe-all-stageprofile-bfd \
+  maybe-all-stageprofile-opcodes \
+  maybe-all-stageprofile-binutils              \
+  maybe-all-stageprofile-gas \
+  maybe-all-stageprofile-gcc        \
+  maybe-all-stageprofile-intl   \
+  maybe-all-stageprofile-ld \
+  maybe-all-stageprofile-libcpp  \
+  maybe-all-stageprofile-libiberty                        \
+  maybe-all-stageprofile-zlib       
+
+do-clean: clean-stageprofile
+clean-stageprofile:     \
+  maybe-clean-stageprofile-bfd \
+  maybe-clean-stageprofile-opcodes \
+  maybe-clean-stageprofile-binutils              \
+  maybe-clean-stageprofile-gas \
+  maybe-clean-stageprofile-gcc        \
+  maybe-clean-stageprofile-intl   \
+  maybe-clean-stageprofile-ld \
+  maybe-clean-stageprofile-libcpp  \
+  maybe-clean-stageprofile-libiberty                        \
+  maybe-clean-stageprofile-zlib       
+
+
+.PHONY: configure-stageprofile-bfd maybe-configure-stageprofile-bfd
+.PHONY: all-stageprofile-bfd maybe-all-stageprofile-bfd
+.PHONY: clean-stageprofile-bfd maybe-clean-stageprofile-bfd
+
+maybe-configure-stageprofile-bfd:
+maybe-all-stageprofile-bfd:
+maybe-clean-stageprofile-bfd:
+
+@if bfd-bootstrap
+maybe-configure-stageprofile-bfd: configure-stageprofile-bfd
+configure-stageprofile-bfd:
+       @$(MAKE) stageprofile-start
+       @[ -f bfd/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage profile in bfd ; \
+       cd bfd || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/bfd"; \
+           libsrcdir="$$s/bfd";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/bfd"; \
+           libsrcdir="$$s/bfd";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stageprofile-bfd: all-stageprofile-bfd
+all-stageprofile-bfd: configure-stageprofile-bfd
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-bfd: clean-stageprofile-bfd
+clean-stageprofile-bfd:
+       @[ -f bfd/Makefile ] || [ -f stageprofile-bfd/Makefile ] \
+         || exit 0 ; \
+       [ -f bfd/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif bfd-bootstrap
+
+
+.PHONY: configure-stageprofile-opcodes maybe-configure-stageprofile-opcodes
+.PHONY: all-stageprofile-opcodes maybe-all-stageprofile-opcodes
+.PHONY: clean-stageprofile-opcodes maybe-clean-stageprofile-opcodes
+
+maybe-configure-stageprofile-opcodes:
+maybe-all-stageprofile-opcodes:
+maybe-clean-stageprofile-opcodes:
+
+@if opcodes-bootstrap
+maybe-configure-stageprofile-opcodes: configure-stageprofile-opcodes
+configure-stageprofile-opcodes:
+       @$(MAKE) stageprofile-start
+       @[ -f opcodes/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage profile in opcodes ; \
+       cd opcodes || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/opcodes"; \
+           libsrcdir="$$s/opcodes";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/opcodes"; \
+           libsrcdir="$$s/opcodes";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stageprofile-opcodes: all-stageprofile-opcodes
+all-stageprofile-opcodes: configure-stageprofile-opcodes
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-opcodes: clean-stageprofile-opcodes
+clean-stageprofile-opcodes:
+       @[ -f opcodes/Makefile ] || [ -f stageprofile-opcodes/Makefile ] \
+         || exit 0 ; \
+       [ -f opcodes/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif opcodes-bootstrap
+
+
+.PHONY: configure-stageprofile-binutils maybe-configure-stageprofile-binutils
+.PHONY: all-stageprofile-binutils maybe-all-stageprofile-binutils
+.PHONY: clean-stageprofile-binutils maybe-clean-stageprofile-binutils
+
+maybe-configure-stageprofile-binutils:
+maybe-all-stageprofile-binutils:
+maybe-clean-stageprofile-binutils:
+
+@if binutils-bootstrap
+maybe-configure-stageprofile-binutils: configure-stageprofile-binutils
+configure-stageprofile-binutils:
+       @$(MAKE) stageprofile-start
+       @[ -f binutils/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage profile in binutils ; \
+       cd binutils || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/binutils"; \
+           libsrcdir="$$s/binutils";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/binutils"; \
+           libsrcdir="$$s/binutils";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stageprofile-binutils: all-stageprofile-binutils
+all-stageprofile-binutils: configure-stageprofile-binutils
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-binutils: clean-stageprofile-binutils
+clean-stageprofile-binutils:
+       @[ -f binutils/Makefile ] || [ -f stageprofile-binutils/Makefile ] \
+         || exit 0 ; \
+       [ -f binutils/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif binutils-bootstrap
+
+
+.PHONY: configure-stageprofile-gas maybe-configure-stageprofile-gas
+.PHONY: all-stageprofile-gas maybe-all-stageprofile-gas
+.PHONY: clean-stageprofile-gas maybe-clean-stageprofile-gas
+
+maybe-configure-stageprofile-gas:
+maybe-all-stageprofile-gas:
+maybe-clean-stageprofile-gas:
+
+@if gas-bootstrap
+maybe-configure-stageprofile-gas: configure-stageprofile-gas
+configure-stageprofile-gas:
+       @$(MAKE) stageprofile-start
+       @[ -f gas/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage profile in gas ; \
+       cd gas || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/gas"; \
+           libsrcdir="$$s/gas";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/gas"; \
+           libsrcdir="$$s/gas";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stageprofile-gas: all-stageprofile-gas
+all-stageprofile-gas: configure-stageprofile-gas
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-gas: clean-stageprofile-gas
+clean-stageprofile-gas:
+       @[ -f gas/Makefile ] || [ -f stageprofile-gas/Makefile ] \
+         || exit 0 ; \
+       [ -f gas/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif gas-bootstrap
+
+
+.PHONY: configure-stageprofile-gcc maybe-configure-stageprofile-gcc
+.PHONY: all-stageprofile-gcc maybe-all-stageprofile-gcc
+.PHONY: clean-stageprofile-gcc maybe-clean-stageprofile-gcc
+
+maybe-configure-stageprofile-gcc:
+maybe-all-stageprofile-gcc:
+maybe-clean-stageprofile-gcc:
+
+@if gcc-bootstrap
+maybe-configure-stageprofile-gcc: configure-stageprofile-gcc
+configure-stageprofile-gcc:
+       @$(MAKE) stageprofile-start
+       @[ -f gcc/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage profile in gcc ; \
+       cd gcc || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/gcc"; \
+           libsrcdir="$$s/gcc";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/gcc"; \
+           libsrcdir="$$s/gcc";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stageprofile-gcc: all-stageprofile-gcc
+all-stageprofile-gcc: configure-stageprofile-gcc
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" $(EXTRA_GCC_FLAGS)
+
+maybe-clean-stageprofile-gcc: clean-stageprofile-gcc
+clean-stageprofile-gcc:
+       @[ -f gcc/Makefile ] || [ -f stageprofile-gcc/Makefile ] \
+         || exit 0 ; \
+       [ -f gcc/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" $(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+.PHONY: configure-stageprofile-intl maybe-configure-stageprofile-intl
+.PHONY: all-stageprofile-intl maybe-all-stageprofile-intl
+.PHONY: clean-stageprofile-intl maybe-clean-stageprofile-intl
+
+maybe-configure-stageprofile-intl:
+maybe-all-stageprofile-intl:
+maybe-clean-stageprofile-intl:
+
+@if intl-bootstrap
+maybe-configure-stageprofile-intl: configure-stageprofile-intl
+configure-stageprofile-intl:
+       @$(MAKE) stageprofile-start
+       @[ -f intl/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage profile in intl ; \
+       cd intl || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/intl"; \
+           libsrcdir="$$s/intl";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/intl"; \
+           libsrcdir="$$s/intl";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stageprofile-intl: all-stageprofile-intl
+all-stageprofile-intl: configure-stageprofile-intl
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-intl: clean-stageprofile-intl
+clean-stageprofile-intl:
+       @[ -f intl/Makefile ] || [ -f stageprofile-intl/Makefile ] \
+         || exit 0 ; \
+       [ -f intl/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif intl-bootstrap
+
+
+.PHONY: configure-stageprofile-ld maybe-configure-stageprofile-ld
+.PHONY: all-stageprofile-ld maybe-all-stageprofile-ld
+.PHONY: clean-stageprofile-ld maybe-clean-stageprofile-ld
+
+maybe-configure-stageprofile-ld:
+maybe-all-stageprofile-ld:
+maybe-clean-stageprofile-ld:
+
+@if ld-bootstrap
+maybe-configure-stageprofile-ld: configure-stageprofile-ld
+configure-stageprofile-ld:
+       @$(MAKE) stageprofile-start
+       @[ -f ld/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage profile in ld ; \
+       cd ld || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/ld"; \
+           libsrcdir="$$s/ld";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/ld"; \
+           libsrcdir="$$s/ld";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stageprofile-ld: all-stageprofile-ld
+all-stageprofile-ld: configure-stageprofile-ld
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-ld: clean-stageprofile-ld
+clean-stageprofile-ld:
+       @[ -f ld/Makefile ] || [ -f stageprofile-ld/Makefile ] \
+         || exit 0 ; \
+       [ -f ld/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif ld-bootstrap
+
+
+.PHONY: configure-stageprofile-libcpp maybe-configure-stageprofile-libcpp
+.PHONY: all-stageprofile-libcpp maybe-all-stageprofile-libcpp
+.PHONY: clean-stageprofile-libcpp maybe-clean-stageprofile-libcpp
+
+maybe-configure-stageprofile-libcpp:
+maybe-all-stageprofile-libcpp:
+maybe-clean-stageprofile-libcpp:
+
+@if libcpp-bootstrap
+maybe-configure-stageprofile-libcpp: configure-stageprofile-libcpp
+configure-stageprofile-libcpp:
+       @$(MAKE) stageprofile-start
+       @[ -f libcpp/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage profile in libcpp ; \
+       cd libcpp || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/libcpp"; \
+           libsrcdir="$$s/libcpp";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/libcpp"; \
+           libsrcdir="$$s/libcpp";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stageprofile-libcpp: all-stageprofile-libcpp
+all-stageprofile-libcpp: configure-stageprofile-libcpp
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-libcpp: clean-stageprofile-libcpp
+clean-stageprofile-libcpp:
+       @[ -f libcpp/Makefile ] || [ -f stageprofile-libcpp/Makefile ] \
+         || exit 0 ; \
+       [ -f libcpp/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif libcpp-bootstrap
+
+
+.PHONY: configure-stageprofile-libiberty maybe-configure-stageprofile-libiberty
+.PHONY: all-stageprofile-libiberty maybe-all-stageprofile-libiberty
+.PHONY: clean-stageprofile-libiberty maybe-clean-stageprofile-libiberty
+
+maybe-configure-stageprofile-libiberty:
+maybe-all-stageprofile-libiberty:
+maybe-clean-stageprofile-libiberty:
+
+@if libiberty-bootstrap
+maybe-configure-stageprofile-libiberty: configure-stageprofile-libiberty
+configure-stageprofile-libiberty:
+       @$(MAKE) stageprofile-start
+       @[ -f libiberty/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage profile in libiberty ; \
+       cd libiberty || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/libiberty"; \
+           libsrcdir="$$s/libiberty";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/libiberty"; \
+           libsrcdir="$$s/libiberty";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stageprofile-libiberty: all-stageprofile-libiberty
+all-stageprofile-libiberty: configure-stageprofile-libiberty
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-libiberty: clean-stageprofile-libiberty
+clean-stageprofile-libiberty:
+       @[ -f libiberty/Makefile ] || [ -f stageprofile-libiberty/Makefile ] \
+         || exit 0 ; \
+       [ -f libiberty/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif libiberty-bootstrap
+
+
+.PHONY: configure-stageprofile-zlib maybe-configure-stageprofile-zlib
+.PHONY: all-stageprofile-zlib maybe-all-stageprofile-zlib
+.PHONY: clean-stageprofile-zlib maybe-clean-stageprofile-zlib
+
+maybe-configure-stageprofile-zlib:
+maybe-all-stageprofile-zlib:
+maybe-clean-stageprofile-zlib:
+
+@if zlib-bootstrap
+maybe-configure-stageprofile-zlib: configure-stageprofile-zlib
+configure-stageprofile-zlib:
+       @$(MAKE) stageprofile-start
+       @[ -f zlib/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage profile in zlib ; \
+       cd zlib || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/zlib"; \
+           libsrcdir="$$s/zlib";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/zlib"; \
+           libsrcdir="$$s/zlib";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stageprofile-zlib: all-stageprofile-zlib
+all-stageprofile-zlib: configure-stageprofile-zlib
+       @$(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-zlib: clean-stageprofile-zlib
+clean-stageprofile-zlib:
+       @[ -f zlib/Makefile ] || [ -f stageprofile-zlib/Makefile ] \
+         || exit 0 ; \
+       [ -f zlib/Makefile ] || $(MAKE) stageprofile-start ; \
+       cd zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif zlib-bootstrap
+
+
+
+# FIXME: Will not need to be conditional when toplevel bootstrap is the
+# only possibility, but now it conflicts with no-bootstrap rules
+@if gcc-bootstrap
+
+
+
+
+# Rules to wipe a stage and all the following ones, also used for cleanstrap
+distclean-stage1:: distclean-stageprofile 
+.PHONY: distclean-stageprofile
+distclean-stageprofile::
+       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+       rm -rf stageprofile-* 
+
+
+@endif gcc-bootstrap
+
+
+.PHONY: stagefeedback-start stagefeedback-end
+
+stagefeedback-start::
+       @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
+       echo stagefeedback > stage_current ; \
+       echo stagefeedback > stage_last
+@if bfd
+       @[ -d stagefeedback-bfd ] || mkdir stagefeedback-bfd; \
+       set stagefeedback-bfd bfd ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-bfd prev-bfd ; @CREATE_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @[ -d stagefeedback-opcodes ] || mkdir stagefeedback-opcodes; \
+       set stagefeedback-opcodes opcodes ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-opcodes prev-opcodes ; @CREATE_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @[ -d stagefeedback-binutils ] || mkdir stagefeedback-binutils; \
+       set stagefeedback-binutils binutils ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-binutils prev-binutils ; @CREATE_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @[ -d stagefeedback-gas ] || mkdir stagefeedback-gas; \
+       set stagefeedback-gas gas ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-gas prev-gas ; @CREATE_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @[ -d stagefeedback-gcc ] || mkdir stagefeedback-gcc; \
+       set stagefeedback-gcc gcc ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-gcc prev-gcc ; @CREATE_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @[ -d stagefeedback-intl ] || mkdir stagefeedback-intl; \
+       set stagefeedback-intl intl ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-intl prev-intl ; @CREATE_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @[ -d stagefeedback-ld ] || mkdir stagefeedback-ld; \
+       set stagefeedback-ld ld ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-ld prev-ld ; @CREATE_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @[ -d stagefeedback-libcpp ] || mkdir stagefeedback-libcpp; \
+       set stagefeedback-libcpp libcpp ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-libcpp prev-libcpp ; @CREATE_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @[ -d stagefeedback-libiberty ] || mkdir stagefeedback-libiberty; \
+       set stagefeedback-libiberty libiberty ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-libiberty prev-libiberty ; @CREATE_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @[ -d stagefeedback-zlib ] || mkdir stagefeedback-zlib; \
+       set stagefeedback-zlib zlib ; @CREATE_LINK_TO_DIR@  ; \
+       set stage1-zlib prev-zlib ; @CREATE_LINK_TO_DIR@ 
+@endif zlib
+
+stagefeedback-end::
+       @rm -f stage_current
+@if bfd
+       @set bfd stagefeedback-bfd ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-bfd stage1-bfd ; @UNDO_LINK_TO_DIR@ 
+@endif bfd
+@if opcodes
+       @set opcodes stagefeedback-opcodes ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-opcodes stage1-opcodes ; @UNDO_LINK_TO_DIR@ 
+@endif opcodes
+@if binutils
+       @set binutils stagefeedback-binutils ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-binutils stage1-binutils ; @UNDO_LINK_TO_DIR@ 
+@endif binutils
+@if gas
+       @set gas stagefeedback-gas ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-gas stage1-gas ; @UNDO_LINK_TO_DIR@ 
+@endif gas
+@if gcc
+       @set gcc stagefeedback-gcc ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-gcc stage1-gcc ; @UNDO_LINK_TO_DIR@ 
+@endif gcc
+@if intl
+       @set intl stagefeedback-intl ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-intl stage1-intl ; @UNDO_LINK_TO_DIR@ 
+@endif intl
+@if ld
+       @set ld stagefeedback-ld ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-ld stage1-ld ; @UNDO_LINK_TO_DIR@ 
+@endif ld
+@if libcpp
+       @set libcpp stagefeedback-libcpp ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-libcpp stage1-libcpp ; @UNDO_LINK_TO_DIR@ 
+@endif libcpp
+@if libiberty
+       @set libiberty stagefeedback-libiberty ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-libiberty stage1-libiberty ; @UNDO_LINK_TO_DIR@ 
+@endif libiberty
+@if zlib
+       @set zlib stagefeedback-zlib ; @UNDO_LINK_TO_DIR@  ; \
+       set prev-zlib stage1-zlib ; @UNDO_LINK_TO_DIR@ 
+@endif zlib
+
+# Bubble a bugfix through all the stages up to stage feedback.  They
+# are remade, but not reconfigured.  The next stage (if any) will not
+# be reconfigured as well.
+.PHONY: stagefeedback-bubble
+stagefeedback-bubble:: stage1-bubble
+       @if test -f stagefeedback-lean || test -f stage1-lean  ; then \
+         echo Skipping rebuild of stagefeedback ; \
+       else \
+         $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stagefeedback; \
+       fi
+
+.PHONY: all-stagefeedback clean-stagefeedback
+all-stagefeedback:     \
+  maybe-all-stagefeedback-bfd \
+  maybe-all-stagefeedback-opcodes \
+  maybe-all-stagefeedback-binutils              \
+  maybe-all-stagefeedback-gas \
+  maybe-all-stagefeedback-gcc        \
+  maybe-all-stagefeedback-intl   \
+  maybe-all-stagefeedback-ld \
+  maybe-all-stagefeedback-libcpp  \
+  maybe-all-stagefeedback-libiberty                        \
+  maybe-all-stagefeedback-zlib       
+
+do-clean: clean-stagefeedback
+clean-stagefeedback:     \
+  maybe-clean-stagefeedback-bfd \
+  maybe-clean-stagefeedback-opcodes \
+  maybe-clean-stagefeedback-binutils              \
+  maybe-clean-stagefeedback-gas \
+  maybe-clean-stagefeedback-gcc        \
+  maybe-clean-stagefeedback-intl   \
+  maybe-clean-stagefeedback-ld \
+  maybe-clean-stagefeedback-libcpp  \
+  maybe-clean-stagefeedback-libiberty                        \
+  maybe-clean-stagefeedback-zlib       
+
+
+.PHONY: configure-stagefeedback-bfd maybe-configure-stagefeedback-bfd
+.PHONY: all-stagefeedback-bfd maybe-all-stagefeedback-bfd
+.PHONY: clean-stagefeedback-bfd maybe-clean-stagefeedback-bfd
+
+maybe-configure-stagefeedback-bfd:
+maybe-all-stagefeedback-bfd:
+maybe-clean-stagefeedback-bfd:
+
+@if bfd-bootstrap
+maybe-configure-stagefeedback-bfd: configure-stagefeedback-bfd
+configure-stagefeedback-bfd:
+       @$(MAKE) stagefeedback-start
+       @[ -f bfd/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage feedback in bfd ; \
+       cd bfd || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/bfd"; \
+           libsrcdir="$$s/bfd";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/bfd"; \
+           libsrcdir="$$s/bfd";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stagefeedback-bfd: all-stagefeedback-bfd
+all-stagefeedback-bfd: configure-stagefeedback-bfd
+       @$(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-bfd: clean-stagefeedback-bfd
+clean-stagefeedback-bfd:
+       @[ -f bfd/Makefile ] || [ -f stagefeedback-bfd/Makefile ] \
+         || exit 0 ; \
+       [ -f bfd/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd bfd && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif bfd-bootstrap
+
+
+.PHONY: configure-stagefeedback-opcodes maybe-configure-stagefeedback-opcodes
+.PHONY: all-stagefeedback-opcodes maybe-all-stagefeedback-opcodes
+.PHONY: clean-stagefeedback-opcodes maybe-clean-stagefeedback-opcodes
+
+maybe-configure-stagefeedback-opcodes:
+maybe-all-stagefeedback-opcodes:
+maybe-clean-stagefeedback-opcodes:
+
+@if opcodes-bootstrap
+maybe-configure-stagefeedback-opcodes: configure-stagefeedback-opcodes
+configure-stagefeedback-opcodes:
+       @$(MAKE) stagefeedback-start
+       @[ -f opcodes/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage feedback in opcodes ; \
+       cd opcodes || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/opcodes"; \
+           libsrcdir="$$s/opcodes";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/opcodes"; \
+           libsrcdir="$$s/opcodes";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stagefeedback-opcodes: all-stagefeedback-opcodes
+all-stagefeedback-opcodes: configure-stagefeedback-opcodes
+       @$(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-opcodes: clean-stagefeedback-opcodes
+clean-stagefeedback-opcodes:
+       @[ -f opcodes/Makefile ] || [ -f stagefeedback-opcodes/Makefile ] \
+         || exit 0 ; \
+       [ -f opcodes/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd opcodes && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif opcodes-bootstrap
+
+
+.PHONY: configure-stagefeedback-binutils maybe-configure-stagefeedback-binutils
+.PHONY: all-stagefeedback-binutils maybe-all-stagefeedback-binutils
+.PHONY: clean-stagefeedback-binutils maybe-clean-stagefeedback-binutils
+
+maybe-configure-stagefeedback-binutils:
+maybe-all-stagefeedback-binutils:
+maybe-clean-stagefeedback-binutils:
+
+@if binutils-bootstrap
+maybe-configure-stagefeedback-binutils: configure-stagefeedback-binutils
+configure-stagefeedback-binutils:
+       @$(MAKE) stagefeedback-start
+       @[ -f binutils/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage feedback in binutils ; \
+       cd binutils || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/binutils"; \
+           libsrcdir="$$s/binutils";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/binutils"; \
+           libsrcdir="$$s/binutils";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
+
+maybe-all-stagefeedback-binutils: all-stagefeedback-binutils
+all-stagefeedback-binutils: configure-stagefeedback-binutils
+       @$(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-binutils: clean-stagefeedback-binutils
+clean-stagefeedback-binutils:
+       @[ -f binutils/Makefile ] || [ -f stagefeedback-binutils/Makefile ] \
+         || exit 0 ; \
+       [ -f binutils/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd binutils && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif binutils-bootstrap
+
+
+.PHONY: configure-stagefeedback-gas maybe-configure-stagefeedback-gas
+.PHONY: all-stagefeedback-gas maybe-all-stagefeedback-gas
+.PHONY: clean-stagefeedback-gas maybe-clean-stagefeedback-gas
+
+maybe-configure-stagefeedback-gas:
+maybe-all-stagefeedback-gas:
+maybe-clean-stagefeedback-gas:
+
+@if gas-bootstrap
+maybe-configure-stagefeedback-gas: configure-stagefeedback-gas
+configure-stagefeedback-gas:
+       @$(MAKE) stagefeedback-start
+       @[ -f gas/Makefile ] && exit 0 || : ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(GCC_HOST_EXPORTS)  \
-       echo Configuring stage 1 in gcc ; \
-       cd gcc || exit 1; \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage feedback in gas ; \
+       cd gas || exit 1; \
        case $(srcdir) in \
          \.) \
            srcdiroption="--srcdir=."; \
            libsrcdir=".";; \
          /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/gcc"; \
-           libsrcdir="$$s/gcc";; \
+           srcdiroption="--srcdir=$(srcdir)/gas"; \
+           libsrcdir="$$s/gas";; \
          *) \
-           srcdiroption="--srcdir=../$(srcdir)/gcc"; \
-           libsrcdir="$$s/gcc";; \
+           srcdiroption="--srcdir=../$(srcdir)/gas"; \
+           libsrcdir="$$s/gas";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" && \
-         $(STAMP) ../configure-stage1-gcc
+         @stage2_werror_flag@ 
 
-all-stage1-gcc: configure-stage1-gcc
-       $(MAKE) new-stage1-start
+maybe-all-stagefeedback-gas: all-stagefeedback-gas
+all-stagefeedback-gas: configure-stagefeedback-gas
+       @$(MAKE) stagefeedback-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(GCC_HOST_EXPORTS)  \
-       cd gcc && \
-       $(MAKE) $(GCC_FLAGS_TO_PASS)  \
-               CFLAGS="$(STAGE1_CFLAGS)" && $(STAMP) ../all-stage1-gcc
-
-
-
-
-
-.PHONY: new-restage1 distclean-stage1
-
-distclean-stage1:  distclean-stage2 
-       [ -f stage_last ] && $(MAKE) new-`cat stage_last`-end || :
-       rm -rf configure-stage1-gcc all-stage1-gcc stage1-gcc 
-
-new-restage1:  distclean-stage2 
-       rm -rf all-stage1-gcc 
-       $(MAKE)  all-stage1-gcc 
-
-
-
-
-.PHONY: new-stage2-start new-stage2-end
-
-new-stage2-start:
-       [ -f stage_last ] && $(MAKE) new-`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@ 
-
-new-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: new-stage2-bubble
-new-stage2-bubble: new-stage1-bubble
-       @if [ -f all-stage2-gcc ] ; then \
-         echo Remaking stage 2 ; \
-         rm -f all-stage2-gcc ; \
-         $(MAKE) all-stage2-gcc  && \
-         if [ -f configure-stage3-gcc ] ; then \
-           $(STAMP) configure-stage3-gcc ; \
-         fi ; \
-       else \
-         $(MAKE) all-stage2-gcc ; \
-       fi
-
-configure-stage2-gcc:  all-stage1-gcc 
-       $(MAKE) new-stage2-start
-       @if [ -f stage2-gcc/Makefile ] ; then \
-         $(STAMP) configure-stage2-gcc ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+       $(STAGE_HOST_EXPORTS)  \
+       cd gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-gas: clean-stagefeedback-gas
+clean-stagefeedback-gas:
+       @[ -f gas/Makefile ] || [ -f stagefeedback-gas/Makefile ] \
+         || exit 0 ; \
+       [ -f gas/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd gas && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif gas-bootstrap
+
+
+.PHONY: configure-stagefeedback-gcc maybe-configure-stagefeedback-gcc
+.PHONY: all-stagefeedback-gcc maybe-all-stagefeedback-gcc
+.PHONY: clean-stagefeedback-gcc maybe-clean-stagefeedback-gcc
+
+maybe-configure-stagefeedback-gcc:
+maybe-all-stagefeedback-gcc:
+maybe-clean-stagefeedback-gcc:
+
+@if gcc-bootstrap
+maybe-configure-stagefeedback-gcc: configure-stagefeedback-gcc
+configure-stagefeedback-gcc:
+       @$(MAKE) stagefeedback-start
+       @[ -f gcc/Makefile ] && exit 0 || : ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
        $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 2 in gcc ; \
+       echo Configuring stage feedback in gcc ; \
        cd gcc || exit 1; \
        case $(srcdir) in \
          \.) \
@@ -28268,271 +34559,974 @@ configure-stage2-gcc:  all-stage1-gcc
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ && \
-         $(STAMP) ../configure-stage2-gcc
+         @stage2_werror_flag@ 
 
-all-stage2-gcc: configure-stage2-gcc
-       $(MAKE) new-stage2-start
+maybe-all-stagefeedback-gcc: all-stagefeedback-gcc
+all-stagefeedback-gcc: configure-stagefeedback-gcc
+       @$(MAKE) stagefeedback-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
        $(STAGE_HOST_EXPORTS)  \
        cd gcc && \
-       $(MAKE) $(GCC_FLAGS_TO_PASS)  \
-               CC="$${CC}" CC_FOR_BUILD="${CC_FOR_BUILD}" \
-               STAGE_PREFIX=$$r/stage1-gcc/  \
-               $(POSTSTAGE1_FLAGS_TO_PASS) && $(STAMP) ../all-stage2-gcc
-
-
-
-
-
-.PHONY: new-restage2 distclean-stage2
-
-distclean-stage2:  distclean-stage3 
-       [ -f stage_last ] && $(MAKE) new-`cat stage_last`-end || :
-       rm -rf configure-stage2-gcc all-stage2-gcc stage2-gcc 
-
-new-restage2:  distclean-stage3 
-       rm -rf all-stage2-gcc 
-       $(MAKE)  all-stage2-gcc 
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" $(EXTRA_GCC_FLAGS)
+
+maybe-clean-stagefeedback-gcc: clean-stagefeedback-gcc
+clean-stagefeedback-gcc:
+       @[ -f gcc/Makefile ] || [ -f stagefeedback-gcc/Makefile ] \
+         || exit 0 ; \
+       [ -f gcc/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" $(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
 
 
+.PHONY: configure-stagefeedback-intl maybe-configure-stagefeedback-intl
+.PHONY: all-stagefeedback-intl maybe-all-stagefeedback-intl
+.PHONY: clean-stagefeedback-intl maybe-clean-stagefeedback-intl
 
+maybe-configure-stagefeedback-intl:
+maybe-all-stagefeedback-intl:
+maybe-clean-stagefeedback-intl:
 
-.PHONY: new-stage3-start new-stage3-end
+@if intl-bootstrap
+maybe-configure-stagefeedback-intl: configure-stagefeedback-intl
+configure-stagefeedback-intl:
+       @$(MAKE) stagefeedback-start
+       @[ -f intl/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage feedback in intl ; \
+       cd intl || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/intl"; \
+           libsrcdir="$$s/intl";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/intl"; \
+           libsrcdir="$$s/intl";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
 
-new-stage3-start:
-       [ -f stage_last ] && $(MAKE) new-`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@ 
+maybe-all-stagefeedback-intl: all-stagefeedback-intl
+all-stagefeedback-intl: configure-stagefeedback-intl
+       @$(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-intl: clean-stagefeedback-intl
+clean-stagefeedback-intl:
+       @[ -f intl/Makefile ] || [ -f stagefeedback-intl/Makefile ] \
+         || exit 0 ; \
+       [ -f intl/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd intl && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif intl-bootstrap
+
+
+.PHONY: configure-stagefeedback-ld maybe-configure-stagefeedback-ld
+.PHONY: all-stagefeedback-ld maybe-all-stagefeedback-ld
+.PHONY: clean-stagefeedback-ld maybe-clean-stagefeedback-ld
+
+maybe-configure-stagefeedback-ld:
+maybe-all-stagefeedback-ld:
+maybe-clean-stagefeedback-ld:
+
+@if ld-bootstrap
+maybe-configure-stagefeedback-ld: configure-stagefeedback-ld
+configure-stagefeedback-ld:
+       @$(MAKE) stagefeedback-start
+       @[ -f ld/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage feedback in ld ; \
+       cd ld || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/ld"; \
+           libsrcdir="$$s/ld";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/ld"; \
+           libsrcdir="$$s/ld";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
 
-new-stage3-end:
-       rm -f stage_last ; \
-       set gcc stage3-gcc ; @UNDO_LINK_TO_DIR@  ; \
-       set prev-gcc stage2-gcc ; @UNDO_LINK_TO_DIR@ 
+maybe-all-stagefeedback-ld: all-stagefeedback-ld
+all-stagefeedback-ld: configure-stagefeedback-ld
+       @$(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-ld: clean-stagefeedback-ld
+clean-stagefeedback-ld:
+       @[ -f ld/Makefile ] || [ -f stagefeedback-ld/Makefile ] \
+         || exit 0 ; \
+       [ -f ld/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd ld && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif ld-bootstrap
+
+
+.PHONY: configure-stagefeedback-libcpp maybe-configure-stagefeedback-libcpp
+.PHONY: all-stagefeedback-libcpp maybe-all-stagefeedback-libcpp
+.PHONY: clean-stagefeedback-libcpp maybe-clean-stagefeedback-libcpp
+
+maybe-configure-stagefeedback-libcpp:
+maybe-all-stagefeedback-libcpp:
+maybe-clean-stagefeedback-libcpp:
+
+@if libcpp-bootstrap
+maybe-configure-stagefeedback-libcpp: configure-stagefeedback-libcpp
+configure-stagefeedback-libcpp:
+       @$(MAKE) stagefeedback-start
+       @[ -f libcpp/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage feedback in libcpp ; \
+       cd libcpp || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/libcpp"; \
+           libsrcdir="$$s/libcpp";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/libcpp"; \
+           libsrcdir="$$s/libcpp";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
 
-# 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: new-stage3-bubble
-new-stage3-bubble: new-stage2-bubble
-       @if [ -f all-stage3-gcc ] ; then \
-         echo Remaking stage 3 ; \
-         rm -f all-stage3-gcc ; \
-         $(MAKE) all-stage3-gcc ; \
-       else \
-         $(MAKE) all-stage3-gcc ; \
-       fi
+maybe-all-stagefeedback-libcpp: all-stagefeedback-libcpp
+all-stagefeedback-libcpp: configure-stagefeedback-libcpp
+       @$(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-libcpp: clean-stagefeedback-libcpp
+clean-stagefeedback-libcpp:
+       @[ -f libcpp/Makefile ] || [ -f stagefeedback-libcpp/Makefile ] \
+         || exit 0 ; \
+       [ -f libcpp/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd libcpp && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif libcpp-bootstrap
+
+
+.PHONY: configure-stagefeedback-libiberty maybe-configure-stagefeedback-libiberty
+.PHONY: all-stagefeedback-libiberty maybe-all-stagefeedback-libiberty
+.PHONY: clean-stagefeedback-libiberty maybe-clean-stagefeedback-libiberty
+
+maybe-configure-stagefeedback-libiberty:
+maybe-all-stagefeedback-libiberty:
+maybe-clean-stagefeedback-libiberty:
+
+@if libiberty-bootstrap
+maybe-configure-stagefeedback-libiberty: configure-stagefeedback-libiberty
+configure-stagefeedback-libiberty:
+       @$(MAKE) stagefeedback-start
+       @[ -f libiberty/Makefile ] && exit 0 || : ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       echo Configuring stage feedback in libiberty ; \
+       cd libiberty || exit 1; \
+       case $(srcdir) in \
+         \.) \
+           srcdiroption="--srcdir=."; \
+           libsrcdir=".";; \
+         /* | [A-Za-z]:[\\/]*) \
+           srcdiroption="--srcdir=$(srcdir)/libiberty"; \
+           libsrcdir="$$s/libiberty";; \
+         *) \
+           srcdiroption="--srcdir=../$(srcdir)/libiberty"; \
+           libsrcdir="$$s/libiberty";; \
+       esac; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) $${srcdiroption} \
+         @stage2_werror_flag@ 
 
-configure-stage3-gcc:  all-stage2-gcc 
-       $(MAKE) new-stage3-start
-       @if [ -f stage3-gcc/Makefile ] ; then \
-         $(STAMP) configure-stage3-gcc ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+maybe-all-stagefeedback-libiberty: all-stagefeedback-libiberty
+all-stagefeedback-libiberty: configure-stagefeedback-libiberty
+       @$(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+       $(STAGE_HOST_EXPORTS)  \
+       cd libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-libiberty: clean-stagefeedback-libiberty
+clean-stagefeedback-libiberty:
+       @[ -f libiberty/Makefile ] || [ -f stagefeedback-libiberty/Makefile ] \
+         || exit 0 ; \
+       [ -f libiberty/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd libiberty && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif libiberty-bootstrap
+
+
+.PHONY: configure-stagefeedback-zlib maybe-configure-stagefeedback-zlib
+.PHONY: all-stagefeedback-zlib maybe-all-stagefeedback-zlib
+.PHONY: clean-stagefeedback-zlib maybe-clean-stagefeedback-zlib
+
+maybe-configure-stagefeedback-zlib:
+maybe-all-stagefeedback-zlib:
+maybe-clean-stagefeedback-zlib:
+
+@if zlib-bootstrap
+maybe-configure-stagefeedback-zlib: configure-stagefeedback-zlib
+configure-stagefeedback-zlib:
+       @$(MAKE) stagefeedback-start
+       @[ -f zlib/Makefile ] && exit 0 || : ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
        $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 3 in gcc ; \
-       cd gcc || exit 1; \
+       echo Configuring stage feedback in zlib ; \
+       cd zlib || exit 1; \
        case $(srcdir) in \
          \.) \
            srcdiroption="--srcdir=."; \
            libsrcdir=".";; \
          /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/gcc"; \
-           libsrcdir="$$s/gcc";; \
+           srcdiroption="--srcdir=$(srcdir)/zlib"; \
+           libsrcdir="$$s/zlib";; \
          *) \
-           srcdiroption="--srcdir=../$(srcdir)/gcc"; \
-           libsrcdir="$$s/gcc";; \
+           srcdiroption="--srcdir=../$(srcdir)/zlib"; \
+           libsrcdir="$$s/zlib";; \
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@ && \
-         $(STAMP) ../configure-stage3-gcc
+         @stage2_werror_flag@ 
 
-all-stage3-gcc: configure-stage3-gcc
-       $(MAKE) new-stage3-start
+maybe-all-stagefeedback-zlib: all-stagefeedback-zlib
+all-stagefeedback-zlib: configure-stagefeedback-zlib
+       @$(MAKE) stagefeedback-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
        $(STAGE_HOST_EXPORTS)  \
-       cd gcc && \
-       $(MAKE) $(GCC_FLAGS_TO_PASS)  \
-               CC="$${CC}" CC_FOR_BUILD="${CC_FOR_BUILD}" \
-               STAGE_PREFIX=$$r/stage2-gcc/  \
-               $(POSTSTAGE1_FLAGS_TO_PASS) && $(STAMP) ../all-stage3-gcc
+       cd zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-zlib: clean-stagefeedback-zlib
+clean-stagefeedback-zlib:
+       @[ -f zlib/Makefile ] || [ -f stagefeedback-zlib/Makefile ] \
+         || exit 0 ; \
+       [ -f zlib/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif zlib-bootstrap
 
 
-compare: all-stage3-gcc
-       [ -f stage_last ] && $(MAKE) new-`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
 
+# FIXME: Will not need to be conditional when toplevel bootstrap is the
+# only possibility, but now it conflicts with no-bootstrap rules
+@if gcc-bootstrap
 
 
-.PHONY: new-bootstrap
-new-bootstrap:
-       $(MAKE) new-stage3-bubble  compare  \
-         new-stage3-start all new-stage3-end 
 
 
-.PHONY: new-restage3 distclean-stage3
+# Rules to wipe a stage and all the following ones, also used for cleanstrap
+distclean-stage1:: distclean-stagefeedback 
+.PHONY: distclean-stagefeedback
+distclean-stagefeedback::
+       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+       rm -rf stagefeedback-* 
 
-distclean-stage3: 
-       [ -f stage_last ] && $(MAKE) new-`cat stage_last`-end || :
-       rm -rf configure-stage3-gcc all-stage3-gcc stage3-gcc compare 
 
-new-restage3: 
-       rm -rf all-stage3-gcc compare 
-       $(MAKE) compare 
+@endif gcc-bootstrap
 
 
-.PHONY: new-cleanstrap
-new-cleanstrap: distclean-stage1 new-bootstrap
 
+stagefeedback-start::
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       cd stageprofile-gcc && \
+         { find . -type d | sort | sed 's,.*,$(SHELL) '"$$s"'/mkinstalldirs "../gcc/&",' | $(SHELL); } && \
+         { find . -name '*.*da' | sed 's,.*,$(LN) -f "&" "../gcc/&",' | $(SHELL); }
 
+# FIXME: Will not need to be conditional when toplevel bootstrap is the
+# only possibility, but now it conflicts with no-bootstrap rules
+@if gcc-bootstrap
+profiledbootstrap:
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       echo "Bootstrapping the compiler"; \
+       $(MAKE) stageprofile-bubble distclean-stagefeedback
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
+       $(SET_LIB_PATH) \
+       echo "Building runtime libraries and training compiler"; \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       $(HOST_EXPORTS) \
+       echo "Building feedback based compiler"; \
+       $(MAKE) stagefeedback-bubble stagefeedback-end
+@endif gcc-bootstrap
 
+@if gcc-bootstrap
+NOTPARALLEL = .NOTPARALLEL
+$(NOTPARALLEL):
+do-distclean: distclean-stage1
+@endif gcc-bootstrap
 
 # --------------------------------------
 # Dependencies between different modules
 # --------------------------------------
 
+# Generic dependencies for target modules on host stuff, especially gcc
+
+configure-target-libstdc++-v3: maybe-all-gcc
+
+configure-target-libmudflap: maybe-all-gcc
+
+configure-target-newlib: maybe-all-gcc
+
+configure-target-libgfortran: maybe-all-gcc
+
+configure-target-libobjc: maybe-all-gcc
+
+configure-target-libtermcap: maybe-all-gcc
+
+configure-target-winsup: maybe-all-gcc
+
+configure-target-libgloss: maybe-all-gcc
+
+configure-target-libiberty: maybe-all-gcc
+
+configure-target-gperf: maybe-all-gcc
+
+configure-target-examples: maybe-all-gcc
+
+configure-target-libffi: maybe-all-gcc
+
+configure-target-libjava: maybe-all-gcc
+
+configure-target-zlib: maybe-all-gcc
+
+configure-target-boehm-gc: maybe-all-gcc
+
+configure-target-qthreads: maybe-all-gcc
+
+configure-target-rda: maybe-all-gcc
+
+configure-target-libada: maybe-all-gcc
+
+
+
+configure-target-boehm-gc: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-gperf: maybe-all-target-newlib maybe-all-target-libgloss
+configure-target-gperf: maybe-all-target-libstdc++-v3
+
+configure-target-libada: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-libgfortran: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-libffi: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-libjava: maybe-all-target-newlib maybe-all-target-libgloss
+configure-target-libjava: maybe-all-target-libstdc++-v3
+
+configure-target-libobjc: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-libstdc++-v3: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-zlib: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-examples: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-libtermcap: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-rda: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-winsup: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-qthreads: maybe-all-target-newlib maybe-all-target-libgloss
+
+
 # There are two types of dependencies here: 'hard' dependencies, where one
 # module simply won't build without the other; and 'soft' dependencies, where
 # if the depended-on module is missing, the depending module will do without
 # or find a substitute somewhere (perhaps installed).  Soft dependencies
-# are specified by depending on a 'maybe-' target.  If you're not sure,
+# are made here to depend on a 'maybe-' target.  If you're not sure,
 # it's safer to use a soft dependency.
 
-# Host modules specific to gcc.
-# GCC needs to identify certain tools.
-# GCC also needs the information exported by the intl configure script.
-configure-gcc: maybe-configure-intl maybe-configure-binutils maybe-configure-gas maybe-configure-ld maybe-configure-bison maybe-configure-flex
-all-gcc: maybe-all-libiberty maybe-all-intl maybe-all-bison maybe-all-byacc maybe-all-binutils maybe-all-gas maybe-all-ld maybe-all-zlib 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-binutils maybe-all-bison maybe-all-byacc 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.
-configure-gdb: maybe-configure-itcl maybe-configure-tcl maybe-configure-tk maybe-configure-sim
-GDB_TK = @GDB_TK@
-all-gdb: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-mmalloc maybe-all-readline maybe-all-bison maybe-all-byacc maybe-all-sim $(gdbnlmrequirements) $(GDB_TK)
-install-gdb: maybe-install-tcl maybe-install-tk maybe-install-itcl maybe-install-tix maybe-install-libgui
-configure-libgui: maybe-configure-tcl maybe-configure-tk
-all-libgui: maybe-all-tcl maybe-all-tk maybe-all-itcl
 
-# Host modules specific to binutils.
+
+
+# With all the machinery above in place, it is pretty easy to generate
+# dependencies.  Host dependencies are a bit more complex because we have
+# to check for bootstrap/prebootstrap dependencies.  To resolve
+# prebootstrap dependencies, prebootstrap modules are gathered in
+# a hash table.
+all-build-bison: maybe-all-build-texinfo
+all-build-byacc: maybe-all-build-texinfo
+all-build-flex: maybe-all-build-texinfo
+all-build-flex: maybe-all-build-bison
+all-build-flex: maybe-all-build-byacc
+all-build-flex: maybe-all-build-m4
+all-build-libiberty: maybe-all-build-texinfo
+all-build-m4: maybe-all-build-texinfo
+all-build-fixincludes: maybe-all-build-libiberty
+configure-gcc: maybe-configure-intl
+
+configure-stage1-gcc: maybe-configure-stage1-intl
+configure-stage2-gcc: maybe-configure-stage2-intl
+configure-stage3-gcc: maybe-configure-stage3-intl
+configure-stage4-gcc: maybe-configure-stage4-intl
+configure-stageprofile-gcc: maybe-configure-stageprofile-intl
+configure-stagefeedback-gcc: maybe-configure-stagefeedback-intl
+configure-gcc: maybe-configure-binutils
+
+configure-stage1-gcc: maybe-configure-stage1-binutils
+configure-stage2-gcc: maybe-configure-stage2-binutils
+configure-stage3-gcc: maybe-configure-stage3-binutils
+configure-stage4-gcc: maybe-configure-stage4-binutils
+configure-stageprofile-gcc: maybe-configure-stageprofile-binutils
+configure-stagefeedback-gcc: maybe-configure-stagefeedback-binutils
+configure-gcc: maybe-configure-gas
+
+configure-stage1-gcc: maybe-configure-stage1-gas
+configure-stage2-gcc: maybe-configure-stage2-gas
+configure-stage3-gcc: maybe-configure-stage3-gas
+configure-stage4-gcc: maybe-configure-stage4-gas
+configure-stageprofile-gcc: maybe-configure-stageprofile-gas
+configure-stagefeedback-gcc: maybe-configure-stagefeedback-gas
+configure-gcc: maybe-configure-ld
+
+configure-stage1-gcc: maybe-configure-stage1-ld
+configure-stage2-gcc: maybe-configure-stage2-ld
+configure-stage3-gcc: maybe-configure-stage3-ld
+configure-stage4-gcc: maybe-configure-stage4-ld
+configure-stageprofile-gcc: maybe-configure-stageprofile-ld
+configure-stagefeedback-gcc: maybe-configure-stagefeedback-ld
+all-gcc: all-libiberty
+
+all-stage1-gcc: all-stage1-libiberty
+all-stage2-gcc: all-stage2-libiberty
+all-stage3-gcc: all-stage3-libiberty
+all-stage4-gcc: all-stage4-libiberty
+all-stageprofile-gcc: all-stageprofile-libiberty
+all-stagefeedback-gcc: all-stagefeedback-libiberty
+all-gcc: maybe-all-intl
+
+all-stage1-gcc: maybe-all-stage1-intl
+all-stage2-gcc: maybe-all-stage2-intl
+all-stage3-gcc: maybe-all-stage3-intl
+all-stage4-gcc: maybe-all-stage4-intl
+all-stageprofile-gcc: maybe-all-stageprofile-intl
+all-stagefeedback-gcc: maybe-all-stagefeedback-intl
+all-gcc: maybe-all-build-texinfo
+
+all-stage1-gcc: maybe-all-build-texinfo
+all-stage2-gcc: maybe-all-build-texinfo
+all-stage3-gcc: maybe-all-build-texinfo
+all-stage4-gcc: maybe-all-build-texinfo
+all-stageprofile-gcc: maybe-all-build-texinfo
+all-stagefeedback-gcc: maybe-all-build-texinfo
+all-prebootstrap: maybe-all-build-texinfo
+all-gcc: maybe-all-build-bison
+
+all-stage1-gcc: maybe-all-build-bison
+all-stage2-gcc: maybe-all-build-bison
+all-stage3-gcc: maybe-all-build-bison
+all-stage4-gcc: maybe-all-build-bison
+all-stageprofile-gcc: maybe-all-build-bison
+all-stagefeedback-gcc: maybe-all-build-bison
+all-prebootstrap: maybe-all-build-bison
+all-gcc: maybe-all-build-byacc
+
+all-stage1-gcc: maybe-all-build-byacc
+all-stage2-gcc: maybe-all-build-byacc
+all-stage3-gcc: maybe-all-build-byacc
+all-stage4-gcc: maybe-all-build-byacc
+all-stageprofile-gcc: maybe-all-build-byacc
+all-stagefeedback-gcc: maybe-all-build-byacc
+all-prebootstrap: maybe-all-build-byacc
+all-gcc: maybe-all-build-flex
+
+all-stage1-gcc: maybe-all-build-flex
+all-stage2-gcc: maybe-all-build-flex
+all-stage3-gcc: maybe-all-build-flex
+all-stage4-gcc: maybe-all-build-flex
+all-stageprofile-gcc: maybe-all-build-flex
+all-stagefeedback-gcc: maybe-all-build-flex
+all-prebootstrap: maybe-all-build-flex
+all-gcc: maybe-all-build-libiberty
+
+all-stage1-gcc: maybe-all-build-libiberty
+all-stage2-gcc: maybe-all-build-libiberty
+all-stage3-gcc: maybe-all-build-libiberty
+all-stage4-gcc: maybe-all-build-libiberty
+all-stageprofile-gcc: maybe-all-build-libiberty
+all-stagefeedback-gcc: maybe-all-build-libiberty
+all-prebootstrap: maybe-all-build-libiberty
+all-gcc: maybe-all-build-fixincludes
+
+all-stage1-gcc: maybe-all-build-fixincludes
+all-stage2-gcc: maybe-all-build-fixincludes
+all-stage3-gcc: maybe-all-build-fixincludes
+all-stage4-gcc: maybe-all-build-fixincludes
+all-stageprofile-gcc: maybe-all-build-fixincludes
+all-stagefeedback-gcc: maybe-all-build-fixincludes
+all-prebootstrap: maybe-all-build-fixincludes
+all-gcc: maybe-all-binutils
+
+all-stage1-gcc: maybe-all-stage1-binutils
+all-stage2-gcc: maybe-all-stage2-binutils
+all-stage3-gcc: maybe-all-stage3-binutils
+all-stage4-gcc: maybe-all-stage4-binutils
+all-stageprofile-gcc: maybe-all-stageprofile-binutils
+all-stagefeedback-gcc: maybe-all-stagefeedback-binutils
+all-gcc: maybe-all-gas
+
+all-stage1-gcc: maybe-all-stage1-gas
+all-stage2-gcc: maybe-all-stage2-gas
+all-stage3-gcc: maybe-all-stage3-gas
+all-stage4-gcc: maybe-all-stage4-gas
+all-stageprofile-gcc: maybe-all-stageprofile-gas
+all-stagefeedback-gcc: maybe-all-stagefeedback-gas
+all-gcc: maybe-all-ld
+
+all-stage1-gcc: maybe-all-stage1-ld
+all-stage2-gcc: maybe-all-stage2-ld
+all-stage3-gcc: maybe-all-stage3-ld
+all-stage4-gcc: maybe-all-stage4-ld
+all-stageprofile-gcc: maybe-all-stageprofile-ld
+all-stagefeedback-gcc: maybe-all-stagefeedback-ld
+all-gcc: maybe-all-zlib
+
+all-stage1-gcc: maybe-all-stage1-zlib
+all-stage2-gcc: maybe-all-stage2-zlib
+all-stage3-gcc: maybe-all-stage3-zlib
+all-stage4-gcc: maybe-all-stage4-zlib
+all-stageprofile-gcc: maybe-all-stageprofile-zlib
+all-stagefeedback-gcc: maybe-all-stagefeedback-zlib
+all-gcc: all-libcpp
+
+all-stage1-gcc: all-stage1-libcpp
+all-stage2-gcc: all-stage2-libcpp
+all-stage3-gcc: all-stage3-libcpp
+all-stage4-gcc: all-stage4-libcpp
+all-stageprofile-gcc: all-stageprofile-libcpp
+all-stagefeedback-gcc: all-stagefeedback-libcpp
+all-gcc: maybe-all-libiberty
+
+all-stage1-gcc: maybe-all-stage1-libiberty
+all-stage2-gcc: maybe-all-stage2-libiberty
+all-stage3-gcc: maybe-all-stage3-libiberty
+all-stage4-gcc: maybe-all-stage4-libiberty
+all-stageprofile-gcc: maybe-all-stageprofile-libiberty
+all-stagefeedback-gcc: maybe-all-stagefeedback-libiberty
+all-gcc: maybe-all-fixincludes
+
+all-stage1-gcc: maybe-all-stage1-fixincludes
+all-stage2-gcc: maybe-all-stage2-fixincludes
+all-stage3-gcc: maybe-all-stage3-fixincludes
+all-stage4-gcc: maybe-all-stage4-fixincludes
+all-stageprofile-gcc: maybe-all-stageprofile-fixincludes
+all-stagefeedback-gcc: maybe-all-stagefeedback-fixincludes
+install-gcc: maybe-install-fixincludes
+configure-libcpp: configure-libiberty
+
+configure-stage1-libcpp: configure-stage1-libiberty
+configure-stage2-libcpp: configure-stage2-libiberty
+configure-stage3-libcpp: configure-stage3-libiberty
+configure-stage4-libcpp: configure-stage4-libiberty
+configure-stageprofile-libcpp: configure-stageprofile-libiberty
+configure-stagefeedback-libcpp: configure-stagefeedback-libiberty
+configure-libcpp: maybe-configure-intl
+
+configure-stage1-libcpp: maybe-configure-stage1-intl
+configure-stage2-libcpp: maybe-configure-stage2-intl
+configure-stage3-libcpp: maybe-configure-stage3-intl
+configure-stage4-libcpp: maybe-configure-stage4-intl
+configure-stageprofile-libcpp: maybe-configure-stageprofile-intl
+configure-stagefeedback-libcpp: maybe-configure-stagefeedback-intl
+all-libcpp: all-libiberty
+
+all-stage1-libcpp: all-stage1-libiberty
+all-stage2-libcpp: all-stage2-libiberty
+all-stage3-libcpp: all-stage3-libiberty
+all-stage4-libcpp: all-stage4-libiberty
+all-stageprofile-libcpp: all-stageprofile-libiberty
+all-stagefeedback-libcpp: all-stagefeedback-libiberty
+all-libcpp: maybe-all-intl
+
+all-stage1-libcpp: maybe-all-stage1-intl
+all-stage2-libcpp: maybe-all-stage2-intl
+all-stage3-libcpp: maybe-all-stage3-intl
+all-stage4-libcpp: maybe-all-stage4-intl
+all-stageprofile-libcpp: maybe-all-stageprofile-intl
+all-stagefeedback-libcpp: maybe-all-stagefeedback-intl
+all-fixincludes: maybe-all-libiberty
+configure-gdb: maybe-configure-itcl
+configure-gdb: maybe-configure-tcl
+configure-gdb: maybe-configure-tk
+configure-gdb: maybe-configure-sim
+all-gdb: maybe-all-libiberty
+all-gdb: maybe-all-opcodes
+all-gdb: maybe-all-bfd
+all-gdb: maybe-all-readline
+all-gdb: maybe-all-build-bison
+all-gdb: maybe-all-build-byacc
+all-gdb: maybe-all-sim
+install-gdb: maybe-install-tcl
+install-gdb: maybe-install-tk
+install-gdb: maybe-install-itcl
+install-gdb: maybe-install-libgui
+configure-libgui: maybe-configure-tcl
+configure-libgui: maybe-configure-tk
+all-libgui: maybe-all-tcl
+all-libgui: maybe-all-tk
+all-libgui: maybe-all-itcl
 configure-bfd: configure-libiberty
-all-bfd: maybe-all-libiberty maybe-all-intl
-all-binutils: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-flex maybe-all-bison maybe-all-byacc maybe-all-intl
-# We put install-opcodes before install-binutils because the installed
-# binutils might be on PATH, and they might need the shared opcodes
-# library.
+
+configure-stage1-bfd: configure-stage1-libiberty
+configure-stage2-bfd: configure-stage2-libiberty
+configure-stage3-bfd: configure-stage3-libiberty
+configure-stage4-bfd: configure-stage4-libiberty
+configure-stageprofile-bfd: configure-stageprofile-libiberty
+configure-stagefeedback-bfd: configure-stagefeedback-libiberty
+all-bfd: maybe-all-libiberty
+
+all-stage1-bfd: maybe-all-stage1-libiberty
+all-stage2-bfd: maybe-all-stage2-libiberty
+all-stage3-bfd: maybe-all-stage3-libiberty
+all-stage4-bfd: maybe-all-stage4-libiberty
+all-stageprofile-bfd: maybe-all-stageprofile-libiberty
+all-stagefeedback-bfd: maybe-all-stagefeedback-libiberty
+all-bfd: maybe-all-intl
+
+all-stage1-bfd: maybe-all-stage1-intl
+all-stage2-bfd: maybe-all-stage2-intl
+all-stage3-bfd: maybe-all-stage3-intl
+all-stage4-bfd: maybe-all-stage4-intl
+all-stageprofile-bfd: maybe-all-stageprofile-intl
+all-stagefeedback-bfd: maybe-all-stagefeedback-intl
+all-binutils: maybe-all-libiberty
+
+all-stage1-binutils: maybe-all-stage1-libiberty
+all-stage2-binutils: maybe-all-stage2-libiberty
+all-stage3-binutils: maybe-all-stage3-libiberty
+all-stage4-binutils: maybe-all-stage4-libiberty
+all-stageprofile-binutils: maybe-all-stageprofile-libiberty
+all-stagefeedback-binutils: maybe-all-stagefeedback-libiberty
+all-binutils: maybe-all-opcodes
+
+all-stage1-binutils: maybe-all-stage1-opcodes
+all-stage2-binutils: maybe-all-stage2-opcodes
+all-stage3-binutils: maybe-all-stage3-opcodes
+all-stage4-binutils: maybe-all-stage4-opcodes
+all-stageprofile-binutils: maybe-all-stageprofile-opcodes
+all-stagefeedback-binutils: maybe-all-stagefeedback-opcodes
+all-binutils: maybe-all-bfd
+
+all-stage1-binutils: maybe-all-stage1-bfd
+all-stage2-binutils: maybe-all-stage2-bfd
+all-stage3-binutils: maybe-all-stage3-bfd
+all-stage4-binutils: maybe-all-stage4-bfd
+all-stageprofile-binutils: maybe-all-stageprofile-bfd
+all-stagefeedback-binutils: maybe-all-stagefeedback-bfd
+all-binutils: maybe-all-build-flex
+
+all-stage1-binutils: maybe-all-build-flex
+all-stage2-binutils: maybe-all-build-flex
+all-stage3-binutils: maybe-all-build-flex
+all-stage4-binutils: maybe-all-build-flex
+all-stageprofile-binutils: maybe-all-build-flex
+all-stagefeedback-binutils: maybe-all-build-flex
+all-prebootstrap: maybe-all-build-flex
+all-binutils: maybe-all-build-bison
+
+all-stage1-binutils: maybe-all-build-bison
+all-stage2-binutils: maybe-all-build-bison
+all-stage3-binutils: maybe-all-build-bison
+all-stage4-binutils: maybe-all-build-bison
+all-stageprofile-binutils: maybe-all-build-bison
+all-stagefeedback-binutils: maybe-all-build-bison
+all-prebootstrap: maybe-all-build-bison
+all-binutils: maybe-all-build-byacc
+
+all-stage1-binutils: maybe-all-build-byacc
+all-stage2-binutils: maybe-all-build-byacc
+all-stage3-binutils: maybe-all-build-byacc
+all-stage4-binutils: maybe-all-build-byacc
+all-stageprofile-binutils: maybe-all-build-byacc
+all-stagefeedback-binutils: maybe-all-build-byacc
+all-prebootstrap: maybe-all-build-byacc
+all-binutils: maybe-all-intl
+
+all-stage1-binutils: maybe-all-stage1-intl
+all-stage2-binutils: maybe-all-stage2-intl
+all-stage3-binutils: maybe-all-stage3-intl
+all-stage4-binutils: maybe-all-stage4-intl
+all-stageprofile-binutils: maybe-all-stageprofile-intl
+all-stagefeedback-binutils: maybe-all-stagefeedback-intl
 install-binutils: maybe-install-opcodes
-# libopcodes depends on libbfd
 install-opcodes: maybe-install-bfd
-all-gas: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-intl
-all-gprof: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-intl
-all-ld: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-bison maybe-all-byacc maybe-all-flex maybe-all-intl
-all-opcodes: maybe-all-bfd maybe-all-libiberty
-
-# Other host modules in the 'src' repository.
-all-dejagnu: maybe-all-tcl maybe-all-expect maybe-all-tk
-configure-expect: maybe-configure-tcl maybe-configure-tk
-all-expect: maybe-all-tcl maybe-all-tk
-configure-itcl: maybe-configure-tcl maybe-configure-tk
-all-itcl: maybe-all-tcl maybe-all-tk
-# We put install-tcl before install-itcl because itcl wants to run a
-# program on installation which uses the Tcl libraries.
+all-gas: maybe-all-libiberty
+
+all-stage1-gas: maybe-all-stage1-libiberty
+all-stage2-gas: maybe-all-stage2-libiberty
+all-stage3-gas: maybe-all-stage3-libiberty
+all-stage4-gas: maybe-all-stage4-libiberty
+all-stageprofile-gas: maybe-all-stageprofile-libiberty
+all-stagefeedback-gas: maybe-all-stagefeedback-libiberty
+all-gas: maybe-all-opcodes
+
+all-stage1-gas: maybe-all-stage1-opcodes
+all-stage2-gas: maybe-all-stage2-opcodes
+all-stage3-gas: maybe-all-stage3-opcodes
+all-stage4-gas: maybe-all-stage4-opcodes
+all-stageprofile-gas: maybe-all-stageprofile-opcodes
+all-stagefeedback-gas: maybe-all-stagefeedback-opcodes
+all-gas: maybe-all-bfd
+
+all-stage1-gas: maybe-all-stage1-bfd
+all-stage2-gas: maybe-all-stage2-bfd
+all-stage3-gas: maybe-all-stage3-bfd
+all-stage4-gas: maybe-all-stage4-bfd
+all-stageprofile-gas: maybe-all-stageprofile-bfd
+all-stagefeedback-gas: maybe-all-stagefeedback-bfd
+all-gas: maybe-all-intl
+
+all-stage1-gas: maybe-all-stage1-intl
+all-stage2-gas: maybe-all-stage2-intl
+all-stage3-gas: maybe-all-stage3-intl
+all-stage4-gas: maybe-all-stage4-intl
+all-stageprofile-gas: maybe-all-stageprofile-intl
+all-stagefeedback-gas: maybe-all-stagefeedback-intl
+all-gprof: maybe-all-libiberty
+all-gprof: maybe-all-bfd
+all-gprof: maybe-all-opcodes
+all-gprof: maybe-all-intl
+all-ld: maybe-all-libiberty
+
+all-stage1-ld: maybe-all-stage1-libiberty
+all-stage2-ld: maybe-all-stage2-libiberty
+all-stage3-ld: maybe-all-stage3-libiberty
+all-stage4-ld: maybe-all-stage4-libiberty
+all-stageprofile-ld: maybe-all-stageprofile-libiberty
+all-stagefeedback-ld: maybe-all-stagefeedback-libiberty
+all-ld: maybe-all-bfd
+
+all-stage1-ld: maybe-all-stage1-bfd
+all-stage2-ld: maybe-all-stage2-bfd
+all-stage3-ld: maybe-all-stage3-bfd
+all-stage4-ld: maybe-all-stage4-bfd
+all-stageprofile-ld: maybe-all-stageprofile-bfd
+all-stagefeedback-ld: maybe-all-stagefeedback-bfd
+all-ld: maybe-all-opcodes
+
+all-stage1-ld: maybe-all-stage1-opcodes
+all-stage2-ld: maybe-all-stage2-opcodes
+all-stage3-ld: maybe-all-stage3-opcodes
+all-stage4-ld: maybe-all-stage4-opcodes
+all-stageprofile-ld: maybe-all-stageprofile-opcodes
+all-stagefeedback-ld: maybe-all-stagefeedback-opcodes
+all-ld: maybe-all-build-bison
+
+all-stage1-ld: maybe-all-build-bison
+all-stage2-ld: maybe-all-build-bison
+all-stage3-ld: maybe-all-build-bison
+all-stage4-ld: maybe-all-build-bison
+all-stageprofile-ld: maybe-all-build-bison
+all-stagefeedback-ld: maybe-all-build-bison
+all-prebootstrap: maybe-all-build-bison
+all-ld: maybe-all-build-byacc
+
+all-stage1-ld: maybe-all-build-byacc
+all-stage2-ld: maybe-all-build-byacc
+all-stage3-ld: maybe-all-build-byacc
+all-stage4-ld: maybe-all-build-byacc
+all-stageprofile-ld: maybe-all-build-byacc
+all-stagefeedback-ld: maybe-all-build-byacc
+all-prebootstrap: maybe-all-build-byacc
+all-ld: maybe-all-build-flex
+
+all-stage1-ld: maybe-all-build-flex
+all-stage2-ld: maybe-all-build-flex
+all-stage3-ld: maybe-all-build-flex
+all-stage4-ld: maybe-all-build-flex
+all-stageprofile-ld: maybe-all-build-flex
+all-stagefeedback-ld: maybe-all-build-flex
+all-prebootstrap: maybe-all-build-flex
+all-ld: maybe-all-intl
+
+all-stage1-ld: maybe-all-stage1-intl
+all-stage2-ld: maybe-all-stage2-intl
+all-stage3-ld: maybe-all-stage3-intl
+all-stage4-ld: maybe-all-stage4-intl
+all-stageprofile-ld: maybe-all-stageprofile-intl
+all-stagefeedback-ld: maybe-all-stagefeedback-intl
+all-opcodes: maybe-all-bfd
+
+all-stage1-opcodes: maybe-all-stage1-bfd
+all-stage2-opcodes: maybe-all-stage2-bfd
+all-stage3-opcodes: maybe-all-stage3-bfd
+all-stage4-opcodes: maybe-all-stage4-bfd
+all-stageprofile-opcodes: maybe-all-stageprofile-bfd
+all-stagefeedback-opcodes: maybe-all-stagefeedback-bfd
+all-opcodes: maybe-all-libiberty
+
+all-stage1-opcodes: maybe-all-stage1-libiberty
+all-stage2-opcodes: maybe-all-stage2-libiberty
+all-stage3-opcodes: maybe-all-stage3-libiberty
+all-stage4-opcodes: maybe-all-stage4-libiberty
+all-stageprofile-opcodes: maybe-all-stageprofile-libiberty
+all-stagefeedback-opcodes: maybe-all-stagefeedback-libiberty
+all-dejagnu: maybe-all-tcl
+all-dejagnu: maybe-all-expect
+all-dejagnu: maybe-all-tk
+configure-expect: maybe-configure-tcl
+configure-expect: maybe-configure-tk
+all-expect: maybe-all-tcl
+all-expect: maybe-all-tk
+configure-itcl: maybe-configure-tcl
+configure-itcl: maybe-configure-tk
+all-itcl: maybe-all-tcl
+all-itcl: maybe-all-tk
 install-itcl: maybe-install-tcl
-all-sid: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-tcl maybe-all-tk
-install-sid: maybe-install-tcl maybe-install-tk
-all-sim: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-readline maybe-configure-gdb
 configure-tk: maybe-configure-tcl
 all-tk: maybe-all-tcl
-configure-tix: maybe-configure-tcl maybe-configure-tk
-all-tix: maybe-all-tcl maybe-all-tk
-all-texinfo: maybe-all-libiberty
-
-# Other host modules.  Warning, these are not well tested.
-all-autoconf: maybe-all-m4 maybe-all-texinfo
-all-automake: maybe-all-m4 maybe-all-texinfo
-all-bison: maybe-all-texinfo
-all-diff: maybe-all-libiberty
-all-fastjar: maybe-all-zlib maybe-all-libiberty
-all-fileutils: maybe-all-libiberty
-all-flex: maybe-all-libiberty maybe-all-bison maybe-all-byacc
-all-gzip: maybe-all-libiberty
-all-hello: maybe-all-libiberty
-all-m4: maybe-all-libiberty maybe-all-texinfo
-all-make: maybe-all-libiberty maybe-all-intl
-all-patch: maybe-all-libiberty
+all-sid: maybe-all-libiberty
+all-sid: maybe-all-bfd
+all-sid: maybe-all-opcodes
+all-sid: maybe-all-tcl
+all-sid: maybe-all-tk
+install-sid: maybe-install-tcl
+install-sid: maybe-install-tk
+all-sim: maybe-all-libiberty
+all-sim: maybe-all-bfd
+all-sim: maybe-all-opcodes
+all-sim: maybe-all-readline
+all-sim: maybe-configure-gdb
+all-fastjar: maybe-all-zlib
+all-fastjar: maybe-all-build-texinfo
+all-fastjar: maybe-all-libiberty
+all-autoconf: maybe-all-m4
+all-autoconf: maybe-all-build-texinfo
+all-automake: maybe-all-m4
+all-automake: maybe-all-build-texinfo
+all-automake: maybe-all-autoconf
+all-bison: maybe-all-intl
+all-bison: maybe-all-build-texinfo
+all-diff: maybe-all-intl
+all-diff: maybe-all-build-texinfo
+all-fileutils: maybe-all-intl
+all-fileutils: maybe-all-build-texinfo
+all-flex: maybe-all-build-bison
+all-flex: maybe-all-build-byacc
+all-flex: maybe-all-intl
+all-flex: maybe-all-m4
+all-flex: maybe-all-build-texinfo
+all-gzip: maybe-all-intl
+all-gzip: maybe-all-zlib
+all-gzip: maybe-all-build-texinfo
+all-hello: maybe-all-intl
+all-hello: maybe-all-build-texinfo
+all-m4: maybe-all-intl
+all-m4: maybe-all-build-texinfo
+all-make: maybe-all-intl
+all-make: maybe-all-build-texinfo
+all-patch: maybe-all-build-texinfo
+all-make: maybe-all-build-texinfo
 all-prms: maybe-all-libiberty
-all-recode: maybe-all-libiberty
-all-sed: maybe-all-libiberty
+all-recode: maybe-all-build-texinfo
+all-sed: maybe-all-build-texinfo
 all-send-pr: maybe-all-prms
-all-tar: maybe-all-libiberty
-all-uudecode: maybe-all-libiberty
-
-ALL_GCC = maybe-all-gcc
-ALL_GCC_C = $(ALL_GCC) maybe-all-target-newlib maybe-all-target-libgloss
-ALL_GCC_CXX = $(ALL_GCC_C) maybe-all-target-libstdc++-v3
-
-# Target modules specific to gcc.
-configure-target-boehm-gc: $(ALL_GCC_C) maybe-configure-target-qthreads
+all-tar: maybe-all-build-texinfo
+all-uudecode: maybe-all-build-texinfo
+configure-target-boehm-gc: maybe-configure-target-qthreads
 configure-target-fastjar: maybe-configure-target-zlib
-all-target-fastjar: maybe-all-target-zlib maybe-all-target-libiberty
-configure-target-libada: $(ALL_GCC_C)
-configure-target-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
-configure-target-libobjc: $(ALL_GCC_C)
+all-target-fastjar: maybe-all-target-zlib
+all-target-fastjar: maybe-all-target-libiberty
+configure-target-libjava: maybe-configure-target-zlib
+configure-target-libjava: maybe-configure-target-boehm-gc
+configure-target-libjava: maybe-configure-target-qthreads
+configure-target-libjava: maybe-configure-target-libffi
+all-target-libjava: maybe-all-fastjar
+all-target-libjava: maybe-all-target-zlib
+all-target-libjava: maybe-all-target-boehm-gc
+all-target-libjava: maybe-all-target-qthreads
+all-target-libjava: maybe-all-target-libffi
 all-target-libobjc: maybe-all-target-libiberty
-configure-target-libstdc++-v3: $(ALL_GCC_C)
 all-target-libstdc++-v3: maybe-all-target-libiberty
-configure-target-zlib: $(ALL_GCC_C)
-
-# Target modules in the 'src' repository.
-configure-target-examples: $(ALL_GCC_C)
-configure-target-libgloss: $(ALL_GCC)
 all-target-libgloss: maybe-configure-target-newlib
-configure-target-libiberty: $(ALL_GCC)
-configure-target-libtermcap: $(ALL_GCC_C)
-configure-target-newlib: $(ALL_GCC)
-configure-target-rda: $(ALL_GCC_C)
-configure-target-winsup: $(ALL_GCC_C)
-all-target-winsup: maybe-all-target-libiberty maybe-all-target-libtermcap
-
-# Other target modules.  Warning, these are not well tested.
-configure-target-gperf: $(ALL_GCC_CXX)
-all-target-gperf: maybe-all-target-libiberty maybe-all-target-libstdc++-v3
-configure-target-qthreads: $(ALL_GCC_C)
+all-target-winsup: maybe-all-target-libiberty
+all-target-winsup: maybe-all-target-libtermcap
+
+
+# Non-toplevel bootstrap rules must depend on several packages, to be built
+# before gcc.  Another wart that will go away, hopefully soon.
+@if gcc-no-bootstrap
+
+all-prebootstrap: maybe-all-bfd
+all-prebootstrap: maybe-all-opcodes
+all-prebootstrap: maybe-all-binutils
+all-prebootstrap: maybe-all-gas
+all-prebootstrap: maybe-all-intl
+all-prebootstrap: maybe-all-ld
+all-prebootstrap: maybe-all-libcpp
+all-prebootstrap: maybe-all-libiberty
+all-prebootstrap: maybe-all-zlib
+@endif gcc-no-bootstrap
+
+GDB_TK = @GDB_TK@
+all-gdb: $(gdbnlmrequirements) $(GDB_TK)
 
 # Serialization dependencies.  Host configures don't work well in parallel to
 # each other, due to contention over config.cache.  Target configures and