OSDN Git Service

* stmt.c (expand_case): Handle the default label outside of
[pf3gnuchains/gcc-fork.git] / Makefile.in
index fa9432b..0867ec9 100644 (file)
@@ -101,10 +101,11 @@ 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
@@ -170,7 +171,9 @@ 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 = \
@@ -204,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) \
@@ -245,6 +250,10 @@ CXX_FOR_BUILD = $(CXX)
 BUILD_PREFIX = @BUILD_PREFIX@
 BUILD_PREFIX_1 = @BUILD_PREFIX_1@
 
+# 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 ; \
@@ -478,14 +487,6 @@ PICFLAG_FOR_TARGET =
 # Miscellaneous targets and flag lists
 # ------------------------------------
 
-@if gcc-bootstrap
-# Let's leave this as the first rule in the file until toplevel
-# bootstrap is fleshed out completely.
-sorry:
-       @echo Toplevel bootstrap temporarily out of commission.
-       @echo Please reconfigure without --enable-bootstrap
-@endif gcc-bootstrap
-
 # 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.
 @default_target@:
@@ -682,7 +683,6 @@ configure-host:  \
     maybe-configure-ld \
     maybe-configure-libcpp \
     maybe-configure-libgui \
-    maybe-configure-libbanshee \
     maybe-configure-libiberty \
     maybe-configure-libtool \
     maybe-configure-m4 \
@@ -746,7 +746,8 @@ all-build:  \
     maybe-all-build-byacc \
     maybe-all-build-flex \
     maybe-all-build-m4 \
-    maybe-all-build-texinfo
+    maybe-all-build-texinfo \
+    maybe-all-build-fixincludes
 .PHONY: all-host
 all-host:  \
     maybe-all-ash \
@@ -783,7 +784,6 @@ all-host:  \
     maybe-all-ld \
     maybe-all-libcpp \
     maybe-all-libgui \
-    maybe-all-libbanshee \
     maybe-all-libiberty \
     maybe-all-libtool \
     maybe-all-m4 \
@@ -880,7 +880,6 @@ info-host:  \
     maybe-info-ld \
     maybe-info-libcpp \
     maybe-info-libgui \
-    maybe-info-libbanshee \
     maybe-info-libiberty \
     maybe-info-libtool \
     maybe-info-m4 \
@@ -973,7 +972,6 @@ dvi-host:  \
     maybe-dvi-ld \
     maybe-dvi-libcpp \
     maybe-dvi-libgui \
-    maybe-dvi-libbanshee \
     maybe-dvi-libiberty \
     maybe-dvi-libtool \
     maybe-dvi-m4 \
@@ -1066,7 +1064,6 @@ TAGS-host:  \
     maybe-TAGS-ld \
     maybe-TAGS-libcpp \
     maybe-TAGS-libgui \
-    maybe-TAGS-libbanshee \
     maybe-TAGS-libiberty \
     maybe-TAGS-libtool \
     maybe-TAGS-m4 \
@@ -1159,7 +1156,6 @@ install-info-host:  \
     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 \
@@ -1252,7 +1248,6 @@ installcheck-host:  \
     maybe-installcheck-ld \
     maybe-installcheck-libcpp \
     maybe-installcheck-libgui \
-    maybe-installcheck-libbanshee \
     maybe-installcheck-libiberty \
     maybe-installcheck-libtool \
     maybe-installcheck-m4 \
@@ -1345,7 +1340,6 @@ mostlyclean-host:  \
     maybe-mostlyclean-ld \
     maybe-mostlyclean-libcpp \
     maybe-mostlyclean-libgui \
-    maybe-mostlyclean-libbanshee \
     maybe-mostlyclean-libiberty \
     maybe-mostlyclean-libtool \
     maybe-mostlyclean-m4 \
@@ -1438,7 +1432,6 @@ clean-host:  \
     maybe-clean-ld \
     maybe-clean-libcpp \
     maybe-clean-libgui \
-    maybe-clean-libbanshee \
     maybe-clean-libiberty \
     maybe-clean-libtool \
     maybe-clean-m4 \
@@ -1531,7 +1524,6 @@ distclean-host:  \
     maybe-distclean-ld \
     maybe-distclean-libcpp \
     maybe-distclean-libgui \
-    maybe-distclean-libbanshee \
     maybe-distclean-libiberty \
     maybe-distclean-libtool \
     maybe-distclean-m4 \
@@ -1624,7 +1616,6 @@ maintainer-clean-host:  \
     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 \
@@ -1774,7 +1765,6 @@ do-check: unstage  \
     maybe-check-ld \
     maybe-check-libcpp \
     maybe-check-libgui \
-    maybe-check-libbanshee \
     maybe-check-libiberty \
     maybe-check-libtool \
     maybe-check-m4 \
@@ -1886,7 +1876,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 \
@@ -1955,7 +1944,6 @@ install-host:  \
     maybe-install-ld \
     maybe-install-libcpp \
     maybe-install-libgui \
-    maybe-install-libbanshee \
     maybe-install-libiberty \
     maybe-install-libtool \
     maybe-install-m4 \
@@ -2454,6 +2442,71 @@ all-build-texinfo: configure-build-texinfo
          $(MAKE)  $(TARGET-build-texinfo))
 @endif build-texinfo
 
+.PHONY: configure-build-fixincludes maybe-configure-build-fixincludes
+maybe-configure-build-fixincludes:
+@if build-fixincludes
+maybe-configure-build-fixincludes: configure-build-fixincludes
+configure-build-fixincludes:
+       @test ! -f $(BUILD_SUBDIR)/fixincludes/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/fixincludes ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(BUILD_EXPORTS) \
+       echo Configuring in $(BUILD_SUBDIR)/fixincludes; \
+       cd "$(BUILD_SUBDIR)/fixincludes" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) \
+           topdir=$(srcdir) ;; \
+         *) \
+           case "$(BUILD_SUBDIR)" in \
+             .) topdir="../$(srcdir)" ;; \
+             *) topdir="../../$(srcdir)" ;; \
+           esac ;; \
+       esac; \
+       if [ "$(srcdir)" = "." ] ; then \
+         if [ "$(BUILD_SUBDIR)" != "." ] ; then \
+           if $(SHELL) $$s/symlink-tree $${topdir}/fixincludes "no-such-file" ; then \
+             if [ -f Makefile ]; then \
+               if $(MAKE) distclean; then \
+                 true; \
+               else \
+                 exit 1; \
+               fi; \
+             else \
+               true; \
+             fi; \
+           else \
+             exit 1; \
+           fi; \
+         else \
+           true; \
+         fi; \
+         srcdiroption="--srcdir=."; \
+         libsrcdir="."; \
+       else \
+         srcdiroption="--srcdir=$${topdir}/fixincludes"; \
+         libsrcdir="$$s/fixincludes"; \
+       fi; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(BUILD_CONFIGARGS) $${srcdiroption} \
+         --with-build-subdir="$(BUILD_SUBDIR)"  \
+         || exit 1
+@endif build-fixincludes
+
+.PHONY: all-build-fixincludes maybe-all-build-fixincludes
+maybe-all-build-fixincludes:
+@if build-fixincludes
+TARGET-build-fixincludes=all
+maybe-all-build-fixincludes: all-build-fixincludes
+all-build-fixincludes: configure-build-fixincludes
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(BUILD_EXPORTS) \
+       (cd $(BUILD_SUBDIR)/fixincludes && \
+         $(MAKE)  $(TARGET-build-fixincludes))
+@endif build-fixincludes
+
 
 # --------------------------------------
 # Modules which run on the host machine
@@ -2490,13 +2543,15 @@ configure-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
@@ -2792,13 +2847,15 @@ configure-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
@@ -3094,13 +3151,15 @@ configure-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
@@ -3396,13 +3455,15 @@ configure-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
@@ -3699,6 +3760,7 @@ configure-bfd:
 .PHONY: all-bfd maybe-all-bfd
 maybe-all-bfd:
 @if bfd
+TARGET-bfd=all
 maybe-all-bfd: all-bfd
 all-bfd: configure-bfd
        @test -f stage_last && exit 0; \
@@ -3706,7 +3768,8 @@ all-bfd: configure-bfd
        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
@@ -4003,6 +4066,7 @@ configure-opcodes:
 .PHONY: all-opcodes maybe-all-opcodes
 maybe-all-opcodes:
 @if opcodes
+TARGET-opcodes=all
 maybe-all-opcodes: all-opcodes
 all-opcodes: configure-opcodes
        @test -f stage_last && exit 0; \
@@ -4010,7 +4074,8 @@ all-opcodes: configure-opcodes
        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
@@ -4307,6 +4372,7 @@ configure-binutils:
 .PHONY: all-binutils maybe-all-binutils
 maybe-all-binutils:
 @if binutils
+TARGET-binutils=all
 maybe-all-binutils: all-binutils
 all-binutils: configure-binutils
        @test -f stage_last && exit 0; \
@@ -4314,7 +4380,8 @@ all-binutils: configure-binutils
        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
@@ -4610,13 +4677,15 @@ configure-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
@@ -4915,13 +4984,15 @@ configure-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
@@ -5220,13 +5291,15 @@ configure-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
@@ -5522,13 +5595,15 @@ configure-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
@@ -5824,13 +5899,15 @@ configure-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
@@ -6126,13 +6203,15 @@ configure-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
@@ -6423,13 +6502,15 @@ configure-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
@@ -6725,13 +6806,15 @@ configure-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
@@ -7030,13 +7113,15 @@ configure-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
@@ -7332,13 +7417,15 @@ configure-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
@@ -7634,13 +7721,15 @@ configure-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
@@ -7936,13 +8025,15 @@ configure-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
@@ -8242,6 +8333,7 @@ configure-gas:
 .PHONY: all-gas maybe-all-gas
 maybe-all-gas:
 @if gas
+TARGET-gas=all
 maybe-all-gas: all-gas
 all-gas: configure-gas
        @test -f stage_last && exit 0; \
@@ -8249,7 +8341,8 @@ all-gas: configure-gas
        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
@@ -8546,6 +8639,7 @@ configure-gcc:
 .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; \
@@ -8553,8 +8647,8 @@ all-gcc: configure-gcc
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gcc && $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS)  \
-           `if [ -f gcc/stage_last ]; then echo quickstrap ; else echo all; fi` )
+       (cd gcc && $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
+         $(TARGET-gcc))
 @endif gcc
 
 .PHONY: check-gcc maybe-check-gcc
@@ -8850,13 +8944,15 @@ configure-gawk:
 .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 gawk && $(MAKE) $(FLAGS_TO_PASS)  all)
+       (cd gawk && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-gawk))
 @endif gawk
 
 .PHONY: check-gawk maybe-check-gawk
@@ -9152,13 +9248,15 @@ configure-gettext:
 .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 gettext && $(MAKE) $(FLAGS_TO_PASS)  all)
+       (cd gettext && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-gettext))
 @endif gettext
 
 .PHONY: check-gettext maybe-check-gettext
@@ -9454,13 +9552,15 @@ configure-gnuserv:
 .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 gnuserv && $(MAKE) $(FLAGS_TO_PASS)  all)
+       (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-gnuserv))
 @endif gnuserv
 
 .PHONY: check-gnuserv maybe-check-gnuserv
@@ -9756,13 +9856,15 @@ configure-gprof:
 .PHONY: all-gprof maybe-all-gprof
 maybe-all-gprof:
 @if gprof
+TARGET-gprof=all
 maybe-all-gprof: all-gprof
 all-gprof: configure-gprof
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gprof && $(MAKE) $(FLAGS_TO_PASS)  all)
+       (cd gprof && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-gprof))
 @endif gprof
 
 .PHONY: check-gprof maybe-check-gprof
@@ -10058,13 +10160,15 @@ configure-gzip:
 .PHONY: all-gzip maybe-all-gzip
 maybe-all-gzip:
 @if gzip
+TARGET-gzip=all
 maybe-all-gzip: all-gzip
 all-gzip: configure-gzip
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd gzip && $(MAKE) $(FLAGS_TO_PASS)  all)
+       (cd gzip && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-gzip))
 @endif gzip
 
 .PHONY: check-gzip maybe-check-gzip
@@ -10360,13 +10464,15 @@ configure-hello:
 .PHONY: all-hello maybe-all-hello
 maybe-all-hello:
 @if hello
+TARGET-hello=all
 maybe-all-hello: all-hello
 all-hello: configure-hello
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd hello && $(MAKE) $(FLAGS_TO_PASS)  all)
+       (cd hello && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-hello))
 @endif hello
 
 .PHONY: check-hello maybe-check-hello
@@ -10662,13 +10768,15 @@ configure-indent:
 .PHONY: all-indent maybe-all-indent
 maybe-all-indent:
 @if indent
+TARGET-indent=all
 maybe-all-indent: all-indent
 all-indent: configure-indent
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd indent && $(MAKE) $(FLAGS_TO_PASS)  all)
+       (cd indent && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-indent))
 @endif indent
 
 .PHONY: check-indent maybe-check-indent
@@ -10965,6 +11073,7 @@ configure-intl:
 .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; \
@@ -10972,7 +11081,8 @@ all-intl: configure-intl
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd intl && $(MAKE) $(FLAGS_TO_PASS)  all)
+       (cd intl && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-intl))
 @endif intl
 
 .PHONY: check-intl maybe-check-intl
@@ -11268,13 +11378,15 @@ configure-tcl:
 .PHONY: all-tcl maybe-all-tcl
 maybe-all-tcl:
 @if tcl
+TARGET-tcl=all
 maybe-all-tcl: all-tcl
 all-tcl: configure-tcl
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd tcl && $(MAKE) $(FLAGS_TO_PASS)  all)
+       (cd tcl && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-tcl))
 @endif tcl
 
 .PHONY: check-tcl maybe-check-tcl
@@ -11555,13 +11667,15 @@ configure-itcl:
 .PHONY: all-itcl maybe-all-itcl
 maybe-all-itcl:
 @if itcl
+TARGET-itcl=all
 maybe-all-itcl: all-itcl
 all-itcl: configure-itcl
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd itcl && $(MAKE) $(FLAGS_TO_PASS)  all)
+       (cd itcl && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-itcl))
 @endif itcl
 
 .PHONY: check-itcl maybe-check-itcl
@@ -11858,6 +11972,7 @@ configure-ld:
 .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; \
@@ -11865,7 +11980,8 @@ all-ld: configure-ld
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd ld && $(MAKE) $(FLAGS_TO_PASS)  all)
+       (cd ld && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-ld))
 @endif ld
 
 .PHONY: check-ld maybe-check-ld
@@ -12162,6 +12278,7 @@ configure-libcpp:
 .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; \
@@ -12169,7 +12286,8 @@ all-libcpp: configure-libcpp
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        $(HOST_EXPORTS) \
-       (cd libcpp && $(MAKE) $(FLAGS_TO_PASS)  all)
+       (cd libcpp && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-libcpp))
 @endif libcpp
 
 .PHONY: check-libcpp maybe-check-libcpp
@@ -12465,13 +12583,15 @@ configure-libgui:
 .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 libgui && $(MAKE) $(FLAGS_TO_PASS)  all)
+       (cd libgui && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-libgui))
 @endif libgui
 
 .PHONY: check-libgui maybe-check-libgui
@@ -12736,305 +12856,6 @@ maintainer-clean-libgui:
 @endif libgui
 
 
-.PHONY: configure-libbanshee maybe-configure-libbanshee
-maybe-configure-libbanshee:
-@if libbanshee
-maybe-configure-libbanshee: configure-libbanshee
-configure-libbanshee:
-       @test -f stage_last && exit 0; \
-       test ! -f libbanshee/Makefile || exit 0; \
-       [ -d libbanshee ] || mkdir libbanshee; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       echo Configuring in libbanshee; \
-       cd libbanshee || exit 1; \
-       case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/libbanshee"; \
-           libsrcdir="$$s/libbanshee";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/libbanshee"; \
-           libsrcdir="$$s/libbanshee";; \
-       esac; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption}  \
-         || exit 1
-@endif libbanshee
-
-.PHONY: all-libbanshee maybe-all-libbanshee
-maybe-all-libbanshee:
-@if libbanshee
-maybe-all-libbanshee: all-libbanshee
-all-libbanshee: configure-libbanshee
-       @test -f stage_last && exit 0; \
-       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
-
-.PHONY: check-libbanshee maybe-check-libbanshee
-maybe-check-libbanshee:
-@if libbanshee
-maybe-check-libbanshee: check-libbanshee
-
-check-libbanshee:
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       $(HOST_EXPORTS) \
-       (cd libbanshee && $(MAKE) $(FLAGS_TO_PASS) check)
-
-@endif libbanshee
-
-.PHONY: install-libbanshee maybe-install-libbanshee
-maybe-install-libbanshee:
-@if libbanshee
-maybe-install-libbanshee: install-libbanshee
-
-install-libbanshee:
-
-@endif libbanshee
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-libbanshee info-libbanshee
-maybe-info-libbanshee:
-@if libbanshee
-maybe-info-libbanshee: info-libbanshee
-
-info-libbanshee: \
-    configure-libbanshee 
-       @[ -f ./libbanshee/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing info in libbanshee" ; \
-       (cd libbanshee && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 info) \
-         || exit 1
-
-@endif libbanshee
-
-.PHONY: maybe-dvi-libbanshee dvi-libbanshee
-maybe-dvi-libbanshee:
-@if libbanshee
-maybe-dvi-libbanshee: dvi-libbanshee
-
-dvi-libbanshee: \
-    configure-libbanshee 
-       @[ -f ./libbanshee/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing dvi in libbanshee" ; \
-       (cd libbanshee && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 dvi) \
-         || exit 1
-
-@endif libbanshee
-
-.PHONY: maybe-TAGS-libbanshee TAGS-libbanshee
-maybe-TAGS-libbanshee:
-@if libbanshee
-maybe-TAGS-libbanshee: TAGS-libbanshee
-
-TAGS-libbanshee: \
-    configure-libbanshee 
-       @[ -f ./libbanshee/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing TAGS in libbanshee" ; \
-       (cd libbanshee && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 TAGS) \
-         || exit 1
-
-@endif libbanshee
-
-.PHONY: maybe-install-info-libbanshee install-info-libbanshee
-maybe-install-info-libbanshee:
-@if libbanshee
-maybe-install-info-libbanshee: install-info-libbanshee
-
-install-info-libbanshee: \
-    configure-libbanshee \
-    info-libbanshee 
-       @[ -f ./libbanshee/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing install-info in libbanshee" ; \
-       (cd libbanshee && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 install-info) \
-         || exit 1
-
-@endif libbanshee
-
-.PHONY: maybe-installcheck-libbanshee installcheck-libbanshee
-maybe-installcheck-libbanshee:
-@if libbanshee
-maybe-installcheck-libbanshee: installcheck-libbanshee
-
-installcheck-libbanshee: \
-    configure-libbanshee 
-       @[ -f ./libbanshee/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing installcheck in libbanshee" ; \
-       (cd libbanshee && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 installcheck) \
-         || exit 1
-
-@endif libbanshee
-
-.PHONY: maybe-mostlyclean-libbanshee mostlyclean-libbanshee
-maybe-mostlyclean-libbanshee:
-@if libbanshee
-maybe-mostlyclean-libbanshee: mostlyclean-libbanshee
-
-mostlyclean-libbanshee: 
-       @[ -f ./libbanshee/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing mostlyclean in libbanshee" ; \
-       (cd libbanshee && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 mostlyclean) \
-         || exit 1
-
-@endif libbanshee
-
-.PHONY: maybe-clean-libbanshee clean-libbanshee
-maybe-clean-libbanshee:
-@if libbanshee
-maybe-clean-libbanshee: clean-libbanshee
-
-clean-libbanshee: 
-       @[ -f ./libbanshee/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing clean in libbanshee" ; \
-       (cd libbanshee && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 clean) \
-         || exit 1
-
-@endif libbanshee
-
-.PHONY: maybe-distclean-libbanshee distclean-libbanshee
-maybe-distclean-libbanshee:
-@if libbanshee
-maybe-distclean-libbanshee: distclean-libbanshee
-
-distclean-libbanshee: 
-       @[ -f ./libbanshee/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing distclean in libbanshee" ; \
-       (cd libbanshee && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 distclean) \
-         || exit 1
-
-@endif libbanshee
-
-.PHONY: maybe-maintainer-clean-libbanshee maintainer-clean-libbanshee
-maybe-maintainer-clean-libbanshee:
-@if libbanshee
-maybe-maintainer-clean-libbanshee: maintainer-clean-libbanshee
-
-maintainer-clean-libbanshee: 
-       @[ -f ./libbanshee/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(SET_LIB_PATH) \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing maintainer-clean in libbanshee" ; \
-       (cd libbanshee && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                 maintainer-clean) \
-         || exit 1
-
-@endif libbanshee
-
-
 .PHONY: configure-libiberty maybe-configure-libiberty
 maybe-configure-libiberty:
 @if libiberty
@@ -13067,6 +12888,7 @@ configure-libiberty:
 .PHONY: all-libiberty maybe-all-libiberty
 maybe-all-libiberty:
 @if libiberty
+TARGET-libiberty=all
 maybe-all-libiberty: all-libiberty
 all-libiberty: configure-libiberty
        @test -f stage_last && exit 0; \
@@ -13074,7 +12896,8 @@ all-libiberty: configure-libiberty
        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
@@ -13370,13 +13193,15 @@ configure-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
@@ -13672,13 +13497,15 @@ configure-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
@@ -13974,13 +13801,15 @@ configure-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
@@ -14276,13 +14105,15 @@ configure-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
@@ -14573,13 +14404,15 @@ configure-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
@@ -14875,13 +14708,15 @@ configure-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
@@ -15177,13 +15012,15 @@ configure-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
@@ -15479,13 +15316,15 @@ configure-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
@@ -15781,13 +15620,15 @@ configure-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
@@ -16083,13 +15924,15 @@ configure-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
@@ -16375,13 +16218,15 @@ configure-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
@@ -16677,13 +16522,15 @@ configure-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
@@ -16979,13 +16826,15 @@ configure-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
@@ -17281,13 +17130,15 @@ configure-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
@@ -17583,13 +17434,15 @@ configure-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
@@ -17885,13 +17738,15 @@ configure-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
@@ -18187,13 +18042,15 @@ configure-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
@@ -18489,13 +18346,15 @@ configure-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
@@ -18786,13 +18645,15 @@ configure-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
@@ -19088,13 +18949,15 @@ configure-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
@@ -19390,13 +19253,15 @@ configure-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
@@ -19692,13 +19557,15 @@ configure-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
@@ -19994,13 +19861,15 @@ configure-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
@@ -20300,6 +20169,7 @@ configure-zlib:
 .PHONY: all-zlib maybe-all-zlib
 maybe-all-zlib:
 @if zlib
+TARGET-zlib=all
 maybe-all-zlib: all-zlib
 all-zlib: configure-zlib
        @test -f stage_last && exit 0; \
@@ -20307,7 +20177,8 @@ all-zlib: configure-zlib
        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
@@ -20593,13 +20464,15 @@ configure-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
@@ -20895,13 +20768,15 @@ configure-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
@@ -21197,13 +21072,15 @@ configure-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
@@ -21499,13 +21376,15 @@ configure-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
@@ -21801,13 +21680,15 @@ configure-libtermcap:
 .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 libtermcap && $(MAKE) $(FLAGS_TO_PASS)  all)
+       (cd libtermcap && $(MAKE) $(FLAGS_TO_PASS)  \
+         $(TARGET-libtermcap))
 @endif libtermcap
 
 .PHONY: check-libtermcap maybe-check-libtermcap
@@ -22038,13 +21919,15 @@ configure-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
@@ -28119,7 +28002,9 @@ stage:
 # (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.
+# Bugs: This is crippled when doing parallel make, the `make all-host'
+# and `make all-target' phases can be parallelized.
+
 
 # 'touch' doesn't work right on some platforms.
 STAMP = echo timestamp > 
@@ -28137,7 +28022,6 @@ STAGE1_LANGUAGES=@stage1_languages@
 objext = .o
 
 # 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/ \
@@ -28157,88 +28041,81 @@ POSTSTAGE1_FLAGS_TO_PASS = \
 .PHONY: stage1-start stage1-end
 
 stage1-start::
-       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+       @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
        echo stage1 > stage_current ; \
        echo stage1 > stage_last
 @if bfd
-       [ -d stage1-bfd ] || mkdir stage1-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; \
+       @[ -d stage1-opcodes ] || mkdir stage1-opcodes; \
        set stage1-opcodes opcodes ; @CREATE_LINK_TO_DIR@ 
 @endif opcodes
 @if binutils
-       [ -d stage1-binutils ] || mkdir stage1-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; \
+       @[ -d stage1-gas ] || mkdir stage1-gas; \
        set stage1-gas gas ; @CREATE_LINK_TO_DIR@ 
 @endif gas
 @if gcc
-       [ -d stage1-gcc ] || mkdir stage1-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; \
+       @[ -d stage1-intl ] || mkdir stage1-intl; \
        set stage1-intl intl ; @CREATE_LINK_TO_DIR@ 
 @endif intl
 @if ld
-       [ -d stage1-ld ] || mkdir stage1-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; \
+       @[ -d stage1-libcpp ] || mkdir stage1-libcpp; \
        set stage1-libcpp libcpp ; @CREATE_LINK_TO_DIR@ 
 @endif libcpp
-@if libbanshee
-       [ -d stage1-libbanshee ] || mkdir stage1-libbanshee; \
-       set stage1-libbanshee libbanshee ; @CREATE_LINK_TO_DIR@ 
-@endif libbanshee
 @if libiberty
-       [ -d stage1-libiberty ] || mkdir stage1-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; \
+       @[ -d stage1-zlib ] || mkdir stage1-zlib; \
        set stage1-zlib zlib ; @CREATE_LINK_TO_DIR@ 
 @endif zlib
 
 stage1-end::
-       rm -f stage_current
+       @rm -f stage_current
 @if bfd
-       set bfd stage1-bfd ; @UNDO_LINK_TO_DIR@ 
+       @set bfd stage1-bfd ; @UNDO_LINK_TO_DIR@ 
 @endif bfd
 @if opcodes
-       set opcodes stage1-opcodes ; @UNDO_LINK_TO_DIR@ 
+       @set opcodes stage1-opcodes ; @UNDO_LINK_TO_DIR@ 
 @endif opcodes
 @if binutils
-       set binutils stage1-binutils ; @UNDO_LINK_TO_DIR@ 
+       @set binutils stage1-binutils ; @UNDO_LINK_TO_DIR@ 
 @endif binutils
 @if gas
-       set gas stage1-gas ; @UNDO_LINK_TO_DIR@ 
+       @set gas stage1-gas ; @UNDO_LINK_TO_DIR@ 
 @endif gas
 @if gcc
-       set gcc stage1-gcc ; @UNDO_LINK_TO_DIR@ 
+       @set gcc stage1-gcc ; @UNDO_LINK_TO_DIR@ 
 @endif gcc
 @if intl
-       set intl stage1-intl ; @UNDO_LINK_TO_DIR@ 
+       @set intl stage1-intl ; @UNDO_LINK_TO_DIR@ 
 @endif intl
 @if ld
-       set ld stage1-ld ; @UNDO_LINK_TO_DIR@ 
+       @set ld stage1-ld ; @UNDO_LINK_TO_DIR@ 
 @endif ld
 @if libcpp
-       set libcpp stage1-libcpp ; @UNDO_LINK_TO_DIR@ 
+       @set libcpp stage1-libcpp ; @UNDO_LINK_TO_DIR@ 
 @endif libcpp
-@if libbanshee
-       set libbanshee stage1-libbanshee ; @UNDO_LINK_TO_DIR@ 
-@endif libbanshee
 @if libiberty
-       set libiberty stage1-libiberty ; @UNDO_LINK_TO_DIR@ 
+       @set libiberty stage1-libiberty ; @UNDO_LINK_TO_DIR@ 
 @endif libiberty
 @if zlib
-       set zlib stage1-zlib ; @UNDO_LINK_TO_DIR@ 
+       @set zlib stage1-zlib ; @UNDO_LINK_TO_DIR@ 
 @endif zlib
 
 # Bubble a bugfix through all the stages up to stage 1.  They
@@ -28246,13 +28123,13 @@ stage1-end::
 # be reconfigured as well.
 .PHONY: stage1-bubble
 stage1-bubble:: 
-       @case `echo all-stage1-*` in \
-         'all-stage1-*') ;; \
-         *) echo Remaking stage 1 ; rm -f all-stage1-* ;; \
-       esac ; \
-       $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage1
+       @if test -f stage1-lean  ; then \
+         echo Skipping rebuild of stage1 ; \
+       else \
+         $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage1; \
+       fi
 
-.PHONY: all-stage1
+.PHONY: all-stage1 clean-stage1
 all-stage1:     \
   maybe-all-stage1-bfd \
   maybe-all-stage1-opcodes \
@@ -28262,24 +28139,36 @@ all-stage1:     \
   maybe-all-stage1-intl   \
   maybe-all-stage1-ld \
   maybe-all-stage1-libcpp  \
-  maybe-all-stage1-libbanshee \
   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
-       @if [ -f stage1-bfd/Makefile ] ; then \
-         $(STAMP) configure-stage1-bfd ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -28298,34 +28187,42 @@ configure-stage1-bfd:
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"  && \
-         $(STAMP) ../configure-stage1-bfd
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
 
 maybe-all-stage1-bfd: all-stage1-bfd
 all-stage1-bfd: configure-stage1-bfd
-       $(MAKE) stage1-start
+       @$(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)"  && \
-       $(STAMP) ../all-stage1-bfd
+               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
-       @if [ -f stage1-opcodes/Makefile ] ; then \
-         $(STAMP) configure-stage1-opcodes ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -28344,34 +28241,42 @@ configure-stage1-opcodes:
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"  && \
-         $(STAMP) ../configure-stage1-opcodes
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
 
 maybe-all-stage1-opcodes: all-stage1-opcodes
 all-stage1-opcodes: configure-stage1-opcodes
-       $(MAKE) stage1-start
+       @$(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)"  && \
-       $(STAMP) ../all-stage1-opcodes
+               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
-       @if [ -f stage1-binutils/Makefile ] ; then \
-         $(STAMP) configure-stage1-binutils ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -28390,34 +28295,42 @@ configure-stage1-binutils:
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"  && \
-         $(STAMP) ../configure-stage1-binutils
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
 
 maybe-all-stage1-binutils: all-stage1-binutils
 all-stage1-binutils: configure-stage1-binutils
-       $(MAKE) stage1-start
+       @$(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)"  && \
-       $(STAMP) ../all-stage1-binutils
+               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
-       @if [ -f stage1-gas/Makefile ] ; then \
-         $(STAMP) configure-stage1-gas ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -28436,34 +28349,42 @@ configure-stage1-gas:
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"  && \
-         $(STAMP) ../configure-stage1-gas
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
 
 maybe-all-stage1-gas: all-stage1-gas
 all-stage1-gas: configure-stage1-gas
-       $(MAKE) stage1-start
+       @$(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)"  && \
-       $(STAMP) ../all-stage1-gas
+               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
-       @if [ -f stage1-gcc/Makefile ] ; then \
-         $(STAMP) configure-stage1-gcc ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -28482,34 +28403,42 @@ configure-stage1-gcc:
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"  && \
-         $(STAMP) ../configure-stage1-gcc
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
 
 maybe-all-stage1-gcc: all-stage1-gcc
 all-stage1-gcc: configure-stage1-gcc
-       $(MAKE) stage1-start
+       @$(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) && \
-       $(STAMP) ../all-stage1-gcc
+               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
-       @if [ -f stage1-intl/Makefile ] ; then \
-         $(STAMP) configure-stage1-intl ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -28528,34 +28457,42 @@ configure-stage1-intl:
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"  && \
-         $(STAMP) ../configure-stage1-intl
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
 
 maybe-all-stage1-intl: all-stage1-intl
 all-stage1-intl: configure-stage1-intl
-       $(MAKE) stage1-start
+       @$(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)"  && \
-       $(STAMP) ../all-stage1-intl
+               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
-       @if [ -f stage1-ld/Makefile ] ; then \
-         $(STAMP) configure-stage1-ld ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -28574,34 +28511,42 @@ configure-stage1-ld:
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"  && \
-         $(STAMP) ../configure-stage1-ld
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
 
 maybe-all-stage1-ld: all-stage1-ld
 all-stage1-ld: configure-stage1-ld
-       $(MAKE) stage1-start
+       @$(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)"  && \
-       $(STAMP) ../all-stage1-ld
+               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
-       @if [ -f stage1-libcpp/Makefile ] ; then \
-         $(STAMP) configure-stage1-libcpp ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -28620,80 +28565,42 @@ configure-stage1-libcpp:
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"  && \
-         $(STAMP) ../configure-stage1-libcpp
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
 
 maybe-all-stage1-libcpp: all-stage1-libcpp
 all-stage1-libcpp: configure-stage1-libcpp
-       $(MAKE) stage1-start
+       @$(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)"  && \
-       $(STAMP) ../all-stage1-libcpp
-@endif libcpp-bootstrap
+               CFLAGS="$(STAGE1_CFLAGS)" 
 
-maybe-configure-stage1-libbanshee:
-maybe-all-stage1-libbanshee:
+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
 
-@if libbanshee-bootstrap
-maybe-configure-stage1-libbanshee: configure-stage1-libbanshee
-configure-stage1-libbanshee: 
-       $(MAKE) stage1-start
-       @if [ -f stage1-libbanshee/Makefile ] ; then \
-         $(STAMP) configure-stage1-libbanshee ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(HOST_EXPORTS)  \
-       echo Configuring stage 1 in libbanshee ; \
-       cd libbanshee || exit 1; \
-       case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/libbanshee"; \
-           libsrcdir="$$s/libbanshee";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/libbanshee"; \
-           libsrcdir="$$s/libbanshee";; \
-       esac; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"  && \
-         $(STAMP) ../configure-stage1-libbanshee
 
-maybe-all-stage1-libbanshee: all-stage1-libbanshee
-all-stage1-libbanshee: configure-stage1-libbanshee
-       $(MAKE) stage1-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(HOST_EXPORTS)  \
-       cd libbanshee && \
-       $(MAKE) $(FLAGS_TO_PASS)  \
-               CFLAGS="$(STAGE1_CFLAGS)"  && \
-       $(STAMP) ../all-stage1-libbanshee
-@endif libbanshee-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
-       @if [ -f stage1-libiberty/Makefile ] ; then \
-         $(STAMP) configure-stage1-libiberty ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -28712,34 +28619,42 @@ configure-stage1-libiberty:
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"  && \
-         $(STAMP) ../configure-stage1-libiberty
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
 
 maybe-all-stage1-libiberty: all-stage1-libiberty
 all-stage1-libiberty: configure-stage1-libiberty
-       $(MAKE) stage1-start
+       @$(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)"  && \
-       $(STAMP) ../all-stage1-libiberty
+               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
-       @if [ -f stage1-zlib/Makefile ] ; then \
-         $(STAMP) configure-stage1-zlib ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -28758,22 +28673,30 @@ configure-stage1-zlib:
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"  && \
-         $(STAMP) ../configure-stage1-zlib
+         --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
 
 maybe-all-stage1-zlib: all-stage1-zlib
 all-stage1-zlib: configure-stage1-zlib
-       $(MAKE) stage1-start
+       @$(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)"  && \
-       $(STAMP) ../all-stage1-zlib
+               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
@@ -28781,35 +28704,12 @@ all-stage1-zlib: configure-stage1-zlib
 
 
 
-.PHONY: restage1 touch-stage1 distclean-stage1
-
-# Rules to wipe a stage and all the following ones, used for cleanstrap
+# 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 configure-stage1-* all-stage1-* stage1-* 
-
-# Rules to renew the timestamp on a stage and all the following ones
-
-touch-stage1::
-       @case `echo configure-stage1-*` in \
-         'configure-stage1-*') ;; \
-         *) \
-           echo '$(STAMP)' configure-stage1-* && \
-           $(STAMP) configure-stage1-* ;; \
-       esac ; \
-       case `echo all-stage1-*` in \
-         'all-stage1-*') ;; \
-         *) \
-           echo '$(STAMP)' all-stage1-* && \
-           $(STAMP) all-stage1-* ;; \
-       esac
-
-# After building a stage, touch the following ones
-
-restage1::
-       rm -rf all-stage1-* 
-       $(MAKE) $(RECURSE_FLAGS_TO_PASS)  all-stage1 
+       rm -rf stage1-* 
 
 
 @endif gcc-bootstrap
@@ -28818,109 +28718,100 @@ restage1::
 .PHONY: stage2-start stage2-end
 
 stage2-start::
-       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+       @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
        echo stage2 > stage_current ; \
        echo stage2 > stage_last
 @if bfd
-       [ -d stage2-bfd ] || mkdir stage2-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; \
+       @[ -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; \
+       @[ -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; \
+       @[ -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; \
+       @[ -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; \
+       @[ -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; \
+       @[ -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; \
+       @[ -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 libbanshee
-       [ -d stage2-libbanshee ] || mkdir stage2-libbanshee; \
-       set stage2-libbanshee libbanshee ; @CREATE_LINK_TO_DIR@  ; \
-       set stage1-libbanshee prev-libbanshee ; @CREATE_LINK_TO_DIR@ 
-@endif libbanshee
 @if libiberty
-       [ -d stage2-libiberty ] || mkdir stage2-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; \
+       @[ -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
+       @rm -f stage_current
 @if bfd
-       set bfd stage2-bfd ; @UNDO_LINK_TO_DIR@  ; \
+       @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 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 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 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 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 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 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 libcpp stage2-libcpp ; @UNDO_LINK_TO_DIR@  ; \
        set prev-libcpp stage1-libcpp ; @UNDO_LINK_TO_DIR@ 
 @endif libcpp
-@if libbanshee
-       set libbanshee stage2-libbanshee ; @UNDO_LINK_TO_DIR@  ; \
-       set prev-libbanshee stage1-libbanshee ; @UNDO_LINK_TO_DIR@ 
-@endif libbanshee
 @if libiberty
-       set libiberty stage2-libiberty ; @UNDO_LINK_TO_DIR@  ; \
+       @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 zlib stage2-zlib ; @UNDO_LINK_TO_DIR@  ; \
        set prev-zlib stage1-zlib ; @UNDO_LINK_TO_DIR@ 
 @endif zlib
 
@@ -28929,13 +28820,13 @@ stage2-end::
 # be reconfigured as well.
 .PHONY: stage2-bubble
 stage2-bubble:: stage1-bubble
-       @case `echo all-stage2-*` in \
-         'all-stage2-*') ;; \
-         *) echo Remaking stage 2 ; rm -f all-stage2-* ;; \
-       esac ; \
-       $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage2
+       @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
+.PHONY: all-stage2 clean-stage2
 all-stage2:     \
   maybe-all-stage2-bfd \
   maybe-all-stage2-opcodes \
@@ -28945,24 +28836,36 @@ all-stage2:     \
   maybe-all-stage2-intl   \
   maybe-all-stage2-ld \
   maybe-all-stage2-libcpp  \
-  maybe-all-stage2-libbanshee \
   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:  maybe-all-stage1-bfd 
-       $(MAKE) stage2-start
-       @if [ -f stage2-bfd/Makefile ] ; then \
-         $(STAMP) configure-stage2-bfd ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -28981,35 +28884,44 @@ configure-stage2-bfd:  maybe-all-stage1-bfd
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stage2-bfd
+         @stage2_werror_flag@ 
 
 maybe-all-stage2-bfd: all-stage2-bfd
 all-stage2-bfd: configure-stage2-bfd
-       $(MAKE) stage2-start
+       @$(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)  \
-                 && \
-       $(STAMP) ../all-stage2-bfd
+                
+
+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:  maybe-all-stage1-opcodes 
-       $(MAKE) stage2-start
-       @if [ -f stage2-opcodes/Makefile ] ; then \
-         $(STAMP) configure-stage2-opcodes ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -29028,35 +28940,44 @@ configure-stage2-opcodes:  maybe-all-stage1-opcodes
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stage2-opcodes
+         @stage2_werror_flag@ 
 
 maybe-all-stage2-opcodes: all-stage2-opcodes
 all-stage2-opcodes: configure-stage2-opcodes
-       $(MAKE) stage2-start
+       @$(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)  \
-                 && \
-       $(STAMP) ../all-stage2-opcodes
+                
+
+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:  maybe-all-stage1-binutils 
-       $(MAKE) stage2-start
-       @if [ -f stage2-binutils/Makefile ] ; then \
-         $(STAMP) configure-stage2-binutils ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -29075,35 +28996,44 @@ configure-stage2-binutils:  maybe-all-stage1-binutils
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stage2-binutils
+         @stage2_werror_flag@ 
 
 maybe-all-stage2-binutils: all-stage2-binutils
 all-stage2-binutils: configure-stage2-binutils
-       $(MAKE) stage2-start
+       @$(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)  \
-                 && \
-       $(STAMP) ../all-stage2-binutils
+                
+
+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:  maybe-all-stage1-gas 
-       $(MAKE) stage2-start
-       @if [ -f stage2-gas/Makefile ] ; then \
-         $(STAMP) configure-stage2-gas ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -29122,35 +29052,44 @@ configure-stage2-gas:  maybe-all-stage1-gas
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stage2-gas
+         @stage2_werror_flag@ 
 
 maybe-all-stage2-gas: all-stage2-gas
 all-stage2-gas: configure-stage2-gas
-       $(MAKE) stage2-start
+       @$(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)  \
-                 && \
-       $(STAMP) ../all-stage2-gas
+                
+
+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:  maybe-all-stage1-gcc 
-       $(MAKE) stage2-start
-       @if [ -f stage2-gcc/Makefile ] ; then \
-         $(STAMP) configure-stage2-gcc ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -29169,35 +29108,44 @@ configure-stage2-gcc:  maybe-all-stage1-gcc
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stage2-gcc
+         @stage2_werror_flag@ 
 
 maybe-all-stage2-gcc: all-stage2-gcc
 all-stage2-gcc: configure-stage2-gcc
-       $(MAKE) stage2-start
+       @$(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) && \
-       $(STAMP) ../all-stage2-gcc
+                $(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:  maybe-all-stage1-intl 
-       $(MAKE) stage2-start
-       @if [ -f stage2-intl/Makefile ] ; then \
-         $(STAMP) configure-stage2-intl ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -29216,35 +29164,44 @@ configure-stage2-intl:  maybe-all-stage1-intl
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stage2-intl
+         @stage2_werror_flag@ 
 
 maybe-all-stage2-intl: all-stage2-intl
 all-stage2-intl: configure-stage2-intl
-       $(MAKE) stage2-start
+       @$(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)  \
-                 && \
-       $(STAMP) ../all-stage2-intl
+                
+
+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:  maybe-all-stage1-ld 
-       $(MAKE) stage2-start
-       @if [ -f stage2-ld/Makefile ] ; then \
-         $(STAMP) configure-stage2-ld ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -29263,35 +29220,44 @@ configure-stage2-ld:  maybe-all-stage1-ld
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stage2-ld
+         @stage2_werror_flag@ 
 
 maybe-all-stage2-ld: all-stage2-ld
 all-stage2-ld: configure-stage2-ld
-       $(MAKE) stage2-start
+       @$(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)  \
-                 && \
-       $(STAMP) ../all-stage2-ld
+                
+
+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:  maybe-all-stage1-libcpp 
-       $(MAKE) stage2-start
-       @if [ -f stage2-libcpp/Makefile ] ; then \
-         $(STAMP) configure-stage2-libcpp ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -29310,82 +29276,44 @@ configure-stage2-libcpp:  maybe-all-stage1-libcpp
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stage2-libcpp
+         @stage2_werror_flag@ 
 
 maybe-all-stage2-libcpp: all-stage2-libcpp
 all-stage2-libcpp: configure-stage2-libcpp
-       $(MAKE) stage2-start
+       @$(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)  \
-                 && \
-       $(STAMP) ../all-stage2-libcpp
-@endif libcpp-bootstrap
-
-maybe-configure-stage2-libbanshee:
-maybe-all-stage2-libbanshee:
+                
 
-@if libbanshee-bootstrap
-maybe-configure-stage2-libbanshee: configure-stage2-libbanshee
-configure-stage2-libbanshee:  maybe-all-stage1-libbanshee 
-       $(MAKE) stage2-start
-       @if [ -f stage2-libbanshee/Makefile ] ; then \
-         $(STAMP) configure-stage2-libbanshee ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 2 in libbanshee ; \
-       cd libbanshee || exit 1; \
-       case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/libbanshee"; \
-           libsrcdir="$$s/libbanshee";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/libbanshee"; \
-           libsrcdir="$$s/libbanshee";; \
-       esac; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stage2-libbanshee
-
-maybe-all-stage2-libbanshee: all-stage2-libbanshee
-all-stage2-libbanshee: configure-stage2-libbanshee
-       $(MAKE) stage2-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd libbanshee && \
+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)  \
-                 && \
-       $(STAMP) ../all-stage2-libbanshee
-@endif libbanshee-bootstrap
+                 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:  maybe-all-stage1-libiberty 
-       $(MAKE) stage2-start
-       @if [ -f stage2-libiberty/Makefile ] ; then \
-         $(STAMP) configure-stage2-libiberty ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -29404,35 +29332,44 @@ configure-stage2-libiberty:  maybe-all-stage1-libiberty
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stage2-libiberty
+         @stage2_werror_flag@ 
 
 maybe-all-stage2-libiberty: all-stage2-libiberty
 all-stage2-libiberty: configure-stage2-libiberty
-       $(MAKE) stage2-start
+       @$(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)  \
-                 && \
-       $(STAMP) ../all-stage2-libiberty
+                
+
+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:  maybe-all-stage1-zlib 
-       $(MAKE) stage2-start
-       @if [ -f stage2-zlib/Makefile ] ; then \
-         $(STAMP) configure-stage2-zlib ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -29451,23 +29388,32 @@ configure-stage2-zlib:  maybe-all-stage1-zlib
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stage2-zlib
+         @stage2_werror_flag@ 
 
 maybe-all-stage2-zlib: all-stage2-zlib
 all-stage2-zlib: configure-stage2-zlib
-       $(MAKE) stage2-start
+       @$(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)  \
-                 && \
-       $(STAMP) ../all-stage2-zlib
+                
+
+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
@@ -29478,35 +29424,12 @@ all-stage2-zlib: configure-stage2-zlib
 bootstrap2: stage2-bubble  all
 
 
-.PHONY: restage2 touch-stage2 distclean-stage2
-
-# Rules to wipe a stage and all the following ones, used for cleanstrap
+# 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 configure-stage2-* all-stage2-* stage2-* 
-
-# Rules to renew the timestamp on a stage and all the following ones
-touch-stage1:: touch-stage2 
-touch-stage2::
-       @case `echo configure-stage2-*` in \
-         'configure-stage2-*') ;; \
-         *) \
-           echo '$(STAMP)' configure-stage2-* && \
-           $(STAMP) configure-stage2-* ;; \
-       esac ; \
-       case `echo all-stage2-*` in \
-         'all-stage2-*') ;; \
-         *) \
-           echo '$(STAMP)' all-stage2-* && \
-           $(STAMP) all-stage2-* ;; \
-       esac
-
-# After building a stage, touch the following ones
-restage1:: touch-stage2 
-restage2::
-       rm -rf all-stage2-* 
-       $(MAKE) $(RECURSE_FLAGS_TO_PASS)  all-stage2 
+       rm -rf stage2-* 
 
 
 @endif gcc-bootstrap
@@ -29515,109 +29438,100 @@ restage2::
 .PHONY: stage3-start stage3-end
 
 stage3-start::
-       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+       @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
        echo stage3 > stage_current ; \
        echo stage3 > stage_last
 @if bfd
-       [ -d stage3-bfd ] || mkdir stage3-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; \
+       @[ -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; \
+       @[ -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; \
+       @[ -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; \
+       @[ -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; \
+       @[ -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; \
+       @[ -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; \
+       @[ -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 libbanshee
-       [ -d stage3-libbanshee ] || mkdir stage3-libbanshee; \
-       set stage3-libbanshee libbanshee ; @CREATE_LINK_TO_DIR@  ; \
-       set stage2-libbanshee prev-libbanshee ; @CREATE_LINK_TO_DIR@ 
-@endif libbanshee
 @if libiberty
-       [ -d stage3-libiberty ] || mkdir stage3-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; \
+       @[ -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
+       @rm -f stage_current
 @if bfd
-       set bfd stage3-bfd ; @UNDO_LINK_TO_DIR@  ; \
+       @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 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 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 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 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 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 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 libcpp stage3-libcpp ; @UNDO_LINK_TO_DIR@  ; \
        set prev-libcpp stage2-libcpp ; @UNDO_LINK_TO_DIR@ 
 @endif libcpp
-@if libbanshee
-       set libbanshee stage3-libbanshee ; @UNDO_LINK_TO_DIR@  ; \
-       set prev-libbanshee stage2-libbanshee ; @UNDO_LINK_TO_DIR@ 
-@endif libbanshee
 @if libiberty
-       set libiberty stage3-libiberty ; @UNDO_LINK_TO_DIR@  ; \
+       @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 zlib stage3-zlib ; @UNDO_LINK_TO_DIR@  ; \
        set prev-zlib stage2-zlib ; @UNDO_LINK_TO_DIR@ 
 @endif zlib
 
@@ -29626,13 +29540,14 @@ stage3-end::
 # be reconfigured as well.
 .PHONY: stage3-bubble
 stage3-bubble:: stage2-bubble
-       @case `echo all-stage3-*` in \
-         'all-stage3-*') ;; \
-         *) echo Remaking stage 3 ; rm -f all-stage3-* ;; \
-       esac ; \
-       $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage3
+       @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
+.PHONY: all-stage3 clean-stage3
 all-stage3:     \
   maybe-all-stage3-bfd \
   maybe-all-stage3-opcodes \
@@ -29642,24 +29557,36 @@ all-stage3:     \
   maybe-all-stage3-intl   \
   maybe-all-stage3-ld \
   maybe-all-stage3-libcpp  \
-  maybe-all-stage3-libbanshee \
   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:  maybe-all-stage2-bfd 
-       $(MAKE) stage3-start
-       @if [ -f stage3-bfd/Makefile ] ; then \
-         $(STAMP) configure-stage3-bfd ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -29678,35 +29605,44 @@ configure-stage3-bfd:  maybe-all-stage2-bfd
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stage3-bfd
+         @stage2_werror_flag@ 
 
 maybe-all-stage3-bfd: all-stage3-bfd
 all-stage3-bfd: configure-stage3-bfd
-       $(MAKE) stage3-start
+       @$(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)  \
-                 && \
-       $(STAMP) ../all-stage3-bfd
+                
+
+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:  maybe-all-stage2-opcodes 
-       $(MAKE) stage3-start
-       @if [ -f stage3-opcodes/Makefile ] ; then \
-         $(STAMP) configure-stage3-opcodes ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -29725,35 +29661,44 @@ configure-stage3-opcodes:  maybe-all-stage2-opcodes
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stage3-opcodes
+         @stage2_werror_flag@ 
 
 maybe-all-stage3-opcodes: all-stage3-opcodes
 all-stage3-opcodes: configure-stage3-opcodes
-       $(MAKE) stage3-start
+       @$(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)  \
-                 && \
-       $(STAMP) ../all-stage3-opcodes
+                
+
+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:  maybe-all-stage2-binutils 
-       $(MAKE) stage3-start
-       @if [ -f stage3-binutils/Makefile ] ; then \
-         $(STAMP) configure-stage3-binutils ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -29772,35 +29717,44 @@ configure-stage3-binutils:  maybe-all-stage2-binutils
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stage3-binutils
+         @stage2_werror_flag@ 
 
 maybe-all-stage3-binutils: all-stage3-binutils
 all-stage3-binutils: configure-stage3-binutils
-       $(MAKE) stage3-start
+       @$(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)  \
-                 && \
-       $(STAMP) ../all-stage3-binutils
+                
+
+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:  maybe-all-stage2-gas 
-       $(MAKE) stage3-start
-       @if [ -f stage3-gas/Makefile ] ; then \
-         $(STAMP) configure-stage3-gas ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -29819,35 +29773,44 @@ configure-stage3-gas:  maybe-all-stage2-gas
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stage3-gas
+         @stage2_werror_flag@ 
 
 maybe-all-stage3-gas: all-stage3-gas
 all-stage3-gas: configure-stage3-gas
-       $(MAKE) stage3-start
+       @$(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)  \
-                 && \
-       $(STAMP) ../all-stage3-gas
+                
+
+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:  maybe-all-stage2-gcc 
-       $(MAKE) stage3-start
-       @if [ -f stage3-gcc/Makefile ] ; then \
-         $(STAMP) configure-stage3-gcc ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -29866,35 +29829,44 @@ configure-stage3-gcc:  maybe-all-stage2-gcc
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stage3-gcc
+         @stage2_werror_flag@ 
 
 maybe-all-stage3-gcc: all-stage3-gcc
 all-stage3-gcc: configure-stage3-gcc
-       $(MAKE) stage3-start
+       @$(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) && \
-       $(STAMP) ../all-stage3-gcc
+                $(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:  maybe-all-stage2-intl 
-       $(MAKE) stage3-start
-       @if [ -f stage3-intl/Makefile ] ; then \
-         $(STAMP) configure-stage3-intl ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -29913,35 +29885,44 @@ configure-stage3-intl:  maybe-all-stage2-intl
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stage3-intl
+         @stage2_werror_flag@ 
 
 maybe-all-stage3-intl: all-stage3-intl
 all-stage3-intl: configure-stage3-intl
-       $(MAKE) stage3-start
+       @$(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)  \
-                 && \
-       $(STAMP) ../all-stage3-intl
+                
+
+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:  maybe-all-stage2-ld 
-       $(MAKE) stage3-start
-       @if [ -f stage3-ld/Makefile ] ; then \
-         $(STAMP) configure-stage3-ld ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -29960,35 +29941,44 @@ configure-stage3-ld:  maybe-all-stage2-ld
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stage3-ld
+         @stage2_werror_flag@ 
 
 maybe-all-stage3-ld: all-stage3-ld
 all-stage3-ld: configure-stage3-ld
-       $(MAKE) stage3-start
+       @$(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)  \
-                 && \
-       $(STAMP) ../all-stage3-ld
+                
+
+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:  maybe-all-stage2-libcpp 
-       $(MAKE) stage3-start
-       @if [ -f stage3-libcpp/Makefile ] ; then \
-         $(STAMP) configure-stage3-libcpp ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -30007,82 +29997,44 @@ configure-stage3-libcpp:  maybe-all-stage2-libcpp
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stage3-libcpp
+         @stage2_werror_flag@ 
 
 maybe-all-stage3-libcpp: all-stage3-libcpp
 all-stage3-libcpp: configure-stage3-libcpp
-       $(MAKE) stage3-start
+       @$(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)  \
-                 && \
-       $(STAMP) ../all-stage3-libcpp
-@endif libcpp-bootstrap
-
-maybe-configure-stage3-libbanshee:
-maybe-all-stage3-libbanshee:
-
-@if libbanshee-bootstrap
-maybe-configure-stage3-libbanshee: configure-stage3-libbanshee
-configure-stage3-libbanshee:  maybe-all-stage2-libbanshee 
-       $(MAKE) stage3-start
-       @if [ -f stage3-libbanshee/Makefile ] ; then \
-         $(STAMP) configure-stage3-libbanshee ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 3 in libbanshee ; \
-       cd libbanshee || exit 1; \
-       case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/libbanshee"; \
-           libsrcdir="$$s/libbanshee";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/libbanshee"; \
-           libsrcdir="$$s/libbanshee";; \
-       esac; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stage3-libbanshee
+                
 
-maybe-all-stage3-libbanshee: all-stage3-libbanshee
-all-stage3-libbanshee: configure-stage3-libbanshee
-       $(MAKE) stage3-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd libbanshee && \
+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)  \
-                 && \
-       $(STAMP) ../all-stage3-libbanshee
-@endif libbanshee-bootstrap
+                 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:  maybe-all-stage2-libiberty 
-       $(MAKE) stage3-start
-       @if [ -f stage3-libiberty/Makefile ] ; then \
-         $(STAMP) configure-stage3-libiberty ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -30101,35 +30053,44 @@ configure-stage3-libiberty:  maybe-all-stage2-libiberty
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stage3-libiberty
+         @stage2_werror_flag@ 
 
 maybe-all-stage3-libiberty: all-stage3-libiberty
 all-stage3-libiberty: configure-stage3-libiberty
-       $(MAKE) stage3-start
+       @$(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)  \
-                 && \
-       $(STAMP) ../all-stage3-libiberty
+                
+
+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:  maybe-all-stage2-zlib 
-       $(MAKE) stage3-start
-       @if [ -f stage3-zlib/Makefile ] ; then \
-         $(STAMP) configure-stage3-zlib ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -30148,29 +30109,42 @@ configure-stage3-zlib:  maybe-all-stage2-zlib
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stage3-zlib
+         @stage2_werror_flag@ 
 
 maybe-all-stage3-zlib: all-stage3-zlib
 all-stage3-zlib: configure-stage3-zlib
-       $(MAKE) stage3-start
+       @$(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)  \
-                 && \
-       $(STAMP) ../all-stage3-zlib
+                
+
+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: all-stage3-gcc
-       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+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 ; \
@@ -30190,46 +30164,24 @@ compare: all-stage3-gcc
          true; \
        fi ; \
        $(STAMP) compare
+       @bootstrap_lean@-rm -rf stage2-* ; $(STAMP) stage2-lean
 
 
 
 .PHONY: bootstrap
-bootstrap: stage3-bubble  compare  all
-
+bootstrap: stage3-bubble compare all
 
-.PHONY: restage3 touch-stage3 distclean-stage3
 
-# Rules to wipe a stage and all the following ones, used for cleanstrap
+# 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 configure-stage3-* all-stage3-* stage3-* compare 
-
-# Rules to renew the timestamp on a stage and all the following ones
-touch-stage2:: touch-stage3 
-touch-stage3::
-       @case `echo configure-stage3-*` in \
-         'configure-stage3-*') ;; \
-         *) \
-           echo '$(STAMP)' configure-stage3-* && \
-           $(STAMP) configure-stage3-* ;; \
-       esac ; \
-       case `echo all-stage3-*` in \
-         'all-stage3-*') ;; \
-         *) \
-           echo '$(STAMP)' all-stage3-* && \
-           $(STAMP) all-stage3-* ;; \
-       esac
-
-# After building a stage, touch the following ones
-restage2:: touch-stage3 
-restage3::
-       rm -rf all-stage3-* compare 
-       $(MAKE) $(RECURSE_FLAGS_TO_PASS) compare 
+       rm -rf stage3-* compare 
 
 
 .PHONY: cleanstrap
-cleanstrap: distclean-stage1 bootstrap
+cleanstrap: distclean bootstrap
 
 @endif gcc-bootstrap
 
@@ -30237,109 +30189,100 @@ cleanstrap: distclean-stage1 bootstrap
 .PHONY: stage4-start stage4-end
 
 stage4-start::
-       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+       @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
        echo stage4 > stage_current ; \
        echo stage4 > stage_last
 @if bfd
-       [ -d stage4-bfd ] || mkdir stage4-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; \
+       @[ -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; \
+       @[ -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; \
+       @[ -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; \
+       @[ -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; \
+       @[ -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; \
+       @[ -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; \
+       @[ -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 libbanshee
-       [ -d stage4-libbanshee ] || mkdir stage4-libbanshee; \
-       set stage4-libbanshee libbanshee ; @CREATE_LINK_TO_DIR@  ; \
-       set stage3-libbanshee prev-libbanshee ; @CREATE_LINK_TO_DIR@ 
-@endif libbanshee
 @if libiberty
-       [ -d stage4-libiberty ] || mkdir stage4-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; \
+       @[ -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
+       @rm -f stage_current
 @if bfd
-       set bfd stage4-bfd ; @UNDO_LINK_TO_DIR@  ; \
+       @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 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 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 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 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 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 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 libcpp stage4-libcpp ; @UNDO_LINK_TO_DIR@  ; \
        set prev-libcpp stage3-libcpp ; @UNDO_LINK_TO_DIR@ 
 @endif libcpp
-@if libbanshee
-       set libbanshee stage4-libbanshee ; @UNDO_LINK_TO_DIR@  ; \
-       set prev-libbanshee stage3-libbanshee ; @UNDO_LINK_TO_DIR@ 
-@endif libbanshee
 @if libiberty
-       set libiberty stage4-libiberty ; @UNDO_LINK_TO_DIR@  ; \
+       @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 zlib stage4-zlib ; @UNDO_LINK_TO_DIR@  ; \
        set prev-zlib stage3-zlib ; @UNDO_LINK_TO_DIR@ 
 @endif zlib
 
@@ -30348,13 +30291,14 @@ stage4-end::
 # be reconfigured as well.
 .PHONY: stage4-bubble
 stage4-bubble:: stage3-bubble
-       @case `echo all-stage4-*` in \
-         'all-stage4-*') ;; \
-         *) echo Remaking stage 4 ; rm -f all-stage4-* ;; \
-       esac ; \
-       $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage4
+       @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
+.PHONY: all-stage4 clean-stage4
 all-stage4:     \
   maybe-all-stage4-bfd \
   maybe-all-stage4-opcodes \
@@ -30364,24 +30308,36 @@ all-stage4:     \
   maybe-all-stage4-intl   \
   maybe-all-stage4-ld \
   maybe-all-stage4-libcpp  \
-  maybe-all-stage4-libbanshee \
   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:  maybe-all-stage3-bfd 
-       $(MAKE) stage4-start
-       @if [ -f stage4-bfd/Makefile ] ; then \
-         $(STAMP) configure-stage4-bfd ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -30400,35 +30356,44 @@ configure-stage4-bfd:  maybe-all-stage3-bfd
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stage4-bfd
+         @stage2_werror_flag@ 
 
 maybe-all-stage4-bfd: all-stage4-bfd
 all-stage4-bfd: configure-stage4-bfd
-       $(MAKE) stage4-start
+       @$(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)  \
-                 && \
-       $(STAMP) ../all-stage4-bfd
+                
+
+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:  maybe-all-stage3-opcodes 
-       $(MAKE) stage4-start
-       @if [ -f stage4-opcodes/Makefile ] ; then \
-         $(STAMP) configure-stage4-opcodes ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -30447,35 +30412,44 @@ configure-stage4-opcodes:  maybe-all-stage3-opcodes
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stage4-opcodes
+         @stage2_werror_flag@ 
 
 maybe-all-stage4-opcodes: all-stage4-opcodes
 all-stage4-opcodes: configure-stage4-opcodes
-       $(MAKE) stage4-start
+       @$(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)  \
-                 && \
-       $(STAMP) ../all-stage4-opcodes
+                
+
+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:  maybe-all-stage3-binutils 
-       $(MAKE) stage4-start
-       @if [ -f stage4-binutils/Makefile ] ; then \
-         $(STAMP) configure-stage4-binutils ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -30494,35 +30468,44 @@ configure-stage4-binutils:  maybe-all-stage3-binutils
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stage4-binutils
+         @stage2_werror_flag@ 
 
 maybe-all-stage4-binutils: all-stage4-binutils
 all-stage4-binutils: configure-stage4-binutils
-       $(MAKE) stage4-start
+       @$(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)  \
-                 && \
-       $(STAMP) ../all-stage4-binutils
+                
+
+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:  maybe-all-stage3-gas 
-       $(MAKE) stage4-start
-       @if [ -f stage4-gas/Makefile ] ; then \
-         $(STAMP) configure-stage4-gas ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -30541,35 +30524,44 @@ configure-stage4-gas:  maybe-all-stage3-gas
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stage4-gas
+         @stage2_werror_flag@ 
 
 maybe-all-stage4-gas: all-stage4-gas
 all-stage4-gas: configure-stage4-gas
-       $(MAKE) stage4-start
+       @$(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)  \
-                 && \
-       $(STAMP) ../all-stage4-gas
+                
+
+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:  maybe-all-stage3-gcc 
-       $(MAKE) stage4-start
-       @if [ -f stage4-gcc/Makefile ] ; then \
-         $(STAMP) configure-stage4-gcc ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -30588,35 +30580,44 @@ configure-stage4-gcc:  maybe-all-stage3-gcc
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stage4-gcc
+         @stage2_werror_flag@ 
 
 maybe-all-stage4-gcc: all-stage4-gcc
 all-stage4-gcc: configure-stage4-gcc
-       $(MAKE) stage4-start
+       @$(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) && \
-       $(STAMP) ../all-stage4-gcc
+                $(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:  maybe-all-stage3-intl 
-       $(MAKE) stage4-start
-       @if [ -f stage4-intl/Makefile ] ; then \
-         $(STAMP) configure-stage4-intl ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -30635,35 +30636,44 @@ configure-stage4-intl:  maybe-all-stage3-intl
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stage4-intl
+         @stage2_werror_flag@ 
 
 maybe-all-stage4-intl: all-stage4-intl
 all-stage4-intl: configure-stage4-intl
-       $(MAKE) stage4-start
+       @$(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)  \
-                 && \
-       $(STAMP) ../all-stage4-intl
+                
+
+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:  maybe-all-stage3-ld 
-       $(MAKE) stage4-start
-       @if [ -f stage4-ld/Makefile ] ; then \
-         $(STAMP) configure-stage4-ld ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -30682,35 +30692,44 @@ configure-stage4-ld:  maybe-all-stage3-ld
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stage4-ld
+         @stage2_werror_flag@ 
 
 maybe-all-stage4-ld: all-stage4-ld
 all-stage4-ld: configure-stage4-ld
-       $(MAKE) stage4-start
+       @$(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)  \
-                 && \
-       $(STAMP) ../all-stage4-ld
+                
+
+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:  maybe-all-stage3-libcpp 
-       $(MAKE) stage4-start
-       @if [ -f stage4-libcpp/Makefile ] ; then \
-         $(STAMP) configure-stage4-libcpp ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -30729,82 +30748,44 @@ configure-stage4-libcpp:  maybe-all-stage3-libcpp
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stage4-libcpp
+         @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)  \
-                 && \
-       $(STAMP) ../all-stage4-libcpp
-@endif libcpp-bootstrap
-
-maybe-configure-stage4-libbanshee:
-maybe-all-stage4-libbanshee:
-
-@if libbanshee-bootstrap
-maybe-configure-stage4-libbanshee: configure-stage4-libbanshee
-configure-stage4-libbanshee:  maybe-all-stage3-libbanshee 
-       $(MAKE) stage4-start
-       @if [ -f stage4-libbanshee/Makefile ] ; then \
-         $(STAMP) configure-stage4-libbanshee ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage 4 in libbanshee ; \
-       cd libbanshee || exit 1; \
-       case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/libbanshee"; \
-           libsrcdir="$$s/libbanshee";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/libbanshee"; \
-           libsrcdir="$$s/libbanshee";; \
-       esac; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stage4-libbanshee
-
-maybe-all-stage4-libbanshee: all-stage4-libbanshee
-all-stage4-libbanshee: configure-stage4-libbanshee
-       $(MAKE) stage4-start
+       @$(MAKE) stage4-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
        $(STAGE_HOST_EXPORTS)  \
-       cd libbanshee && \
+       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)  \
-                 && \
-       $(STAMP) ../all-stage4-libbanshee
-@endif libbanshee-bootstrap
+                 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:  maybe-all-stage3-libiberty 
-       $(MAKE) stage4-start
-       @if [ -f stage4-libiberty/Makefile ] ; then \
-         $(STAMP) configure-stage4-libiberty ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -30823,35 +30804,44 @@ configure-stage4-libiberty:  maybe-all-stage3-libiberty
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stage4-libiberty
+         @stage2_werror_flag@ 
 
 maybe-all-stage4-libiberty: all-stage4-libiberty
 all-stage4-libiberty: configure-stage4-libiberty
-       $(MAKE) stage4-start
+       @$(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)  \
-                 && \
-       $(STAMP) ../all-stage4-libiberty
+                
+
+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:  maybe-all-stage3-zlib 
-       $(MAKE) stage4-start
-       @if [ -f stage4-zlib/Makefile ] ; then \
-         $(STAMP) configure-stage4-zlib ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -30870,29 +30860,42 @@ configure-stage4-zlib:  maybe-all-stage3-zlib
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stage4-zlib
+         @stage2_werror_flag@ 
 
 maybe-all-stage4-zlib: all-stage4-zlib
 all-stage4-zlib: configure-stage4-zlib
-       $(MAKE) stage4-start
+       @$(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)  \
-                 && \
-       $(STAMP) ../all-stage4-zlib
+                
+
+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: all-stage4-gcc
-       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+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 ; \
@@ -30912,42 +30915,20 @@ compare3: all-stage4-gcc
          true; \
        fi ; \
        $(STAMP) compare3
+       @bootstrap_lean@-rm -rf stage3-* ; $(STAMP) stage3-lean
 
 
 
 .PHONY: bootstrap4
-bootstrap4: stage4-bubble  compare3  all
-
+bootstrap4: stage4-bubble compare3 all
 
-.PHONY: restage4 touch-stage4 distclean-stage4
 
-# Rules to wipe a stage and all the following ones, used for cleanstrap
+# 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 configure-stage4-* all-stage4-* stage4-* compare3 
-
-# Rules to renew the timestamp on a stage and all the following ones
-touch-stage3:: touch-stage4 
-touch-stage4::
-       @case `echo configure-stage4-*` in \
-         'configure-stage4-*') ;; \
-         *) \
-           echo '$(STAMP)' configure-stage4-* && \
-           $(STAMP) configure-stage4-* ;; \
-       esac ; \
-       case `echo all-stage4-*` in \
-         'all-stage4-*') ;; \
-         *) \
-           echo '$(STAMP)' all-stage4-* && \
-           $(STAMP) all-stage4-* ;; \
-       esac
-
-# After building a stage, touch the following ones
-restage3:: touch-stage4 
-restage4::
-       rm -rf all-stage4-* compare3 
-       $(MAKE) $(RECURSE_FLAGS_TO_PASS) compare3 
+       rm -rf stage4-* compare3 
 
 
 @endif gcc-bootstrap
@@ -30956,109 +30937,100 @@ restage4::
 .PHONY: stageprofile-start stageprofile-end
 
 stageprofile-start::
-       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+       @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
        echo stageprofile > stage_current ; \
        echo stageprofile > stage_last
 @if bfd
-       [ -d stageprofile-bfd ] || mkdir stageprofile-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; \
+       @[ -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; \
+       @[ -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; \
+       @[ -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; \
+       @[ -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; \
+       @[ -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; \
+       @[ -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; \
+       @[ -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 libbanshee
-       [ -d stageprofile-libbanshee ] || mkdir stageprofile-libbanshee; \
-       set stageprofile-libbanshee libbanshee ; @CREATE_LINK_TO_DIR@  ; \
-       set stage1-libbanshee prev-libbanshee ; @CREATE_LINK_TO_DIR@ 
-@endif libbanshee
 @if libiberty
-       [ -d stageprofile-libiberty ] || mkdir stageprofile-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; \
+       @[ -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
+       @rm -f stage_current
 @if bfd
-       set bfd stageprofile-bfd ; @UNDO_LINK_TO_DIR@  ; \
+       @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 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 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 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 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 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 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 libcpp stageprofile-libcpp ; @UNDO_LINK_TO_DIR@  ; \
        set prev-libcpp stage1-libcpp ; @UNDO_LINK_TO_DIR@ 
 @endif libcpp
-@if libbanshee
-       set libbanshee stageprofile-libbanshee ; @UNDO_LINK_TO_DIR@  ; \
-       set prev-libbanshee stage1-libbanshee ; @UNDO_LINK_TO_DIR@ 
-@endif libbanshee
 @if libiberty
-       set libiberty stageprofile-libiberty ; @UNDO_LINK_TO_DIR@  ; \
+       @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 zlib stageprofile-zlib ; @UNDO_LINK_TO_DIR@  ; \
        set prev-zlib stage1-zlib ; @UNDO_LINK_TO_DIR@ 
 @endif zlib
 
@@ -31067,13 +31039,13 @@ stageprofile-end::
 # be reconfigured as well.
 .PHONY: stageprofile-bubble
 stageprofile-bubble:: stage1-bubble
-       @case `echo all-stageprofile-*` in \
-         'all-stageprofile-*') ;; \
-         *) echo Remaking stage profile ; rm -f all-stageprofile-* ;; \
-       esac ; \
-       $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stageprofile
+       @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
+.PHONY: all-stageprofile clean-stageprofile
 all-stageprofile:     \
   maybe-all-stageprofile-bfd \
   maybe-all-stageprofile-opcodes \
@@ -31083,24 +31055,36 @@ all-stageprofile:     \
   maybe-all-stageprofile-intl   \
   maybe-all-stageprofile-ld \
   maybe-all-stageprofile-libcpp  \
-  maybe-all-stageprofile-libbanshee \
   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:  maybe-all-stage1-bfd 
-       $(MAKE) stageprofile-start
-       @if [ -f stageprofile-bfd/Makefile ] ; then \
-         $(STAMP) configure-stageprofile-bfd ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -31119,35 +31103,44 @@ configure-stageprofile-bfd:  maybe-all-stage1-bfd
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stageprofile-bfd
+         @stage2_werror_flag@ 
 
 maybe-all-stageprofile-bfd: all-stageprofile-bfd
 all-stageprofile-bfd: configure-stageprofile-bfd
-       $(MAKE) stageprofile-start
+       @$(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"  && \
-       $(STAMP) ../all-stageprofile-bfd
+               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:  maybe-all-stage1-opcodes 
-       $(MAKE) stageprofile-start
-       @if [ -f stageprofile-opcodes/Makefile ] ; then \
-         $(STAMP) configure-stageprofile-opcodes ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -31166,35 +31159,44 @@ configure-stageprofile-opcodes:  maybe-all-stage1-opcodes
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stageprofile-opcodes
+         @stage2_werror_flag@ 
 
 maybe-all-stageprofile-opcodes: all-stageprofile-opcodes
 all-stageprofile-opcodes: configure-stageprofile-opcodes
-       $(MAKE) stageprofile-start
+       @$(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"  && \
-       $(STAMP) ../all-stageprofile-opcodes
+               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:  maybe-all-stage1-binutils 
-       $(MAKE) stageprofile-start
-       @if [ -f stageprofile-binutils/Makefile ] ; then \
-         $(STAMP) configure-stageprofile-binutils ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -31213,35 +31215,44 @@ configure-stageprofile-binutils:  maybe-all-stage1-binutils
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stageprofile-binutils
+         @stage2_werror_flag@ 
 
 maybe-all-stageprofile-binutils: all-stageprofile-binutils
 all-stageprofile-binutils: configure-stageprofile-binutils
-       $(MAKE) stageprofile-start
+       @$(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"  && \
-       $(STAMP) ../all-stageprofile-binutils
+               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:  maybe-all-stage1-gas 
-       $(MAKE) stageprofile-start
-       @if [ -f stageprofile-gas/Makefile ] ; then \
-         $(STAMP) configure-stageprofile-gas ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -31260,35 +31271,44 @@ configure-stageprofile-gas:  maybe-all-stage1-gas
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stageprofile-gas
+         @stage2_werror_flag@ 
 
 maybe-all-stageprofile-gas: all-stageprofile-gas
 all-stageprofile-gas: configure-stageprofile-gas
-       $(MAKE) stageprofile-start
+       @$(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"  && \
-       $(STAMP) ../all-stageprofile-gas
+               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:  maybe-all-stage1-gcc 
-       $(MAKE) stageprofile-start
-       @if [ -f stageprofile-gcc/Makefile ] ; then \
-         $(STAMP) configure-stageprofile-gcc ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -31307,35 +31327,44 @@ configure-stageprofile-gcc:  maybe-all-stage1-gcc
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stageprofile-gcc
+         @stage2_werror_flag@ 
 
 maybe-all-stageprofile-gcc: all-stageprofile-gcc
 all-stageprofile-gcc: configure-stageprofile-gcc
-       $(MAKE) stageprofile-start
+       @$(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) && \
-       $(STAMP) ../all-stageprofile-gcc
+               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:  maybe-all-stage1-intl 
-       $(MAKE) stageprofile-start
-       @if [ -f stageprofile-intl/Makefile ] ; then \
-         $(STAMP) configure-stageprofile-intl ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -31354,35 +31383,44 @@ configure-stageprofile-intl:  maybe-all-stage1-intl
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stageprofile-intl
+         @stage2_werror_flag@ 
 
 maybe-all-stageprofile-intl: all-stageprofile-intl
 all-stageprofile-intl: configure-stageprofile-intl
-       $(MAKE) stageprofile-start
+       @$(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"  && \
-       $(STAMP) ../all-stageprofile-intl
+               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:  maybe-all-stage1-ld 
-       $(MAKE) stageprofile-start
-       @if [ -f stageprofile-ld/Makefile ] ; then \
-         $(STAMP) configure-stageprofile-ld ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -31401,35 +31439,44 @@ configure-stageprofile-ld:  maybe-all-stage1-ld
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stageprofile-ld
+         @stage2_werror_flag@ 
 
 maybe-all-stageprofile-ld: all-stageprofile-ld
 all-stageprofile-ld: configure-stageprofile-ld
-       $(MAKE) stageprofile-start
+       @$(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"  && \
-       $(STAMP) ../all-stageprofile-ld
+               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:  maybe-all-stage1-libcpp 
-       $(MAKE) stageprofile-start
-       @if [ -f stageprofile-libcpp/Makefile ] ; then \
-         $(STAMP) configure-stageprofile-libcpp ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -31448,82 +31495,44 @@ configure-stageprofile-libcpp:  maybe-all-stage1-libcpp
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stageprofile-libcpp
+         @stage2_werror_flag@ 
 
 maybe-all-stageprofile-libcpp: all-stageprofile-libcpp
 all-stageprofile-libcpp: configure-stageprofile-libcpp
-       $(MAKE) stageprofile-start
+       @$(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"  && \
-       $(STAMP) ../all-stageprofile-libcpp
-@endif libcpp-bootstrap
-
-maybe-configure-stageprofile-libbanshee:
-maybe-all-stageprofile-libbanshee:
-
-@if libbanshee-bootstrap
-maybe-configure-stageprofile-libbanshee: configure-stageprofile-libbanshee
-configure-stageprofile-libbanshee:  maybe-all-stage1-libbanshee 
-       $(MAKE) stageprofile-start
-       @if [ -f stageprofile-libbanshee/Makefile ] ; then \
-         $(STAMP) configure-stageprofile-libbanshee ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage profile in libbanshee ; \
-       cd libbanshee || exit 1; \
-       case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/libbanshee"; \
-           libsrcdir="$$s/libbanshee";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/libbanshee"; \
-           libsrcdir="$$s/libbanshee";; \
-       esac; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stageprofile-libbanshee
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
 
-maybe-all-stageprofile-libbanshee: all-stageprofile-libbanshee
-all-stageprofile-libbanshee: configure-stageprofile-libbanshee
-       $(MAKE) stageprofile-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd libbanshee && \
+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"  && \
-       $(STAMP) ../all-stageprofile-libbanshee
-@endif libbanshee-bootstrap
+               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:  maybe-all-stage1-libiberty 
-       $(MAKE) stageprofile-start
-       @if [ -f stageprofile-libiberty/Makefile ] ; then \
-         $(STAMP) configure-stageprofile-libiberty ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -31542,35 +31551,44 @@ configure-stageprofile-libiberty:  maybe-all-stage1-libiberty
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stageprofile-libiberty
+         @stage2_werror_flag@ 
 
 maybe-all-stageprofile-libiberty: all-stageprofile-libiberty
 all-stageprofile-libiberty: configure-stageprofile-libiberty
-       $(MAKE) stageprofile-start
+       @$(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"  && \
-       $(STAMP) ../all-stageprofile-libiberty
+               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:  maybe-all-stage1-zlib 
-       $(MAKE) stageprofile-start
-       @if [ -f stageprofile-zlib/Makefile ] ; then \
-         $(STAMP) configure-stageprofile-zlib ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -31589,23 +31607,32 @@ configure-stageprofile-zlib:  maybe-all-stage1-zlib
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stageprofile-zlib
+         @stage2_werror_flag@ 
 
 maybe-all-stageprofile-zlib: all-stageprofile-zlib
 all-stageprofile-zlib: configure-stageprofile-zlib
-       $(MAKE) stageprofile-start
+       @$(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"  && \
-       $(STAMP) ../all-stageprofile-zlib
+               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
@@ -31613,35 +31640,12 @@ all-stageprofile-zlib: configure-stageprofile-zlib
 
 
 
-.PHONY: restageprofile touch-stageprofile distclean-stageprofile
-
-# Rules to wipe a stage and all the following ones, used for cleanstrap
+# 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 configure-stageprofile-* all-stageprofile-* stageprofile-* 
-
-# Rules to renew the timestamp on a stage and all the following ones
-touch-stage1:: touch-stageprofile 
-touch-stageprofile::
-       @case `echo configure-stageprofile-*` in \
-         'configure-stageprofile-*') ;; \
-         *) \
-           echo '$(STAMP)' configure-stageprofile-* && \
-           $(STAMP) configure-stageprofile-* ;; \
-       esac ; \
-       case `echo all-stageprofile-*` in \
-         'all-stageprofile-*') ;; \
-         *) \
-           echo '$(STAMP)' all-stageprofile-* && \
-           $(STAMP) all-stageprofile-* ;; \
-       esac
-
-# After building a stage, touch the following ones
-restage1:: touch-stageprofile 
-restageprofile::
-       rm -rf all-stageprofile-* 
-       $(MAKE) $(RECURSE_FLAGS_TO_PASS)  all-stageprofile 
+       rm -rf stageprofile-* 
 
 
 @endif gcc-bootstrap
@@ -31650,109 +31654,100 @@ restageprofile::
 .PHONY: stagefeedback-start stagefeedback-end
 
 stagefeedback-start::
-       [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+       @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
        echo stagefeedback > stage_current ; \
        echo stagefeedback > stage_last
 @if bfd
-       [ -d stagefeedback-bfd ] || mkdir stagefeedback-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; \
+       @[ -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; \
+       @[ -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; \
+       @[ -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; \
+       @[ -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; \
+       @[ -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; \
+       @[ -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; \
+       @[ -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 libbanshee
-       [ -d stagefeedback-libbanshee ] || mkdir stagefeedback-libbanshee; \
-       set stagefeedback-libbanshee libbanshee ; @CREATE_LINK_TO_DIR@  ; \
-       set stage1-libbanshee prev-libbanshee ; @CREATE_LINK_TO_DIR@ 
-@endif libbanshee
 @if libiberty
-       [ -d stagefeedback-libiberty ] || mkdir stagefeedback-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; \
+       @[ -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
+       @rm -f stage_current
 @if bfd
-       set bfd stagefeedback-bfd ; @UNDO_LINK_TO_DIR@  ; \
+       @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 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 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 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 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 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 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 libcpp stagefeedback-libcpp ; @UNDO_LINK_TO_DIR@  ; \
        set prev-libcpp stage1-libcpp ; @UNDO_LINK_TO_DIR@ 
 @endif libcpp
-@if libbanshee
-       set libbanshee stagefeedback-libbanshee ; @UNDO_LINK_TO_DIR@  ; \
-       set prev-libbanshee stage1-libbanshee ; @UNDO_LINK_TO_DIR@ 
-@endif libbanshee
 @if libiberty
-       set libiberty stagefeedback-libiberty ; @UNDO_LINK_TO_DIR@  ; \
+       @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 zlib stagefeedback-zlib ; @UNDO_LINK_TO_DIR@  ; \
        set prev-zlib stage1-zlib ; @UNDO_LINK_TO_DIR@ 
 @endif zlib
 
@@ -31761,13 +31756,13 @@ stagefeedback-end::
 # be reconfigured as well.
 .PHONY: stagefeedback-bubble
 stagefeedback-bubble:: stage1-bubble
-       @case `echo all-stagefeedback-*` in \
-         'all-stagefeedback-*') ;; \
-         *) echo Remaking stage feedback ; rm -f all-stagefeedback-* ;; \
-       esac ; \
-       $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stagefeedback
+       @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
+.PHONY: all-stagefeedback clean-stagefeedback
 all-stagefeedback:     \
   maybe-all-stagefeedback-bfd \
   maybe-all-stagefeedback-opcodes \
@@ -31777,24 +31772,36 @@ all-stagefeedback:     \
   maybe-all-stagefeedback-intl   \
   maybe-all-stagefeedback-ld \
   maybe-all-stagefeedback-libcpp  \
-  maybe-all-stagefeedback-libbanshee \
   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:  maybe-all-stage1-bfd 
-       $(MAKE) stagefeedback-start
-       @if [ -f stagefeedback-bfd/Makefile ] ; then \
-         $(STAMP) configure-stagefeedback-bfd ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -31813,35 +31820,44 @@ configure-stagefeedback-bfd:  maybe-all-stage1-bfd
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stagefeedback-bfd
+         @stage2_werror_flag@ 
 
 maybe-all-stagefeedback-bfd: all-stagefeedback-bfd
 all-stagefeedback-bfd: configure-stagefeedback-bfd
-       $(MAKE) stagefeedback-start
+       @$(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"  && \
-       $(STAMP) ../all-stagefeedback-bfd
+               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:  maybe-all-stage1-opcodes 
-       $(MAKE) stagefeedback-start
-       @if [ -f stagefeedback-opcodes/Makefile ] ; then \
-         $(STAMP) configure-stagefeedback-opcodes ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -31860,35 +31876,44 @@ configure-stagefeedback-opcodes:  maybe-all-stage1-opcodes
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stagefeedback-opcodes
+         @stage2_werror_flag@ 
 
 maybe-all-stagefeedback-opcodes: all-stagefeedback-opcodes
 all-stagefeedback-opcodes: configure-stagefeedback-opcodes
-       $(MAKE) stagefeedback-start
+       @$(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"  && \
-       $(STAMP) ../all-stagefeedback-opcodes
+               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:  maybe-all-stage1-binutils 
-       $(MAKE) stagefeedback-start
-       @if [ -f stagefeedback-binutils/Makefile ] ; then \
-         $(STAMP) configure-stagefeedback-binutils ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -31907,35 +31932,44 @@ configure-stagefeedback-binutils:  maybe-all-stage1-binutils
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stagefeedback-binutils
+         @stage2_werror_flag@ 
 
 maybe-all-stagefeedback-binutils: all-stagefeedback-binutils
 all-stagefeedback-binutils: configure-stagefeedback-binutils
-       $(MAKE) stagefeedback-start
+       @$(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"  && \
-       $(STAMP) ../all-stagefeedback-binutils
+               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:  maybe-all-stage1-gas 
-       $(MAKE) stagefeedback-start
-       @if [ -f stagefeedback-gas/Makefile ] ; then \
-         $(STAMP) configure-stagefeedback-gas ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+configure-stagefeedback-gas:
+       @$(MAKE) stagefeedback-start
+       @[ -f gas/Makefile ] && exit 0 || : ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
        $(STAGE_HOST_EXPORTS)  \
@@ -31954,35 +31988,44 @@ configure-stagefeedback-gas:  maybe-all-stage1-gas
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stagefeedback-gas
+         @stage2_werror_flag@ 
 
 maybe-all-stagefeedback-gas: all-stagefeedback-gas
 all-stagefeedback-gas: configure-stagefeedback-gas
-       $(MAKE) stagefeedback-start
+       @$(MAKE) stagefeedback-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
        $(STAGE_HOST_EXPORTS)  \
        cd gas && \
        $(MAKE) $(FLAGS_TO_PASS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  && \
-       $(STAMP) ../all-stagefeedback-gas
+               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:  maybe-all-stage1-gcc 
-       $(MAKE) stagefeedback-start
-       @if [ -f stagefeedback-gcc/Makefile ] ; then \
-         $(STAMP) configure-stagefeedback-gcc ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -32001,35 +32044,44 @@ configure-stagefeedback-gcc:  maybe-all-stage1-gcc
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stagefeedback-gcc
+         @stage2_werror_flag@ 
 
 maybe-all-stagefeedback-gcc: all-stagefeedback-gcc
 all-stagefeedback-gcc: configure-stagefeedback-gcc
-       $(MAKE) stagefeedback-start
+       @$(MAKE) stagefeedback-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-use" $(EXTRA_GCC_FLAGS) && \
-       $(STAMP) ../all-stagefeedback-gcc
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" $(EXTRA_GCC_FLAGS)
+
+maybe-clean-stagefeedback-gcc: clean-stagefeedback-gcc
+clean-stagefeedback-gcc:
+       @[ -f gcc/Makefile ] || [ -f stagefeedback-gcc/Makefile ] \
+         || exit 0 ; \
+       [ -f gcc/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd gcc && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" $(EXTRA_GCC_FLAGS) clean
 @endif gcc-bootstrap
 
+
+.PHONY: configure-stagefeedback-intl maybe-configure-stagefeedback-intl
+.PHONY: all-stagefeedback-intl maybe-all-stagefeedback-intl
+.PHONY: clean-stagefeedback-intl maybe-clean-stagefeedback-intl
+
 maybe-configure-stagefeedback-intl:
 maybe-all-stagefeedback-intl:
+maybe-clean-stagefeedback-intl:
 
 @if intl-bootstrap
 maybe-configure-stagefeedback-intl: configure-stagefeedback-intl
-configure-stagefeedback-intl:  maybe-all-stage1-intl 
-       $(MAKE) stagefeedback-start
-       @if [ -f stagefeedback-intl/Makefile ] ; then \
-         $(STAMP) configure-stagefeedback-intl ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -32048,35 +32100,44 @@ configure-stagefeedback-intl:  maybe-all-stage1-intl
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stagefeedback-intl
+         @stage2_werror_flag@ 
 
 maybe-all-stagefeedback-intl: all-stagefeedback-intl
 all-stagefeedback-intl: configure-stagefeedback-intl
-       $(MAKE) stagefeedback-start
+       @$(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"  && \
-       $(STAMP) ../all-stagefeedback-intl
+               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:  maybe-all-stage1-ld 
-       $(MAKE) stagefeedback-start
-       @if [ -f stagefeedback-ld/Makefile ] ; then \
-         $(STAMP) configure-stagefeedback-ld ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -32095,35 +32156,44 @@ configure-stagefeedback-ld:  maybe-all-stage1-ld
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stagefeedback-ld
+         @stage2_werror_flag@ 
 
 maybe-all-stagefeedback-ld: all-stagefeedback-ld
 all-stagefeedback-ld: configure-stagefeedback-ld
-       $(MAKE) stagefeedback-start
+       @$(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"  && \
-       $(STAMP) ../all-stagefeedback-ld
+               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:  maybe-all-stage1-libcpp 
-       $(MAKE) stagefeedback-start
-       @if [ -f stagefeedback-libcpp/Makefile ] ; then \
-         $(STAMP) configure-stagefeedback-libcpp ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -32142,82 +32212,44 @@ configure-stagefeedback-libcpp:  maybe-all-stage1-libcpp
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stagefeedback-libcpp
+         @stage2_werror_flag@ 
 
 maybe-all-stagefeedback-libcpp: all-stagefeedback-libcpp
 all-stagefeedback-libcpp: configure-stagefeedback-libcpp
-       $(MAKE) stagefeedback-start
+       @$(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"  && \
-       $(STAMP) ../all-stagefeedback-libcpp
-@endif libcpp-bootstrap
-
-maybe-configure-stagefeedback-libbanshee:
-maybe-all-stagefeedback-libbanshee:
-
-@if libbanshee-bootstrap
-maybe-configure-stagefeedback-libbanshee: configure-stagefeedback-libbanshee
-configure-stagefeedback-libbanshee:  maybe-all-stage1-libbanshee 
-       $(MAKE) stagefeedback-start
-       @if [ -f stagefeedback-libbanshee/Makefile ] ; then \
-         $(STAMP) configure-stagefeedback-libbanshee ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       echo Configuring stage feedback in libbanshee ; \
-       cd libbanshee || exit 1; \
-       case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/libbanshee"; \
-           libsrcdir="$$s/libbanshee";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/libbanshee"; \
-           libsrcdir="$$s/libbanshee";; \
-       esac; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stagefeedback-libbanshee
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
 
-maybe-all-stagefeedback-libbanshee: all-stagefeedback-libbanshee
-all-stagefeedback-libbanshee: configure-stagefeedback-libbanshee
-       $(MAKE) stagefeedback-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-       $(STAGE_HOST_EXPORTS)  \
-       cd libbanshee && \
+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"  && \
-       $(STAMP) ../all-stagefeedback-libbanshee
-@endif libbanshee-bootstrap
+               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:  maybe-all-stage1-libiberty 
-       $(MAKE) stagefeedback-start
-       @if [ -f stagefeedback-libiberty/Makefile ] ; then \
-         $(STAMP) configure-stagefeedback-libiberty ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -32236,35 +32268,44 @@ configure-stagefeedback-libiberty:  maybe-all-stage1-libiberty
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stagefeedback-libiberty
+         @stage2_werror_flag@ 
 
 maybe-all-stagefeedback-libiberty: all-stagefeedback-libiberty
 all-stagefeedback-libiberty: configure-stagefeedback-libiberty
-       $(MAKE) stagefeedback-start
+       @$(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"  && \
-       $(STAMP) ../all-stagefeedback-libiberty
+               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:  maybe-all-stage1-zlib 
-       $(MAKE) stagefeedback-start
-       @if [ -f stagefeedback-zlib/Makefile ] ; then \
-         $(STAMP) configure-stagefeedback-zlib ; \
-         exit 0; \
-       else \
-         true ; \
-       fi ; \
+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)  \
@@ -32283,23 +32324,32 @@ configure-stagefeedback-zlib:  maybe-all-stage1-zlib
        esac; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) $${srcdiroption} \
-         @stage2_werror_flag@  && \
-         $(STAMP) ../configure-stagefeedback-zlib
+         @stage2_werror_flag@ 
 
 maybe-all-stagefeedback-zlib: all-stagefeedback-zlib
 all-stagefeedback-zlib: configure-stagefeedback-zlib
-       $(MAKE) stagefeedback-start
+       @$(MAKE) stagefeedback-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
        $(STAGE_HOST_EXPORTS)  \
        cd zlib && \
        $(MAKE) $(FLAGS_TO_PASS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  && \
-       $(STAMP) ../all-stagefeedback-zlib
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-zlib: clean-stagefeedback-zlib
+clean-stagefeedback-zlib:
+       @[ -f zlib/Makefile ] || [ -f stagefeedback-zlib/Makefile ] \
+         || exit 0 ; \
+       [ -f zlib/Makefile ] || $(MAKE) stagefeedback-start ; \
+       cd zlib && \
+       $(MAKE) $(FLAGS_TO_PASS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
 @endif zlib-bootstrap
 
 
+
 # FIXME: Will not need to be conditional when toplevel bootstrap is the
 # only possibility, but now it conflicts with no-bootstrap rules
 @if gcc-bootstrap
@@ -32307,35 +32357,12 @@ all-stagefeedback-zlib: configure-stagefeedback-zlib
 
 
 
-.PHONY: restagefeedback touch-stagefeedback distclean-stagefeedback
-
-# Rules to wipe a stage and all the following ones, used for cleanstrap
+# 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 configure-stagefeedback-* all-stagefeedback-* stagefeedback-* 
-
-# Rules to renew the timestamp on a stage and all the following ones
-touch-stage1:: touch-stagefeedback 
-touch-stagefeedback::
-       @case `echo configure-stagefeedback-*` in \
-         'configure-stagefeedback-*') ;; \
-         *) \
-           echo '$(STAMP)' configure-stagefeedback-* && \
-           $(STAMP) configure-stagefeedback-* ;; \
-       esac ; \
-       case `echo all-stagefeedback-*` in \
-         'all-stagefeedback-*') ;; \
-         *) \
-           echo '$(STAMP)' all-stagefeedback-* && \
-           $(STAMP) all-stagefeedback-* ;; \
-       esac
-
-# After building a stage, touch the following ones
-restage1:: touch-stagefeedback 
-restagefeedback::
-       rm -rf all-stagefeedback-* 
-       $(MAKE) $(RECURSE_FLAGS_TO_PASS)  all-stagefeedback 
+       rm -rf stagefeedback-* 
 
 
 @endif gcc-bootstrap
@@ -32372,6 +32399,12 @@ profiledbootstrap:
        $(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
 # --------------------------------------
@@ -32471,6 +32504,7 @@ 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
@@ -32555,6 +32589,24 @@ 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
@@ -32587,14 +32639,6 @@ 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: maybe-all-libbanshee
-
-all-stage1-gcc: maybe-all-stage1-libbanshee
-all-stage2-gcc: maybe-all-stage2-libbanshee
-all-stage3-gcc: maybe-all-stage3-libbanshee
-all-stage4-gcc: maybe-all-stage4-libbanshee
-all-stageprofile-gcc: maybe-all-stageprofile-libbanshee
-all-stagefeedback-gcc: maybe-all-stagefeedback-libbanshee
 all-gcc: all-libcpp
 
 all-stage1-gcc: all-stage1-libcpp
@@ -32953,7 +32997,6 @@ all-prebootstrap: maybe-all-gas
 all-prebootstrap: maybe-all-intl
 all-prebootstrap: maybe-all-ld
 all-prebootstrap: maybe-all-libcpp
-all-prebootstrap: maybe-all-libbanshee
 all-prebootstrap: maybe-all-libiberty
 all-prebootstrap: maybe-all-zlib
 @endif gcc-no-bootstrap