OSDN Git Service

Fix typo. Name of fourth arg is 'fndecl' not 'indirect'. Update comment
[pf3gnuchains/gcc-fork.git] / Makefile.in
index 4466ec8..efb2d20 100644 (file)
@@ -3,7 +3,7 @@
 #
 # Makefile for directory with subdirs to build.
 #   Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-#   1999, 2000, 2001, 2002 Free Software Foundation
+#   1999, 2000, 2001, 2002, 2003 Free Software Foundation
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 
-# Tell GNU make 3.79 not to run the top level in parallel.  This 
-# prevents contention for $builddir/$target/config.cache, as well
-# as minimizing scatter in file system caches.
-NOTPARALLEL = .NOTPARALLEL
-$(NOTPARALLEL):
-
 VPATH=@srcdir@
 links=@configlinks@
 
@@ -52,6 +46,9 @@ enable_version_specific_runtime_libs = @enable_version_specific_runtime_libs@
 gcc_version_trigger = @gcc_version_trigger@
 gcc_version = @gcc_version@
 
+# The gcc driver likes to know the arguments it was configured with.
+TOPLEVEL_CONFIGURE_ARGUMENTS=@TOPLEVEL_CONFIGURE_ARGUMENTS@
+
 srcdir = @srcdir@
 
 prefix = @prefix@
@@ -110,6 +107,7 @@ INSTALL_DATA = $(INSTALL) -m 644
 AS = @AS@
 AR = @AR@
 AR_FLAGS = rc
+RANLIB = @RANLIB@
 CC = @CC@
 
 # Special variables passed down in EXTRA_GCC_FLAGS.  They are defined
@@ -279,7 +277,7 @@ USUAL_AS_FOR_TARGET = ` \
     if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
       echo $(AS); \
     else \
-       t='$(program_transform_name)'; echo as | sed -e 's/x/x/' $$t ; \
+       echo as | sed '$(program_transform_name)' ; \
     fi; \
   fi`
 
@@ -293,7 +291,7 @@ USUAL_LD_FOR_TARGET = ` \
     if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
       echo $(LD); \
     else \
-       t='$(program_transform_name)'; echo ld | sed -e 's/x/x/' $$t ; \
+       echo ld | sed '$(program_transform_name)' ; \
     fi; \
   fi`
 
@@ -305,7 +303,7 @@ USUAL_DLLTOOL_FOR_TARGET = ` \
     if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
       echo $(DLLTOOL); \
     else \
-       t='$(program_transform_name)'; echo dlltool | sed -e 's/x/x/' $$t ; \
+       echo dlltool | sed '$(program_transform_name)' ; \
     fi; \
   fi`
 
@@ -317,7 +315,7 @@ USUAL_WINDRES_FOR_TARGET = ` \
     if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
       echo $(WINDRES); \
     else \
-       t='$(program_transform_name)'; echo windres | sed -e 's/x/x/' $$t ; \
+       echo windres | sed '$(program_transform_name)' ; \
     fi; \
   fi`
 
@@ -329,7 +327,7 @@ USUAL_AR_FOR_TARGET = ` \
     if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
       echo $(AR); \
     else \
-       t='$(program_transform_name)'; echo ar | sed -e 's/x/x/' $$t ; \
+       echo ar | sed '$(program_transform_name)' ; \
     fi; \
   fi`
 
@@ -345,7 +343,7 @@ USUAL_RANLIB_FOR_TARGET = ` \
          echo ranlib; \
       fi; \
     else \
-       t='$(program_transform_name)'; echo ranlib | sed -e 's/x/x/' $$t ; \
+       echo ranlib | sed '$(program_transform_name)' ; \
     fi; \
   fi`
 
@@ -359,7 +357,7 @@ USUAL_NM_FOR_TARGET = ` \
     if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
       echo $(NM); \
     else \
-       t='$(program_transform_name)'; echo nm | sed -e 's/x/x/' $$t ; \
+       echo nm | sed '$(program_transform_name)' ; \
     fi; \
   fi`
 
@@ -369,6 +367,10 @@ all: all.normal
 .PHONY: all
 
 #### host and target specific makefile fragments come in here.
+@target_makefile_frag@
+@alphaieee_frag@
+@ospace_frag@
+@host_makefile_frag@
 ###
 
 # Flags to pass down to all sub-makes.
@@ -387,6 +389,7 @@ BASE_FLAGS_TO_PASS = \
        "CXXFLAGS=$(CXXFLAGS)" \
        "CXXFLAGS_FOR_TARGET=$(CXXFLAGS_FOR_TARGET)" \
        "CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \
+       "DESTDIR=$(DESTDIR)" \
        "DLLTOOL_FOR_TARGET=$(DLLTOOL_FOR_TARGET)" \
        "INSTALL=$(INSTALL)" \
        "INSTALL_DATA=$(INSTALL_DATA)" \
@@ -541,7 +544,6 @@ CLEAN_MODULES = \
        clean-bison \
        clean-byacc \
        clean-bzip2 \
-       clean-db \
        clean-dejagnu \
        clean-diff \
        clean-dosutils \
@@ -556,7 +558,6 @@ CLEAN_MODULES = \
        clean-gettext \
        clean-gnuserv \
        clean-gprof \
-       clean-grep \
        clean-gzip \
        clean-hello \
        clean-indent \
@@ -582,7 +583,6 @@ CLEAN_MODULES = \
        clean-shellutils \
        clean-sid \
        clean-sim \
-       clean-snavigator \
        clean-tar \
        clean-texinfo \
        clean-textutils \
@@ -656,13 +656,13 @@ do-clean:
              done; \
              ;; \
            esac ; \
-           if (cd ./$$i; \
+           (cd ./$$i && \
                $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                        "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                        "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
                        "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                       clean); \
-           then true; else exit 1; fi; \
+                       clean) \
+           || exit 1; \
          else true; fi; \
        done
        # Break into two pieces
@@ -674,13 +674,13 @@ do-clean:
            for flag in $(EXTRA_TARGET_FLAGS); do \
                eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
            done; \
-           if (cd $(TARGET_SUBDIR)/$$i; \
+           (cd $(TARGET_SUBDIR)/$$i && \
                $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                        "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                        "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
                        "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                       clean); \
-           then true; else exit 1; fi; \
+                       clean) \
+           || exit 1; \
          else true; fi; \
        done
 
@@ -703,13 +703,13 @@ do-distclean:
              done; \
              ;; \
            esac ; \
-           if (cd ./$$i; \
+           (cd ./$$i && \
                $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                        "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                        "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
                        "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                       distclean); \
-           then true; else exit 1; fi; \
+                       distclean) \
+           || exit 1; \
          else true; fi; \
        done
        # Break into two pieces
@@ -721,13 +721,13 @@ do-distclean:
            for flag in $(EXTRA_TARGET_FLAGS); do \
                eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
            done; \
-           if (cd $(TARGET_SUBDIR)/$$i; \
+           (cd $(TARGET_SUBDIR)/$$i && \
                $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                        "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                        "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
                        "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                       distclean); \
-           then true; else exit 1; fi; \
+                       distclean) \
+           || exit 1; \
          else true; fi; \
        done
 
@@ -750,13 +750,13 @@ do-dvi:
              done; \
              ;; \
            esac ; \
-           if (cd ./$$i; \
+           (cd ./$$i && \
                $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                        "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                        "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
                        "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                       dvi); \
-           then true; else exit 1; fi; \
+                       dvi) \
+           || exit 1; \
          else true; fi; \
        done
        # Break into two pieces
@@ -768,13 +768,13 @@ do-dvi:
            for flag in $(EXTRA_TARGET_FLAGS); do \
                eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
            done; \
-           if (cd $(TARGET_SUBDIR)/$$i; \
+           (cd $(TARGET_SUBDIR)/$$i && \
                $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                        "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                        "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
                        "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                       dvi); \
-           then true; else exit 1; fi; \
+                       dvi) \
+           || exit 1; \
          else true; fi; \
        done
 
@@ -797,13 +797,13 @@ do-info:
              done; \
              ;; \
            esac ; \
-           if (cd ./$$i; \
+           (cd ./$$i && \
                $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                        "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                        "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
                        "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                       info); \
-           then true; else exit 1; fi; \
+                       info) \
+           || exit 1; \
          else true; fi; \
        done
        # Break into two pieces
@@ -815,13 +815,13 @@ do-info:
            for flag in $(EXTRA_TARGET_FLAGS); do \
                eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
            done; \
-           if (cd $(TARGET_SUBDIR)/$$i; \
+           (cd $(TARGET_SUBDIR)/$$i && \
                $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                        "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                        "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
                        "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                       info); \
-           then true; else exit 1; fi; \
+                       info) \
+           || exit 1; \
          else true; fi; \
        done
 
@@ -844,13 +844,13 @@ do-install-info:
              done; \
              ;; \
            esac ; \
-           if (cd ./$$i; \
+           (cd ./$$i && \
                $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                        "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                        "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
                        "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                       install-info); \
-           then true; else exit 1; fi; \
+                       install-info) \
+           || exit 1; \
          else true; fi; \
        done
        # Break into two pieces
@@ -862,13 +862,13 @@ do-install-info:
            for flag in $(EXTRA_TARGET_FLAGS); do \
                eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
            done; \
-           if (cd $(TARGET_SUBDIR)/$$i; \
+           (cd $(TARGET_SUBDIR)/$$i && \
                $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                        "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                        "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
                        "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                       install-info); \
-           then true; else exit 1; fi; \
+                       install-info) \
+           || exit 1; \
          else true; fi; \
        done
 
@@ -891,13 +891,13 @@ do-installcheck:
              done; \
              ;; \
            esac ; \
-           if (cd ./$$i; \
+           (cd ./$$i && \
                $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                        "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                        "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
                        "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                       installcheck); \
-           then true; else exit 1; fi; \
+                       installcheck) \
+           || exit 1; \
          else true; fi; \
        done
        # Break into two pieces
@@ -909,13 +909,13 @@ do-installcheck:
            for flag in $(EXTRA_TARGET_FLAGS); do \
                eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
            done; \
-           if (cd $(TARGET_SUBDIR)/$$i; \
+           (cd $(TARGET_SUBDIR)/$$i && \
                $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                        "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                        "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
                        "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                       installcheck); \
-           then true; else exit 1; fi; \
+                       installcheck) \
+           || exit 1; \
          else true; fi; \
        done
 
@@ -938,13 +938,13 @@ do-mostlyclean:
              done; \
              ;; \
            esac ; \
-           if (cd ./$$i; \
+           (cd ./$$i && \
                $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                        "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                        "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
                        "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                       mostlyclean); \
-           then true; else exit 1; fi; \
+                       mostlyclean) \
+           || exit 1; \
          else true; fi; \
        done
        # Break into two pieces
@@ -956,13 +956,13 @@ do-mostlyclean:
            for flag in $(EXTRA_TARGET_FLAGS); do \
                eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
            done; \
-           if (cd $(TARGET_SUBDIR)/$$i; \
+           (cd $(TARGET_SUBDIR)/$$i && \
                $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                        "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                        "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
                        "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                       mostlyclean); \
-           then true; else exit 1; fi; \
+                       mostlyclean) \
+           || exit 1; \
          else true; fi; \
        done
 
@@ -985,13 +985,13 @@ do-maintainer-clean:
              done; \
              ;; \
            esac ; \
-           if (cd ./$$i; \
+           (cd ./$$i && \
                $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                        "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                        "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
                        "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                       maintainer-clean); \
-           then true; else exit 1; fi; \
+                       maintainer-clean) \
+           || exit 1; \
          else true; fi; \
        done
        # Break into two pieces
@@ -1003,13 +1003,13 @@ do-maintainer-clean:
            for flag in $(EXTRA_TARGET_FLAGS); do \
                eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
            done; \
-           if (cd $(TARGET_SUBDIR)/$$i; \
+           (cd $(TARGET_SUBDIR)/$$i && \
                $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                        "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                        "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
                        "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                       maintainer-clean); \
-           then true; else exit 1; fi; \
+                       maintainer-clean) \
+           || exit 1; \
          else true; fi; \
        done
 
@@ -1032,13 +1032,13 @@ do-TAGS:
              done; \
              ;; \
            esac ; \
-           if (cd ./$$i; \
+           (cd ./$$i && \
                $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                        "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                        "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
                        "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                       TAGS); \
-           then true; else exit 1; fi; \
+                       TAGS) \
+           || exit 1; \
          else true; fi; \
        done
        # Break into two pieces
@@ -1050,13 +1050,13 @@ do-TAGS:
            for flag in $(EXTRA_TARGET_FLAGS); do \
                eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
            done; \
-           if (cd $(TARGET_SUBDIR)/$$i; \
+           (cd $(TARGET_SUBDIR)/$$i && \
                $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                        "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                        "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
                        "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-                       TAGS); \
-           then true; else exit 1; fi; \
+                       TAGS) \
+           || exit 1; \
          else true; fi; \
        done
 
@@ -1078,7 +1078,7 @@ do-info: maybe-all-texinfo
 install-info: do-install-info dir.info
        s=`cd $(srcdir); ${PWD}`; export s; \
        if [ -f dir.info ] ; then \
-         $(INSTALL_DATA) dir.info $(infodir)/dir.info ; \
+         $(INSTALL_DATA) dir.info $(DESTDIR)$(infodir)/dir.info ; \
        else true ; fi
 
 local-clean:
@@ -1086,6 +1086,7 @@ local-clean:
 
 local-distclean:
        -rm -f Makefile config.status config.cache mh-frag mt-frag
+       -rm -f multilib.out multilib.tmp maybedep.tmp serdep.tmp
        -if [ "$(TARGET_SUBDIR)" != "." ]; then \
          rm -rf $(TARGET_SUBDIR); \
        else true; fi
@@ -1114,7 +1115,7 @@ $(CLEAN_MODULES) $(CLEAN_X11_MODULES) clean-gcc:
          r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) clean); \
+         (cd $${dir} && $(MAKE) $(FLAGS_TO_PASS) clean); \
        else \
          true; \
        fi
@@ -1127,7 +1128,7 @@ $(CLEAN_TARGET_MODULES):
          r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/$${dir}; $(MAKE) $(TARGET_FLAGS_TO_PASS) clean); \
+         (cd $(TARGET_SUBDIR)/$${dir} && $(MAKE) $(TARGET_FLAGS_TO_PASS) clean); \
        else \
          true; \
        fi
@@ -1185,7 +1186,7 @@ install.all: install-no-fixedincludes
        @if [ -f ./gcc/Makefile ] ; then \
                r=`${PWD}` ; export r ; \
                $(SET_LIB_PATH) \
-               (cd ./gcc; \
+               (cd ./gcc && \
                $(MAKE) $(FLAGS_TO_PASS) install-headers) ; \
        else \
                true ; \
@@ -1208,7 +1209,7 @@ installdirs: mkinstalldirs
 
 dir.info: do-install-info
        if [ -f $(srcdir)/texinfo/gen-info-dir ] ; then \
-         $(srcdir)/texinfo/gen-info-dir $(infodir) $(srcdir)/texinfo/dir.info-template > dir.info.new ; \
+         $(srcdir)/texinfo/gen-info-dir $(DESTDIR)$(infodir) $(srcdir)/texinfo/dir.info-template > dir.info.new ; \
          mv -f dir.info.new dir.info ; \
        else true ; \
        fi
@@ -1227,16 +1228,16 @@ etags tags: TAGS
 # built are.
 TAGS: do-TAGS
 
-
 # --------------------------------------
 # Modules which run on the build machine
 # --------------------------------------
 
 .PHONY: configure-build-libiberty maybe-configure-build-libiberty
 maybe-configure-build-libiberty:
-configure-build-libiberty: $(BUILD_SUBDIR)/libiberty/Makefile
-@build_prefix@$(BUILD_SUBDIR)/libiberty/Makefile: config.status
-       @[ -d $(BUILD_SUBDIR)/libiberty ] || mkdir $(BUILD_SUBDIR)/libiberty;\
+configure-build-libiberty:
+       @test ! -f $(BUILD_SUBDIR)/libiberty/Makefile || exit 0; \
+           [ -d $(BUILD_SUBDIR)/libiberty ] || \
+               mkdir $(BUILD_SUBDIR)/libiberty;\
            r=`${PWD}`; export r; \
            s=`cd $(srcdir); ${PWD}`; export s; \
            AR="$(AR_FOR_BUILD)"; export AR; \
@@ -1307,10 +1308,9 @@ all-build-libiberty: configure-build-libiberty
 
 .PHONY: configure-ash maybe-configure-ash
 maybe-configure-ash:
-configure-ash: ash/Makefile
-
-ash/Makefile: config.status
-       @[ -d ash ] || mkdir ash; \
+configure-ash:
+       @test ! -f ash/Makefile || exit 0; \
+       [ -d ash ] || mkdir ash; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -1352,7 +1352,7 @@ all-ash: configure-ash
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd ash; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd ash && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-ash
@@ -1360,7 +1360,7 @@ check-ash:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd ash; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd ash && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -1370,15 +1370,14 @@ install-ash: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd ash; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd ash && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-autoconf maybe-configure-autoconf
 maybe-configure-autoconf:
-configure-autoconf: autoconf/Makefile
-
-autoconf/Makefile: config.status
-       @[ -d autoconf ] || mkdir autoconf; \
+configure-autoconf:
+       @test ! -f autoconf/Makefile || exit 0; \
+       [ -d autoconf ] || mkdir autoconf; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -1420,7 +1419,7 @@ all-autoconf: configure-autoconf
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd autoconf; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd autoconf && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-autoconf
@@ -1428,7 +1427,7 @@ check-autoconf:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd autoconf; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd autoconf && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -1438,15 +1437,14 @@ install-autoconf: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd autoconf; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd autoconf && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-automake maybe-configure-automake
 maybe-configure-automake:
-configure-automake: automake/Makefile
-
-automake/Makefile: config.status
-       @[ -d automake ] || mkdir automake; \
+configure-automake:
+       @test ! -f automake/Makefile || exit 0; \
+       [ -d automake ] || mkdir automake; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -1488,7 +1486,7 @@ all-automake: configure-automake
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd automake; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd automake && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-automake
@@ -1496,7 +1494,7 @@ check-automake:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd automake; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd automake && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -1506,15 +1504,14 @@ install-automake: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd automake; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd automake && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-bash maybe-configure-bash
 maybe-configure-bash:
-configure-bash: bash/Makefile
-
-bash/Makefile: config.status
-       @[ -d bash ] || mkdir bash; \
+configure-bash:
+       @test ! -f bash/Makefile || exit 0; \
+       [ -d bash ] || mkdir bash; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -1556,7 +1553,7 @@ all-bash: configure-bash
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd bash; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd bash && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-bash
@@ -1564,7 +1561,7 @@ check-bash:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd bash; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd bash && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -1574,15 +1571,14 @@ install-bash: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd bash; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd bash && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-bfd maybe-configure-bfd
 maybe-configure-bfd:
-configure-bfd: bfd/Makefile
-
-bfd/Makefile: config.status
-       @[ -d bfd ] || mkdir bfd; \
+configure-bfd:
+       @test ! -f bfd/Makefile || exit 0; \
+       [ -d bfd ] || mkdir bfd; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -1624,7 +1620,7 @@ all-bfd: configure-bfd
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd bfd; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd bfd && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-bfd
@@ -1632,7 +1628,7 @@ check-bfd:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd bfd; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd bfd && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -1642,15 +1638,14 @@ install-bfd: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd bfd; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd bfd && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-opcodes maybe-configure-opcodes
 maybe-configure-opcodes:
-configure-opcodes: opcodes/Makefile
-
-opcodes/Makefile: config.status
-       @[ -d opcodes ] || mkdir opcodes; \
+configure-opcodes:
+       @test ! -f opcodes/Makefile || exit 0; \
+       [ -d opcodes ] || mkdir opcodes; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -1692,7 +1687,7 @@ all-opcodes: configure-opcodes
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd opcodes; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd opcodes && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-opcodes
@@ -1700,7 +1695,7 @@ check-opcodes:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd opcodes; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd opcodes && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -1710,15 +1705,14 @@ install-opcodes: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd opcodes; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd opcodes && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-binutils maybe-configure-binutils
 maybe-configure-binutils:
-configure-binutils: binutils/Makefile
-
-binutils/Makefile: config.status
-       @[ -d binutils ] || mkdir binutils; \
+configure-binutils:
+       @test ! -f binutils/Makefile || exit 0; \
+       [ -d binutils ] || mkdir binutils; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -1760,7 +1754,7 @@ all-binutils: configure-binutils
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd binutils; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd binutils && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-binutils
@@ -1768,7 +1762,7 @@ check-binutils:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd binutils; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd binutils && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -1778,15 +1772,14 @@ install-binutils: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd binutils; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd binutils && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-bison maybe-configure-bison
 maybe-configure-bison:
-configure-bison: bison/Makefile
-
-bison/Makefile: config.status
-       @[ -d bison ] || mkdir bison; \
+configure-bison:
+       @test ! -f bison/Makefile || exit 0; \
+       [ -d bison ] || mkdir bison; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -1828,7 +1821,7 @@ all-bison: configure-bison
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd bison; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd bison && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-bison
@@ -1838,7 +1831,7 @@ check-bison:
            r=`${PWD}`; export r; \
            s=`cd $(srcdir); ${PWD}`; export s; \
            $(SET_LIB_PATH) \
-           (cd bison; $(MAKE) $(FLAGS_TO_PASS) check); \
+           (cd bison && $(MAKE) $(FLAGS_TO_PASS) check); \
        fi
 
 
@@ -1849,15 +1842,14 @@ install-bison: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd bison; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd bison && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-byacc maybe-configure-byacc
 maybe-configure-byacc:
-configure-byacc: byacc/Makefile
-
-byacc/Makefile: config.status
-       @[ -d byacc ] || mkdir byacc; \
+configure-byacc:
+       @test ! -f byacc/Makefile || exit 0; \
+       [ -d byacc ] || mkdir byacc; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -1899,7 +1891,7 @@ all-byacc: configure-byacc
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd byacc; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd byacc && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-byacc
@@ -1909,7 +1901,7 @@ check-byacc:
            r=`${PWD}`; export r; \
            s=`cd $(srcdir); ${PWD}`; export s; \
            $(SET_LIB_PATH) \
-           (cd byacc; $(MAKE) $(FLAGS_TO_PASS) check); \
+           (cd byacc && $(MAKE) $(FLAGS_TO_PASS) check); \
        fi
 
 
@@ -1920,15 +1912,14 @@ install-byacc: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd byacc; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd byacc && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-bzip2 maybe-configure-bzip2
 maybe-configure-bzip2:
-configure-bzip2: bzip2/Makefile
-
-bzip2/Makefile: config.status
-       @[ -d bzip2 ] || mkdir bzip2; \
+configure-bzip2:
+       @test ! -f bzip2/Makefile || exit 0; \
+       [ -d bzip2 ] || mkdir bzip2; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -1970,7 +1961,7 @@ all-bzip2: configure-bzip2
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd bzip2; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd bzip2 && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-bzip2
@@ -1978,7 +1969,7 @@ check-bzip2:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd bzip2; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd bzip2 && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -1988,83 +1979,14 @@ install-bzip2: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd bzip2; $(MAKE) $(FLAGS_TO_PASS) install)
-
-
-.PHONY: configure-db maybe-configure-db
-maybe-configure-db:
-configure-db: db/Makefile
-
-db/Makefile: config.status
-       @[ -d db ] || mkdir db; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       if [ z$(build_canonical) !=  z$(host_canoncial) ] ; then \
-         AR="$(AR)"; export AR; \
-         AS="$(AS)"; export AS; \
-         CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
-         DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
-         LD="$(LD)"; export LD; \
-         NM="$(NM)"; export NM; \
-         RANLIB="$(RANLIB)"; export RANLIB; \
-         WINDRES="$(WINDRES)"; export WINDRES; \
-         OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-         OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       fi; \
-       echo Configuring in db; \
-       cd db || exit 1; \
-       case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/db"; \
-           libsrcdir="$$s/db";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/db"; \
-           libsrcdir="$$s/db";; \
-       esac; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         || exit 1
-
-.PHONY: all-db maybe-all-db
-maybe-all-db:
-all-db: configure-db
-       @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd db; $(MAKE) $(FLAGS_TO_PASS) all)
-
-
-.PHONY: check-db
-check-db:
-       @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd db; $(MAKE) $(FLAGS_TO_PASS) check)
-
-
-
-.PHONY: install-db maybe-install-db
-maybe-install-db:
-install-db: installdirs
-       @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd db; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd bzip2 && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-dejagnu maybe-configure-dejagnu
 maybe-configure-dejagnu:
-configure-dejagnu: dejagnu/Makefile
-
-dejagnu/Makefile: config.status
-       @[ -d dejagnu ] || mkdir dejagnu; \
+configure-dejagnu:
+       @test ! -f dejagnu/Makefile || exit 0; \
+       [ -d dejagnu ] || mkdir dejagnu; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -2106,7 +2028,7 @@ all-dejagnu: configure-dejagnu
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd dejagnu; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd dejagnu && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-dejagnu
@@ -2114,7 +2036,7 @@ check-dejagnu:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd dejagnu; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd dejagnu && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -2124,15 +2046,14 @@ install-dejagnu: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd dejagnu; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd dejagnu && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-diff maybe-configure-diff
 maybe-configure-diff:
-configure-diff: diff/Makefile
-
-diff/Makefile: config.status
-       @[ -d diff ] || mkdir diff; \
+configure-diff:
+       @test ! -f diff/Makefile || exit 0; \
+       [ -d diff ] || mkdir diff; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -2174,7 +2095,7 @@ all-diff: configure-diff
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd diff; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd diff && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-diff
@@ -2182,7 +2103,7 @@ check-diff:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd diff; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd diff && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -2192,15 +2113,14 @@ install-diff: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd diff; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd diff && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-dosutils maybe-configure-dosutils
 maybe-configure-dosutils:
-configure-dosutils: dosutils/Makefile
-
-dosutils/Makefile: config.status
-       @[ -d dosutils ] || mkdir dosutils; \
+configure-dosutils:
+       @test ! -f dosutils/Makefile || exit 0; \
+       [ -d dosutils ] || mkdir dosutils; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -2242,7 +2162,7 @@ all-dosutils: configure-dosutils
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd dosutils; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd dosutils && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-dosutils
@@ -2256,15 +2176,14 @@ install-dosutils: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd dosutils; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd dosutils && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-etc maybe-configure-etc
 maybe-configure-etc:
-configure-etc: etc/Makefile
-
-etc/Makefile: config.status
-       @[ -d etc ] || mkdir etc; \
+configure-etc:
+       @test ! -f etc/Makefile || exit 0; \
+       [ -d etc ] || mkdir etc; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -2306,7 +2225,7 @@ all-etc: configure-etc
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd etc; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd etc && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-etc
@@ -2314,7 +2233,7 @@ check-etc:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd etc; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd etc && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -2324,15 +2243,14 @@ install-etc: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd etc; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd etc && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-fastjar maybe-configure-fastjar
 maybe-configure-fastjar:
-configure-fastjar: fastjar/Makefile
-
-fastjar/Makefile: config.status
-       @[ -d fastjar ] || mkdir fastjar; \
+configure-fastjar:
+       @test ! -f fastjar/Makefile || exit 0; \
+       [ -d fastjar ] || mkdir fastjar; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -2374,7 +2292,7 @@ all-fastjar: configure-fastjar
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd fastjar; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd fastjar && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-fastjar
@@ -2384,7 +2302,7 @@ check-fastjar:
            r=`${PWD}`; export r; \
            s=`cd $(srcdir); ${PWD}`; export s; \
            $(SET_LIB_PATH) \
-           (cd fastjar; $(MAKE) $(FLAGS_TO_PASS) check); \
+           (cd fastjar && $(MAKE) $(FLAGS_TO_PASS) check); \
        fi
 
 
@@ -2395,15 +2313,14 @@ install-fastjar: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd fastjar; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd fastjar && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-fileutils maybe-configure-fileutils
 maybe-configure-fileutils:
-configure-fileutils: fileutils/Makefile
-
-fileutils/Makefile: config.status
-       @[ -d fileutils ] || mkdir fileutils; \
+configure-fileutils:
+       @test ! -f fileutils/Makefile || exit 0; \
+       [ -d fileutils ] || mkdir fileutils; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -2445,7 +2362,7 @@ all-fileutils: configure-fileutils
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd fileutils; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd fileutils && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-fileutils
@@ -2453,7 +2370,7 @@ check-fileutils:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd fileutils; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd fileutils && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -2463,15 +2380,14 @@ install-fileutils: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd fileutils; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd fileutils && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-findutils maybe-configure-findutils
 maybe-configure-findutils:
-configure-findutils: findutils/Makefile
-
-findutils/Makefile: config.status
-       @[ -d findutils ] || mkdir findutils; \
+configure-findutils:
+       @test ! -f findutils/Makefile || exit 0; \
+       [ -d findutils ] || mkdir findutils; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -2513,7 +2429,7 @@ all-findutils: configure-findutils
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd findutils; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd findutils && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-findutils
@@ -2521,7 +2437,7 @@ check-findutils:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd findutils; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd findutils && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -2531,15 +2447,14 @@ install-findutils: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd findutils; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd findutils && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-find maybe-configure-find
 maybe-configure-find:
-configure-find: find/Makefile
-
-find/Makefile: config.status
-       @[ -d find ] || mkdir find; \
+configure-find:
+       @test ! -f find/Makefile || exit 0; \
+       [ -d find ] || mkdir find; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -2581,7 +2496,7 @@ all-find: configure-find
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd find; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd find && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-find
@@ -2589,7 +2504,7 @@ check-find:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd find; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd find && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -2599,15 +2514,14 @@ install-find: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd find; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd find && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-flex maybe-configure-flex
 maybe-configure-flex:
-configure-flex: flex/Makefile
-
-flex/Makefile: config.status
-       @[ -d flex ] || mkdir flex; \
+configure-flex:
+       @test ! -f flex/Makefile || exit 0; \
+       [ -d flex ] || mkdir flex; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -2649,7 +2563,7 @@ all-flex: configure-flex
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd flex; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd flex && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-flex
@@ -2659,7 +2573,7 @@ check-flex:
            r=`${PWD}`; export r; \
            s=`cd $(srcdir); ${PWD}`; export s; \
            $(SET_LIB_PATH) \
-           (cd flex; $(MAKE) $(FLAGS_TO_PASS) check); \
+           (cd flex && $(MAKE) $(FLAGS_TO_PASS) check); \
        fi
 
 
@@ -2670,15 +2584,14 @@ install-flex: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd flex; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd flex && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-gas maybe-configure-gas
 maybe-configure-gas:
-configure-gas: gas/Makefile
-
-gas/Makefile: config.status
-       @[ -d gas ] || mkdir gas; \
+configure-gas:
+       @test ! -f gas/Makefile || exit 0; \
+       [ -d gas ] || mkdir gas; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -2720,7 +2633,7 @@ all-gas: configure-gas
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd gas; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd gas && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-gas
@@ -2728,7 +2641,7 @@ check-gas:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd gas; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd gas && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -2738,15 +2651,14 @@ install-gas: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd gas; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd gas && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-gawk maybe-configure-gawk
 maybe-configure-gawk:
-configure-gawk: gawk/Makefile
-
-gawk/Makefile: config.status
-       @[ -d gawk ] || mkdir gawk; \
+configure-gawk:
+       @test ! -f gawk/Makefile || exit 0; \
+       [ -d gawk ] || mkdir gawk; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -2788,7 +2700,7 @@ all-gawk: configure-gawk
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd gawk; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd gawk && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-gawk
@@ -2796,7 +2708,7 @@ check-gawk:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd gawk; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd gawk && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -2806,15 +2718,14 @@ install-gawk: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd gawk; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd gawk && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-gettext maybe-configure-gettext
 maybe-configure-gettext:
-configure-gettext: gettext/Makefile
-
-gettext/Makefile: config.status
-       @[ -d gettext ] || mkdir gettext; \
+configure-gettext:
+       @test ! -f gettext/Makefile || exit 0; \
+       [ -d gettext ] || mkdir gettext; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -2856,7 +2767,7 @@ all-gettext: configure-gettext
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd gettext; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd gettext && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-gettext
@@ -2864,7 +2775,7 @@ check-gettext:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd gettext; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd gettext && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -2874,15 +2785,14 @@ install-gettext: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd gettext; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd gettext && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-gnuserv maybe-configure-gnuserv
 maybe-configure-gnuserv:
-configure-gnuserv: gnuserv/Makefile
-
-gnuserv/Makefile: config.status
-       @[ -d gnuserv ] || mkdir gnuserv; \
+configure-gnuserv:
+       @test ! -f gnuserv/Makefile || exit 0; \
+       [ -d gnuserv ] || mkdir gnuserv; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -2924,7 +2834,7 @@ all-gnuserv: configure-gnuserv
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd gnuserv; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-gnuserv
@@ -2932,7 +2842,7 @@ check-gnuserv:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd gnuserv; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -2942,15 +2852,14 @@ install-gnuserv: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd gnuserv; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-gprof maybe-configure-gprof
 maybe-configure-gprof:
-configure-gprof: gprof/Makefile
-
-gprof/Makefile: config.status
-       @[ -d gprof ] || mkdir gprof; \
+configure-gprof:
+       @test ! -f gprof/Makefile || exit 0; \
+       [ -d gprof ] || mkdir gprof; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -2992,7 +2901,7 @@ all-gprof: configure-gprof
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd gprof; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd gprof && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-gprof
@@ -3000,7 +2909,7 @@ check-gprof:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd gprof; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd gprof && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -3010,83 +2919,14 @@ install-gprof: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd gprof; $(MAKE) $(FLAGS_TO_PASS) install)
-
-
-.PHONY: configure-grep maybe-configure-grep
-maybe-configure-grep:
-configure-grep: grep/Makefile
-
-grep/Makefile: config.status
-       @[ -d grep ] || mkdir grep; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       if [ z$(build_canonical) !=  z$(host_canoncial) ] ; then \
-         AR="$(AR)"; export AR; \
-         AS="$(AS)"; export AS; \
-         CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
-         DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
-         LD="$(LD)"; export LD; \
-         NM="$(NM)"; export NM; \
-         RANLIB="$(RANLIB)"; export RANLIB; \
-         WINDRES="$(WINDRES)"; export WINDRES; \
-         OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-         OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       fi; \
-       echo Configuring in grep; \
-       cd grep || exit 1; \
-       case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/grep"; \
-           libsrcdir="$$s/grep";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/grep"; \
-           libsrcdir="$$s/grep";; \
-       esac; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         || exit 1
-
-.PHONY: all-grep maybe-all-grep
-maybe-all-grep:
-all-grep: configure-grep
-       @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd grep; $(MAKE) $(FLAGS_TO_PASS) all)
-
-
-.PHONY: check-grep
-check-grep:
-       @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd grep; $(MAKE) $(FLAGS_TO_PASS) check)
-
-
-
-.PHONY: install-grep maybe-install-grep
-maybe-install-grep:
-install-grep: installdirs
-       @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd grep; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd gprof && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-gzip maybe-configure-gzip
 maybe-configure-gzip:
-configure-gzip: gzip/Makefile
-
-gzip/Makefile: config.status
-       @[ -d gzip ] || mkdir gzip; \
+configure-gzip:
+       @test ! -f gzip/Makefile || exit 0; \
+       [ -d gzip ] || mkdir gzip; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -3128,7 +2968,7 @@ all-gzip: configure-gzip
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd gzip; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd gzip && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-gzip
@@ -3136,7 +2976,7 @@ check-gzip:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd gzip; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd gzip && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -3146,15 +2986,14 @@ install-gzip: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd gzip; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd gzip && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-hello maybe-configure-hello
 maybe-configure-hello:
-configure-hello: hello/Makefile
-
-hello/Makefile: config.status
-       @[ -d hello ] || mkdir hello; \
+configure-hello:
+       @test ! -f hello/Makefile || exit 0; \
+       [ -d hello ] || mkdir hello; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -3196,7 +3035,7 @@ all-hello: configure-hello
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd hello; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd hello && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-hello
@@ -3204,7 +3043,7 @@ check-hello:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd hello; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd hello && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -3214,15 +3053,14 @@ install-hello: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd hello; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd hello && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-indent maybe-configure-indent
 maybe-configure-indent:
-configure-indent: indent/Makefile
-
-indent/Makefile: config.status
-       @[ -d indent ] || mkdir indent; \
+configure-indent:
+       @test ! -f indent/Makefile || exit 0; \
+       [ -d indent ] || mkdir indent; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -3264,7 +3102,7 @@ all-indent: configure-indent
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd indent; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd indent && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-indent
@@ -3272,7 +3110,7 @@ check-indent:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd indent; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd indent && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -3282,15 +3120,14 @@ install-indent: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd indent; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd indent && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-intl maybe-configure-intl
 maybe-configure-intl:
-configure-intl: intl/Makefile
-
-intl/Makefile: config.status
-       @[ -d intl ] || mkdir intl; \
+configure-intl:
+       @test ! -f intl/Makefile || exit 0; \
+       [ -d intl ] || mkdir intl; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -3332,7 +3169,7 @@ all-intl: configure-intl
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd intl; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd intl && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-intl
@@ -3340,7 +3177,7 @@ check-intl:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd intl; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd intl && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -3350,15 +3187,14 @@ install-intl: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd intl; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd intl && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-tcl maybe-configure-tcl
 maybe-configure-tcl:
-configure-tcl: tcl/Makefile
-
-tcl/Makefile: config.status
-       @[ -d tcl ] || mkdir tcl; \
+configure-tcl:
+       @test ! -f tcl/Makefile || exit 0; \
+       [ -d tcl ] || mkdir tcl; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -3400,7 +3236,7 @@ all-tcl: configure-tcl
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd tcl; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd tcl && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-tcl
@@ -3408,7 +3244,7 @@ check-tcl:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd tcl; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd tcl && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -3418,15 +3254,14 @@ install-tcl: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd tcl; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd tcl && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-itcl maybe-configure-itcl
 maybe-configure-itcl:
-configure-itcl: itcl/Makefile
-
-itcl/Makefile: config.status
-       @[ -d itcl ] || mkdir itcl; \
+configure-itcl:
+       @test ! -f itcl/Makefile || exit 0; \
+       [ -d itcl ] || mkdir itcl; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -3468,7 +3303,7 @@ all-itcl: configure-itcl
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd itcl; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd itcl && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-itcl
@@ -3476,7 +3311,7 @@ check-itcl:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd itcl; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd itcl && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -3486,15 +3321,14 @@ install-itcl: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd itcl; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd itcl && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-ld maybe-configure-ld
 maybe-configure-ld:
-configure-ld: ld/Makefile
-
-ld/Makefile: config.status
-       @[ -d ld ] || mkdir ld; \
+configure-ld:
+       @test ! -f ld/Makefile || exit 0; \
+       [ -d ld ] || mkdir ld; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -3536,7 +3370,7 @@ all-ld: configure-ld
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd ld; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd ld && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-ld
@@ -3544,7 +3378,7 @@ check-ld:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd ld; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd ld && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -3554,15 +3388,14 @@ install-ld: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd ld; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd ld && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-libgui maybe-configure-libgui
 maybe-configure-libgui:
-configure-libgui: libgui/Makefile
-
-libgui/Makefile: config.status
-       @[ -d libgui ] || mkdir libgui; \
+configure-libgui:
+       @test ! -f libgui/Makefile || exit 0; \
+       [ -d libgui ] || mkdir libgui; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -3604,7 +3437,7 @@ all-libgui: configure-libgui
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd libgui; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd libgui && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-libgui
@@ -3612,7 +3445,7 @@ check-libgui:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd libgui; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd libgui && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -3622,15 +3455,14 @@ install-libgui: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd libgui; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd libgui && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-libiberty maybe-configure-libiberty
 maybe-configure-libiberty:
-configure-libiberty: libiberty/Makefile
-
-libiberty/Makefile: config.status
-       @[ -d libiberty ] || mkdir libiberty; \
+configure-libiberty:
+       @test ! -f libiberty/Makefile || exit 0; \
+       [ -d libiberty ] || mkdir libiberty; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -3672,7 +3504,7 @@ all-libiberty: configure-libiberty
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd libiberty; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd libiberty && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-libiberty
@@ -3680,7 +3512,7 @@ check-libiberty:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd libiberty; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd libiberty && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -3690,15 +3522,14 @@ install-libiberty: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd libiberty; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd libiberty && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-libtool maybe-configure-libtool
 maybe-configure-libtool:
-configure-libtool: libtool/Makefile
-
-libtool/Makefile: config.status
-       @[ -d libtool ] || mkdir libtool; \
+configure-libtool:
+       @test ! -f libtool/Makefile || exit 0; \
+       [ -d libtool ] || mkdir libtool; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -3740,7 +3571,7 @@ all-libtool: configure-libtool
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd libtool; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd libtool && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-libtool
@@ -3748,7 +3579,7 @@ check-libtool:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd libtool; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd libtool && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -3758,15 +3589,14 @@ install-libtool: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd libtool; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd libtool && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-m4 maybe-configure-m4
 maybe-configure-m4:
-configure-m4: m4/Makefile
-
-m4/Makefile: config.status
-       @[ -d m4 ] || mkdir m4; \
+configure-m4:
+       @test ! -f m4/Makefile || exit 0; \
+       [ -d m4 ] || mkdir m4; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -3808,7 +3638,7 @@ all-m4: configure-m4
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd m4; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd m4 && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-m4
@@ -3816,7 +3646,7 @@ check-m4:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd m4; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd m4 && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -3826,15 +3656,14 @@ install-m4: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd m4; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd m4 && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-make maybe-configure-make
 maybe-configure-make:
-configure-make: make/Makefile
-
-make/Makefile: config.status
-       @[ -d make ] || mkdir make; \
+configure-make:
+       @test ! -f make/Makefile || exit 0; \
+       [ -d make ] || mkdir make; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -3876,7 +3705,7 @@ all-make: configure-make
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd make; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd make && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-make
@@ -3884,7 +3713,7 @@ check-make:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd make; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd make && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -3894,15 +3723,14 @@ install-make: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd make; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd make && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-mmalloc maybe-configure-mmalloc
 maybe-configure-mmalloc:
-configure-mmalloc: mmalloc/Makefile
-
-mmalloc/Makefile: config.status
-       @[ -d mmalloc ] || mkdir mmalloc; \
+configure-mmalloc:
+       @test ! -f mmalloc/Makefile || exit 0; \
+       [ -d mmalloc ] || mkdir mmalloc; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -3944,7 +3772,7 @@ all-mmalloc: configure-mmalloc
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd mmalloc; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd mmalloc && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-mmalloc
@@ -3958,15 +3786,14 @@ install-mmalloc: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd mmalloc; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd mmalloc && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-patch maybe-configure-patch
 maybe-configure-patch:
-configure-patch: patch/Makefile
-
-patch/Makefile: config.status
-       @[ -d patch ] || mkdir patch; \
+configure-patch:
+       @test ! -f patch/Makefile || exit 0; \
+       [ -d patch ] || mkdir patch; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -4008,7 +3835,7 @@ all-patch: configure-patch
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd patch; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd patch && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-patch
@@ -4016,7 +3843,7 @@ check-patch:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd patch; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd patch && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -4026,15 +3853,14 @@ install-patch: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd patch; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd patch && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-perl maybe-configure-perl
 maybe-configure-perl:
-configure-perl: perl/Makefile
-
-perl/Makefile: config.status
-       @[ -d perl ] || mkdir perl; \
+configure-perl:
+       @test ! -f perl/Makefile || exit 0; \
+       [ -d perl ] || mkdir perl; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -4076,7 +3902,7 @@ all-perl: configure-perl
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd perl; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd perl && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-perl
@@ -4084,7 +3910,7 @@ check-perl:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd perl; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd perl && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -4094,15 +3920,14 @@ install-perl: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd perl; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd perl && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-prms maybe-configure-prms
 maybe-configure-prms:
-configure-prms: prms/Makefile
-
-prms/Makefile: config.status
-       @[ -d prms ] || mkdir prms; \
+configure-prms:
+       @test ! -f prms/Makefile || exit 0; \
+       [ -d prms ] || mkdir prms; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -4144,7 +3969,7 @@ all-prms: configure-prms
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd prms; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd prms && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-prms
@@ -4152,7 +3977,7 @@ check-prms:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd prms; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd prms && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -4162,15 +3987,14 @@ install-prms: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd prms; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd prms && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-rcs maybe-configure-rcs
 maybe-configure-rcs:
-configure-rcs: rcs/Makefile
-
-rcs/Makefile: config.status
-       @[ -d rcs ] || mkdir rcs; \
+configure-rcs:
+       @test ! -f rcs/Makefile || exit 0; \
+       [ -d rcs ] || mkdir rcs; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -4212,7 +4036,7 @@ all-rcs: configure-rcs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd rcs; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd rcs && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-rcs
@@ -4220,7 +4044,7 @@ check-rcs:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd rcs; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd rcs && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -4230,15 +4054,14 @@ install-rcs: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd rcs; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd rcs && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-readline maybe-configure-readline
 maybe-configure-readline:
-configure-readline: readline/Makefile
-
-readline/Makefile: config.status
-       @[ -d readline ] || mkdir readline; \
+configure-readline:
+       @test ! -f readline/Makefile || exit 0; \
+       [ -d readline ] || mkdir readline; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -4280,7 +4103,7 @@ all-readline: configure-readline
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd readline; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd readline && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-readline
@@ -4288,7 +4111,7 @@ check-readline:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd readline; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd readline && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -4298,15 +4121,14 @@ install-readline: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd readline; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd readline && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-release maybe-configure-release
 maybe-configure-release:
-configure-release: release/Makefile
-
-release/Makefile: config.status
-       @[ -d release ] || mkdir release; \
+configure-release:
+       @test ! -f release/Makefile || exit 0; \
+       [ -d release ] || mkdir release; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -4348,7 +4170,7 @@ all-release: configure-release
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd release; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd release && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-release
@@ -4363,10 +4185,9 @@ install-release:
 
 .PHONY: configure-recode maybe-configure-recode
 maybe-configure-recode:
-configure-recode: recode/Makefile
-
-recode/Makefile: config.status
-       @[ -d recode ] || mkdir recode; \
+configure-recode:
+       @test ! -f recode/Makefile || exit 0; \
+       [ -d recode ] || mkdir recode; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -4408,7 +4229,7 @@ all-recode: configure-recode
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd recode; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd recode && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-recode
@@ -4416,7 +4237,7 @@ check-recode:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd recode; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd recode && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -4426,15 +4247,14 @@ install-recode: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd recode; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd recode && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-sed maybe-configure-sed
 maybe-configure-sed:
-configure-sed: sed/Makefile
-
-sed/Makefile: config.status
-       @[ -d sed ] || mkdir sed; \
+configure-sed:
+       @test ! -f sed/Makefile || exit 0; \
+       [ -d sed ] || mkdir sed; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -4476,7 +4296,7 @@ all-sed: configure-sed
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd sed; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd sed && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-sed
@@ -4484,7 +4304,7 @@ check-sed:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd sed; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd sed && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -4494,15 +4314,14 @@ install-sed: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd sed; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd sed && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-send-pr maybe-configure-send-pr
 maybe-configure-send-pr:
-configure-send-pr: send-pr/Makefile
-
-send-pr/Makefile: config.status
-       @[ -d send-pr ] || mkdir send-pr; \
+configure-send-pr:
+       @test ! -f send-pr/Makefile || exit 0; \
+       [ -d send-pr ] || mkdir send-pr; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -4544,7 +4363,7 @@ all-send-pr: configure-send-pr
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd send-pr; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd send-pr && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-send-pr
@@ -4552,7 +4371,7 @@ check-send-pr:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd send-pr; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd send-pr && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -4562,15 +4381,14 @@ install-send-pr: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd send-pr; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd send-pr && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-shellutils maybe-configure-shellutils
 maybe-configure-shellutils:
-configure-shellutils: shellutils/Makefile
-
-shellutils/Makefile: config.status
-       @[ -d shellutils ] || mkdir shellutils; \
+configure-shellutils:
+       @test ! -f shellutils/Makefile || exit 0; \
+       [ -d shellutils ] || mkdir shellutils; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -4612,7 +4430,7 @@ all-shellutils: configure-shellutils
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd shellutils; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd shellutils && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-shellutils
@@ -4620,7 +4438,7 @@ check-shellutils:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd shellutils; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd shellutils && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -4630,15 +4448,14 @@ install-shellutils: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd shellutils; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd shellutils && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-sid maybe-configure-sid
 maybe-configure-sid:
-configure-sid: sid/Makefile
-
-sid/Makefile: config.status
-       @[ -d sid ] || mkdir sid; \
+configure-sid:
+       @test ! -f sid/Makefile || exit 0; \
+       [ -d sid ] || mkdir sid; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -4680,7 +4497,7 @@ all-sid: configure-sid
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd sid; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd sid && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-sid
@@ -4688,7 +4505,7 @@ check-sid:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd sid; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd sid && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -4698,15 +4515,14 @@ install-sid: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd sid; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd sid && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-sim maybe-configure-sim
 maybe-configure-sim:
-configure-sim: sim/Makefile
-
-sim/Makefile: config.status
-       @[ -d sim ] || mkdir sim; \
+configure-sim:
+       @test ! -f sim/Makefile || exit 0; \
+       [ -d sim ] || mkdir sim; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -4748,7 +4564,7 @@ all-sim: configure-sim
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd sim; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd sim && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-sim
@@ -4756,7 +4572,7 @@ check-sim:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd sim; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd sim && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -4766,83 +4582,14 @@ install-sim: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd sim; $(MAKE) $(FLAGS_TO_PASS) install)
-
-
-.PHONY: configure-snavigator maybe-configure-snavigator
-maybe-configure-snavigator:
-configure-snavigator: snavigator/Makefile
-
-snavigator/Makefile: config.status
-       @[ -d snavigator ] || mkdir snavigator; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
-       CC="$(CC)"; export CC; \
-       CFLAGS="$(CFLAGS)"; export CFLAGS; \
-       CXX="$(CXX)"; export CXX; \
-       CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       if [ z$(build_canonical) !=  z$(host_canoncial) ] ; then \
-         AR="$(AR)"; export AR; \
-         AS="$(AS)"; export AS; \
-         CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
-         DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
-         LD="$(LD)"; export LD; \
-         NM="$(NM)"; export NM; \
-         RANLIB="$(RANLIB)"; export RANLIB; \
-         WINDRES="$(WINDRES)"; export WINDRES; \
-         OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-         OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-       fi; \
-       echo Configuring in snavigator; \
-       cd snavigator || exit 1; \
-       case $(srcdir) in \
-         \.) \
-           srcdiroption="--srcdir=."; \
-           libsrcdir=".";; \
-         /* | [A-Za-z]:[\\/]*) \
-           srcdiroption="--srcdir=$(srcdir)/snavigator"; \
-           libsrcdir="$$s/snavigator";; \
-         *) \
-           srcdiroption="--srcdir=../$(srcdir)/snavigator"; \
-           libsrcdir="$$s/snavigator";; \
-       esac; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption} \
-         || exit 1
-
-.PHONY: all-snavigator maybe-all-snavigator
-maybe-all-snavigator:
-all-snavigator: configure-snavigator
-       @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd snavigator; $(MAKE) $(FLAGS_TO_PASS) all)
-
-
-.PHONY: check-snavigator
-check-snavigator:
-       @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd snavigator; $(MAKE) $(FLAGS_TO_PASS) check)
-
-
-
-.PHONY: install-snavigator maybe-install-snavigator
-maybe-install-snavigator:
-install-snavigator: installdirs
-       @r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
-         $(SET_LIB_PATH) \
-         (cd snavigator; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd sim && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-tar maybe-configure-tar
 maybe-configure-tar:
-configure-tar: tar/Makefile
-
-tar/Makefile: config.status
-       @[ -d tar ] || mkdir tar; \
+configure-tar:
+       @test ! -f tar/Makefile || exit 0; \
+       [ -d tar ] || mkdir tar; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -4884,7 +4631,7 @@ all-tar: configure-tar
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd tar; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd tar && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-tar
@@ -4892,7 +4639,7 @@ check-tar:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd tar; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd tar && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -4902,15 +4649,14 @@ install-tar: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd tar; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd tar && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-texinfo maybe-configure-texinfo
 maybe-configure-texinfo:
-configure-texinfo: texinfo/Makefile
-
-texinfo/Makefile: config.status
-       @[ -d texinfo ] || mkdir texinfo; \
+configure-texinfo:
+       @test ! -f texinfo/Makefile || exit 0; \
+       [ -d texinfo ] || mkdir texinfo; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -4952,7 +4698,7 @@ all-texinfo: configure-texinfo
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd texinfo; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd texinfo && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-texinfo
@@ -4960,7 +4706,7 @@ check-texinfo:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd texinfo; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd texinfo && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -4971,10 +4717,9 @@ install-texinfo:
 
 .PHONY: configure-textutils maybe-configure-textutils
 maybe-configure-textutils:
-configure-textutils: textutils/Makefile
-
-textutils/Makefile: config.status
-       @[ -d textutils ] || mkdir textutils; \
+configure-textutils:
+       @test ! -f textutils/Makefile || exit 0; \
+       [ -d textutils ] || mkdir textutils; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -5016,7 +4761,7 @@ all-textutils: configure-textutils
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd textutils; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd textutils && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-textutils
@@ -5024,7 +4769,7 @@ check-textutils:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd textutils; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd textutils && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -5034,15 +4779,14 @@ install-textutils: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd textutils; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd textutils && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-time maybe-configure-time
 maybe-configure-time:
-configure-time: time/Makefile
-
-time/Makefile: config.status
-       @[ -d time ] || mkdir time; \
+configure-time:
+       @test ! -f time/Makefile || exit 0; \
+       [ -d time ] || mkdir time; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -5084,7 +4828,7 @@ all-time: configure-time
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd time; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd time && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-time
@@ -5092,7 +4836,7 @@ check-time:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd time; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd time && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -5102,15 +4846,14 @@ install-time: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd time; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd time && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-uudecode maybe-configure-uudecode
 maybe-configure-uudecode:
-configure-uudecode: uudecode/Makefile
-
-uudecode/Makefile: config.status
-       @[ -d uudecode ] || mkdir uudecode; \
+configure-uudecode:
+       @test ! -f uudecode/Makefile || exit 0; \
+       [ -d uudecode ] || mkdir uudecode; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -5152,7 +4895,7 @@ all-uudecode: configure-uudecode
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd uudecode; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd uudecode && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-uudecode
@@ -5160,7 +4903,7 @@ check-uudecode:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd uudecode; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd uudecode && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -5170,15 +4913,14 @@ install-uudecode: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd uudecode; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd uudecode && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-wdiff maybe-configure-wdiff
 maybe-configure-wdiff:
-configure-wdiff: wdiff/Makefile
-
-wdiff/Makefile: config.status
-       @[ -d wdiff ] || mkdir wdiff; \
+configure-wdiff:
+       @test ! -f wdiff/Makefile || exit 0; \
+       [ -d wdiff ] || mkdir wdiff; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -5220,7 +4962,7 @@ all-wdiff: configure-wdiff
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd wdiff; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd wdiff && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-wdiff
@@ -5228,7 +4970,7 @@ check-wdiff:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd wdiff; $(MAKE) $(FLAGS_TO_PASS) check)
+         (cd wdiff && $(MAKE) $(FLAGS_TO_PASS) check)
 
 
 
@@ -5238,15 +4980,14 @@ install-wdiff: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd wdiff; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd wdiff && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-zip maybe-configure-zip
 maybe-configure-zip:
-configure-zip: zip/Makefile
-
-zip/Makefile: config.status
-       @[ -d zip ] || mkdir zip; \
+configure-zip:
+       @test ! -f zip/Makefile || exit 0; \
+       [ -d zip ] || mkdir zip; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -5288,7 +5029,7 @@ all-zip: configure-zip
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd zip; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd zip && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-zip
@@ -5298,7 +5039,7 @@ check-zip:
            r=`${PWD}`; export r; \
            s=`cd $(srcdir); ${PWD}`; export s; \
            $(SET_LIB_PATH) \
-           (cd zip; $(MAKE) $(FLAGS_TO_PASS) check); \
+           (cd zip && $(MAKE) $(FLAGS_TO_PASS) check); \
        fi
 
 
@@ -5309,15 +5050,14 @@ install-zip: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd zip; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd zip && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-zlib maybe-configure-zlib
 maybe-configure-zlib:
-configure-zlib: zlib/Makefile
-
-zlib/Makefile: config.status
-       @[ -d zlib ] || mkdir zlib; \
+configure-zlib:
+       @test ! -f zlib/Makefile || exit 0; \
+       [ -d zlib ] || mkdir zlib; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -5359,7 +5099,7 @@ all-zlib: configure-zlib
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd zlib; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd zlib && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-zlib
@@ -5374,10 +5114,9 @@ install-zlib:
 
 .PHONY: configure-gdb maybe-configure-gdb
 maybe-configure-gdb:
-configure-gdb: gdb/Makefile
-
-gdb/Makefile: config.status
-       @[ -d gdb ] || mkdir gdb; \
+configure-gdb:
+       @test ! -f gdb/Makefile || exit 0; \
+       [ -d gdb ] || mkdir gdb; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -5419,7 +5158,7 @@ all-gdb: configure-gdb
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd gdb; $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
+         (cd gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
 
 
 .PHONY: check-gdb
@@ -5427,7 +5166,7 @@ check-gdb:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd gdb; $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+         (cd gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
 
 
 
@@ -5437,15 +5176,14 @@ install-gdb: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd gdb; $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
+         (cd gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-expect maybe-configure-expect
 maybe-configure-expect:
-configure-expect: expect/Makefile
-
-expect/Makefile: config.status
-       @[ -d expect ] || mkdir expect; \
+configure-expect:
+       @test ! -f expect/Makefile || exit 0; \
+       [ -d expect ] || mkdir expect; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -5487,7 +5225,7 @@ all-expect: configure-expect
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd expect; $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
+         (cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
 
 
 .PHONY: check-expect
@@ -5495,7 +5233,7 @@ check-expect:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd expect; $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+         (cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
 
 
 
@@ -5505,15 +5243,14 @@ install-expect: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd expect; $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
+         (cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-guile maybe-configure-guile
 maybe-configure-guile:
-configure-guile: guile/Makefile
-
-guile/Makefile: config.status
-       @[ -d guile ] || mkdir guile; \
+configure-guile:
+       @test ! -f guile/Makefile || exit 0; \
+       [ -d guile ] || mkdir guile; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -5555,7 +5292,7 @@ all-guile: configure-guile
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd guile; $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
+         (cd guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
 
 
 .PHONY: check-guile
@@ -5563,7 +5300,7 @@ check-guile:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd guile; $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+         (cd guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
 
 
 
@@ -5573,15 +5310,14 @@ install-guile: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd guile; $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
+         (cd guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-tk maybe-configure-tk
 maybe-configure-tk:
-configure-tk: tk/Makefile
-
-tk/Makefile: config.status
-       @[ -d tk ] || mkdir tk; \
+configure-tk:
+       @test ! -f tk/Makefile || exit 0; \
+       [ -d tk ] || mkdir tk; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -5623,7 +5359,7 @@ all-tk: configure-tk
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd tk; $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
+         (cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
 
 
 .PHONY: check-tk
@@ -5631,7 +5367,7 @@ check-tk:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd tk; $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+         (cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
 
 
 
@@ -5641,15 +5377,14 @@ install-tk: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd tk; $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
+         (cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-tix maybe-configure-tix
 maybe-configure-tix:
-configure-tix: tix/Makefile
-
-tix/Makefile: config.status
-       @[ -d tix ] || mkdir tix; \
+configure-tix:
+       @test ! -f tix/Makefile || exit 0; \
+       [ -d tix ] || mkdir tix; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -5691,7 +5426,7 @@ all-tix: configure-tix
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd tix; $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
+         (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
 
 
 .PHONY: check-tix
@@ -5699,7 +5434,7 @@ check-tix:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd tix; $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+         (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
 
 
 
@@ -5709,15 +5444,14 @@ install-tix: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd tix; $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
+         (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-libtermcap maybe-configure-libtermcap
 maybe-configure-libtermcap:
-configure-libtermcap: libtermcap/Makefile
-
-libtermcap/Makefile: config.status
-       @[ -d libtermcap ] || mkdir libtermcap; \
+configure-libtermcap:
+       @test ! -f libtermcap/Makefile || exit 0; \
+       [ -d libtermcap ] || mkdir libtermcap; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -5759,7 +5493,7 @@ all-libtermcap: configure-libtermcap
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd libtermcap; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd libtermcap && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-libtermcap
@@ -5773,15 +5507,14 @@ install-libtermcap: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd libtermcap; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd libtermcap && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-utils maybe-configure-utils
 maybe-configure-utils:
-configure-utils: utils/Makefile
-
-utils/Makefile: config.status
-       @[ -d utils ] || mkdir utils; \
+configure-utils:
+       @test ! -f utils/Makefile || exit 0; \
+       [ -d utils ] || mkdir utils; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
@@ -5823,7 +5556,7 @@ all-utils: configure-utils
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd utils; $(MAKE) $(FLAGS_TO_PASS) all)
+         (cd utils && $(MAKE) $(FLAGS_TO_PASS) all)
 
 
 .PHONY: check-utils
@@ -5837,7 +5570,7 @@ install-utils: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd utils; $(MAKE) $(FLAGS_TO_PASS) install)
+         (cd utils && $(MAKE) $(FLAGS_TO_PASS) install)
 
 
 
@@ -5847,18 +5580,18 @@ install-utils: installdirs
 
 .PHONY: configure-target-libstdc++-v3 maybe-configure-target-libstdc++-v3
 maybe-configure-target-libstdc++-v3:
-configure-target-libstdc++-v3: $(TARGET_SUBDIR)/libstdc++-v3/Makefile
-
-# Don't manually override CC_FOR_TARGET at make time; get it set right
-# at configure time.  Otherwise multilibs may be wrong.
-$(TARGET_SUBDIR)/libstdc++-v3/multilib.out: maybe-all-gcc
-       @[ -d $(TARGET_SUBDIR)/libstdc++-v3 ] || mkdir $(TARGET_SUBDIR)/libstdc++-v3;\
-       r=`${PWD}`; export r; \
-       echo "Configuring multilibs for libstdc++-v3"; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.out 2> /dev/null
 
-$(TARGET_SUBDIR)/libstdc++-v3/Makefile: config.status $(TARGET_SUBDIR)/libstdc++-v3/multilib.out
-       @[ -d $(TARGET_SUBDIR)/libstdc++-v3 ] || mkdir $(TARGET_SUBDIR)/libstdc++-v3;\
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/libstdc++-v3/multilib.out: multilib.out
+       @[ -d $(TARGET_SUBDIR)/libstdc++-v3 ] || \
+           mkdir $(TARGET_SUBDIR)/libstdc++-v3; \
+       rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || : ; \
+       cp multilib.out $(TARGET_SUBDIR)/libstdc++-v3/multilib.out
+
+configure-target-libstdc++-v3: $(TARGET_SUBDIR)/libstdc++-v3/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+           [ -d $(TARGET_SUBDIR)/libstdc++-v3 ] || \
+               mkdir $(TARGET_SUBDIR)/libstdc++-v3;\
            r=`${PWD}`; export r; \
            s=`cd $(srcdir); ${PWD}`; export s; \
            $(SET_LIB_PATH) \
@@ -5866,6 +5599,7 @@ $(TARGET_SUBDIR)/libstdc++-v3/Makefile: config.status $(TARGET_SUBDIR)/libstdc++
            AS="$(AS_FOR_TARGET)"; export AS; \
            CC="$(CC_FOR_TARGET)"; export CC; \
            CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+           CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
            CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
            CXX="$(RAW_CXX_FOR_TARGET)"; export CXX; \
            CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
@@ -5923,7 +5657,7 @@ all-target-libstdc++-v3: configure-target-libstdc++-v3
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libstdc++-v3; \
+         (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  all)
 
 .PHONY: check-target-libstdc++-v3
@@ -5931,7 +5665,7 @@ check-target-libstdc++-v3:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libstdc++-v3; \
+         (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  check)
 
 
@@ -5941,24 +5675,24 @@ install-target-libstdc++-v3: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libstdc++-v3; \
+         (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-target-newlib maybe-configure-target-newlib
 maybe-configure-target-newlib:
-configure-target-newlib: $(TARGET_SUBDIR)/newlib/Makefile
-
-# Don't manually override CC_FOR_TARGET at make time; get it set right
-# at configure time.  Otherwise multilibs may be wrong.
-$(TARGET_SUBDIR)/newlib/multilib.out: maybe-all-gcc
-       @[ -d $(TARGET_SUBDIR)/newlib ] || mkdir $(TARGET_SUBDIR)/newlib;\
-       r=`${PWD}`; export r; \
-       echo "Configuring multilibs for newlib"; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/newlib/multilib.out 2> /dev/null
 
-$(TARGET_SUBDIR)/newlib/Makefile: config.status $(TARGET_SUBDIR)/newlib/multilib.out
-       @[ -d $(TARGET_SUBDIR)/newlib ] || mkdir $(TARGET_SUBDIR)/newlib;\
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/newlib/multilib.out: multilib.out
+       @[ -d $(TARGET_SUBDIR)/newlib ] || \
+           mkdir $(TARGET_SUBDIR)/newlib; \
+       rm -f $(TARGET_SUBDIR)/newlib/Makefile || : ; \
+       cp multilib.out $(TARGET_SUBDIR)/newlib/multilib.out
+
+configure-target-newlib: $(TARGET_SUBDIR)/newlib/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/newlib/Makefile || exit 0; \
+           [ -d $(TARGET_SUBDIR)/newlib ] || \
+               mkdir $(TARGET_SUBDIR)/newlib;\
            r=`${PWD}`; export r; \
            s=`cd $(srcdir); ${PWD}`; export s; \
            $(SET_LIB_PATH) \
@@ -5966,6 +5700,7 @@ $(TARGET_SUBDIR)/newlib/Makefile: config.status $(TARGET_SUBDIR)/newlib/multilib
            AS="$(AS_FOR_TARGET)"; export AS; \
            CC="$(CC_FOR_TARGET)"; export CC; \
            CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+           CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
            CXX="$(CXX_FOR_TARGET)"; export CXX; \
            CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
            GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
@@ -6022,7 +5757,7 @@ all-target-newlib: configure-target-newlib
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/newlib; \
+         (cd $(TARGET_SUBDIR)/newlib && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
 
 .PHONY: check-target-newlib
@@ -6030,7 +5765,7 @@ check-target-newlib:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/newlib; \
+         (cd $(TARGET_SUBDIR)/newlib && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
 
 
@@ -6040,24 +5775,24 @@ install-target-newlib: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/newlib; \
+         (cd $(TARGET_SUBDIR)/newlib && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-target-libf2c maybe-configure-target-libf2c
 maybe-configure-target-libf2c:
-configure-target-libf2c: $(TARGET_SUBDIR)/libf2c/Makefile
-
-# Don't manually override CC_FOR_TARGET at make time; get it set right
-# at configure time.  Otherwise multilibs may be wrong.
-$(TARGET_SUBDIR)/libf2c/multilib.out: maybe-all-gcc
-       @[ -d $(TARGET_SUBDIR)/libf2c ] || mkdir $(TARGET_SUBDIR)/libf2c;\
-       r=`${PWD}`; export r; \
-       echo "Configuring multilibs for libf2c"; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libf2c/multilib.out 2> /dev/null
 
-$(TARGET_SUBDIR)/libf2c/Makefile: config.status $(TARGET_SUBDIR)/libf2c/multilib.out
-       @[ -d $(TARGET_SUBDIR)/libf2c ] || mkdir $(TARGET_SUBDIR)/libf2c;\
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/libf2c/multilib.out: multilib.out
+       @[ -d $(TARGET_SUBDIR)/libf2c ] || \
+           mkdir $(TARGET_SUBDIR)/libf2c; \
+       rm -f $(TARGET_SUBDIR)/libf2c/Makefile || : ; \
+       cp multilib.out $(TARGET_SUBDIR)/libf2c/multilib.out
+
+configure-target-libf2c: $(TARGET_SUBDIR)/libf2c/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/libf2c/Makefile || exit 0; \
+           [ -d $(TARGET_SUBDIR)/libf2c ] || \
+               mkdir $(TARGET_SUBDIR)/libf2c;\
            r=`${PWD}`; export r; \
            s=`cd $(srcdir); ${PWD}`; export s; \
            $(SET_LIB_PATH) \
@@ -6065,6 +5800,7 @@ $(TARGET_SUBDIR)/libf2c/Makefile: config.status $(TARGET_SUBDIR)/libf2c/multilib
            AS="$(AS_FOR_TARGET)"; export AS; \
            CC="$(CC_FOR_TARGET)"; export CC; \
            CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+           CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
            CXX="$(CXX_FOR_TARGET)"; export CXX; \
            CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
            GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
@@ -6121,7 +5857,7 @@ all-target-libf2c: configure-target-libf2c
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libf2c; \
+         (cd $(TARGET_SUBDIR)/libf2c && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
 
 .PHONY: check-target-libf2c
@@ -6129,7 +5865,7 @@ check-target-libf2c:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libf2c; \
+         (cd $(TARGET_SUBDIR)/libf2c && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
 
 
@@ -6139,24 +5875,24 @@ install-target-libf2c: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libf2c; \
+         (cd $(TARGET_SUBDIR)/libf2c && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-target-libobjc maybe-configure-target-libobjc
 maybe-configure-target-libobjc:
-configure-target-libobjc: $(TARGET_SUBDIR)/libobjc/Makefile
-
-# Don't manually override CC_FOR_TARGET at make time; get it set right
-# at configure time.  Otherwise multilibs may be wrong.
-$(TARGET_SUBDIR)/libobjc/multilib.out: maybe-all-gcc
-       @[ -d $(TARGET_SUBDIR)/libobjc ] || mkdir $(TARGET_SUBDIR)/libobjc;\
-       r=`${PWD}`; export r; \
-       echo "Configuring multilibs for libobjc"; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libobjc/multilib.out 2> /dev/null
 
-$(TARGET_SUBDIR)/libobjc/Makefile: config.status $(TARGET_SUBDIR)/libobjc/multilib.out
-       @[ -d $(TARGET_SUBDIR)/libobjc ] || mkdir $(TARGET_SUBDIR)/libobjc;\
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/libobjc/multilib.out: multilib.out
+       @[ -d $(TARGET_SUBDIR)/libobjc ] || \
+           mkdir $(TARGET_SUBDIR)/libobjc; \
+       rm -f $(TARGET_SUBDIR)/libobjc/Makefile || : ; \
+       cp multilib.out $(TARGET_SUBDIR)/libobjc/multilib.out
+
+configure-target-libobjc: $(TARGET_SUBDIR)/libobjc/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/libobjc/Makefile || exit 0; \
+           [ -d $(TARGET_SUBDIR)/libobjc ] || \
+               mkdir $(TARGET_SUBDIR)/libobjc;\
            r=`${PWD}`; export r; \
            s=`cd $(srcdir); ${PWD}`; export s; \
            $(SET_LIB_PATH) \
@@ -6164,6 +5900,7 @@ $(TARGET_SUBDIR)/libobjc/Makefile: config.status $(TARGET_SUBDIR)/libobjc/multil
            AS="$(AS_FOR_TARGET)"; export AS; \
            CC="$(CC_FOR_TARGET)"; export CC; \
            CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+           CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
            CXX="$(CXX_FOR_TARGET)"; export CXX; \
            CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
            GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
@@ -6220,7 +5957,7 @@ all-target-libobjc: configure-target-libobjc
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libobjc; \
+         (cd $(TARGET_SUBDIR)/libobjc && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
 
 .PHONY: check-target-libobjc
@@ -6228,7 +5965,7 @@ check-target-libobjc:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libobjc; \
+         (cd $(TARGET_SUBDIR)/libobjc && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
 
 
@@ -6238,24 +5975,24 @@ install-target-libobjc: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libobjc; \
+         (cd $(TARGET_SUBDIR)/libobjc && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-target-libtermcap maybe-configure-target-libtermcap
 maybe-configure-target-libtermcap:
-configure-target-libtermcap: $(TARGET_SUBDIR)/libtermcap/Makefile
-
-# Don't manually override CC_FOR_TARGET at make time; get it set right
-# at configure time.  Otherwise multilibs may be wrong.
-$(TARGET_SUBDIR)/libtermcap/multilib.out: maybe-all-gcc
-       @[ -d $(TARGET_SUBDIR)/libtermcap ] || mkdir $(TARGET_SUBDIR)/libtermcap;\
-       r=`${PWD}`; export r; \
-       echo "Configuring multilibs for libtermcap"; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libtermcap/multilib.out 2> /dev/null
 
-$(TARGET_SUBDIR)/libtermcap/Makefile: config.status $(TARGET_SUBDIR)/libtermcap/multilib.out
-       @[ -d $(TARGET_SUBDIR)/libtermcap ] || mkdir $(TARGET_SUBDIR)/libtermcap;\
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/libtermcap/multilib.out: multilib.out
+       @[ -d $(TARGET_SUBDIR)/libtermcap ] || \
+           mkdir $(TARGET_SUBDIR)/libtermcap; \
+       rm -f $(TARGET_SUBDIR)/libtermcap/Makefile || : ; \
+       cp multilib.out $(TARGET_SUBDIR)/libtermcap/multilib.out
+
+configure-target-libtermcap: $(TARGET_SUBDIR)/libtermcap/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/libtermcap/Makefile || exit 0; \
+           [ -d $(TARGET_SUBDIR)/libtermcap ] || \
+               mkdir $(TARGET_SUBDIR)/libtermcap;\
            r=`${PWD}`; export r; \
            s=`cd $(srcdir); ${PWD}`; export s; \
            $(SET_LIB_PATH) \
@@ -6263,6 +6000,7 @@ $(TARGET_SUBDIR)/libtermcap/Makefile: config.status $(TARGET_SUBDIR)/libtermcap/
            AS="$(AS_FOR_TARGET)"; export AS; \
            CC="$(CC_FOR_TARGET)"; export CC; \
            CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+           CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
            CXX="$(CXX_FOR_TARGET)"; export CXX; \
            CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
            GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
@@ -6319,7 +6057,7 @@ all-target-libtermcap: configure-target-libtermcap
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libtermcap; \
+         (cd $(TARGET_SUBDIR)/libtermcap && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
 
 # Dummy target for uncheckable module.
@@ -6333,24 +6071,24 @@ install-target-libtermcap: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libtermcap; \
+         (cd $(TARGET_SUBDIR)/libtermcap && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-target-winsup maybe-configure-target-winsup
 maybe-configure-target-winsup:
-configure-target-winsup: $(TARGET_SUBDIR)/winsup/Makefile
-
-# Don't manually override CC_FOR_TARGET at make time; get it set right
-# at configure time.  Otherwise multilibs may be wrong.
-$(TARGET_SUBDIR)/winsup/multilib.out: maybe-all-gcc
-       @[ -d $(TARGET_SUBDIR)/winsup ] || mkdir $(TARGET_SUBDIR)/winsup;\
-       r=`${PWD}`; export r; \
-       echo "Configuring multilibs for winsup"; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/winsup/multilib.out 2> /dev/null
 
-$(TARGET_SUBDIR)/winsup/Makefile: config.status $(TARGET_SUBDIR)/winsup/multilib.out
-       @[ -d $(TARGET_SUBDIR)/winsup ] || mkdir $(TARGET_SUBDIR)/winsup;\
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/winsup/multilib.out: multilib.out
+       @[ -d $(TARGET_SUBDIR)/winsup ] || \
+           mkdir $(TARGET_SUBDIR)/winsup; \
+       rm -f $(TARGET_SUBDIR)/winsup/Makefile || : ; \
+       cp multilib.out $(TARGET_SUBDIR)/winsup/multilib.out
+
+configure-target-winsup: $(TARGET_SUBDIR)/winsup/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/winsup/Makefile || exit 0; \
+           [ -d $(TARGET_SUBDIR)/winsup ] || \
+               mkdir $(TARGET_SUBDIR)/winsup;\
            r=`${PWD}`; export r; \
            s=`cd $(srcdir); ${PWD}`; export s; \
            $(SET_LIB_PATH) \
@@ -6358,6 +6096,7 @@ $(TARGET_SUBDIR)/winsup/Makefile: config.status $(TARGET_SUBDIR)/winsup/multilib
            AS="$(AS_FOR_TARGET)"; export AS; \
            CC="$(CC_FOR_TARGET)"; export CC; \
            CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+           CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
            CXX="$(CXX_FOR_TARGET)"; export CXX; \
            CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
            GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
@@ -6414,7 +6153,7 @@ all-target-winsup: configure-target-winsup
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/winsup; \
+         (cd $(TARGET_SUBDIR)/winsup && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
 
 .PHONY: check-target-winsup
@@ -6422,7 +6161,7 @@ check-target-winsup:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/winsup; \
+         (cd $(TARGET_SUBDIR)/winsup && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
 
 
@@ -6432,24 +6171,24 @@ install-target-winsup: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/winsup; \
+         (cd $(TARGET_SUBDIR)/winsup && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-target-libgloss maybe-configure-target-libgloss
 maybe-configure-target-libgloss:
-configure-target-libgloss: $(TARGET_SUBDIR)/libgloss/Makefile
-
-# Don't manually override CC_FOR_TARGET at make time; get it set right
-# at configure time.  Otherwise multilibs may be wrong.
-$(TARGET_SUBDIR)/libgloss/multilib.out: maybe-all-gcc
-       @[ -d $(TARGET_SUBDIR)/libgloss ] || mkdir $(TARGET_SUBDIR)/libgloss;\
-       r=`${PWD}`; export r; \
-       echo "Configuring multilibs for libgloss"; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgloss/multilib.out 2> /dev/null
 
-$(TARGET_SUBDIR)/libgloss/Makefile: config.status $(TARGET_SUBDIR)/libgloss/multilib.out
-       @[ -d $(TARGET_SUBDIR)/libgloss ] || mkdir $(TARGET_SUBDIR)/libgloss;\
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/libgloss/multilib.out: multilib.out
+       @[ -d $(TARGET_SUBDIR)/libgloss ] || \
+           mkdir $(TARGET_SUBDIR)/libgloss; \
+       rm -f $(TARGET_SUBDIR)/libgloss/Makefile || : ; \
+       cp multilib.out $(TARGET_SUBDIR)/libgloss/multilib.out
+
+configure-target-libgloss: $(TARGET_SUBDIR)/libgloss/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/libgloss/Makefile || exit 0; \
+           [ -d $(TARGET_SUBDIR)/libgloss ] || \
+               mkdir $(TARGET_SUBDIR)/libgloss;\
            r=`${PWD}`; export r; \
            s=`cd $(srcdir); ${PWD}`; export s; \
            $(SET_LIB_PATH) \
@@ -6457,6 +6196,7 @@ $(TARGET_SUBDIR)/libgloss/Makefile: config.status $(TARGET_SUBDIR)/libgloss/mult
            AS="$(AS_FOR_TARGET)"; export AS; \
            CC="$(CC_FOR_TARGET)"; export CC; \
            CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+           CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
            CXX="$(CXX_FOR_TARGET)"; export CXX; \
            CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
            GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
@@ -6513,7 +6253,7 @@ all-target-libgloss: configure-target-libgloss
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libgloss; \
+         (cd $(TARGET_SUBDIR)/libgloss && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
 
 # Dummy target for uncheckable module.
@@ -6527,24 +6267,24 @@ install-target-libgloss: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libgloss; \
+         (cd $(TARGET_SUBDIR)/libgloss && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-target-libiberty maybe-configure-target-libiberty
 maybe-configure-target-libiberty:
-configure-target-libiberty: $(TARGET_SUBDIR)/libiberty/Makefile
-
-# Don't manually override CC_FOR_TARGET at make time; get it set right
-# at configure time.  Otherwise multilibs may be wrong.
-$(TARGET_SUBDIR)/libiberty/multilib.out: maybe-all-gcc
-       @[ -d $(TARGET_SUBDIR)/libiberty ] || mkdir $(TARGET_SUBDIR)/libiberty;\
-       r=`${PWD}`; export r; \
-       echo "Configuring multilibs for libiberty"; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libiberty/multilib.out 2> /dev/null
 
-$(TARGET_SUBDIR)/libiberty/Makefile: config.status $(TARGET_SUBDIR)/libiberty/multilib.out
-       @[ -d $(TARGET_SUBDIR)/libiberty ] || mkdir $(TARGET_SUBDIR)/libiberty;\
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/libiberty/multilib.out: multilib.out
+       @[ -d $(TARGET_SUBDIR)/libiberty ] || \
+           mkdir $(TARGET_SUBDIR)/libiberty; \
+       rm -f $(TARGET_SUBDIR)/libiberty/Makefile || : ; \
+       cp multilib.out $(TARGET_SUBDIR)/libiberty/multilib.out
+
+configure-target-libiberty: $(TARGET_SUBDIR)/libiberty/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/libiberty/Makefile || exit 0; \
+           [ -d $(TARGET_SUBDIR)/libiberty ] || \
+               mkdir $(TARGET_SUBDIR)/libiberty;\
            r=`${PWD}`; export r; \
            s=`cd $(srcdir); ${PWD}`; export s; \
            $(SET_LIB_PATH) \
@@ -6552,6 +6292,7 @@ $(TARGET_SUBDIR)/libiberty/Makefile: config.status $(TARGET_SUBDIR)/libiberty/mu
            AS="$(AS_FOR_TARGET)"; export AS; \
            CC="$(CC_FOR_TARGET)"; export CC; \
            CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+           CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
            CXX="$(CXX_FOR_TARGET)"; export CXX; \
            CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
            GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
@@ -6608,7 +6349,7 @@ all-target-libiberty: configure-target-libiberty
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libiberty; \
+         (cd $(TARGET_SUBDIR)/libiberty && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
 
 .PHONY: check-target-libiberty
@@ -6616,7 +6357,7 @@ check-target-libiberty:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libiberty; \
+         (cd $(TARGET_SUBDIR)/libiberty && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
 
 
@@ -6626,24 +6367,24 @@ install-target-libiberty: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libiberty; \
+         (cd $(TARGET_SUBDIR)/libiberty && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-target-gperf maybe-configure-target-gperf
 maybe-configure-target-gperf:
-configure-target-gperf: $(TARGET_SUBDIR)/gperf/Makefile
-
-# Don't manually override CC_FOR_TARGET at make time; get it set right
-# at configure time.  Otherwise multilibs may be wrong.
-$(TARGET_SUBDIR)/gperf/multilib.out: maybe-all-gcc
-       @[ -d $(TARGET_SUBDIR)/gperf ] || mkdir $(TARGET_SUBDIR)/gperf;\
-       r=`${PWD}`; export r; \
-       echo "Configuring multilibs for gperf"; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/gperf/multilib.out 2> /dev/null
 
-$(TARGET_SUBDIR)/gperf/Makefile: config.status $(TARGET_SUBDIR)/gperf/multilib.out
-       @[ -d $(TARGET_SUBDIR)/gperf ] || mkdir $(TARGET_SUBDIR)/gperf;\
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/gperf/multilib.out: multilib.out
+       @[ -d $(TARGET_SUBDIR)/gperf ] || \
+           mkdir $(TARGET_SUBDIR)/gperf; \
+       rm -f $(TARGET_SUBDIR)/gperf/Makefile || : ; \
+       cp multilib.out $(TARGET_SUBDIR)/gperf/multilib.out
+
+configure-target-gperf: $(TARGET_SUBDIR)/gperf/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/gperf/Makefile || exit 0; \
+           [ -d $(TARGET_SUBDIR)/gperf ] || \
+               mkdir $(TARGET_SUBDIR)/gperf;\
            r=`${PWD}`; export r; \
            s=`cd $(srcdir); ${PWD}`; export s; \
            $(SET_LIB_PATH) \
@@ -6651,6 +6392,7 @@ $(TARGET_SUBDIR)/gperf/Makefile: config.status $(TARGET_SUBDIR)/gperf/multilib.o
            AS="$(AS_FOR_TARGET)"; export AS; \
            CC="$(CC_FOR_TARGET)"; export CC; \
            CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+           CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
            CXX="$(CXX_FOR_TARGET)"; export CXX; \
            CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
            GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
@@ -6707,7 +6449,7 @@ all-target-gperf: configure-target-gperf
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/gperf; \
+         (cd $(TARGET_SUBDIR)/gperf && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
 
 .PHONY: check-target-gperf
@@ -6715,7 +6457,7 @@ check-target-gperf:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/gperf; \
+         (cd $(TARGET_SUBDIR)/gperf && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
 
 
@@ -6725,24 +6467,24 @@ install-target-gperf: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/gperf; \
+         (cd $(TARGET_SUBDIR)/gperf && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-target-examples maybe-configure-target-examples
 maybe-configure-target-examples:
-configure-target-examples: $(TARGET_SUBDIR)/examples/Makefile
-
-# Don't manually override CC_FOR_TARGET at make time; get it set right
-# at configure time.  Otherwise multilibs may be wrong.
-$(TARGET_SUBDIR)/examples/multilib.out: maybe-all-gcc
-       @[ -d $(TARGET_SUBDIR)/examples ] || mkdir $(TARGET_SUBDIR)/examples;\
-       r=`${PWD}`; export r; \
-       echo "Configuring multilibs for examples"; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/examples/multilib.out 2> /dev/null
 
-$(TARGET_SUBDIR)/examples/Makefile: config.status $(TARGET_SUBDIR)/examples/multilib.out
-       @[ -d $(TARGET_SUBDIR)/examples ] || mkdir $(TARGET_SUBDIR)/examples;\
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/examples/multilib.out: multilib.out
+       @[ -d $(TARGET_SUBDIR)/examples ] || \
+           mkdir $(TARGET_SUBDIR)/examples; \
+       rm -f $(TARGET_SUBDIR)/examples/Makefile || : ; \
+       cp multilib.out $(TARGET_SUBDIR)/examples/multilib.out
+
+configure-target-examples: $(TARGET_SUBDIR)/examples/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/examples/Makefile || exit 0; \
+           [ -d $(TARGET_SUBDIR)/examples ] || \
+               mkdir $(TARGET_SUBDIR)/examples;\
            r=`${PWD}`; export r; \
            s=`cd $(srcdir); ${PWD}`; export s; \
            $(SET_LIB_PATH) \
@@ -6750,6 +6492,7 @@ $(TARGET_SUBDIR)/examples/Makefile: config.status $(TARGET_SUBDIR)/examples/mult
            AS="$(AS_FOR_TARGET)"; export AS; \
            CC="$(CC_FOR_TARGET)"; export CC; \
            CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+           CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
            CXX="$(CXX_FOR_TARGET)"; export CXX; \
            CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
            GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
@@ -6806,7 +6549,7 @@ all-target-examples: configure-target-examples
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/examples; \
+         (cd $(TARGET_SUBDIR)/examples && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
 
 # Dummy target for uncheckable module.
@@ -6822,18 +6565,18 @@ install-target-examples:
 
 .PHONY: configure-target-libffi maybe-configure-target-libffi
 maybe-configure-target-libffi:
-configure-target-libffi: $(TARGET_SUBDIR)/libffi/Makefile
-
-# Don't manually override CC_FOR_TARGET at make time; get it set right
-# at configure time.  Otherwise multilibs may be wrong.
-$(TARGET_SUBDIR)/libffi/multilib.out: maybe-all-gcc
-       @[ -d $(TARGET_SUBDIR)/libffi ] || mkdir $(TARGET_SUBDIR)/libffi;\
-       r=`${PWD}`; export r; \
-       echo "Configuring multilibs for libffi"; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libffi/multilib.out 2> /dev/null
 
-$(TARGET_SUBDIR)/libffi/Makefile: config.status $(TARGET_SUBDIR)/libffi/multilib.out
-       @[ -d $(TARGET_SUBDIR)/libffi ] || mkdir $(TARGET_SUBDIR)/libffi;\
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/libffi/multilib.out: multilib.out
+       @[ -d $(TARGET_SUBDIR)/libffi ] || \
+           mkdir $(TARGET_SUBDIR)/libffi; \
+       rm -f $(TARGET_SUBDIR)/libffi/Makefile || : ; \
+       cp multilib.out $(TARGET_SUBDIR)/libffi/multilib.out
+
+configure-target-libffi: $(TARGET_SUBDIR)/libffi/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/libffi/Makefile || exit 0; \
+           [ -d $(TARGET_SUBDIR)/libffi ] || \
+               mkdir $(TARGET_SUBDIR)/libffi;\
            r=`${PWD}`; export r; \
            s=`cd $(srcdir); ${PWD}`; export s; \
            $(SET_LIB_PATH) \
@@ -6841,6 +6584,7 @@ $(TARGET_SUBDIR)/libffi/Makefile: config.status $(TARGET_SUBDIR)/libffi/multilib
            AS="$(AS_FOR_TARGET)"; export AS; \
            CC="$(CC_FOR_TARGET)"; export CC; \
            CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+           CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
            CXX="$(CXX_FOR_TARGET)"; export CXX; \
            CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
            GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
@@ -6897,7 +6641,7 @@ all-target-libffi: configure-target-libffi
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libffi; \
+         (cd $(TARGET_SUBDIR)/libffi && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
 
 .PHONY: check-target-libffi
@@ -6905,30 +6649,34 @@ check-target-libffi:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libffi; \
+         (cd $(TARGET_SUBDIR)/libffi && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
 
 
 .PHONY: install-target-libffi maybe-install-target-libffi
 maybe-install-target-libffi:
-# Dummy target for uninstallable.
-install-target-libffi:
+install-target-libffi: installdirs
+       @r=`${PWD}`; export r; \
+         s=`cd $(srcdir); ${PWD}`; export s; \
+         $(SET_LIB_PATH) \
+         (cd $(TARGET_SUBDIR)/libffi && \
+           $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-target-libjava maybe-configure-target-libjava
 maybe-configure-target-libjava:
-configure-target-libjava: $(TARGET_SUBDIR)/libjava/Makefile
 
-# Don't manually override CC_FOR_TARGET at make time; get it set right
-# at configure time.  Otherwise multilibs may be wrong.
-$(TARGET_SUBDIR)/libjava/multilib.out: maybe-all-gcc
-       @[ -d $(TARGET_SUBDIR)/libjava ] || mkdir $(TARGET_SUBDIR)/libjava;\
-       r=`${PWD}`; export r; \
-       echo "Configuring multilibs for libjava"; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libjava/multilib.out 2> /dev/null
-
-$(TARGET_SUBDIR)/libjava/Makefile: config.status $(TARGET_SUBDIR)/libjava/multilib.out
-       @[ -d $(TARGET_SUBDIR)/libjava ] || mkdir $(TARGET_SUBDIR)/libjava;\
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/libjava/multilib.out: multilib.out
+       @[ -d $(TARGET_SUBDIR)/libjava ] || \
+           mkdir $(TARGET_SUBDIR)/libjava; \
+       rm -f $(TARGET_SUBDIR)/libjava/Makefile || : ; \
+       cp multilib.out $(TARGET_SUBDIR)/libjava/multilib.out
+
+configure-target-libjava: $(TARGET_SUBDIR)/libjava/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/libjava/Makefile || exit 0; \
+           [ -d $(TARGET_SUBDIR)/libjava ] || \
+               mkdir $(TARGET_SUBDIR)/libjava;\
            r=`${PWD}`; export r; \
            s=`cd $(srcdir); ${PWD}`; export s; \
            $(SET_LIB_PATH) \
@@ -6936,6 +6684,7 @@ $(TARGET_SUBDIR)/libjava/Makefile: config.status $(TARGET_SUBDIR)/libjava/multil
            AS="$(AS_FOR_TARGET)"; export AS; \
            CC="$(CC_FOR_TARGET)"; export CC; \
            CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+           CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
            CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
            CXX="$(RAW_CXX_FOR_TARGET)"; export CXX; \
            CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
@@ -6993,7 +6742,7 @@ all-target-libjava: configure-target-libjava
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libjava; \
+         (cd $(TARGET_SUBDIR)/libjava && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  all)
 
 .PHONY: check-target-libjava
@@ -7001,7 +6750,7 @@ check-target-libjava:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libjava; \
+         (cd $(TARGET_SUBDIR)/libjava && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  check)
 
 
@@ -7011,24 +6760,24 @@ install-target-libjava: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/libjava; \
+         (cd $(TARGET_SUBDIR)/libjava && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-target-zlib maybe-configure-target-zlib
 maybe-configure-target-zlib:
-configure-target-zlib: $(TARGET_SUBDIR)/zlib/Makefile
-
-# Don't manually override CC_FOR_TARGET at make time; get it set right
-# at configure time.  Otherwise multilibs may be wrong.
-$(TARGET_SUBDIR)/zlib/multilib.out: maybe-all-gcc
-       @[ -d $(TARGET_SUBDIR)/zlib ] || mkdir $(TARGET_SUBDIR)/zlib;\
-       r=`${PWD}`; export r; \
-       echo "Configuring multilibs for zlib"; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/zlib/multilib.out 2> /dev/null
 
-$(TARGET_SUBDIR)/zlib/Makefile: config.status $(TARGET_SUBDIR)/zlib/multilib.out
-       @[ -d $(TARGET_SUBDIR)/zlib ] || mkdir $(TARGET_SUBDIR)/zlib;\
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/zlib/multilib.out: multilib.out
+       @[ -d $(TARGET_SUBDIR)/zlib ] || \
+           mkdir $(TARGET_SUBDIR)/zlib; \
+       rm -f $(TARGET_SUBDIR)/zlib/Makefile || : ; \
+       cp multilib.out $(TARGET_SUBDIR)/zlib/multilib.out
+
+configure-target-zlib: $(TARGET_SUBDIR)/zlib/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/zlib/Makefile || exit 0; \
+           [ -d $(TARGET_SUBDIR)/zlib ] || \
+               mkdir $(TARGET_SUBDIR)/zlib;\
            r=`${PWD}`; export r; \
            s=`cd $(srcdir); ${PWD}`; export s; \
            $(SET_LIB_PATH) \
@@ -7036,6 +6785,7 @@ $(TARGET_SUBDIR)/zlib/Makefile: config.status $(TARGET_SUBDIR)/zlib/multilib.out
            AS="$(AS_FOR_TARGET)"; export AS; \
            CC="$(CC_FOR_TARGET)"; export CC; \
            CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+           CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
            CXX="$(CXX_FOR_TARGET)"; export CXX; \
            CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
            GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
@@ -7092,7 +6842,7 @@ all-target-zlib: configure-target-zlib
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/zlib; \
+         (cd $(TARGET_SUBDIR)/zlib && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
 
 .PHONY: check-target-zlib
@@ -7100,7 +6850,7 @@ check-target-zlib:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/zlib; \
+         (cd $(TARGET_SUBDIR)/zlib && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
 
 
@@ -7110,24 +6860,24 @@ install-target-zlib: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/zlib; \
+         (cd $(TARGET_SUBDIR)/zlib && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-target-boehm-gc maybe-configure-target-boehm-gc
 maybe-configure-target-boehm-gc:
-configure-target-boehm-gc: $(TARGET_SUBDIR)/boehm-gc/Makefile
 
-# Don't manually override CC_FOR_TARGET at make time; get it set right
-# at configure time.  Otherwise multilibs may be wrong.
-$(TARGET_SUBDIR)/boehm-gc/multilib.out: maybe-all-gcc
-       @[ -d $(TARGET_SUBDIR)/boehm-gc ] || mkdir $(TARGET_SUBDIR)/boehm-gc;\
-       r=`${PWD}`; export r; \
-       echo "Configuring multilibs for boehm-gc"; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/boehm-gc/multilib.out 2> /dev/null
-
-$(TARGET_SUBDIR)/boehm-gc/Makefile: config.status $(TARGET_SUBDIR)/boehm-gc/multilib.out
-       @[ -d $(TARGET_SUBDIR)/boehm-gc ] || mkdir $(TARGET_SUBDIR)/boehm-gc;\
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/boehm-gc/multilib.out: multilib.out
+       @[ -d $(TARGET_SUBDIR)/boehm-gc ] || \
+           mkdir $(TARGET_SUBDIR)/boehm-gc; \
+       rm -f $(TARGET_SUBDIR)/boehm-gc/Makefile || : ; \
+       cp multilib.out $(TARGET_SUBDIR)/boehm-gc/multilib.out
+
+configure-target-boehm-gc: $(TARGET_SUBDIR)/boehm-gc/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/boehm-gc/Makefile || exit 0; \
+           [ -d $(TARGET_SUBDIR)/boehm-gc ] || \
+               mkdir $(TARGET_SUBDIR)/boehm-gc;\
            r=`${PWD}`; export r; \
            s=`cd $(srcdir); ${PWD}`; export s; \
            $(SET_LIB_PATH) \
@@ -7135,6 +6885,7 @@ $(TARGET_SUBDIR)/boehm-gc/Makefile: config.status $(TARGET_SUBDIR)/boehm-gc/mult
            AS="$(AS_FOR_TARGET)"; export AS; \
            CC="$(CC_FOR_TARGET)"; export CC; \
            CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+           CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
            CXX="$(CXX_FOR_TARGET)"; export CXX; \
            CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
            GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
@@ -7191,7 +6942,7 @@ all-target-boehm-gc: configure-target-boehm-gc
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/boehm-gc; \
+         (cd $(TARGET_SUBDIR)/boehm-gc && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
 
 .PHONY: check-target-boehm-gc
@@ -7199,7 +6950,7 @@ check-target-boehm-gc:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/boehm-gc; \
+         (cd $(TARGET_SUBDIR)/boehm-gc && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
 
 
@@ -7209,24 +6960,24 @@ install-target-boehm-gc: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/boehm-gc; \
+         (cd $(TARGET_SUBDIR)/boehm-gc && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-target-qthreads maybe-configure-target-qthreads
 maybe-configure-target-qthreads:
-configure-target-qthreads: $(TARGET_SUBDIR)/qthreads/Makefile
-
-# Don't manually override CC_FOR_TARGET at make time; get it set right
-# at configure time.  Otherwise multilibs may be wrong.
-$(TARGET_SUBDIR)/qthreads/multilib.out: maybe-all-gcc
-       @[ -d $(TARGET_SUBDIR)/qthreads ] || mkdir $(TARGET_SUBDIR)/qthreads;\
-       r=`${PWD}`; export r; \
-       echo "Configuring multilibs for qthreads"; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/qthreads/multilib.out 2> /dev/null
 
-$(TARGET_SUBDIR)/qthreads/Makefile: config.status $(TARGET_SUBDIR)/qthreads/multilib.out
-       @[ -d $(TARGET_SUBDIR)/qthreads ] || mkdir $(TARGET_SUBDIR)/qthreads;\
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/qthreads/multilib.out: multilib.out
+       @[ -d $(TARGET_SUBDIR)/qthreads ] || \
+           mkdir $(TARGET_SUBDIR)/qthreads; \
+       rm -f $(TARGET_SUBDIR)/qthreads/Makefile || : ; \
+       cp multilib.out $(TARGET_SUBDIR)/qthreads/multilib.out
+
+configure-target-qthreads: $(TARGET_SUBDIR)/qthreads/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/qthreads/Makefile || exit 0; \
+           [ -d $(TARGET_SUBDIR)/qthreads ] || \
+               mkdir $(TARGET_SUBDIR)/qthreads;\
            r=`${PWD}`; export r; \
            s=`cd $(srcdir); ${PWD}`; export s; \
            $(SET_LIB_PATH) \
@@ -7234,6 +6985,7 @@ $(TARGET_SUBDIR)/qthreads/Makefile: config.status $(TARGET_SUBDIR)/qthreads/mult
            AS="$(AS_FOR_TARGET)"; export AS; \
            CC="$(CC_FOR_TARGET)"; export CC; \
            CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+           CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
            CXX="$(CXX_FOR_TARGET)"; export CXX; \
            CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
            GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
@@ -7290,7 +7042,7 @@ all-target-qthreads: configure-target-qthreads
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/qthreads; \
+         (cd $(TARGET_SUBDIR)/qthreads && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
 
 .PHONY: check-target-qthreads
@@ -7298,7 +7050,7 @@ check-target-qthreads:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/qthreads; \
+         (cd $(TARGET_SUBDIR)/qthreads && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
 
 
@@ -7308,24 +7060,24 @@ install-target-qthreads: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/qthreads; \
+         (cd $(TARGET_SUBDIR)/qthreads && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
 
 
 .PHONY: configure-target-rda maybe-configure-target-rda
 maybe-configure-target-rda:
-configure-target-rda: $(TARGET_SUBDIR)/rda/Makefile
 
-# Don't manually override CC_FOR_TARGET at make time; get it set right
-# at configure time.  Otherwise multilibs may be wrong.
-$(TARGET_SUBDIR)/rda/multilib.out: maybe-all-gcc
-       @[ -d $(TARGET_SUBDIR)/rda ] || mkdir $(TARGET_SUBDIR)/rda;\
-       r=`${PWD}`; export r; \
-       echo "Configuring multilibs for rda"; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/rda/multilib.out 2> /dev/null
-
-$(TARGET_SUBDIR)/rda/Makefile: config.status $(TARGET_SUBDIR)/rda/multilib.out
-       @[ -d $(TARGET_SUBDIR)/rda ] || mkdir $(TARGET_SUBDIR)/rda;\
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/rda/multilib.out: multilib.out
+       @[ -d $(TARGET_SUBDIR)/rda ] || \
+           mkdir $(TARGET_SUBDIR)/rda; \
+       rm -f $(TARGET_SUBDIR)/rda/Makefile || : ; \
+       cp multilib.out $(TARGET_SUBDIR)/rda/multilib.out
+
+configure-target-rda: $(TARGET_SUBDIR)/rda/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/rda/Makefile || exit 0; \
+           [ -d $(TARGET_SUBDIR)/rda ] || \
+               mkdir $(TARGET_SUBDIR)/rda;\
            r=`${PWD}`; export r; \
            s=`cd $(srcdir); ${PWD}`; export s; \
            $(SET_LIB_PATH) \
@@ -7333,6 +7085,7 @@ $(TARGET_SUBDIR)/rda/Makefile: config.status $(TARGET_SUBDIR)/rda/multilib.out
            AS="$(AS_FOR_TARGET)"; export AS; \
            CC="$(CC_FOR_TARGET)"; export CC; \
            CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+           CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
            CXX="$(CXX_FOR_TARGET)"; export CXX; \
            CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
            GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
@@ -7389,7 +7142,7 @@ all-target-rda: configure-target-rda
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/rda; \
+         (cd $(TARGET_SUBDIR)/rda && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
 
 .PHONY: check-target-rda
@@ -7397,7 +7150,7 @@ check-target-rda:
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/rda; \
+         (cd $(TARGET_SUBDIR)/rda && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
 
 
@@ -7407,7 +7160,7 @@ install-target-rda: installdirs
        @r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd $(TARGET_SUBDIR)/rda; \
+         (cd $(TARGET_SUBDIR)/rda && \
            $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
 
 
@@ -7423,16 +7176,16 @@ install-target-rda: installdirs
 # gcc is the only module which uses GCC_FLAGS_TO_PASS.
 .PHONY: configure-gcc maybe-configure-gcc
 maybe-configure-gcc:
-configure-gcc: gcc/Makefile
-
-gcc/Makefile: config.status
-       @[ -d gcc ] || mkdir gcc; \
+configure-gcc:
+       @test ! -f gcc/Makefile || exit 0; \
+       [ -d gcc ] || mkdir gcc; \
        r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        CC="$(CC)"; export CC; \
        CFLAGS="$(CFLAGS)"; export CFLAGS; \
        CXX="$(CXX)"; export CXX; \
        CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
+       TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
        if [ z$(build_canonical) !=  z$(host_canoncial) ] ; then \
          AR="$(AR)"; export AR; \
          AS="$(AS)"; export AS; \
@@ -7472,12 +7225,12 @@ all-gcc: configure-gcc
          r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) quickstrap); \
+         (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) quickstrap); \
        else \
          r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) all); \
+         (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) all); \
        fi
 
 # Building GCC uses some tools for rebuilding "source" files
@@ -7539,7 +7292,7 @@ check-gcc:
          r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) check); \
+         (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check); \
        else \
          true; \
        fi
@@ -7550,13 +7303,14 @@ check-gcc-c++:
          r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); \
+         (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); \
        else \
          true; \
        fi
 
 .PHONY: check-c++
-check-c++: check-target-libstdc++-v3 check-gcc-c++
+check-c++:
+       $(MAKE) check-target-libstdc++-v3 check-gcc-c++ NOTPARALLEL=parallel-ok
 
 .PHONY: install-gcc maybe-install-gcc
 maybe-install-gcc:
@@ -7565,7 +7319,7 @@ install-gcc:
          r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
-         (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
+         (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
        else \
          true; \
        fi
@@ -7585,7 +7339,7 @@ gcc-no-fixedincludes:
          r=`${PWD}`; export r; \
          s=`cd $(srcdir); ${PWD}` ; export s; \
          $(SET_LIB_PATH) \
-         (cd ./gcc; \
+         (cd ./gcc && \
           $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
          rm -rf gcc/include; \
          mv gcc/tmp-include gcc/include 2>/dev/null; \
@@ -7642,7 +7396,7 @@ all-itcl: maybe-all-tcl maybe-all-tk
 # We put install-tcl before install-itcl because itcl wants to run a
 # program on installation which uses the Tcl libraries.
 install-itcl: maybe-install-tcl
-all-sid: maybe-all-tcl maybe-all-tk
+all-sid: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-tcl maybe-all-tk
 install-sid: maybe-install-tcl maybe-install-tk
 all-sim: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-readline maybe-configure-gdb
 configure-tk: maybe-configure-tcl
@@ -7659,7 +7413,6 @@ all-diff: maybe-all-libiberty
 all-fastjar: maybe-all-zlib maybe-all-libiberty
 all-fileutils: maybe-all-libiberty
 all-flex: maybe-all-libiberty maybe-all-bison maybe-all-byacc
-all-grep: maybe-all-libiberty
 all-gzip: maybe-all-libiberty
 all-hello: maybe-all-libiberty
 all-m4: maybe-all-libiberty maybe-all-texinfo
@@ -7669,7 +7422,6 @@ all-prms: maybe-all-libiberty
 all-recode: maybe-all-libiberty
 all-sed: maybe-all-libiberty
 all-send-pr: maybe-all-prms
-all-snavigator: maybe-all-tcl maybe-all-tk maybe-all-itcl maybe-all-tix maybe-all-db maybe-all-grep maybe-all-libgui
 all-tar: maybe-all-libiberty
 all-uudecode: maybe-all-libiberty
 
@@ -7721,21 +7473,42 @@ configure-target-qthreads: $(ALL_GCC_C)
 # Regenerating top level configury
 # --------------------------------
 
-# Rebuilding Makefile.in, using autogen.
-$(srcdir)/Makefile.in: # $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def
-       cd $(srcdir) && autogen Makefile.def
+# Multilib.out tells target dirs what multilibs they should build.
+# There is really only one copy.  We use the 'timestamp' method to
+# work around various timestamp bugs on some systems.
+# We use move-if-change so that it's only considered updated when it
+# actually changes, because it has to depend on a phony target.
+multilib.out: maybe-all-gcc
+       @r=`${PWD}`; export r; \
+       echo "Checking multilib configuration..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > multilib.tmp 2> /dev/null ; \
+       $(SHELL) $(srcdir)/move-if-change multilib.tmp multilib.out ; \
 
-# with the gnu make, this is done automatically.
+# Rebuilding Makefile.in, using autogen.
+AUTOGEN = autogen
+$(srcdir)/Makefile.in: @MAINT@ $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def
+       cd $(srcdir) && $(AUTOGEN) Makefile.def
 
-host_makefile_frag=@host_makefile_frag@
-target_makefile_frag=@target_makefile_frag@
+# Rebuilding Makefile.
+Makefile: $(srcdir)/Makefile.in config.status
+       CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-Makefile: Makefile.in configure.in $(host_makefile_frag) $(target_makefile_frag) $(gcc_version_trigger)
-       $(SHELL) ./config.status
+config.status: configure $(gcc_version_trigger)
+       $(SHELL) ./config.status --recheck
 
+# Rebuilding configure.
+AUTOCONF = autoconf
+$(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4
+       cd $(srcdir) && $(AUTOCONF)
 #
 
 .NOEXPORT:
 MAKEOVERRIDES=
 
+# Tell GNU make 3.79 not to run the top level in parallel.  This 
+# prevents contention for $builddir/$target/config.cache, as well
+# as minimizing scatter in file system caches.
+NOTPARALLEL = .NOTPARALLEL
+$(NOTPARALLEL):
+
 # end of Makefile.in