2001-01-20 Maciej W. Rozycki <macro@ds2.pg.gda.pl>
[deliverable/binutils-gdb.git] / Makefile.in
index 3840e4dbe089b097f80eb010dc9fdced5c74a9c5..14a775634bc9d6c8801c0404d17abd6d808b9e53 100644 (file)
@@ -1,6 +1,7 @@
 #
 # Makefile for directory with subdirs to build.
-#   Copyright (C) 1990, 1991, 1992, 1993 Free Software Foundation
+#   Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+#   1999, 2000, 2001 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
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 
 srcdir = .
 
 prefix = /usr/local
-
 exec_prefix = $(prefix)
-bindir = $(exec_prefix)/bin
-libdir = $(exec_prefix)/lib
-tooldir = $(exec_prefix)/$(target)
+
+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
+gxx_include_dir=${includedir}/g++
+
+tooldir = $(exec_prefix)/$(target_alias)
+build_tooldir = $(exec_prefix)/$(target_alias)
 
 program_transform_name =
 
-datadir = $(prefix)/lib
-mandir = $(prefix)/man
 man1dir = $(mandir)/man1
 man2dir = $(mandir)/man2
 man3dir = $(mandir)/man3
@@ -41,15 +53,20 @@ man8dir = $(mandir)/man8
 man9dir = $(mandir)/man9
 infodir = $(prefix)/info
 includedir = $(prefix)/include
-docdir = $(datadir)/doc
+# Directory in which the compiler finds executables, libraries, etc.
+libsubdir = $(libdir)/gcc-lib/$(target_alias)/$(gcc_version)
 GDB_NLM_DEPS = 
 
 SHELL = /bin/sh
 
-INSTALL = $${srcroot}/install.sh -c
-INSTALL_PROGRAM = $(INSTALL)
+# INSTALL_PROGRAM_ARGS is changed by configure.in to use -x for a
+# cygwin host.
+INSTALL_PROGRAM_ARGS =
+
+INSTALL = $(SHELL) $$s/install-sh -c
+INSTALL_PROGRAM = $(INSTALL) $(INSTALL_PROGRAM_ARGS)
+INSTALL_SCRIPT = $(INSTALL)
 INSTALL_DATA = $(INSTALL) -m 644
-INSTALL_XFORM = $(INSTALL) -t='$(program_transform_name)'
 
 INSTALL_DOSREL = install-dosrel-fake
 
@@ -64,47 +81,67 @@ 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
+
+LDFLAGS = 
 LIBCFLAGS = $(CFLAGS)
 CFLAGS_FOR_TARGET = $(CFLAGS)
+LDFLAGS_FOR_TARGET = 
 LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
 PICFLAG = 
 PICFLAG_FOR_TARGET = 
 
-# start-sanitize-chill
 CHILLFLAGS = $(CFLAGS)
 CHILL_LIB = -lchill
-# end-sanitize-chill
-CXX = gcc
+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
 
 RANLIB = ranlib
+
+DLLTOOL = dlltool
+WINDRES = windres
+
 NM = nm
-# Not plain GZIP, since gzip looks there for extra command-line options.
-GZIPPROG = gzip
 
-# 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 byacc ; \
+LD = ld
+
+BZIPPROG = bzip2
+MD5PROG = md5sum
+
+# 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/ ; \
+        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 ] ; \
        then echo $$r/flex/flex ; \
-       else echo flex ; fi`
+       else echo ${DEFAULT_LEX} ; fi`
 
 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/makeinfo ] ; \
+MAKEINFO = `if [ -f $$r/texinfo/makeinfo/Makefile ] ; \
        then echo $$r/texinfo/makeinfo/makeinfo ; \
        else echo makeinfo ; fi`
 
@@ -117,8 +154,8 @@ EXPECT = `if [ -f $$r/expect/expect ] ; \
        then echo $$r/expect/expect ; \
        else echo expect ; fi`
 
-RUNTEST = `if [ -f $${srcroot}/dejagnu/runtest ] ; \
-       then echo $${srcroot}/dejagnu/runtest ; \
+RUNTEST = `if [ -f $$s/dejagnu/runtest ] ; \
+       then echo $$s/dejagnu/runtest ; \
        else echo runtest ; fi`
 
 
@@ -132,70 +169,67 @@ 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
+TARGET_CONFIGDIRS = libiberty libgloss $(SPECIAL_LIBS) newlib libio librx libstdc++ libg++ winsup opcodes bsp libstub cygmon libf2c libchill libobjc
 
 # Target libraries are put under this directory:
-TARGET_SUBDIR = . # Changed by configure to $(target_alias) if cross.
+# Changed by configure to $(target_alias) if cross.
+TARGET_SUBDIR = .
 
 # This is set by the configure script to the arguments passed to configure.
 CONFIG_ARGUMENTS = 
 
+# This is set by configure to REALLY_SET_LIB_PATH if --enable-shared
+# was used.
+SET_LIB_PATH =
+
+# This is the name of the environment variable used for the path to
+# the libraries.  This may be changed by configure.in.
+RPATH_ENVVAR = LD_LIBRARY_PATH
+
+# This is the list of directories that may be needed in RPATH_ENVVAR
+# so that programs built for the host machine work.
+HOST_LIB_PATH = $$r/bfd:$$r/opcodes
+
+# This is the list of directories that may be needed in RPATH_ENVVAR
+# so that prorgams built for the target machine work.
+TARGET_LIB_PATH = $$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs:$$r/$(TARGET_SUBDIR)/libstdc++
+
+# configure.in sets SET_LIB_PATH to this if --enable-shared was used.
+# Some platforms don't like blank entries, so we remove duplicate,
+# leading and trailing colons.
+REALLY_SET_LIB_PATH = \
+  $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH):$(TARGET_LIB_PATH):$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
+
 ALL = all.normal
-INSTALL_TARGET = install-dirs \
+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/Makefile ] ; then \
-    if [ -f $$r/$(TARGET_SUBDIR)/newlib/Makefile ] ; then \
-      echo $$r/gcc/xgcc -B$$r/gcc/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $${srcroot}/newlib/libc/include -nostdinc; \
-    else \
-      echo $$r/gcc/xgcc -B$$r/gcc/; \
-    fi; \
-  else \
-    if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
-      echo $(CC); \
-    else \
-      t='$(program_transform_name)'; echo gcc | sed -e 's/x/x/' $$t; \
-    fi; \
-  fi`
-
-# start-sanitize-chill
-CHILL_FOR_TARGET = ` \
-  if [ -f $$r/gcc/Makefile ] ; then \
-    echo $$r/gcc/xgcc -B$$r/gcc/ -L$$r/gcc/ch/runtime/; \
-  else \
-    if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
-      echo $(CC); \
-    else \
-      t='$(program_transform_name)'; echo gcc | sed -e 's/x/x/' $$t; \
-    fi; \
-  fi`
-
-# end-sanitize-chill
+# Should be substed by configure.in
+FLAGS_FOR_TARGET =
+CC_FOR_TARGET =
+CHILL_FOR_TARGET =
+CXX_FOR_TARGET =
 
-CXX_FOR_TARGET = ` \
-  if [ -f $$r/gcc/Makefile ] ; then \
-    if [ -f $$r/$(TARGET_SUBDIR)/newlib/Makefile ] ; then \
-      echo $$r/gcc/xgcc -B$$r/gcc/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $${srcroot}/newlib/libc/include -nostdinc; \
-    else \
-      echo $$r/gcc/xgcc -B$$r/gcc/; \
-    fi; \
-  else \
-    if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
-      echo $(CXX); \
-    else \
-      t='$(program_transform_name)'; echo gcc | sed -e 's/x/x/' $$t; \
-    fi; \
-  fi`
+# If GCC_FOR_TARGET is not overriden on the command line, then this
+# variable is passed down to the gcc Makefile, where it is used to
+# build libgcc2.a.  We define it here so that it can itself be
+# overridden on the command line.
+GCC_FOR_TARGET = $$r/gcc/xgcc -B$$r/gcc/ $(FLAGS_FOR_TARGET)
 
 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); \
@@ -205,8 +239,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); \
@@ -226,6 +260,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 ; \
@@ -249,8 +294,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); \
@@ -259,6 +304,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.
 ###
 
@@ -273,21 +330,18 @@ 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)" \
        "CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \
        "DLLTOOL_FOR_TARGET=$(DLLTOOL_FOR_TARGET)" \
-       "GCC_FOR_TARGET=$(CC_FOR_TARGET)" \
        "INSTALL=$(INSTALL)" \
        "INSTALL_DATA=$(INSTALL_DATA)" \
        "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
-       "INSTALL_XFORM=$(INSTALL_XFORM)" \
+       "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
        "LDFLAGS=$(LDFLAGS)" \
        "LEX=$(LEX)" \
        "LD_FOR_TARGET=$(LD_FOR_TARGET)" \
@@ -296,19 +350,40 @@ BASE_FLAGS_TO_PASS = \
        "LIBCXXFLAGS=$(LIBCXXFLAGS)" \
        "LIBCXXFLAGS_FOR_TARGET=$(LIBCXXFLAGS_FOR_TARGET)" \
        "M4=$(M4)" \
+       "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)" \
+       "build_tooldir=$(build_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.
@@ -318,8 +393,11 @@ EXTRA_HOST_FLAGS = \
        'AS=$(AS)' \
        'CC=$(CC)' \
        'CXX=$(CXX)' \
+       'DLLTOOL=$(DLLTOOL)' \
+       'LD=$(LD)' \
        'NM=$(NM)' \
-       'RANLIB=$(RANLIB)'
+       'RANLIB=$(RANLIB)' \
+       'WINDRES=$(WINDRES)'
 
 FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)
 
@@ -351,8 +429,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)
 
@@ -363,49 +441,78 @@ TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
 # The HOST_* variables are a special case, which are used for the gcc
 # cross-building scheme.
 EXTRA_GCC_FLAGS = \
-       'AR=$$(AR_FOR_TARGET)' \
+       'AR=$(AR)' \
        'AS=$(AS)' \
        'CC=$(CC)' \
        'CXX=$(CXX)' \
+       'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
        'HOST_CC=$(CC_FOR_BUILD)' \
        'HOST_PREFIX=$(HOST_PREFIX)' \
        'HOST_PREFIX_1=$(HOST_PREFIX_1)' \
        'NM=$(NM)' \
-       'RANLIB=$$(RANLIB_FOR_TARGET)'
+       'RANLIB=$(RANLIB)' \
+       'WINDRES=$$(WINDRES_FOR_TARGET)' \
+       "GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \
+       "`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)
 
 # This is a list of the targets for all of the modules which are compiled
 # 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 \
+       all-cgen \
+       all-cvssrc \
+       all-db \
        all-dejagnu \
        all-diff \
        all-dosutils \
        all-etc \
        all-fileutils \
+       all-findutils \
        all-find \
        all-flex \
        all-gas \
        all-gawk \
+       all-gettext \
+       all-gnuserv \
        all-gprof \
        all-grep \
        all-grez \
        all-gzip \
        all-hello \
        all-indent \
+       all-inet \
+       all-intl \
        all-ispell \
+       all-itcl \
        all-ld \
+       all-libgui \
        all-libiberty \
+       all-libtool \
        all-m4 \
        all-make \
        all-mmalloc \
        all-opcodes \
        all-patch \
+       all-perl \
        all-prms \
        all-rcs \
        all-readline \
@@ -414,18 +521,22 @@ ALL_MODULES = \
        all-sed \
        all-send-pr \
        all-shellutils \
+       all-sid \
        all-sim \
+       all-snavigator \
        all-tar \
        all-tcl \
+       all-tcl8.1 \
        all-texinfo \
        all-textutils \
        all-tgas \
        all-time \
        all-uudecode \
-       all-wdiff 
+       all-wdiff \
+       all-zip \
+       all-zlib \
+       $(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).
 # This is a list of the check targets for all of the modules which are
 # compiled using $(FLAGS_TO_PASS).
 #
@@ -433,34 +544,52 @@ 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
+       check-flex \
+       check-zip
 
 CROSS_CHECK_MODULES = \
+       check-apache \
+       check-ash \
        check-autoconf \
+       check-automake \
+       check-bash \
        check-bfd \
        check-binutils \
-       check-cvs \
+       check-bzip2 \
+       check-cgen \
+       check-cvssrc \
+       check-db \
        check-dejagnu \
        check-diff \
        check-etc \
        check-fileutils \
+       check-findutils \
        check-find \
        check-gas \
        check-gawk \
+       check-gettext \
+       check-gnuserv \
        check-gprof \
        check-grep \
        check-gzip \
        check-hello \
        check-indent \
+       check-inet \
+       check-intl \
        check-ispell \
+       check-itcl \
        check-ld \
+       check-libgui \
        check-libiberty \
+       check-libtool \
        check-m4 \
        check-make \
        check-mmcheckoc \
        check-opcodes \
        check-patch \
+       check-perl \
        check-prms \
        check-rcs \
        check-readline \
@@ -468,6 +597,8 @@ CROSS_CHECK_MODULES = \
        check-sed \
        check-send-pr \
        check-shellutils \
+       check-snavigator \
+       check-sid \
        check-sim \
        check-tar \
        check-tcl \
@@ -476,41 +607,66 @@ CROSS_CHECK_MODULES = \
        check-tgas \
        check-time \
        check-uudecode \
-       check-wdiff
+       check-wdiff \
+       $(EXTRA_TARGET_HOST_CHECK_MODULES)
 
 CHECK_MODULES=$(NATIVE_CHECK_MODULES) $(CROSS_CHECK_MODULES)
 
 # This is a list of the install targets for all of the modules which are
 # compiled using $(FLAGS_TO_PASS).
+# 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-cgen \
+       install-cvssrc \
+       install-db \
        install-dejagnu \
        install-diff \
        install-dosutils \
        install-etc \
        install-fileutils \
+       install-findutils \
        install-find \
        install-flex \
        install-gas \
        install-gawk \
+       install-gettext \
+       install-gnuserv \
        install-gprof \
        install-grep \
        install-grez \
        install-gzip \
        install-hello \
        install-indent \
+       install-inet \
+       install-intl \
        install-ispell \
+       install-tcl \
+       install-tcl8.1 \
+       install-itcl \
        install-ld \
+       install-libgui \
        install-libiberty \
+       install-libtool \
        install-m4 \
        install-make \
        install-mmalloc \
-       install-opcodes \
        install-patch \
+       install-perl \
        install-prms \
        install-rcs \
        install-readline \
@@ -518,15 +674,17 @@ INSTALL_MODULES = \
        install-sed \
        install-send-pr \
        install-shellutils \
+       install-sid \
        install-sim \
+       install-snavigator \
        install-tar \
-       install-tcl \
-       install-texinfo \
        install-textutils \
        install-tgas \
        install-time \
        install-uudecode \
-       install-wdiff
+       install-wdiff \
+       install-zip \
+       $(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).
@@ -536,18 +694,23 @@ ALL_X11_MODULES = \
        all-gdb \
        all-expect \
        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).
 CHECK_X11_MODULES = \
        check-emacs \
        check-gdb \
+       check-guile \
        check-expect \
        check-gash \
        check-tclX \
-       check-tk
+       check-tk \
+       check-tix
 
 # This is a list of the install targets for all the modules which are
 # compiled using $(X11_FLAGS_TO_PASS).
@@ -555,66 +718,222 @@ INSTALL_X11_MODULES = \
        install-emacs \
        install-emacs19 \
        install-gdb \
+       install-guile \
        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).
 ALL_TARGET_MODULES = \
        all-target-libio \
        all-target-libstdc++ \
+       all-target-libstdc++-v3 \
        all-target-librx \
        all-target-libg++ \
        all-target-newlib \
+       all-target-libf2c \
+       all-target-libchill \
+       all-target-libobjc \
+       all-target-libtermcap \
        all-target-winsup \
        all-target-libgloss \
-       all-target-libiberty
+       all-target-libiberty \
+       all-target-gperf \
+       all-target-examples \
+       all-target-libstub \
+       all-target-libffi \
+       all-target-libjava \
+       all-target-zlib \
+       all-target-boehm-gc \
+       all-target-qthreads \
+       all-target-bsp \
+       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 = \
        configure-target-libio \
        configure-target-libstdc++ \
+       configure-target-libstdc++-v3 \
        configure-target-librx \
        configure-target-libg++ \
        configure-target-newlib \
+       configure-target-libf2c \
+       configure-target-libchill \
+       configure-target-libobjc \
+       configure-target-libtermcap \
        configure-target-winsup \
        configure-target-libgloss \
-       configure-target-libiberty
+       configure-target-libiberty \
+       configure-target-gperf \
+       configure-target-examples \
+       configure-target-libstub \
+       configure-target-libffi \
+       configure-target-libjava \
+       configure-target-zlib \
+       configure-target-boehm-gc \
+       configure-target-qthreads \
+       configure-target-bsp \
+       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 = \
        check-target-libio \
        check-target-libstdc++ \
+       check-target-libstdc++-v3 \
        check-target-libg++ \
        check-target-newlib \
+       check-target-libf2c \
+       check-target-libchill \
+       check-target-libobjc \
        check-target-winsup \
-       check-target-libiberty
+       check-target-libiberty \
+       check-target-libffi \
+       check-target-libjava \
+       check-target-zlib \
+       check-target-boehm-gc \
+       check-target-qthreads \
+       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 = \
        install-target-libio \
        install-target-libstdc++ \
+       install-target-libstdc++-v3 \
        install-target-libg++ \
        install-target-newlib \
+       install-target-libf2c \
+       install-target-libchill \
+       install-target-libobjc \
+       install-target-libtermcap \
        install-target-winsup \
        install-target-libgloss \
-       install-target-libiberty
-
-# The first rule in the file had better be this one.  Don't put any above it.
-all: all.normal
-.PHONY: all
+       install-target-libiberty \
+       install-target-bsp \
+       install-target-libjava \
+       install-target-zlib \
+       install-target-boehm-gc \
+       install-target-qthreads \
+       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-bzip2 \
+       clean-cgen \
+       clean-cvssrc \
+       clean-db \
+       clean-dejagnu \
+       clean-diff \
+       clean-dosutils \
+       clean-etc \
+       clean-fileutils \
+       clean-findutils \
+       clean-find \
+       clean-flex \
+       clean-gas \
+       clean-gawk \
+       clean-gettext \
+       clean-gnuserv \
+       clean-gprof \
+       clean-grep \
+       clean-grez \
+       clean-gzip \
+       clean-hello \
+       clean-indent \
+       clean-inet \
+       clean-intl \
+       clean-ispell \
+       clean-itcl \
+       clean-ld \
+       clean-libgui \
+       clean-libiberty \
+       clean-libtool \
+       clean-m4 \
+       clean-make \
+       clean-mmalloc \
+       clean-opcodes \
+       clean-patch \
+       clean-perl \
+       clean-prms \
+       clean-rcs \
+       clean-readline \
+       clean-release \
+       clean-recode \
+       clean-sed \
+       clean-send-pr \
+       clean-shellutils \
+       clean-sid \
+       clean-sim \
+       clean-snavigator \
+       clean-tar \
+       clean-tcl \
+       clean-texinfo \
+       clean-textutils \
+       clean-tgas \
+       clean-time \
+       clean-uudecode \
+       clean-wdiff \
+       clean-zip \
+       clean-zlib
+
+# All of the target modules that can be cleaned
+CLEAN_TARGET_MODULES = \
+       clean-target-libio \
+       clean-target-libstdc++ \
+       clean-target-libstdc++-v3 \
+       clean-target-librx \
+       clean-target-libg++ \
+       clean-target-newlib \
+       clean-target-libf2c \
+       clean-target-libchill \
+       clean-target-libobjc \
+       clean-target-winsup \
+       clean-target-libgloss \
+       clean-target-libiberty \
+       clean-target-gperf \
+       clean-target-examples \
+       clean-target-libstub \
+       clean-target-libffi \
+       clean-target-libjava \
+       clean-target-zlib \
+       clean-target-boehm-gc \
+       clean-target-qthreads \
+       clean-target-bsp \
+       clean-target-cygmon
+
+# All of the x11 modules that can be cleaned
+CLEAN_X11_MODULES = \
+       clean-emacs \
+       clean-emacs19 \
+       clean-gdb \
+       clean-expect \
+       clean-gash \
+       clean-guile \
+       clean-tclX \
+       clean-tk \
+       clean-tix
 
 # The target built for a native build.
 .PHONY: all.normal
 all.normal: \
        $(ALL_MODULES) \
-       $(ALL_TARGET_MODULES) \
        $(ALL_X11_MODULES) \
+       $(ALL_TARGET_MODULES) \
        all-gcc
 
 # Do a target for all the subdirectories.  A ``make do-X'' will do a
@@ -638,43 +957,47 @@ DO_X = \
 $(DO_X):
        @target=`echo $@ | sed -e 's/^do-//'`; \
        r=`pwd`; export r; \
-       srcroot=`cd $(srcdir); pwd`; export srcroot; \
+       s=`cd $(srcdir); pwd`; export s; \
+       $(SET_LIB_PATH) \
        for i in $(SUBDIRS) -dummy-; do \
          if [ -f ./$$i/Makefile ]; then \
            case $$i in \
            gcc) \
              for flag in $(EXTRA_GCC_FLAGS); do \
-               eval `echo "$$flag" | sed -e "s|^\(.*\)=\(.*\)|\1='\2'|"`; \
+               eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'|"`; \
              done; \
              ;; \
            *) \
              for flag in $(EXTRA_HOST_FLAGS); do \
-               eval `echo "$$flag" | sed -e "s|^\(.*\)=\(.*\)|\1='\2'|"`; \
+               eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'|"`; \
              done; \
              ;; \
            esac ; \
-           export AR AS CC CXX NM RANLIB; \
+           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}" "NM=$${NM}" \
+                       "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                        "RANLIB=$${RANLIB}" \
+                       "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
                        $${target}); \
            then true; else exit 1; fi; \
          else true; fi; \
        done
        @target=`echo $@ | sed -e 's/^do-//'`; \
        r=`pwd`; export r; \
-       srcroot=`cd $(srcdir); pwd`; export srcroot; \
+       s=`cd $(srcdir); pwd`; export s; \
+       $(SET_LIB_PATH) \
        for i in $(TARGET_CONFIGDIRS) -dummy-; do \
          if [ -f $(TARGET_SUBDIR)/$$i/Makefile ]; then \
            for flag in $(EXTRA_TARGET_FLAGS); do \
-               eval `echo "$$flag" | sed -e "s|^\(.*\)=\(.*\)|\1='\2'|"`; \
+               eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'|"`; \
            done; \
-           export AR AS CC CXX NM RANLIB; \
+           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}" "NM=$${NM}" \
+                       "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                        "RANLIB=$${RANLIB}" \
+                       "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
                        $${target}); \
            then true; else exit 1; fi; \
          else true; fi; \
@@ -689,17 +1012,23 @@ info: do-info
 installcheck: do-installcheck
 dvi: do-dvi
 
+# Make sure makeinfo is built before we do a `make info'.
+do-info: all-texinfo
+
 install-info: do-install-info dir.info
-       srcroot=`cd $(srcdir); pwd`; export srcroot; \
+       s=`cd $(srcdir); pwd`; export s; \
        if [ -f dir.info ] ; then \
          $(INSTALL_DATA) dir.info $(infodir)/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
+       -rm -f Makefile config.status config.cache mh-frag mt-frag
+       -if [ "$(TARGET_SUBDIR)" != "." ]; then \
+         rm -rf $(TARGET_SUBDIR); \
+       else true; fi
 
 local-maintainer-clean:
        @echo "This command is intended for maintainers to use;"
@@ -712,6 +1041,39 @@ maintainer-clean: local-maintainer-clean do-maintainer-clean local-clean
 maintainer-clean: local-distclean
 realclean: maintainer-clean
 
+# This rule is used to clean specific modules.
+.PHONY: $(CLEAN_MODULES) $(CLEAN_X11_MODULES) clean-gcc
+$(CLEAN_MODULES) $(CLEAN_X11_MODULES) clean-gcc:
+       @dir=`echo $@ | sed -e 's/clean-//'`; \
+       if [ -f ./$${dir}/Makefile ] ; then \
+         r=`pwd`; export r; \
+         s=`cd $(srcdir); pwd`; export s; \
+         $(SET_LIB_PATH) \
+         (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) clean); \
+       else \
+         true; \
+       fi
+
+.PHONY: $(CLEAN_TARGET_MODULES)
+$(CLEAN_TARGET_MODULES):
+       @dir=`echo $@ | sed -e 's/clean-target-//'`; \
+       rm -f $(TARGET_SUBDIR)/$${dir}/multilib.out $(TARGET_SUBDIR)/$${dir}/tmpmulti.out; \
+       if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
+         r=`pwd`; export r; \
+         s=`cd $(srcdir); pwd`; export s; \
+         $(SET_LIB_PATH) \
+         (cd $(TARGET_SUBDIR)/$${dir}; $(MAKE) $(TARGET_FLAGS_TO_PASS) clean); \
+       else \
+         true; \
+       fi
+
+clean-target: $(CLEAN_TARGET_MODULES) clean-target-libgcc
+clean-target-libgcc:
+       test ! -d gcc/libgcc || \
+       (cd gcc/libgcc && find . -type d -print) | \
+       while read d; do rm -f gcc/$$d/libgcc.a || : ; done
+       -rm -rf gcc/libgcc
+
 # Check target.
 
 .PHONY: check
@@ -720,10 +1082,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"
@@ -747,17 +1131,23 @@ vault-install:
 install.all: install-no-fixedincludes
        @if [ -f ./gcc/Makefile ] ; then \
                r=`pwd` ; export r ; \
+               $(SET_LIB_PATH) \
                (cd ./gcc; \
                $(MAKE) $(FLAGS_TO_PASS) install-headers) ; \
        else \
                true ; \
        fi
 
+# inet-install is used because the I*Net wants DejaGNU installed but
+# not built.  Similarly, gzip is built but not installed.
+inet-install:
+       $(MAKE) INSTALL_MODULES="`echo $(INSTALL_MODULES) | sed -e 's/install-dejagnu//' -e 's/install-gzip//'`" install
+
 # install-no-fixedincludes is used because Cygnus can not distribute
 # the fixed header files.
 .PHONY: install-no-fixedincludes
 install-no-fixedincludes: \
-       install-dirs \
+       installdirs \
        $(INSTALL_MODULES) \
        $(INSTALL_TARGET_MODULES) \
        $(INSTALL_X11_MODULES) \
@@ -776,7 +1166,8 @@ gcc-no-fixedincludes:
          touch gcc/stmp-fixinc gcc/include/fixed; \
          rm -f gcc/stmp-headers gcc/stmp-int-hdrs; \
          r=`pwd`; export r; \
-         srcroot=`cd $(srcdir); pwd` ; export srcroot; \
+         s=`cd $(srcdir); pwd` ; export s; \
+         $(SET_LIB_PATH) \
          (cd ./gcc; \
           $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
          rm -rf gcc/include; \
@@ -794,7 +1185,8 @@ $(ALL_MODULES) all-gui all-libproc:
        @dir=`echo $@ | sed -e 's/all-//'`; \
        if [ -f ./$${dir}/Makefile ] ; then \
          r=`pwd`; export r; \
-         srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         s=`cd $(srcdir); pwd`; export s; \
+         $(SET_LIB_PATH) \
          (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) all); \
        else \
          true; \
@@ -810,7 +1202,8 @@ $(NATIVE_CHECK_MODULES):
          dir=`echo $@ | sed -e 's/check-//'`; \
          if [ -f ./$${dir}/Makefile ] ; then \
            r=`pwd`; export r; \
-           srcroot=`cd $(srcdir); pwd`; export srcroot; \
+           s=`cd $(srcdir); pwd`; export s; \
+           $(SET_LIB_PATH) \
            (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) check); \
          else \
            true; \
@@ -821,7 +1214,8 @@ $(CROSS_CHECK_MODULES):
        @dir=`echo $@ | sed -e 's/check-//'`; \
        if [ -f ./$${dir}/Makefile ] ; then \
          r=`pwd`; export r; \
-         srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         s=`cd $(srcdir); pwd`; export s; \
+         $(SET_LIB_PATH) \
          (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) check); \
        else \
          true; \
@@ -830,11 +1224,12 @@ $(CROSS_CHECK_MODULES):
 # 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.
 .PHONY: $(INSTALL_MODULES)
-$(INSTALL_MODULES): install-dirs
+$(INSTALL_MODULES): installdirs
        @dir=`echo $@ | sed -e 's/install-//'`; \
        if [ -f ./$${dir}/Makefile ] ; then \
          r=`pwd`; export r; \
-         srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         s=`cd $(srcdir); pwd`; export s; \
+         $(SET_LIB_PATH) \
          (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) install); \
        else \
          true; \
@@ -845,34 +1240,102 @@ $(INSTALL_MODULES): install-dirs
 .PHONY: $(CONFIGURE_TARGET_MODULES)
 $(CONFIGURE_TARGET_MODULES):
        @dir=`echo $@ | sed -e 's/configure-target-//'`; \
-       if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
+       if [ -d $(TARGET_SUBDIR)/$${dir} ]; then \
+         r=`pwd`; export r; \
+         $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/$${dir}/tmpmulti.out 2> /dev/null; \
+         if [ -s $(TARGET_SUBDIR)/$${dir}/tmpmulti.out ]; then \
+           if [ -f $(TARGET_SUBDIR)/$${dir}/multilib.out ]; then \
+             if cmp $(TARGET_SUBDIR)/$${dir}/multilib.out $(TARGET_SUBDIR)/$${dir}/tmpmulti.out > /dev/null; then \
+               rm -f $(TARGET_SUBDIR)/$${dir}/tmpmulti.out; \
+             else \
+               echo "Multilibs changed for $${dir}, reconfiguring"; \
+               rm -f $(TARGET_SUBDIR)/$${dir}/multilib.out $(TARGET_SUBDIR)/$${dir}/Makefile; \
+               mv $(TARGET_SUBDIR)/$${dir}/tmpmulti.out $(TARGET_SUBDIR)/$${dir}/multilib.out; \
+             fi; \
+           else \
+             mv $(TARGET_SUBDIR)/$${dir}/tmpmulti.out $(TARGET_SUBDIR)/$${dir}/multilib.out; \
+           fi; \
+         fi; \
+       fi; exit 0      # break command into two pieces
+       @dir=`echo $@ | sed -e 's/configure-target-//'`; \
+       if [ ! -d $(TARGET_SUBDIR) ]; then \
+         true; \
+       elif [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
          true; \
        elif echo " $(TARGET_CONFIGDIRS) " | grep " $${dir} " >/dev/null 2>&1; then \
          if [ -d $(srcdir)/$${dir} ]; then \
            [ -d $(TARGET_SUBDIR)/$${dir} ] || mkdir $(TARGET_SUBDIR)/$${dir};\
            r=`pwd`; export r; \
-           srcroot=`cd $(srcdir); pwd`; export srcroot; \
+           s=`cd $(srcdir); pwd`; export s; \
+           $(SET_LIB_PATH) \
            AR="$(AR_FOR_TARGET)"; export AR; \
            AS="$(AS_FOR_TARGET)"; export AS; \
            CC="$(CC_FOR_TARGET)"; export CC; \
            CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
            CXX="$(CXX_FOR_TARGET)"; export CXX; \
            CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+           DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
            LD="$(LD_FOR_TARGET)"; export LD; \
+            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}; \
-           if [ -f $${srcroot}/$${dir}/configure ] ; then \
-             $${srcroot}/$${dir}/configure \
-               $(CONFIG_ARGUMENTS) --srcdir=$${srcroot}/$${dir}; \
+           case $(srcdir) in \
+           /*) \
+             topdir=$(srcdir) ;; \
+           *) \
+             case "$(TARGET_SUBDIR)" in \
+             .) topdir="../$(srcdir)" ;; \
+             *) topdir="../../$(srcdir)" ;; \
+             esac ;; \
+           esac; \
+           if [ "$(srcdir)" = "." ] ; then \
+             if [ "$(TARGET_SUBDIR)" != "." ] ; then \
+               if $(SHELL) $$s/symlink-tree $${topdir}/$${dir} "no-such-file" ; then \
+                 if [ -f Makefile ]; then \
+                   if $(MAKE) distclean; then \
+                     true; \
+                   else \
+                     exit 1; \
+                   fi; \
+                 else \
+                   true; \
+                 fi; \
+               else \
+                 exit 1; \
+               fi; \
+             else \
+               true; \
+             fi; \
+             srcdiroption="--srcdir=."; \
+             libsrcdir="."; \
+           else \
+             srcdiroption="--srcdir=$${topdir}/$${dir}"; \
+             libsrcdir="$$s/$${dir}"; \
+           fi; \
+           if [ -f $${libsrcdir}/configure ] ; then \
+             rm -f no-such-file skip-this-dir; \
+             CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+               $(CONFIG_ARGUMENTS) $${srcdiroption} \
+               --with-target-subdir="$(TARGET_SUBDIR)"; \
+           else \
+             rm -f no-such-file skip-this-dir; \
+             CONFIG_SITE=no-such-file $(SHELL) $$s/configure \
+               $(CONFIG_ARGUMENTS) $${srcdiroption} \
+               --with-target-subdir="$(TARGET_SUBDIR)"; \
+           fi; \
+           if [ -f skip-this-dir ] ; then \
+             sh skip-this-dir; \
+             rm -f skip-this-dir; \
+             cd ..; rmdir $${dir} || true; \
            else \
-             $${srcroot}/configure \
-               $(CONFIG_ARGUMENTS) --srcdir=$${srcroot}/$${dir}; \
+             true; \
            fi; \
          else \
            true; \
-         fi \
+         fi; \
        else \
          true; \
        fi
@@ -884,7 +1347,8 @@ $(ALL_TARGET_MODULES):
        @dir=`echo $@ | sed -e 's/all-target-//'`; \
        if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
          r=`pwd`; export r; \
-         srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         s=`cd $(srcdir); pwd`; export s; \
+         $(SET_LIB_PATH) \
          (cd $(TARGET_SUBDIR)/$${dir}; $(MAKE) $(TARGET_FLAGS_TO_PASS) all); \
        else \
          true; \
@@ -897,7 +1361,8 @@ $(CHECK_TARGET_MODULES):
        @dir=`echo $@ | sed -e 's/check-target-//'`; \
        if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
          r=`pwd`; export r; \
-         srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         s=`cd $(srcdir); pwd`; export s; \
+         $(SET_LIB_PATH) \
          (cd $(TARGET_SUBDIR)/$${dir};$(MAKE) $(TARGET_FLAGS_TO_PASS) check);\
        else \
          true; \
@@ -907,11 +1372,12 @@ $(CHECK_TARGET_MODULES):
 # TARGET_FLAGS_TO_PASS.  To build a target install-X means to cd to X
 # and make install.
 .PHONY: $(INSTALL_TARGET_MODULES)
-$(INSTALL_TARGET_MODULES): install-dirs
+$(INSTALL_TARGET_MODULES): installdirs
        @dir=`echo $@ | sed -e 's/install-target-//'`; \
        if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
          r=`pwd`; export r; \
-         srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         s=`cd $(srcdir); pwd`; export s; \
+         $(SET_LIB_PATH) \
          (cd $(TARGET_SUBDIR)/$${dir}; \
            $(MAKE) $(TARGET_FLAGS_TO_PASS) install); \
        else \
@@ -925,7 +1391,8 @@ $(ALL_X11_MODULES):
        @dir=`echo $@ | sed -e 's/all-//'`; \
        if [ -f ./$${dir}/Makefile ] ; then \
          r=`pwd`; export r; \
-         srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         s=`cd $(srcdir); pwd`; export s; \
+         $(SET_LIB_PATH) \
          (cd $${dir}; \
           $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all); \
        else \
@@ -939,7 +1406,8 @@ $(CHECK_X11_MODULES):
        @dir=`echo $@ | sed -e 's/check-//'`; \
        if [ -f ./$${dir}/Makefile ] ; then \
          r=`pwd`; export r; \
-         srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         s=`cd $(srcdir); pwd`; export s; \
+         $(SET_LIB_PATH) \
          (cd $${dir}; \
           $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check); \
        else \
@@ -949,11 +1417,12 @@ $(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; \
-         srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         s=`cd $(srcdir); pwd`; export s; \
+         $(SET_LIB_PATH) \
          (cd $${dir}; \
           $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install); \
        else \
@@ -965,17 +1434,71 @@ $(INSTALL_X11_MODULES):
 all-gcc:
        @if [ -f ./gcc/Makefile ] ; then \
          r=`pwd`; export r; \
-         srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         s=`cd $(srcdir); pwd`; export s; \
+         $(SET_LIB_PATH) \
          (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) all); \
        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-bootstrap
+       @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:
        @if [ -f ./gcc/Makefile ] ; then \
          r=`pwd`; export r; \
-         srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         s=`cd $(srcdir); pwd`; export s; \
+         $(SET_LIB_PATH) \
          (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) check); \
        else \
          true; \
@@ -985,22 +1508,33 @@ check-gcc:
 install-gcc:
        @if [ -f ./gcc/Makefile ] ; then \
          r=`pwd`; export r; \
-         srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         s=`cd $(srcdir); pwd`; export s; \
+         $(SET_LIB_PATH) \
          (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
        else \
          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.
 .PHONY: install-dosrel
-install-dosrel: install-dirs info
+install-dosrel: installdirs info
        @dir=`echo $@ | sed -e 's/install-//'`; \
        if [ -f ./$${dir}/Makefile ] ; then \
          r=`pwd`; export r; \
-         srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         s=`cd $(srcdir); pwd`; export s; \
+         $(SET_LIB_PATH) \
          (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) install); \
        else \
          true; \
@@ -1010,100 +1544,147 @@ install-dosrel-fake:
 
 
 # This is a list of inter-dependencies among modules.
-all-autoconf: all-m4
-all-bfd:
-all-binutils: all-libiberty all-opcodes all-bfd all-flex all-byacc
+all-apache:
+all-ash:
+all-autoconf: all-m4 all-texinfo
+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
+all-bison: all-texinfo
+configure-target-boehm-gc: $(ALL_GCC_CXX) configure-target-qthreads
+all-target-boehm-gc: configure-target-boehm-gc
+configure-target-bsp: $(ALL_GCC_C)
+all-target-bsp: configure-target-bsp
 all-byacc:
-all-cvs:
+all-bzip2:
+all-cgen: all-libiberty
+all-cvssrc:
+configure-target-cygmon: $(ALL_GCC_C)
+all-target-cygmon: configure-target-cygmon all-target-libiberty all-target-libio all-target-libstub all-target-bsp
+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_C)
+all-target-examples: configure-target-examples
 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
+all-gas: all-libiberty all-opcodes all-bfd all-intl
 all-gash: all-tcl
 all-gawk:
 ALL_GCC = all-gcc
-all-gcc: all-libiberty all-byacc all-binutils all-gas all-ld
-all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-byacc all-sim $(gdbnlmrequirements)
-all-gprof: all-libiberty all-bfd
+ALL_GCC_C = $(ALL_GCC) all-target-newlib all-target-libgloss
+ALL_GCC_CXX = $(ALL_GCC_C) all-target-libstdc++ all-target-libstdc++-v3
+all-gcc: all-bison all-byacc all-binutils all-gas all-ld all-zlib
+all-bootstrap: all-libiberty all-texinfo all-bison all-byacc all-binutils all-gas all-ld all-zlib
+GDB_TK = all-tk all-tcl all-itcl all-tix all-libgui
+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:
+configure-target-gperf: $(ALL_GCC_C)
+all-target-gperf: configure-target-gperf all-target-libiberty all-target-libstdc++
+all-gprof: all-libiberty all-bfd all-opcodes all-intl
 all-grep: all-libiberty
-all-grez: all-libiberty all-bfd
+all-grez: all-libiberty all-bfd all-opcodes
 all-gui: all-gdb all-libproc all-target-librx
+all-guile:
 all-gzip: all-libiberty
 all-hello: all-libiberty
 all-indent:
+all-inet: all-tcl all-send-pr all-perl
+all-intl:
 all-ispell: all-emacs19
-all-ld: all-libiberty all-bfd all-byacc all-flex
-configure-target-libg++: $(ALL_GCC)
-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++
+all-itcl: all-tcl all-tk all-tcl8.1 all-tk8.1
+all-ld: all-libiberty all-bfd all-opcodes all-bison all-byacc all-flex all-intl
+configure-target-libg++: $(ALL_GCC_CXX) configure-target-librx
+all-target-libg++: configure-target-libg++ all-target-libiberty all-target-librx
 configure-target-libgloss: $(ALL_GCC)
-all-target-libgloss: configure-target-libgloss
-configure-target-libio: $(ALL_GCC)
+all-target-libgloss: configure-target-libgloss configure-target-newlib
+configure-target-libio: $(ALL_GCC_C)
 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:
-configure-target-librx: $(ALL_GCC) configure-target-newlib
+configure-target-libffi: $(ALL_GCC_C) 
+all-target-libffi: configure-target-libffi
+configure-target-libjava: $(ALL_GCC_CXX) configure-target-zlib configure-target-boehm-gc configure-target-qthreads configure-target-libffi
+all-target-libjava: configure-target-libjava all-zip all-target-zlib all-target-boehm-gc all-target-qthreads all-target-libffi
+configure-target-librx: $(ALL_GCC_C)
 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-libstdc++: $(ALL_GCC_C)
+all-target-libstdc++: configure-target-libstdc++ all-target-libiberty all-target-libio
+configure-target-libstdc++-v3: $(ALL_GCC_C)
+all-target-libstdc++-v3: configure-target-libstdc++-v3 all-target-libiberty
+configure-target-libstub: $(ALL_GCC_C)
+all-target-libstub: configure-target-libstub
+all-libtool:
+configure-target-libf2c: $(ALL_GCC_C)
+all-target-libf2c: configure-target-libf2c all-target-libiberty
+configure-target-libchill: $(ALL_GCC_C)
+all-target-libchill: configure-target-libchill all-target-libiberty
+configure-target-libobjc: $(ALL_GCC_C)
+all-target-libobjc: configure-target-libobjc all-target-libiberty
 all-m4: all-libiberty
 all-make: all-libiberty
 all-mmalloc:
 configure-target-newlib: $(ALL_GCC)
-all-target-newlib: configure-target-newlib all-binutils all-gas all-gcc
-all-opcodes: all-bfd
+all-target-newlib: configure-target-newlib
+configure-target-libtermcap: $(ALL_GCC_C)
+all-target-libtermcap: configure-target-libtermcap
+all-opcodes: all-bfd all-libiberty all-cgen
 all-patch: all-libiberty
+all-perl:
 all-prms: all-libiberty
+configure-target-qthreads: $(ALL_GCC_C)
+all-target-qthreads: configure-target-qthreads
 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-sid: all-tcl all-tk
+all-sim: all-libiberty all-bfd all-opcodes all-readline all-cgen
+all-snavigator: all-tcl all-tk all-itcl all-db all-grep all-libgui
 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-tgas: all-libiberty all-bfd all-opcodes
 all-time:
+all-tix: all-tcl all-tk all-tcl8.1 all-tk8.1
 all-wdiff:
-all-target-winsup: all-target-newlib  configure-target-winsup 
-configure-target-winsup: configure-target-newlib
+configure-target-winsup: $(ALL_GCC_C)
+all-target-winsup: all-target-libiberty all-target-libtermcap configure-target-winsup
 all-uudecode: all-libiberty
-configure-target-libiberty: $(ALL_GCC)
-all-target-libiberty: configure-target-libiberty all-gcc all-ld all-target-newlib
-
+all-zip:
+all-zlib:
+configure-target-zlib: $(ALL_GCC_C)
+all-target-zlib: configure-target-zlib
+configure-target-libiberty: $(ALL_GCC_C)
+all-target-libiberty: configure-target-libiberty
+all-target: $(ALL_TARGET_MODULES)
+install-target: $(INSTALL_TARGET_MODULES)
+install-gdb: install-tcl install-tk install-itcl install-tix install-libgui
+install-sid: install-tcl install-tk
 ### other supporting targets
 
 MAKEDIRS= \
        $(prefix) \
-       $(exec_prefix) \
-       $(tooldir)
-
-.PHONY: install-dirs
-install-dirs:
-       @for i in $(MAKEDIRS) ; do \
-               echo Making $$i... ; \
-               parent=`echo $$i | sed -e 's@/[^/]*$$@@' | sed -e 's@^$$@/@'`; \
-               if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi ; \
-               if [ ! -d $$i ] ; then \
-                       if mkdir $$i ; then \
-                               true ; \
-                       else \
-                               exit 1 ; \
-                       fi ; \
-               else \
-                       true ; \
-               fi ; \
-       done
-
+       $(exec_prefix)
+.PHONY: installdirs
+installdirs: mkinstalldirs
+       $(SHELL) $(srcdir)/mkinstalldirs $(MAKEDIRS)
 
 dir.info: do-install-info
        if [ -f $(srcdir)/texinfo/gen-info-dir ] ; then \
@@ -1128,7 +1709,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
 
 #
@@ -1138,49 +1719,81 @@ 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 \
-       mpw-README mpw-build.in mpw-config.in mpw-configure \
-       COPYING COPYING.LIB install.sh cfg-ml-com.in cfg-ml-pos.in
+       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 \
+       libtool.m4 gettext.m4 ltcf-c.sh ltcf-cxx.sh ltcf-gcj.sh
 
 # Files in devo/etc used in any net release.
 # ChangeLog omitted because it may refer to files which are not in this
 # distribution (perhaps it would be better to include it anyway).
-ETC_SUPPORT= Makefile.in cfg-paper.texi configure.in configure.man \
-       configure.texi standards.texi make-stds.texi \
-       configure.info* standards.info* cfg-paper.info*
+ETC_SUPPORT= Makefile.in configure configure.in standards.texi \
+       make-stds.texi standards.info* configure.texi configure.info* \
+       configbuild.* configdev.*
+
 
 # When you use `make setup-dirs' or `make taz' you should always redefine
 # this macro.
 SUPPORT_FILES = list-of-support-files-for-tool-in-question
-# Files where "byacc" (Cygnus version) should be changed to "bison -y" (FSF).
-DISTBISONFILES= binutils/Makefile.in gas/Makefile.in gdb/Makefile.in
 
-.PHONY: taz
+# NOTE: No double quotes in the below.  It is used within shell script
+# as VER="$(VER)"
+VER = `        if grep AM_INIT_AUTOMAKE $(TOOL)/configure.in >/dev/null 2>&1; then \
+         sed < $(TOOL)/configure.in -n 's/AM_INIT_AUTOMAKE[^,]*, *\([^)]*\))/\1/p'; \
+       else \
+         sed < $(TOOL)/Makefile.in -n 's/^VERSION *= *//p'; \
+       fi`
+PACKAGE = $(TOOL)
 
-taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) \
-  texinfo/texinfo.tex texinfo/gpl.texinfo texinfo/lgpl.texinfo
-       # Make sure "diststuff" files get built properly.
-       for f in $(DISTBISONFILES) ; do \
-         if [ -r $$f ]; then \
-           sed '/^BISON *=.*$$/s/.*/BISON = bison -y/' <$$f >tmp ; \
-           mv -f tmp $$f ; \
-         else true; fi ; \
-       done
-       # Take out texinfo from a few places; make simple BISON=bison line.
+.PHONY: taz
+taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex
+       $(MAKE) -f Makefile.in do-proto-toplev \
+               TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
+               MD5PROG="$(MD5PROG)" \
+               SUPPORT_FILES="$(SUPPORT_FILES)"
+       $(MAKE) -f Makefile.in do-md5sum \
+               TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
+               MD5PROG="$(MD5PROG)" \
+               SUPPORT_FILES="$(SUPPORT_FILES)"
+       $(MAKE) -f Makefile.in do-tar-bz2 \
+               TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
+               MD5PROG="$(MD5PROG)" \
+               SUPPORT_FILES="$(SUPPORT_FILES)"
+
+.PHONY: gdb-taz
+gdb-taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex
+       $(MAKE) -f Makefile.in do-proto-toplev \
+               TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
+               MD5PROG="$(MD5PROG)" \
+               SUPPORT_FILES="$(SUPPORT_FILES)"
+       $(MAKE) -f Makefile.in do-md5sum \
+               TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
+               MD5PROG="$(MD5PROG)" \
+               SUPPORT_FILES="$(SUPPORT_FILES)"
+       $(MAKE) -f Makefile.in do-djunpack \
+               TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
+               MD5PROG="$(MD5PROG)" \
+               SUPPORT_FILES="$(SUPPORT_FILES)"
+       $(MAKE) -f Makefile.in do-tar-bz2 \
+               TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
+               MD5PROG="$(MD5PROG)" \
+               SUPPORT_FILES="$(SUPPORT_FILES)"
+
+.PHONY: do-proto-toplev
+do-proto-toplev: $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex
+       echo "==> Making $(PACKAGE)-$(VER)/"
+       # Take out texinfo from a few places.
        sed -e '/^all\.normal: /s/\all-texinfo //' \
            -e '/^      install-texinfo /d' \
-           -e '/^BISON = /,/^$$/d' \
-           -e '/^# BISON:/s/.*/BISON = bison -y/' \
        <Makefile.in >tmp
        mv -f tmp Makefile.in
        #
-       $(start-sanitize-Sanitize)
-       @if [ -f .Sanitize ] ; then echo "RUN Sanitize FIRST!" ; false ; fi ;
-       $(end-sanitize-Sanitize)
        ./configure sun4
        [ -z "$(CONFIGURE_TARGET_MODULES)" ] \
-         || $(MAKE) $(CONFIGURE_TARGET_MODULES) ALL_GCC="" \
-           CC_FOR_TARGET="$(CC) CXX_FOR_TARGET="$(CXX)"
+         || $(MAKE) $(CONFIGURE_TARGET_MODULES) \
+           ALL_GCC="" ALL_GCC_C="" ALL_GCC_CXX="" \
+           CC_FOR_TARGET="$(CC)" CXX_FOR_TARGET="$(CXX)"
        # Make links, and run "make diststuff" or "make info" when needed.
        rm -rf proto-toplev ; mkdir proto-toplev
        set -e ; dirs="$(TOOL) $(DEVO_SUPPORT) $(SUPPORT_FILES)" ; \
@@ -1199,7 +1812,7 @@ taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) \
            fi ; \
          else ln -s ../$$d proto-toplev/$$d ; fi ; \
        done
-       cd etc ; $(MAKE) info
+       cd etc && $(MAKE) info
        $(MAKE) distclean
        #
        mkdir proto-toplev/etc
@@ -1214,58 +1827,115 @@ taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) \
            <configure.in >proto-toplev/configure.in
        #
        mkdir proto-toplev/texinfo
-       ln -s ../../texinfo/texinfo.tex proto-toplev/texinfo/
-       ln -s ../../texinfo/gpl.texinfo proto-toplev/texinfo/
-       ln -s ../../texinfo/lgpl.texinfo proto-toplev/texinfo/
-       ln -s ../../texinfo/tex3patch   proto-toplev/texinfo/
-       chmod og=u `find . -print`
-       (VER=`sed <$(TOOL)/Makefile.in -n 's/^VERSION *= *//p'`; \
-               echo "==> Making $(TOOL)-$$VER.tar.gz"; \
-               rm -f $(TOOL)-$$VER; ln -s proto-toplev $(TOOL)-$$VER; \
-               tar cfh - $(TOOL)-$$VER \
-               | $(GZIPPROG) -v -9 >$(TOOL)-$$VER.tar.gz )
-
-TEXINFO_SUPPORT= texinfo/texinfo.tex texinfo/gpl.texinfo texinfo/lgpl.texinfo
+       ln -s ../../texinfo/texinfo.tex         proto-toplev/texinfo/
+       if test -r texinfo/util/tex3patch ; then \
+         mkdir proto-toplev/texinfo/util && \
+         ln -s ../../../texinfo/util/tex3patch proto-toplev/texinfo/util ; \
+       else true; fi
+       chmod -R og=u . || chmod og=u `find . -print`
+       #
+       -rm -f $(PACKAGE)-$(VER)
+       ln -s proto-toplev $(PACKAGE)-$(VER)
+
+.PHONY: do-tar-bz2
+do-tar-bz2:
+       echo "==> Making $(PACKAGE)-$(VER).tar.bz2"
+       -rm -f $(PACKAGE)-$(VER).tar.bz2
+       find $(PACKAGE)-$(VER) -follow -name CVS -prune -o -type f -print \
+               | tar cTfh - $(PACKAGE)-$(VER).tar
+       $(BZIPPROG) -v -9 $(PACKAGE)-$(VER).tar
+
+.PHONY: do-md5sum
+do-md5sum:
+       echo "==> Adding md5 checksum to top-level directory"
+       cd proto-toplev && find * -follow -name CVS -prune -o -type f -print \
+               | xargs $(MD5PROG) > ../md5.sum
+       mv md5.sum proto-toplev
+
+.PHONY: do-djunpack
+do-djunpack:
+       echo "==> Adding updated djunpack.bat to top-level directory"
+       echo - 's /gdb-[0-9\.]*/gdb-'"$(VER)"'/'
+       sed < djunpack.bat > djunpack.new \
+               -e 's/gdb-[0-9][0-9\.]*/gdb-'"$(VER)"'/'
+       mv djunpack.new djunpack.bat
+       -rm -f proto-toplev/djunpack.bat
+       ln -s ../djunpack.bat proto-toplev/djunpack.bat
+
+TEXINFO_SUPPORT= texinfo/texinfo.tex
 DIST_SUPPORT= $(DEVO_SUPPORT) $(TEXINFO_SUPPORT)
 
-.PHONY: gas.tar.gz
-GAS_SUPPORT_DIRS= bfd include libiberty opcodes
-gas.tar.gz: $(DIST_SUPPORT) $(GAS_SUPPORT_DIRS) gas
+.PHONY: gas.tar.bz2
+GAS_SUPPORT_DIRS= bfd include libiberty opcodes intl setup.com makefile.vms mkdep
+gas.tar.bz2: $(DIST_SUPPORT) $(GAS_SUPPORT_DIRS) gas
        $(MAKE) -f Makefile.in taz TOOL=gas \
+               MD5PROG="$(MD5PROG)" \
                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
-binutils.tar.gz: $(DIST_SUPPORT) $(BINUTILS_SUPPORT_DIRS) binutils
+.PHONY: binutils.tar.bz2
+BINUTILS_SUPPORT_DIRS= bfd gas include libiberty opcodes ld gprof intl setup.com makefile.vms mkdep
+binutils.tar.bz2: $(DIST_SUPPORT) $(BINUTILS_SUPPORT_DIRS) binutils
        $(MAKE) -f Makefile.in taz TOOL=binutils \
-               SUPPORT_FILES="$(BINUTILS_SUPPORT_DIRS) makeall.bat configure.bat"
+               MD5PROG="$(MD5PROG)" \
+               SUPPORT_FILES="$(BINUTILS_SUPPORT_DIRS)"
 
-.PHONY: gas+binutils.tar.gz
+.PHONY: gas+binutils.tar.bz2
 GASB_SUPPORT_DIRS= $(GAS_SUPPORT_DIRS) binutils ld gprof
-gas+binutils.tar.gz: $(DIST_SUPPORT) $(GASB_SUPPORT_DIRS) gas
+gas+binutils.tar.bz2: $(DIST_SUPPORT) $(GASB_SUPPORT_DIRS) gas
        $(MAKE) -f Makefile.in taz TOOL=gas \
-               SUPPORT_FILES="$(GASB_SUPPORT_DIRS) makeall.bat configure.bat"
+               MD5PROG="$(MD5PROG)" \
+               SUPPORT_FILES="$(GASB_SUPPORT_DIRS)"
 
-.PHONY: libg++.tar.gz
+.PHONY: libg++.tar.bz2
 LIBGXX_SUPPORT_DIRS=include libstdc++ libio librx libiberty
-libg++.tar.gz: $(DIST_SUPPORT) libg++
+libg++.tar.bz2: $(DIST_SUPPORT) libg++
        $(MAKE) -f Makefile.in taz TOOL=libg++ \
+               MD5PROG="$(MD5PROG)" \
                SUPPORT_FILES="$(LIBGXX_SUPPORT_DIRS)"
 
 GNATS_SUPPORT_DIRS=include libiberty send-pr
-gnats.tar.gz: $(DIST_SUPPORT) $(GNATS_SUPPORT_DIRS) gnats
+gnats.tar.bz2: $(DIST_SUPPORT) $(GNATS_SUPPORT_DIRS) gnats
        $(MAKE) -f  Makefile.in taz TOOL=gnats \
+               MD5PROG="$(MD5PROG)" \
                SUPPORT_FILES="$(GNATS_SUPPORT_DIRS)"
 
-.PHONY: gdb.tar.gz
-GDB_SUPPORT_DIRS= bfd include libiberty mmalloc opcodes readline sim utils
-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 \
-               SUPPORT_FILES="$(GDB_SUPPORT_DIRS) $(GDBTK_SUPPORT_DIRS)"
-
-.PHONY: newlib.tar.gz
+.PHONY: gdb.tar.bz2
+GDB_SUPPORT_DIRS= bfd include libiberty mmalloc opcodes readline sim utils intl
+gdb.tar.bz2: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
+       $(MAKE) -f Makefile.in gdb-taz TOOL=gdb \
+               MD5PROG="$(MD5PROG)" \
+               SUPPORT_FILES="$(GDB_SUPPORT_DIRS)"
+
+.PHONY: dejagnu.tar.bz2
+DEJAGNU_SUPPORT_DIRS=  tcl expect libiberty
+dejagnu.tar.bz2: $(DIST_SUPPORT) $(DEJAGNU_SUPPORT_DIRS) dejagnu
+       $(MAKE) -f Makefile.in taz TOOL=dejagnu \
+               MD5PROG="$(MD5PROG)" \
+               SUPPORT_FILES="$(DEJAGNU_SUPPORT_DIRS)"
+
+.PHONY: gdb+dejagnu.tar.bz2
+GDBD_SUPPORT_DIRS= $(GDB_SUPPORT_DIRS) tcl expect dejagnu
+gdb+dejagnu.tar.bz2: $(DIST_SUPPORT) $(GDBD_SUPPORT_DIRS) gdb
+       $(MAKE) -f Makefile.in gdb-taz TOOL=gdb PACKAGE=gdb+dejagnu \
+               MD5PROG="$(MD5PROG)" \
+               SUPPORT_FILES="$(GDBD_SUPPORT_DIRS)"
+
+.PHONY: insight.tar.bz2
+INSIGHT_SUPPORT_DIRS= $(GDB_SUPPORT_DIRS) tcl tk itcl tix libgui
+insight.tar.bz2: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
+       $(MAKE) -f Makefile.in gdb-taz TOOL=gdb PACKAGE=insight \
+               MD5PROG="$(MD5PROG)" \
+               SUPPORT_FILES="$(INSIGHT_SUPPORT_DIRS)"
+
+.PHONY: insight+dejagnu.tar.bz2
+INSIGHTD_SUPPORT_DIRS= $(INSIGHT_SUPPORT_DIRS) expect dejagnu
+insight+dejagnu.tar.bz2: $(DIST_SUPPORT) $(INSIGHTD_SUPPORT_DIRS) gdb
+       $(MAKE) -f Makefile.in gdb-taz TOOL=gdb PACKAGE="insight+dejagnu" \
+               MD5PROG="$(MD5PROG)" \
+               SUPPORT_FILES="$(INSIGHTD_SUPPORT_DIRS)"
+
+.PHONY: newlib.tar.bz2
 NEWLIB_SUPPORT_DIRS=libgloss
 # taz configures for the sun4 target which won't configure newlib.
 # We need newlib configured so that the .info files are made.
@@ -1273,27 +1943,18 @@ NEWLIB_SUPPORT_DIRS=libgloss
 # taz will build the .info files but since SUBDIRS won't contain newlib,
 # distclean won't be run (leaving Makefile, config.status, and the tmp files
 # used in building the .info files, eg: *.def, *.ref).
-# Compensate here by configuring newlib for a simple (no multilib support)
-# cross target (sparc64), building the info files, and doing make distclean
-# ourselves.
-newlib.tar.gz: $(DIST_SUPPORT) $(NEWLIB_SUPPORT_DIRS) newlib
-       rootme=`pwd` ; \
-         cd newlib && ../configure --srcdir $$rootme/newlib \
-               --host sun4 --target sparc64-elf
-       cd newlib ; make info
-       cd newlib ; make distclean
+# The problem isn't solvable however without a lot of extra work because
+# target libraries are built in subdir $(target_alias) which gets nuked during
+# the make distclean.  For now punt on the issue of shipping newlib info files
+# with newlib net releases and wait for a day when some native target (sun4?)
+# supports newlib (if only minimally).
+newlib.tar.bz2: $(DIST_SUPPORT) $(NEWLIB_SUPPORT_DIRS) newlib
        $(MAKE) -f Makefile.in taz TOOL=newlib \
+               MD5PROG="$(MD5PROG)" \
                SUPPORT_FILES="$(NEWLIB_SUPPORT_DIRS)" \
                DEVO_SUPPORT="$(DEVO_SUPPORT) COPYING.NEWLIB" 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
This page took 0.046313 seconds and 4 git commands to generate.