X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=Makefile.in;h=c27046ccc0e7604b2ca69748e9fba077d794da00;hb=3885a41e320e2d3c0486ee852b7804ebc314ce78;hp=f35233b792e4cde0c1ba9b3fa7a8f8bea32bd454;hpb=456876c8c4acde3502377a3133f2120a5ae87a52;p=deliverable%2Fbinutils-gdb.git

diff --git a/Makefile.in b/Makefile.in
index f35233b792..c27046ccc0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -49,12 +49,16 @@ man6dir = $(mandir)/man6
 man7dir = $(mandir)/man7
 man8dir = $(mandir)/man8
 man9dir = $(mandir)/man9
+infodir = $(prefix)/info
+includedir = $(prefix)/include
+# Directory in which the compiler finds executables, libraries, etc.
+libsubdir = $(libdir)/gcc-lib/$(target_alias)/$(gcc_version)
 GDB_NLM_DEPS = 
 
 SHELL = /bin/sh
 
 # INSTALL_PROGRAM_ARGS is changed by configure.in to use -x for a
-# cygwin32 host.
+# cygwin host.
 INSTALL_PROGRAM_ARGS =
 
 INSTALL = $(SHELL) $$s/install-sh -c
@@ -86,10 +90,8 @@ LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
 PICFLAG = 
 PICFLAG_FOR_TARGET = 
 
-# start-sanitize-chill
 CHILLFLAGS = $(CFLAGS)
 CHILL_LIB = -lchill
-# end-sanitize-chill
 CXX = c++
 
 # Use -O2 to stress test the compiler.
@@ -112,6 +114,7 @@ GZIPPROG = gzip
 # These values are substituted by configure.
 DEFAULT_YACC = yacc
 DEFAULT_LEX = lex
+DEFAULT_M4 = m4
 
 BISON = `if [ -f $$r/bison/bison ] ; then \
 	    echo $$r/bison/bison -L $$s/bison/ ; \
@@ -133,7 +136,7 @@ LEX = `if [ -f $$r/flex/flex ] ; \
 
 M4 = `if [ -f $$r/m4/m4 ] ; \
 	then echo $$r/m4/m4 ; \
-	else echo m4 ; fi`
+	else echo ${DEFAULT_M4} ; fi`
 
 MAKEINFO = `if [ -f $$r/texinfo/makeinfo/Makefile ] ; \
 	then echo $$r/texinfo/makeinfo/makeinfo ; \
@@ -163,7 +166,12 @@ OTHERS =
 
 # This is set by the configure script to the list of directories which
 # should be built using the target tools.
-TARGET_CONFIGDIRS = libiberty libgloss newlib libio librx libstdc++ libg++ winsup opcodes libstub cygmon
+
+# start-sanitize-dsp
+SPECIAL_LIBS = libdsp
+# end-sanitize-dsp
+
+TARGET_CONFIGDIRS = libiberty libgloss $(SPECIAL_LIBS) newlib libio librx libstdc++ libg++ winsup opcodes libstub cygmon
 
 # Target libraries are put under this directory:
 # Changed by configure to $(target_alias) if cross.
@@ -193,15 +201,24 @@ INSTALL_TARGET = installdirs \
 	$(INSTALL_X11_MODULES) \
 	$(INSTALL_DOSREL)
 
+INSTALL_TARGET_CROSS = installdirs \
+	install-gcc-cross \
+	$(INSTALL_MODULES) \
+	$(INSTALL_TARGET_MODULES) \
+	$(INSTALL_X11_MODULES) \
+	$(INSTALL_DOSREL)
 
 CC_FOR_TARGET = ` \
   if [ -f $$r/gcc/xgcc ] ; then \
     if [ -f $$r/$(TARGET_SUBDIR)/newlib/Makefile ] ; then \
-      if [ -f $$r/$(TARGET_SUBDIR)/winsup/Makefile ] ; then \
-        echo $$r/gcc/xgcc -B$$r/gcc/ -B$$r/$(TARGET_SUBDIR)/newlib/ -L$$r/$(TARGET_SUBDIR)/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \
-      else \
-        echo $$r/gcc/xgcc -B$$r/gcc/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \
-      fi; \
+      case "$(target_canonical)" in \
+        i[3456]86-*-cygwin*) \
+          echo $$r/gcc/xgcc -B$$r/gcc/ -B$$r/$(TARGET_SUBDIR)/newlib/ -L$$r/$(TARGET_SUBDIR)/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/winsup/include -idirafter $$s/newlib/libc/include -nostdinc; \
+          ;; \
+        *) \
+          echo $$r/gcc/xgcc -B$$r/gcc/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \
+	  ;; \
+      esac \
     else \
       echo $$r/gcc/xgcc -B$$r/gcc/; \
     fi; \
@@ -219,7 +236,6 @@ CC_FOR_TARGET = ` \
 # overridden on the command line.
 GCC_FOR_TARGET = $$r/gcc/xgcc -B$$r/gcc/
 
-# start-sanitize-chill
 CHILL_FOR_TARGET = ` \
   if [ -f $$r/gcc/xgcc ] ; then \
     echo $$r/gcc/xgcc -B$$r/gcc/ -L$$r/gcc/ch/runtime/; \
@@ -231,16 +247,17 @@ CHILL_FOR_TARGET = ` \
     fi; \
   fi`
 
-# end-sanitize-chill
-
 CXX_FOR_TARGET = ` \
   if [ -f $$r/gcc/xgcc ] ; then \
     if [ -f $$r/$(TARGET_SUBDIR)/newlib/Makefile ] ; then \
-      if [ -f $$r/$(TARGET_SUBDIR)/winsup/Makefile ] ; then \
-        echo $$r/gcc/xgcc -B$$r/gcc/ -B$$r/$(TARGET_SUBDIR)/newlib/ -L$$r/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \
-      else \
-        echo $$r/gcc/xgcc -B$$r/gcc/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \
-      fi; \
+      case "$(target_canonical)" in \
+        i[3456]86-*-cygwin*) \
+          echo $$r/gcc/xgcc -B$$r/gcc/ -B$$r/$(TARGET_SUBDIR)/newlib/ -L$$r/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/winsup/include -idirafter $$s/newlib/libc/include -nostdinc; \
+          ;; \
+        *) \
+          echo $$r/gcc/xgcc -B$$r/gcc/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \
+	  ;; \
+      esac \
     else \
       echo $$r/gcc/xgcc -B$$r/gcc/; \
     fi; \
@@ -355,11 +372,9 @@ BASE_FLAGS_TO_PASS = \
 	"CC_FOR_TARGET=$(CC_FOR_TARGET)" \
 	"CFLAGS=$(CFLAGS)" \
 	"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
-	$(start-sanitize-chill)\
 	"CHILLFLAGS=$(CHILLFLAGS)" \
 	"CHILL_FOR_TARGET=$(CHILL_FOR_TARGET)" \
 	"CHILL_LIB=$(CHILL_LIB)" \
-	$(end-sanitize-chill)\
 	"CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
 	"CXXFLAGS=$(CXXFLAGS)" \
 	"CXXFLAGS_FOR_TARGET=$(CXXFLAGS_FOR_TARGET)" \
@@ -380,14 +395,13 @@ BASE_FLAGS_TO_PASS = \
 	"MAKE=$(MAKE)" \
 	"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
 	"NM_FOR_TARGET=$(NM_FOR_TARGET)" \
-	"PICFLAG=$(PICFLAG)" \
-	"PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
 	"RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \
 	"RPATH_ENVVAR=$(RPATH_ENVVAR)" \
 	"SHELL=$(SHELL)" \
 	"EXPECT=$(EXPECT)" \
 	"RUNTEST=$(RUNTEST)" \
 	"RUNTESTFLAGS=$(RUNTESTFLAGS)" \
+	"TARGET_SUBDIR=$(TARGET_SUBDIR)" \
 	"WINDRES_FOR_TARGET=$(WINDRES_FOR_TARGET)" \
 	"YACC=$(YACC)" \
 	"bindir=$(bindir)" \
@@ -405,7 +419,12 @@ BASE_FLAGS_TO_PASS = \
 	"sbindir=$(sbindir)" \
 	"sharedstatedir=$(sharedstatedir)" \
 	"sysconfdir=$(sysconfdir)" \
-	"tooldir=$(tooldir)"
+	"tooldir=$(tooldir)" \
+	"gxx_include_dir=$(gxx_include_dir)" \
+	"gcc_version=$(gcc_version)" \
+	"gcc_version_trigger=$(gcc_version_trigger)" \
+	"target_alias=$(target_alias)" \
+	"libsubdir=$(libsubdir)"
 
 # Flags to pass down to most sub-makes, in which we're building with
 # the host environment.
@@ -451,7 +470,6 @@ EXTRA_TARGET_FLAGS = \
 	'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
 	'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \
 	'NM=$$(NM_FOR_TARGET)' \
-	'PICFLAG=$$(PICFLAG_FOR_TARGET)' \
 	'RANLIB=$$(RANLIB_FOR_TARGET)' \
 	'WINDRES=$$(WINDRES_FOR_TARGET)'
 
@@ -500,6 +518,7 @@ ALL_MODULES = \
 	all-binutils \
 	all-bison \
 	all-byacc \
+	all-bzip2 \
 	$(start-sanitize-cygnus) \
 	all-cgen \
 	$(end-sanitize-cygnus) \
@@ -564,6 +583,7 @@ ALL_MODULES = \
 	$(end-sanitize-cygnus) \
 	all-tar \
 	all-tcl \
+	all-tcl8.1 \
 	all-texinfo \
 	all-textutils \
 	all-tgas \
@@ -573,6 +593,7 @@ ALL_MODULES = \
 	all-vmake \
 	$(end-sanitize-ide) \
 	all-wdiff \
+	all-zip \
 	$(EXTRA_TARGET_HOST_ALL_MODULES)
 
 # This is a list of the check targets for all of the modules which are
@@ -584,7 +605,8 @@ ALL_MODULES = \
 NATIVE_CHECK_MODULES = \
 	check-bison \
 	check-byacc \
-	check-flex
+	check-flex \
+	check-zip
 
 CROSS_CHECK_MODULES = \
 	check-apache \
@@ -594,6 +616,7 @@ CROSS_CHECK_MODULES = \
 	check-bash \
 	check-bfd \
 	check-binutils \
+	check-bzip2 \
 	check-cvssrc \
 	check-db \
 	check-dejagnu \
@@ -678,6 +701,7 @@ INSTALL_MODULES = \
 	install-automake \
 	install-bash \
 	install-bfd \
+	install-bzip2 \
 	install-opcodes \
 	install-binutils \
 	install-bison \
@@ -712,6 +736,7 @@ INSTALL_MODULES = \
 	install-intl \
 	install-ispell \
 	install-tcl \
+	install-tcl8.1 \
 	install-itcl \
 	$(start-sanitize-ide) \
 	install-jstools \
@@ -750,6 +775,7 @@ INSTALL_MODULES = \
 	install-vmake \
 	$(end-sanitize-ide) \
 	install-wdiff \
+	install-zip \
 	$(EXTRA_TARGET_HOST_INSTALL_MODULES)
 
 # This is a list of the targets for all of the modules which are compiled
@@ -763,6 +789,7 @@ ALL_X11_MODULES = \
 	all-guile \
 	all-tclX \
 	all-tk \
+	all-tk8.1 \
 	all-tix
 
 # This is a list of the check targets for all of the modules which are
@@ -788,6 +815,7 @@ INSTALL_X11_MODULES = \
 	install-gash \
 	install-tclX \
 	install-tk \
+	install-tk8.1 \
 	install-tix
 
 # This is a list of the targets for all of the modules which are compiled
@@ -799,6 +827,9 @@ ALL_TARGET_MODULES = \
 	all-target-libg++ \
 	all-target-newlib \
 	all-target-winsup \
+	$(start-sanitize-dsp) \
+	all-target-libdsp \
+	$(end-sanitize-dsp) \
 	all-target-libgloss \
 	all-target-libiberty \
 	all-target-gperf \
@@ -807,12 +838,16 @@ ALL_TARGET_MODULES = \
 	$(start-sanitize-java) \
 	all-target-libjava \
 	all-target-boehm-gc \
+	all-target-qthreads \
 	$(end-sanitize-java) \
 	all-target-cygmon
 
 # This is a list of the configure targets for all of the modules which
 # are compiled using the target tools.
 CONFIGURE_TARGET_MODULES = \
+	$(start-sanitize-dsp) \
+	configure-target-libdsp \
+	$(end-sanitize-dsp) \
 	configure-target-libio \
 	configure-target-libstdc++ \
 	configure-target-librx \
@@ -827,12 +862,16 @@ CONFIGURE_TARGET_MODULES = \
 	$(start-sanitize-java) \
 	configure-target-libjava \
 	configure-target-boehm-gc \
+	configure-target-qthreads \
 	$(end-sanitize-java) \
 	configure-target-cygmon
 
 # This is a list of the check targets for all of the modules which are
 # compiled using $(TARGET_FLAGS_TO_PASS).
 CHECK_TARGET_MODULES = \
+	$(start-sanitize-dsp) \
+	check-target-libdsp \
+	$(end-sanitize-dsp) \
 	check-target-libio \
 	check-target-libstdc++ \
 	check-target-libg++ \
@@ -842,12 +881,16 @@ CHECK_TARGET_MODULES = \
 	$(start-sanitize-java) \
 	check-target-libjava \
 	check-target-boehm-gc \
+	check-target-qthreads \
 	$(end-sanitize-java) \
 	check-target-gperf
 
 # This is a list of the install targets for all of the modules which are
 # compiled using $(TARGET_FLAGS_TO_PASS).
 INSTALL_TARGET_MODULES = \
+	$(start-sanitize-dsp) \
+	install-target-libdsp \
+	$(end-sanitize-dsp) \
 	install-target-libio \
 	install-target-libstdc++ \
 	install-target-libg++ \
@@ -858,6 +901,7 @@ INSTALL_TARGET_MODULES = \
 	$(start-sanitize-java) \
 	install-target-libjava \
 	install-target-boehm-gc \
+	install-target-qthreads \
 	$(end-sanitize-java) \
 	install-target-gperf
 
@@ -872,6 +916,7 @@ CLEAN_MODULES = \
 	clean-binutils \
 	clean-bison \
 	clean-byacc \
+	clean-bzip2 \
 	$(start-sanitize-cygnus) \
 	clean-cgen \
 	$(end-sanitize-cygnus) \
@@ -944,10 +989,14 @@ CLEAN_MODULES = \
 	$(start-sanitize-ide) \
 	clean-vmake \
 	$(end-sanitize-ide) \
-	clean-wdiff
+	clean-wdiff \
+	clean-zip
 
 # All of the target modules that can be cleaned
 CLEAN_TARGET_MODULES = \
+	$(start-sanitize-dsp) \
+	clean-target-libdsp \
+	$(end-sanitize-dsp) \
 	clean-target-libio \
 	clean-target-libstdc++ \
 	clean-target-librx \
@@ -962,6 +1011,7 @@ CLEAN_TARGET_MODULES = \
 	$(start-sanitize-java) \
 	clean-target-libjava \
 	clean-target-boehm-gc \
+	clean-target-qthreads \
 	$(end-sanitize-java) \
 	clean-target-cygmon
 
@@ -1071,10 +1121,10 @@ install-info: do-install-info dir.info
 	else true ; fi
 
 local-clean:
-	-rm -f *.a TEMP errs core *.o *~ \#* TAGS *.E
+	-rm -f *.a TEMP errs core *.o *~ \#* TAGS *.E *.log
 
 local-distclean:
-	-rm -f Makefile config.status config.cache
+	-rm -f Makefile config.status config.cache mh-frag mt-frag
 	-if [ "$(TARGET_SUBDIR)" != "." ]; then \
 	  rm -rf $(TARGET_SUBDIR); \
 	else true; fi
@@ -1126,10 +1176,32 @@ check: $(CHECK_MODULES) \
 	$(CHECK_X11_MODULES) \
 	check-gcc
 
+# Automated reporting of test results.
+
+warning.log: build.log
+	$(srcdir)/contrib/warn_summary build.log > $@
+
+mail-report.log:
+	if test x'$(BOOT_CFLAGS)' != x''; then \
+	    BOOT_CFLAGS='$(BOOT_CFLAGS)'; export BOOT_CFLAGS; \
+	fi; \
+	$(srcdir)/contrib/test_summary -t >$@
+	chmod +x $@
+	echo If you really want to send e-mail, run ./$@ now
+
+mail-report-with-warnings.log: warning.log
+	if test x'$(BOOT_CFLAGS)' != x''; then \
+	    BOOT_CFLAGS='$(BOOT_CFLAGS)'; export BOOT_CFLAGS; \
+	fi; \
+	$(srcdir)/contrib/test_summary -t -i warning.log >$@
+	chmod +x $@
+	echo If you really want to send e-mail, run ./$@ now
+
 # Installation targets.
 
-.PHONY: install uninstall source-vault binary-vault vault-install
+.PHONY: install install-cross uninstall source-vault binary-vault vault-install
 install: $(INSTALL_TARGET) 
+install-cross: $(INSTALL_TARGET_CROSS) 
 
 uninstall:
 	@echo "the uninstall target is not supported in this tree"
@@ -1215,6 +1287,8 @@ install-foundry:
 	  else \
 	    true; \
 	  fi; \
+	date '+%D %r' > builddate \
+	$(INSTALL_DATA) builddate $(datadir)/builddate ; \
 	done
 # end-sanitize-ide
 
@@ -1297,11 +1371,6 @@ $(CONFIGURE_TARGET_MODULES):
 		mv $(TARGET_SUBDIR)/$${dir}/tmpmulti.out $(TARGET_SUBDIR)/$${dir}/multilib.out; \
 	      fi; \
 	    else \
-	      if echo '.;' | cmp - $(TARGET_SUBDIR)/$${dir}/tmpmulti.out >/dev/null 2>&1; then \
-		true; \
-	      else \
-		rm -f $(TARGET_SUBDIR)/$${dir}/Makefile; \
-	      fi; \
 	      mv $(TARGET_SUBDIR)/$${dir}/tmpmulti.out $(TARGET_SUBDIR)/$${dir}/multilib.out; \
 	    fi; \
 	  fi; \
@@ -1365,11 +1434,13 @@ $(CONFIGURE_TARGET_MODULES):
 	      libsrcdir="$$s/$${dir}"; \
 	    fi; \
 	    if [ -f $${libsrcdir}/configure ] ; then \
-	      $(SHELL) $${libsrcdir}/configure \
+	      rm -f no-such-file; \
+	      CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
 		$(CONFIG_ARGUMENTS) $${srcdiroption} \
 		--with-target-subdir="$(TARGET_SUBDIR)"; \
 	    else \
-	      $(SHELL) $$s/configure \
+	      rm -f no-such-file; \
+	      CONFIG_SITE=no-such-file $(SHELL) $$s/configure \
 		$(CONFIG_ARGUMENTS) $${srcdiroption} \
 		--with-target-subdir="$(TARGET_SUBDIR)"; \
 	    fi; \
@@ -1481,16 +1552,57 @@ all-gcc:
 	  true; \
 	fi
 
-.PHONY: all-bootstrap
-all-bootstrap:
-	@if [ -f ./gcc/Makefile ] ; then \
-	  r=`pwd`; export r; \
-	  s=`cd $(srcdir); pwd`; export s; \
-	  $(SET_LIB_PATH) \
-	  (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) bootstrap); \
-	else \
-	  true; \
-	fi
+# Building GCC uses some tools for rebuilding "source" files
+# like texinfo, bison/byacc, etc.  So we must depend on those.
+#
+# While building GCC, it may be necessary to run various target
+# programs like the assembler, linker, etc.  So we depend on
+# those too.
+#
+# In theory, on an SMP all those dependencies can be resolved
+# in parallel.
+#
+.PHONY: bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean
+bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean: all-texinfo all-bison all-byacc all-binutils all-gas all-ld
+	@r=`pwd`; export r; \
+	s=`cd $(srcdir); pwd`; export s; \
+	$(SET_LIB_PATH) \
+	echo "Bootstrapping the compiler"; \
+	cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) $@
+	@r=`pwd`; export r; \
+	s=`cd $(srcdir); pwd`; export s; \
+	case "$@" in \
+	  *bootstrap4-lean ) \
+			msg="Comparing stage3 and stage4 of the compiler"; \
+	  		compare=compare3-lean ;; \
+	  *bootstrap4 ) msg="Comparing stage3 and stage4 of the compiler"; \
+	  		compare=compare3 ;; \
+	  *-lean )	msg="Comparing stage2 and stage3 of the compiler"; \
+	  		compare=compare-lean ;; \
+	  * )		msg="Comparing stage2 and stage3 of the compiler"; \
+	  		compare=compare ;; \
+	esac; \
+	$(SET_LIB_PATH) \
+	echo "$$msg"; \
+	cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) $$compare
+	@r=`pwd`; export r; \
+	s=`cd $(srcdir); pwd` ; export s; \
+	$(SET_LIB_PATH) \
+	echo "Building runtime libraries"; \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) all
+
+.PHONY: cross
+cross: all-texinfo all-bison all-byacc all-binutils all-gas all-ld
+	@r=`pwd`; export r; \
+	s=`cd $(srcdir); pwd`; export s; \
+	$(SET_LIB_PATH) \
+	echo "Building the C and C++ compiler"; \
+	cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c c++"
+	@r=`pwd`; export r; \
+	s=`cd $(srcdir); pwd` ; export s; \
+	$(SET_LIB_PATH) \
+	echo "Building runtime libraries"; \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) all LANGUAGES="c c++"
 
 .PHONY: check-gcc
 check-gcc:
@@ -1514,7 +1626,16 @@ install-gcc:
 	  true; \
 	fi
 
-
+.PHONY: install-gcc-cross
+install-gcc-cross:
+	@if [ -f ./gcc/Makefile ] ; then \
+	  r=`pwd`; export r; \
+	  s=`cd $(srcdir); pwd`; export s; \
+	  $(SET_LIB_PATH) \
+	  (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c c++" install); \
+	else \
+	  true; \
+	fi
 # EXPERIMENTAL STUFF
 # This rule is used to install the modules which use FLAGS_TO_PASS.
 # To build a target install-X means to cd to X and make install.
@@ -1537,7 +1658,7 @@ install-dosrel-fake:
 all-apache:
 all-ash:
 all-autoconf: all-m4 all-texinfo
-all-automake:
+all-automake: all-m4 all-texinfo
 all-bash:
 all-bfd: all-libiberty all-intl
 all-binutils: all-libiberty all-opcodes all-bfd all-flex all-bison all-byacc all-intl
@@ -1546,8 +1667,9 @@ all-bison: all-texinfo
 all-target-boehm-gc: configure-target-boehm-gc
 # end-sanitize-java
 all-byacc:
+all-bzip2:
 # start-sanitize-cygnus
-all-cgen:
+all-cgen: all-libiberty
 # These two have dependencies on cgen, and while this section is alphabetically
 # sorted, I wish to keep these together until things settle.
 all-opcodes: all-cgen
@@ -1600,11 +1722,15 @@ all-indent:
 all-inet: all-tcl all-send-pr all-perl
 all-intl:
 all-ispell: all-emacs19
-all-itcl: all-tcl all-tk
+all-itcl: all-tcl all-tk all-tcl8.1 all-tk8.1
 # start-sanitize-ide
 all-jstools: all-tcl all-tk all-tix all-libgui all-libide all-libidetcl
 # end-sanitize-ide
 all-ld: all-libiberty all-bfd all-opcodes all-bison all-byacc all-flex all-intl
+# start-sanitize-dsp
+all-target-libdsp: configure-target-libdsp configure-target-newlib
+configure-target-libdsp: $(ALL_GCC) 
+# end-sanitize-dsp
 configure-target-libg++: $(ALL_GCC) configure-target-librx
 all-target-libg++: configure-target-libg++ all-gas all-ld all-gcc all-target-libiberty all-target-newlib all-target-libio all-target-librx all-target-libstdc++
 configure-target-libgloss: $(ALL_GCC)
@@ -1612,15 +1738,15 @@ all-target-libgloss: configure-target-libgloss configure-target-newlib
 configure-target-libio: $(ALL_GCC)
 all-target-libio: configure-target-libio all-gas all-ld all-gcc all-target-libiberty all-target-newlib
 check-target-libio: all-target-libstdc++
-all-libgui: all-tcl all-tk all-itcl
+all-libgui: all-tcl all-tk all-tcl8.1 all-tk8.1 all-itcl
 all-libiberty:
 # start-sanitize-ide
 all-libide: all-ilu
 all-libidetcl: all-tcl all-tk all-itcl all-ilu all-libgui all-libide
 # end-sanitize-ide
 # start-sanitize-java
-configure-target-libjava: $(ALL_GCC) configure-target-boehm-gc
-all-target-libjava: configure-target-libjava all-gcc all-target-newlib all-target-boehm-gc
+configure-target-libjava: $(ALL_GCC) configure-target-boehm-gc configure-target-qthreads
+all-target-libjava: configure-target-libjava all-gcc all-zip all-target-newlib all-target-boehm-gc all-target-qthreads
 # end-sanitize-java
 configure-target-librx: $(ALL_GCC) configure-target-newlib
 all-target-librx: configure-target-librx
@@ -1638,6 +1764,9 @@ all-opcodes: all-bfd all-libiberty
 all-patch: all-libiberty
 all-perl:
 all-prms: all-libiberty
+# start-sanitize-java
+all-target-qthreads: configure-target-qthreads
+# end-sanitize-java
 all-rcs:
 all-readline:
 all-recode: all-libiberty
@@ -1646,17 +1775,19 @@ all-send-pr: all-prms
 all-shellutils:
 all-sim: all-libiberty all-bfd all-opcodes all-readline
 # start-sanitize-cygnus
-all-snavigator: all-tcl all-tk all-tix all-itcl all-db all-grep all-flexlm all-libgui
+all-snavigator: all-tcl8.1 all-tk8.1 all-tix all-itcl all-db all-grep all-flexlm all-libgui
 # end-sanitize-cygnus
 all-tar: all-libiberty
 all-tcl:
+all-tcl8.1:
 all-tclX: all-tcl all-tk
 all-tk: all-tcl
+all-tk8.1: all-tcl8.1
 all-texinfo: all-libiberty
 all-textutils:
 all-tgas: all-libiberty all-bfd all-opcodes
 all-time:
-all-tix: all-tcl all-tk
+all-tix: all-tcl all-tk all-tcl8.1 all-tk8.1
 # start-sanitize-ide
 all-vmake: all-tcl all-tk all-itcl all-tix all-libgui all-libide all-libidetcl
 # end-sanitize-ide
@@ -1664,6 +1795,7 @@ all-wdiff:
 all-target-winsup: all-target-newlib all-target-libiberty all-target-libio configure-target-winsup 
 configure-target-winsup: configure-target-newlib
 all-uudecode: all-libiberty
+all-zip:
 configure-target-libiberty: $(ALL_GCC)
 all-target-libiberty: configure-target-libiberty all-gcc all-ld all-target-newlib
 all-target: $(ALL_TARGET_MODULES)
@@ -1703,7 +1835,7 @@ TAGS: do-TAGS
 
 # with the gnu make, this is done automatically.
 
-Makefile: Makefile.in configure.in $(host_makefile_frag) $(target_makefile_frag)
+Makefile: Makefile.in configure.in $(host_makefile_frag) $(target_makefile_frag) $(gcc_version_trigger)
 	$(SHELL) ./config.status
 
 #
@@ -1713,7 +1845,7 @@ Makefile: Makefile.in configure.in $(host_makefile_frag) $(target_makefile_frag)
 # ChangeLog omitted because it may refer to files which are not in this
 # distribution (perhaps it would be better to include it anyway).
 DEVO_SUPPORT= README Makefile.in configure configure.in \
-	config.guess config.sub config move-if-change \
+	config.guess config.if config.sub config move-if-change \
 	mpw-README mpw-build.in mpw-config.in mpw-configure mpw-install \
 	COPYING COPYING.LIB install-sh config-ml.in symlink-tree \
 	mkinstalldirs ltconfig ltmain.sh missing ylwrap
@@ -1785,7 +1917,7 @@ taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) \
 	  mkdir proto-toplev/texinfo/util && \
 	  ln -s ../../../texinfo/util/tex3patch	proto-toplev/texinfo/util ; \
 	else true; fi
-	chmod og=u `find . -print`
+	chmod -R og=u . || chmod og=u `find . -print`
 	if grep AM_INIT_AUTOMAKE $(TOOL)/configure.in >/dev/null 2>&1; then \
 	  ver=`sed < $(TOOL)/configure.in -n 's/AM_INIT_AUTOMAKE[^,]*, *\([^)]*\))/\1/p'`; \
 	else \
@@ -1861,11 +1993,4 @@ newlib.tar.gz: $(DIST_SUPPORT) $(NEWLIB_SUPPORT_DIRS) newlib
 .NOEXPORT:
 MAKEOVERRIDES=
 
-# start-sanitize-chill
-## This is ugly, but I don't want GNU make to put these variables in
-## the environment.  Older makes will see this as a set of targets
-## with no dependencies and no actions.
-unexport CHILLFLAGS CHILL_LIB CHILL_FOR_TARGET :
-# end-sanitize-chill
-
 # end of Makefile.in