]> git.ipfire.org Git - thirdparty/binutils-gdb.git/blobdiff - Makefile.in
dummy commit before egcs merge
[thirdparty/binutils-gdb.git] / Makefile.in
index 21fdd02d929e50009015fbcdd8bfd9852b655337..e0242ba606990aa0ee2a0ff534aedfe97b66cbf4 100644 (file)
@@ -1,6 +1,7 @@
 #
 # Makefile for directory with subdirs to build.
-#   Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 1997 Free Software Foundation
+#   Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 97, 1998
+#   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
 srcdir = .
 
 prefix = /usr/local
-
 exec_prefix = $(prefix)
-bindir = $(exec_prefix)/bin
-libdir = $(exec_prefix)/lib
+
+bindir=${exec_prefix}/bin
+sbindir=${exec_prefix}/sbin
+libexecdir=${exec_prefix}/libexec
+datadir=${prefix}/share
+sysconfdir=${prefix}/etc
+sharedstatedir=${prefix}/com
+localstatedir=${prefix}/var
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+oldincludedir=/usr/include
+infodir=${prefix}/info
+mandir=${prefix}/man
+
 tooldir = $(exec_prefix)/$(target)
 
 program_transform_name =
 
-datadir = $(prefix)/share
-mandir = $(prefix)/man
 man1dir = $(mandir)/man1
 man2dir = $(mandir)/man2
 man3dir = $(mandir)/man3
@@ -41,12 +51,19 @@ 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.
+INSTALL_PROGRAM_ARGS =
+
 INSTALL = $(SHELL) $$s/install-sh -c
-INSTALL_PROGRAM = $(INSTALL)
+INSTALL_PROGRAM = $(INSTALL) $(INSTALL_PROGRAM_ARGS)
+INSTALL_SCRIPT = $(INSTALL)
 INSTALL_DATA = $(INSTALL) -m 644
 
 INSTALL_DOSREL = install-dosrel-fake
@@ -62,9 +79,10 @@ HOST_CC = $(CC_FOR_BUILD)
 HOST_PREFIX = 
 HOST_PREFIX_1 = loser-
 
-# We don't specify -g -O because many compilers don't support -g -O,
-# and/or -O is broken in and of itself.
+# These flag values are normally overridden by the configure script.
 CFLAGS = -g
+CXXFLAGS = -g -O2
+
 LIBCFLAGS = $(CFLAGS)
 CFLAGS_FOR_TARGET = $(CFLAGS)
 LDFLAGS_FOR_TARGET = 
@@ -72,14 +90,11 @@ 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.
-CXXFLAGS = -g -O2
 LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
 CXXFLAGS_FOR_TARGET = $(CXXFLAGS)
 LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
@@ -87,6 +102,7 @@ LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
 RANLIB = ranlib
 
 DLLTOOL = dlltool
+WINDRES = windres
 
 NM = nm
 
@@ -98,11 +114,20 @@ GZIPPROG = gzip
 # These values are substituted by configure.
 DEFAULT_YACC = yacc
 DEFAULT_LEX = lex
-
-# BISON: This line sed'ed to BISON = bison -y for FSF releases, don't remove.
-BISON = `if [ -f $$r/byacc/byacc ] ; \
-           then echo $$r/byacc/byacc ; \
-           else echo ${DEFAULT_YACC} ; \
+DEFAULT_M4 = m4
+
+BISON = `if [ -f $$r/bison/bison ] ; then \
+           echo $$r/bison/bison -L $$s/bison/ ; \
+        else \
+           echo bison ; \
+        fi`
+
+YACC = `if [ -f $$r/bison/bison ] ; then \
+           echo $$r/bison/bison -y -L $$s/bison/ ; \
+       elif [ -f $$r/byacc/byacc ] ; then \
+           echo $$r/byacc/byacc ; \
+       else \
+           echo ${DEFAULT_YACC} ; \
        fi`
 
 LEX = `if [ -f $$r/flex/flex ] ; \
@@ -111,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 ; \
@@ -141,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
+
+# 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.
@@ -165,18 +195,24 @@ REALLY_SET_LIB_PATH = \
 
 ALL = all.normal
 INSTALL_TARGET = installdirs \
+       install-gcc \
        $(INSTALL_MODULES) \
        $(INSTALL_TARGET_MODULES) \
        $(INSTALL_X11_MODULES) \
-       install-gcc \
        $(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/newlib/ -L$$r/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \
+        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; \
@@ -197,7 +233,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/; \
@@ -209,13 +244,11 @@ 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/newlib/ -L$$r/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \
+        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; \
@@ -231,8 +264,8 @@ CXX_FOR_TARGET = ` \
   fi`
 
 AS_FOR_TARGET = ` \
-  if [ -f $$r/gas/as.new ] ; then \
-    echo $$r/gas/as.new ; \
+  if [ -f $$r/gas/as-new ] ; then \
+    echo $$r/gas/as-new ; \
   else \
     if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
       echo $(AS); \
@@ -242,8 +275,8 @@ AS_FOR_TARGET = ` \
   fi`
 
 LD_FOR_TARGET = ` \
-  if [ -f $$r/ld/ld.new ] ; then \
-    echo $$r/ld/ld.new ; \
+  if [ -f $$r/ld/ld-new ] ; then \
+    echo $$r/ld/ld-new ; \
   else \
     if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
       echo $(LD); \
@@ -263,6 +296,17 @@ DLLTOOL_FOR_TARGET = ` \
     fi; \
   fi`
 
+WINDRES_FOR_TARGET = ` \
+  if [ -f $$r/binutils/windres ] ; then \
+    echo $$r/binutils/windres ; \
+  else \
+    if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
+      echo $(WINDRES); \
+    else \
+       t='$(program_transform_name)'; echo windres | sed -e 's/x/x/' $$t ; \
+    fi; \
+  fi`
+
 AR_FOR_TARGET = ` \
   if [ -f $$r/binutils/ar ] ; then \
     echo $$r/binutils/ar ; \
@@ -286,8 +330,8 @@ RANLIB_FOR_TARGET = ` \
   fi`
 
 NM_FOR_TARGET = ` \
-  if [ -f $$r/binutils/nm.new ] ; then \
-    echo $$r/binutils/nm.new ; \
+  if [ -f $$r/binutils/nm-new ] ; then \
+    echo $$r/binutils/nm-new ; \
   else \
     if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
       echo $(NM); \
@@ -296,6 +340,18 @@ NM_FOR_TARGET = ` \
     fi; \
   fi`
 
+# The first rule in the file had better be this one.  Don't put any above it.
+# This lives here to allow makefile fragments to contain dependencies.
+all: all.normal
+.PHONY: all
+
+# These can be overridden by config/mt-*.
+# The _TARGET_ is because they're specified in mt-foo.
+# The _HOST_ is because they're programs that run on the host.
+EXTRA_TARGET_HOST_ALL_MODULES =
+EXTRA_TARGET_HOST_INSTALL_MODULES =
+EXTRA_TARGET_HOST_CHECK_MODULES =
+
 #### host and target specific makefile fragments come in here.
 ###
 
@@ -310,11 +366,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)" \
@@ -323,6 +377,7 @@ BASE_FLAGS_TO_PASS = \
        "INSTALL=$(INSTALL)" \
        "INSTALL_DATA=$(INSTALL_DATA)" \
        "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
+       "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
        "LDFLAGS=$(LDFLAGS)" \
        "LEX=$(LEX)" \
        "LD_FOR_TARGET=$(LD_FOR_TARGET)" \
@@ -334,17 +389,36 @@ 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)" \
-       "YACC=$(BISON)" \
+       "TARGET_SUBDIR=$(TARGET_SUBDIR)" \
+       "WINDRES_FOR_TARGET=$(WINDRES_FOR_TARGET)" \
+       "YACC=$(YACC)" \
+       "bindir=$(bindir)" \
+       "datadir=$(datadir)" \
        "exec_prefix=$(exec_prefix)" \
+       "includedir=$(includedir)" \
+       "infodir=$(infodir)" \
+       "libdir=$(libdir)" \
+       "libexecdir=$(libexecdir)" \
+       "lispdir=$(lispdir)" \
+       "localstatedir=$(localstatedir)" \
+       "mandir=$(mandir)" \
+       "oldincludedir=$(oldincludedir)" \
        "prefix=$(prefix)" \
-       "tooldir=$(tooldir)" 
+       "sbindir=$(sbindir)" \
+       "sharedstatedir=$(sharedstatedir)" \
+       "sysconfdir=$(sysconfdir)" \
+       "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.
@@ -357,8 +431,8 @@ EXTRA_HOST_FLAGS = \
        'DLLTOOL=$(DLLTOOL)' \
        'LD=$(LD)' \
        'NM=$(NM)' \
-       'RANLIB=$(RANLIB)' 
-
+       'RANLIB=$(RANLIB)' \
+       'WINDRES=$(WINDRES)'
 
 FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)
 
@@ -390,8 +464,8 @@ EXTRA_TARGET_FLAGS = \
        'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
        'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \
        'NM=$$(NM_FOR_TARGET)' \
-       'PICFLAG=$$(PICFLAG_FOR_TARGET)' \
-       'RANLIB=$$(RANLIB_FOR_TARGET)'
+       'RANLIB=$$(RANLIB_FOR_TARGET)' \
+       'WINDRES=$$(WINDRES_FOR_TARGET)'
 
 TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
 
@@ -412,16 +486,17 @@ EXTRA_GCC_FLAGS = \
        'HOST_PREFIX_1=$(HOST_PREFIX_1)' \
        'NM=$(NM)' \
        'RANLIB=$$(RANLIB_FOR_TARGET)' \
+       'WINDRES=$$(WINDRES_FOR_TARGET)' \
        "GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \
-       `if test x"$(LANGUAGES)" != x; then echo "LANGUAGES=$(LANGUAGES)"; fi` \
-       `if test x"$(STMP_FIXPROTO)" != x; then echo "STMP_FIXPROTO=$(STMP_FIXPROTO)"; fi` \
-       `if test x"$(LIMITS_H_TEST)" != x; then echo "LIMITS_H_TEST=$(LIMITS_H_TEST)"; fi` \
-       `if test x"$(LIBGCC1_TEST)" != x; then echo "LIBGCC1_TEST=$(LIBGCC1_TEST)"; fi` \
-       `if test x"$(LIBGCC2_CFLAGS)" != x; then echo "LIBGCC2_CFLAGS=$(LIBGCC2_CFLAGS)"; fi` \
-       `if test x"$(LIBGCC2_DEBUG_CFLAGS)" != x; then echo "LIBGCC2_DEBUG_CFLAGS=$(LIBGCC2_DEBUG_CFLAGS)"; fi` \
-       `if test x"$(LIBGCC2_INCLUDES)" != x; then echo "LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)"; fi` \
-       `if test x"$(ENQUIRE)" != x; then echo "ENQUIRE=$(ENQUIRE)"; fi` \
-       `if test x"$(BOOT_CFLAGS)" != x; then echo "BOOT_CFLAGS=$(BOOT_CFLAGS)"; fi`
+       "`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s/.*=$$/XFOO=/`" \
+       "`echo 'STMP_FIXPROTO=$(STMP_FIXPROTO)' | sed -e s/.*=$$/XFOO=/`" \
+       "`echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)' | sed -e s/.*=$$/XFOO=/`" \
+       "`echo 'LIBGCC1_TEST=$(LIBGCC1_TEST)' | sed -e s/.*=$$/XFOO=/`" \
+       "`echo 'LIBGCC2_CFLAGS=$(LIBGCC2_CFLAGS)' | sed -e s/.*=$$/XFOO=/`" \
+       "`echo 'LIBGCC2_DEBUG_CFLAGS=$(LIBGCC2_DEBUG_CFLAGS)' | sed -e s/.*=$$/XFOO=/`" \
+       "`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s/.*=$$/XFOO=/`" \
+       "`echo 'ENQUIRE=$(ENQUIRE)' | sed -e s/.*=$$/XFOO=/`" \
+       "`echo 'BOOT_CFLAGS=$(BOOT_CFLAGS)' | sed -e s/.*=$$/XFOO=/`"
 
 GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS)
 
@@ -429,13 +504,19 @@ GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS)
 # using $(FLAGS_TO_PASS).
 ALL_MODULES = \
        all-apache \
+       all-ash \
        all-autoconf \
        all-automake \
        all-bash \
        all-bfd \
        all-binutils \
+       all-bison \
        all-byacc \
-       all-cvs \
+       all-bzip2 \
+       $(start-sanitize-cygnus) \
+       all-cgen \
+       $(end-sanitize-cygnus) \
+       all-cvssrc \
        all-db \
        all-dejagnu \
        all-diff \
@@ -445,8 +526,12 @@ ALL_MODULES = \
        all-findutils \
        all-find \
        all-flex \
+       $(start-sanitize-cygnus) \
+       all-flexlm \
+       $(end-sanitize-cygnus) \
        all-gas \
        all-gawk \
+       all-gettext \
        all-gnuserv \
        all-gprof \
        all-grep \
@@ -458,13 +543,20 @@ ALL_MODULES = \
        $(end-sanitize-ide) \
        all-indent \
        all-inet \
+       all-intl \
        all-ispell \
        all-itcl \
+       $(start-sanitize-ide) \
+       all-jstools \
+       $(end-sanitize-ide) \
        all-ld \
+       all-libgui \
        all-libiberty \
        $(start-sanitize-ide) \
        all-libide \
+       all-libidetcl \
        $(end-sanitize-ide) \
+       all-libtool \
        all-m4 \
        all-make \
        all-mmalloc \
@@ -480,9 +572,12 @@ ALL_MODULES = \
        all-send-pr \
        all-shellutils \
        all-sim \
-       all-sn \
+       $(start-sanitize-cygnus) \
+       all-snavigator \
+       $(end-sanitize-cygnus) \
        all-tar \
        all-tcl \
+       all-tcl8.1 \
        all-texinfo \
        all-textutils \
        all-tgas \
@@ -491,7 +586,8 @@ ALL_MODULES = \
        $(start-sanitize-ide) \
        all-vmake \
        $(end-sanitize-ide) \
-       all-wdiff 
+       all-wdiff \
+       $(EXTRA_TARGET_HOST_ALL_MODULES)
 
 # This is a list of the check targets for all of the modules which are
 # compiled using $(FLAGS_TO_PASS).
@@ -500,17 +596,20 @@ ALL_MODULES = \
 # are tested as part of the host's native tool-chain, and not
 # tested in a cross configuration.
 NATIVE_CHECK_MODULES = \
+       check-bison \
        check-byacc \
        check-flex
 
 CROSS_CHECK_MODULES = \
        check-apache \
+       check-ash \
        check-autoconf \
        check-automake \
        check-bash \
        check-bfd \
        check-binutils \
-       check-cvs \
+       check-bzip2 \
+       check-cvssrc \
        check-db \
        check-dejagnu \
        check-diff \
@@ -518,8 +617,12 @@ CROSS_CHECK_MODULES = \
        check-fileutils \
        check-findutils \
        check-find \
+       $(start-sanitize-cygnus) \
+       check-flexlm \
+       $(end-sanitize-cygnus) \
        check-gas \
        check-gawk \
+       check-gettext \
        check-gnuserv \
        check-gprof \
        check-grep \
@@ -530,13 +633,20 @@ CROSS_CHECK_MODULES = \
        $(end-sanitize-ide) \
        check-indent \
        check-inet \
+       check-intl \
        check-ispell \
        check-itcl \
+       $(start-sanitize-ide) \
+       check-jstools \
+       $(end-sanitize-ide) \
        check-ld \
+       check-libgui \
        check-libiberty \
        $(start-sanitize-ide) \
        check-libide \
+       check-libidetcl \
        $(end-sanitize-ide) \
+       check-libtool \
        check-m4 \
        check-make \
        check-mmcheckoc \
@@ -550,7 +660,9 @@ CROSS_CHECK_MODULES = \
        check-sed \
        check-send-pr \
        check-shellutils \
-       check-sn \
+       $(start-sanitize-cygnus) \
+       check-snavigator \
+       $(end-sanitize-cygnus) \
        check-sim \
        check-tar \
        check-tcl \
@@ -562,7 +674,8 @@ CROSS_CHECK_MODULES = \
        $(start-sanitize-ide) \
        check-vmake \
        $(end-sanitize-ide) \
-       check-wdiff
+       check-wdiff \
+       $(EXTRA_TARGET_HOST_CHECK_MODULES)
 
 CHECK_MODULES=$(NATIVE_CHECK_MODULES) $(CROSS_CHECK_MODULES)
 
@@ -571,16 +684,21 @@ CHECK_MODULES=$(NATIVE_CHECK_MODULES) $(CROSS_CHECK_MODULES)
 # We put install-opcodes before install-binutils because the installed
 # binutils might be on PATH, and they might need the shared opcodes
 # library.
+# We put install-tcl before install-itcl because itcl wants to run a
+# program on installation which uses the Tcl libraries.
 INSTALL_MODULES = \
        install-apache \
+       install-ash \
        install-autoconf \
        install-automake \
        install-bash \
        install-bfd \
+       install-bzip2 \
        install-opcodes \
        install-binutils \
+       install-bison \
        install-byacc \
-       install-cvs \
+       install-cvssrc \
        install-db \
        install-dejagnu \
        install-diff \
@@ -590,8 +708,12 @@ INSTALL_MODULES = \
        install-findutils \
        install-find \
        install-flex \
+       $(start-sanitize-cygnus) \
+       install-flexlm \
+       $(end-sanitize-cygnus) \
        install-gas \
        install-gawk \
+       install-gettext \
        install-gnuserv \
        install-gprof \
        install-grep \
@@ -603,13 +725,22 @@ INSTALL_MODULES = \
        $(end-sanitize-ide) \
        install-indent \
        install-inet \
+       install-intl \
        install-ispell \
+       install-tcl \
+       install-tcl8.1 \
        install-itcl \
+       $(start-sanitize-ide) \
+       install-jstools \
+       $(end-sanitize-ide) \
        install-ld \
+       install-libgui \
        install-libiberty \
        $(start-sanitize-ide) \
        install-libide \
+       install-libidetcl \
        $(end-sanitize-ide) \
+       install-libtool \
        install-m4 \
        install-make \
        install-mmalloc \
@@ -623,9 +754,10 @@ INSTALL_MODULES = \
        install-send-pr \
        install-shellutils \
        install-sim \
-       install-sn \
+       $(start-sanitize-cygnus) \
+       install-snavigator \
+       $(end-sanitize-cygnus) \
        install-tar \
-       install-tcl \
        install-texinfo \
        install-textutils \
        install-tgas \
@@ -634,7 +766,8 @@ INSTALL_MODULES = \
        $(start-sanitize-ide) \
        install-vmake \
        $(end-sanitize-ide) \
-       install-wdiff
+       install-wdiff \
+       $(EXTRA_TARGET_HOST_INSTALL_MODULES)
 
 # This is a list of the targets for all of the modules which are compiled
 # using $(X11_FLAGS_TO_PASS).
@@ -646,7 +779,9 @@ ALL_X11_MODULES = \
        all-gash \
        all-guile \
        all-tclX \
-       all-tk
+       all-tk \
+       all-tk8.1 \
+       all-tix
 
 # This is a list of the check targets for all of the modules which are
 # compiled using $(X11_FLAGS_TO_PASS).
@@ -656,7 +791,9 @@ CHECK_X11_MODULES = \
        check-guile \
        check-expect \
        check-gash \
-       check-tclX
+       check-tclX \
+       check-tk \
+       check-tix
 
 # This is a list of the install targets for all the modules which are
 # compiled using $(X11_FLAGS_TO_PASS).
@@ -668,7 +805,9 @@ INSTALL_X11_MODULES = \
        install-expect \
        install-gash \
        install-tclX \
-       install-tk
+       install-tk \
+       install-tk8.1 \
+       install-tix
 
 # This is a list of the targets for all of the modules which are compiled
 # using $(TARGET_FLAGS_TO_PASS).
@@ -679,13 +818,27 @@ 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-examples
+       all-target-gperf \
+       all-target-examples \
+       all-target-libstub \
+       $(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 \
@@ -694,39 +847,71 @@ CONFIGURE_TARGET_MODULES = \
        configure-target-winsup \
        configure-target-libgloss \
        configure-target-libiberty \
-       configure-target-examples
+       configure-target-gperf \
+       configure-target-examples \
+       configure-target-libstub \
+       $(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++ \
        check-target-newlib \
        check-target-winsup \
-       check-target-libiberty
+       check-target-libiberty \
+       $(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++ \
        install-target-newlib \
        install-target-winsup \
        install-target-libgloss \
-       install-target-libiberty
+       install-target-libiberty \
+       $(start-sanitize-java) \
+       install-target-libjava \
+       install-target-boehm-gc \
+       install-target-qthreads \
+       $(end-sanitize-java) \
+       install-target-gperf
 
 # This is a list of the targets for which we can do a clean-{target}.
 CLEAN_MODULES = \
        clean-apache \
+       clean-ash \
        clean-autoconf \
        clean-automake \
        clean-bash \
        clean-bfd \
        clean-binutils \
+       clean-bison \
        clean-byacc \
-       clean-cvs \
+       clean-bzip2 \
+       $(start-sanitize-cygnus) \
+       clean-cgen \
+       $(end-sanitize-cygnus) \
+       clean-cvssrc \
        clean-db \
        clean-dejagnu \
        clean-diff \
@@ -736,8 +921,12 @@ CLEAN_MODULES = \
        clean-findutils \
        clean-find \
        clean-flex \
+       $(start-sanitize-cygnus) \
+       clean-flexlm \
+       $(end-sanitize-cygnus) \
        clean-gas \
        clean-gawk \
+       clean-gettext \
        clean-gnuserv \
        clean-gprof \
        clean-grep \
@@ -749,13 +938,20 @@ CLEAN_MODULES = \
        $(end-sanitize-ide) \
        clean-indent \
        clean-inet \
+       clean-intl \
        clean-ispell \
        clean-itcl \
+       $(start-sanitize-ide) \
+       clean-jstools \
+       $(end-sanitize-ide) \
        clean-ld \
+       clean-libgui \
        clean-libiberty \
        $(start-sanitize-ide) \
        clean-libide \
+       clean-libidetcl \
        $(end-sanitize-ide) \
+       clean-libtool \
        clean-m4 \
        clean-make \
        clean-mmalloc \
@@ -771,7 +967,9 @@ CLEAN_MODULES = \
        clean-send-pr \
        clean-shellutils \
        clean-sim \
-       clean-sn \
+       $(start-sanitize-cygnus) \
+       clean-snavigator \
+       $(end-sanitize-cygnus) \
        clean-tar \
        clean-tcl \
        clean-texinfo \
@@ -786,6 +984,9 @@ CLEAN_MODULES = \
 
 # 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 \
@@ -794,7 +995,15 @@ CLEAN_TARGET_MODULES = \
        clean-target-winsup \
        clean-target-libgloss \
        clean-target-libiberty \
-       clean-target-examples
+       clean-target-gperf \
+       clean-target-examples \
+       clean-target-libstub \
+       $(start-sanitize-java) \
+       clean-target-libjava \
+       clean-target-boehm-gc \
+       clean-target-qthreads \
+       $(end-sanitize-java) \
+       clean-target-cygmon
 
 # All of the x11 modules that can be cleaned
 CLEAN_X11_MODULES = \
@@ -805,11 +1014,8 @@ CLEAN_X11_MODULES = \
        clean-gash \
        clean-guile \
        clean-tclX \
-       clean-tk
-
-# The first rule in the file had better be this one.  Don't put any above it.
-all: all.normal
-.PHONY: all
+       clean-tk \
+       clean-tix
 
 # The target built for a native build.
 .PHONY: all.normal
@@ -856,12 +1062,12 @@ $(DO_X):
              done; \
              ;; \
            esac ; \
-           export AR AS CC CXX LD NM RANLIB DLLTOOL; \
+           export AR AS CC CXX LD NM RANLIB DLLTOOL WINDRES; \
            if (cd ./$$i; \
                $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                        "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                        "RANLIB=$${RANLIB}" \
-                       "DLLTOOL=$${DLLTOOL}" \
+                       "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
                        $${target}); \
            then true; else exit 1; fi; \
          else true; fi; \
@@ -875,12 +1081,12 @@ $(DO_X):
            for flag in $(EXTRA_TARGET_FLAGS); do \
                eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'|"`; \
            done; \
-           export AR AS CC CXX LD NM RANLIB DLLTOOL; \
+           export AR AS CC CXX LD NM RANLIB DLLTOOL WINDRES; \
            if (cd $(TARGET_SUBDIR)/$$i; \
                $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                        "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                        "RANLIB=$${RANLIB}" \
-                       "DLLTOOL=$${DLLTOOL}" \
+                       "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
                        $${target}); \
            then true; else exit 1; fi; \
          else true; fi; \
@@ -905,10 +1111,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
@@ -960,10 +1166,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"
@@ -1030,6 +1258,30 @@ gcc-no-fixedincludes:
          mv gcc/tmp-include gcc/include 2>/dev/null; \
        else true; fi
 
+# start-sanitize-ide
+# Install Foundry.  Avoid installing a bunch of stuff we don't need.
+install-foundry:
+       mods="$(INSTALL_MODULES)"; \
+       x11_mods="$(INSTALL_X11_MODULES)"; \
+       for d in install-tcl install-tk install-itcl install-tix install-ilu; do \
+         mods="`echo $${mods} | sed -e "s/$$d//"`"; \
+         x11_mods="`echo $${x11_mods} | sed -e "s/$$d//"`"; \
+       done; \
+       $(MAKE) INSTALL_MODULES="$${mods}" INSTALL_X11_MODULES="$${x11_mods}" install
+       for d in tcl tk itcl tix ilu; do \
+         if [ -f $$d/Makefile ]; then \
+           r=`pwd`; export r; \
+           s=`cd $(srcdir); pwd`; export s; \
+           $(SET_LIB_PATH) \
+           (cd $$d; $(MAKE) $(FLAGS_TO_PASS) install-minimal); \
+         else \
+           true; \
+         fi; \
+       date '+%D %r' > builddate \
+       $(INSTALL_DATA) builddate $(datadir)/builddate ; \
+       done
+# end-sanitize-ide
+
 # This rule is used to build the modules which use FLAGS_TO_PASS.  To
 # build a target all-X means to cd to X and make all.
 #
@@ -1135,6 +1387,7 @@ $(CONFIGURE_TARGET_MODULES):
             LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
            NM="$(NM_FOR_TARGET)"; export NM; \
            RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
+           WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
            echo Configuring in $(TARGET_SUBDIR)/$${dir}; \
            cd $(TARGET_SUBDIR)/$${dir}; \
            case $(srcdir) in \
@@ -1171,11 +1424,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; \
@@ -1263,7 +1518,7 @@ $(CHECK_X11_MODULES):
 # This rule is used to install the modules which use X11_FLAGS_TO_PASS.
 # To build a target install-X means to cd to X and make install.
 .PHONY: $(INSTALL_X11_MODULES)
-$(INSTALL_X11_MODULES):
+$(INSTALL_X11_MODULES): installdirs
        @dir=`echo $@ | sed -e 's/install-//'`; \
        if [ -f ./$${dir}/Makefile ] ; then \
          r=`pwd`; export r; \
@@ -1287,16 +1542,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:
@@ -1320,7 +1616,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.
@@ -1341,18 +1646,33 @@ install-dosrel-fake:
 
 # This is a list of inter-dependencies among modules.
 all-apache:
-all-autoconf: all-m4
-all-automake:
+all-ash:
+all-autoconf: all-m4 all-texinfo
+all-automake: all-m4 all-texinfo
 all-bash:
-all-bfd:
-all-binutils: all-libiberty all-opcodes all-bfd all-flex all-byacc
+all-bfd: all-libiberty all-intl
+all-binutils: all-libiberty all-opcodes all-bfd all-flex all-bison all-byacc all-intl
+all-bison: all-texinfo
+# start-sanitize-java
+all-target-boehm-gc: configure-target-boehm-gc
+# end-sanitize-java
 all-byacc:
-all-cvs:
+all-bzip2:
+# start-sanitize-cygnus
+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
+all-sim: all-cgen
+# end-sanitize-cygnus
+all-cvssrc:
+configure-target-cygmon: $(ALL_GCC)
+all-target-cygmon: configure-target-cygmon all-gas all-ld all-gcc all-target-libiberty all-target-newlib all-target-libio all-target-libstub
 all-db:
 all-dejagnu: all-tcl all-expect all-tk
 all-diff: all-libiberty
 all-emacs:
-all-emacs19: all-byacc
+all-emacs19: all-bison all-byacc
 all-etc:
 configure-target-examples: $(ALL_GCC)
 all-target-examples: configure-target-examples
@@ -1360,18 +1680,26 @@ all-expect: all-tcl all-tk
 all-fileutils: all-libiberty
 all-findutils:
 all-find:
-all-flex: all-libiberty all-byacc
-all-gas: all-libiberty all-opcodes all-bfd
+all-flex: all-libiberty all-bison all-byacc
+# start-sanitize-cygnus
+all-flexlm:
+# end-sanitize-cygnus
+all-gas: all-libiberty all-opcodes all-bfd all-intl
 all-gash: all-tcl
 all-gawk:
 ALL_GCC = all-gcc
-all-gcc: all-byacc all-binutils all-gas all-ld
-all-bootstrap: all-libiberty all-byacc all-binutils all-gas all-ld
-GDB_TK = all-tk all-tcl
-all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK)
+all-gcc: all-bison all-byacc all-binutils all-gas all-ld
+all-bootstrap: all-libiberty all-bison all-byacc all-binutils all-gas all-ld
+GDB_TK = all-tk all-tcl all-itcl all-tix all-libgui
+# start-sanitize-ide
+GDB_TK = all-tk all-tcl all-itcl all-tix all-libgui all-libide all-libidetcl
+# end-sanitize-ide
+all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-bison all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK)
+all-gettext:
 all-gnuserv:
-all-gprof: all-libiberty all-bfd all-opcodes
-all-grep: all-libiberty
+configure-target-gperf: $(ALL_GCC)
+all-target-gperf: configure-target-gperf all-target-libiberty all-target-libstdc++
+all-gprof: all-libiberty all-bfd all-opcodes all-intl
 all-grez: all-libiberty all-bfd all-opcodes
 all-gui: all-gdb all-libproc all-target-librx
 all-guile:
@@ -1382,23 +1710,41 @@ all-ilu:
 # end-sanitize-ide
 all-indent:
 all-inet: all-tcl all-send-pr all-perl
+all-intl:
 all-ispell: all-emacs19
-all-itcl: all-tcl all-tk
-all-ld: all-libiberty all-bfd all-opcodes all-byacc all-flex
+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)
 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-tcl8.1 all-tk8.1 all-itcl
 all-libiberty:
 # start-sanitize-ide
-all-libide: all-tcl all-tk all-itcl all-ilu
+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 configure-target-qthreads
+all-target-libjava: configure-target-libjava all-gcc 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
 configure-target-libstdc++: $(ALL_GCC)
 all-target-libstdc++: configure-target-libstdc++ all-gas all-ld all-gcc all-target-libiberty all-target-newlib all-target-libio
+configure-target-libstub: $(ALL_GCC)
+all-target-libstub: configure-target-libstub
+all-libtool:
 all-m4: all-libiberty
 all-make: all-libiberty
 all-mmalloc:
@@ -1408,34 +1754,44 @@ 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
 all-sed: all-libiberty
 all-send-pr: all-prms
 all-shellutils:
-all-sim: all-libiberty all-bfd all-opcodes
-all-sn: all-tcl all-tk all-itcl all-db
+all-sim: all-libiberty all-bfd all-opcodes all-readline
+# start-sanitize-cygnus
+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-tcl8.1 all-tk8.1
 # start-sanitize-ide
-all-vmake: all-tcl all-tk all-itcl all-libide
+all-vmake: all-tcl all-tk all-itcl all-tix all-libgui all-libide all-libidetcl
 # end-sanitize-ide
 all-wdiff:
-all-target-winsup: all-target-newlib all-target-libiberty all-target-librx all-target-libio configure-target-winsup 
+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
 configure-target-libiberty: $(ALL_GCC)
 all-target-libiberty: configure-target-libiberty all-gcc all-ld all-target-newlib
 all-target: $(ALL_TARGET_MODULES)
 install-target: $(INSTALL_TARGET_MODULES)
-
+# start-sanitize-gdbtk
+install-gdb: install-tcl install-tk install-itcl install-tix install-libgui
+#end-sanitize-gdbtk
 ### other supporting targets
 
 MAKEDIRS= \
@@ -1468,7 +1824,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
 
 #
@@ -1478,10 +1834,10 @@ 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
+       mkinstalldirs ltconfig ltmain.sh missing ylwrap
 
 # Files in devo/etc used in any net release.
 # ChangeLog omitted because it may refer to files which are not in this
@@ -1497,11 +1853,9 @@ SUPPORT_FILES = list-of-support-files-for-tool-in-question
 
 taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) \
   texinfo/texinfo.tex texinfo/gpl.texinfo texinfo/lgpl.texinfo
-       # Take out texinfo from a few places; make simple BISON=bison line.
+       # Take out texinfo from a few places.
        sed -e '/^all\.normal: /s/\all-texinfo //' \
            -e '/^      install-texinfo /d' \
-           -e '/^BISON = `if/,/^$$/d' \
-           -e '/^# BISON:/s/.*/BISON = $(DEFAULT_YACC)/' \
        <Makefile.in >tmp
        mv -f tmp Makefile.in
        #
@@ -1552,9 +1906,13 @@ 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`
-       $(MAKE) -f Makefile.in do-tar-gz TOOL=$(TOOL) \
-               VER=`sed <$(TOOL)/Makefile.in -n 's/^VERSION *= *//p'`
+       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 \
+         ver=`sed <$(TOOL)/Makefile.in -n 's/^VERSION *= *//p'`; \
+       fi; \
+       $(MAKE) -f Makefile.in do-tar-gz TOOL=$(TOOL) VER=$$ver
 
 do-tar-gz:
        echo "==> Making $(TOOL)-$(VER).tar.gz"
@@ -1567,14 +1925,14 @@ TEXINFO_SUPPORT= texinfo/texinfo.tex texinfo/gpl.texinfo texinfo/lgpl.texinfo
 DIST_SUPPORT= $(DEVO_SUPPORT) $(TEXINFO_SUPPORT)
 
 .PHONY: gas.tar.gz
-GAS_SUPPORT_DIRS= bfd include libiberty opcodes setup.com makefile.vms
+GAS_SUPPORT_DIRS= bfd include libiberty opcodes intl setup.com makefile.vms
 gas.tar.gz: $(DIST_SUPPORT) $(GAS_SUPPORT_DIRS) gas
        $(MAKE) -f Makefile.in taz TOOL=gas \
                SUPPORT_FILES="$(GAS_SUPPORT_DIRS)"
 
 # The FSF "binutils" release includes gprof and ld.
 .PHONY: binutils.tar.gz
-BINUTILS_SUPPORT_DIRS= bfd gas include libiberty opcodes ld gprof setup.com makefile.vms
+BINUTILS_SUPPORT_DIRS= bfd gas include libiberty opcodes ld gprof intl setup.com makefile.vms
 binutils.tar.gz: $(DIST_SUPPORT) $(BINUTILS_SUPPORT_DIRS) binutils
        $(MAKE) -f Makefile.in taz TOOL=binutils \
                SUPPORT_FILES="$(BINUTILS_SUPPORT_DIRS) makeall.bat configure.bat"
@@ -1597,7 +1955,7 @@ gnats.tar.gz: $(DIST_SUPPORT) $(GNATS_SUPPORT_DIRS) gnats
                SUPPORT_FILES="$(GNATS_SUPPORT_DIRS)"
 
 .PHONY: gdb.tar.gz
-GDB_SUPPORT_DIRS= bfd include libiberty mmalloc opcodes readline sim utils
+GDB_SUPPORT_DIRS= bfd include libiberty mmalloc opcodes readline sim utils intl
 GDBTK_SUPPORT_DIRS= `if [ -d tcl -a -d tk ] ; then echo tcl tk ; fi`
 gdb.tar.gz: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
        $(MAKE) -f Makefile.in taz TOOL=gdb \
@@ -1624,11 +1982,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