X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=Makefile.in;h=461ac42b6e43ea65158ee8b5234d07862c7d5811;hb=e1b0e3c22b8ea908749180bb7862ae36fe3beb69;hp=8f1d28a28a2752e40c97e48d7409c7013151d160;hpb=b926ffc5881e089ac7e412b6a1cf228be2c1ed44;p=deliverable%2Fbinutils-gdb.git

diff --git a/Makefile.in b/Makefile.in
index 8f1d28a28a..461ac42b6e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,6 +35,7 @@ includedir=${prefix}/include
 oldincludedir=/usr/include
 infodir=${prefix}/info
 mandir=${prefix}/man
+gxx_include_dir=${includedir}/g++
 
 tooldir = $(exec_prefix)/$(target)
 
@@ -83,6 +84,7 @@ HOST_PREFIX_1 = loser-
 CFLAGS = -g
 CXXFLAGS = -g -O2
 
+LDFLAGS = 
 LIBCFLAGS = $(CFLAGS)
 CFLAGS_FOR_TARGET = $(CFLAGS)
 LDFLAGS_FOR_TARGET = 
@@ -95,9 +97,9 @@ CHILL_LIB = -lchill
 CXX = c++
 
 # Use -O2 to stress test the compiler.
-LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
+LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates -fexceptions
 CXXFLAGS_FOR_TARGET = $(CXXFLAGS)
-LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
+LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates -fexceptions
 
 RANLIB = ranlib
 
@@ -108,8 +110,8 @@ NM = nm
 
 LD = ld
 
-# Not plain GZIP, since gzip looks there for extra command-line options.
-GZIPPROG = gzip
+BZIPPROG = bzip2
+MD5PROG = md5sum
 
 # These values are substituted by configure.
 DEFAULT_YACC = yacc
@@ -167,9 +169,6 @@ OTHERS =
 # This is set by the configure script to the list of directories which
 # should be built using the target tools.
 
-# start-sanitize-dsp
-SPECIAL_LIBS = libdsp
-# end-sanitize-dsp
 
 TARGET_CONFIGDIRS = libiberty libgloss $(SPECIAL_LIBS) newlib libio librx libstdc++ libg++ winsup opcodes bsp libstub cygmon
 
@@ -190,7 +189,11 @@ RPATH_ENVVAR = LD_LIBRARY_PATH
 
 # configure.in sets SET_LIB_PATH to this if --enable-shared was used.
 REALLY_SET_LIB_PATH = \
-  $(RPATH_ENVVAR)=$$r/bfd:$$r/opcodes:$$$(RPATH_ENVVAR); \
+  if [ x"$$$(RPATH_ENVVAR)" != x ]; then \
+    $(RPATH_ENVVAR)=$$r/bfd:$$r/opcodes:$$$(RPATH_ENVVAR); \
+  else \
+    $(RPATH_ENVVAR)=$$r/bfd:$$r/opcodes; \
+  fi; \
   export $(RPATH_ENVVAR);
 
 ALL = all.normal
@@ -213,7 +216,7 @@ CC_FOR_TARGET = ` \
     if [ -f $$r/$(TARGET_SUBDIR)/newlib/Makefile ] ; then \
       case "$(target_canonical)" in \
         i[3456]86-*-cygwin*) \
-          echo $$r/gcc/xgcc -B$$r/gcc/ -B$$r/$(TARGET_SUBDIR)/newlib/ -L$$r/$(TARGET_SUBDIR)/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/winsup/include -idirafter $$s/newlib/libc/include -idirafter $$s/newlib/libc/sys/cygwin -idirafter $$s/newlib/libc/sys/cygwin32 -nostdinc; \
+          echo $$r/gcc/xgcc -B$$r/gcc/ -B$(build_tooldir)/bin/ -B$$r/$(TARGET_SUBDIR)/newlib/ -L$$r/$(TARGET_SUBDIR)/winsup -L$$r/$(TARGET_SUBDIR)/winsup/cygwin -L$$r/$(TARGET_SUBDIR)/winsup/w32api/lib -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/winsup/include -idirafter $$s/winsup/cygwin/include -idirafter $$s/winsup/w32api/include -idirafter $$s/newlib/libc/include -idirafter $$s/newlib/libc/sys/cygwin -idirafter $$s/newlib/libc/sys/cygwin32 -nostdinc; \
           ;; \
         *) \
           echo $$r/gcc/xgcc -B$$r/gcc/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \
@@ -252,7 +255,7 @@ CXX_FOR_TARGET = ` \
     if [ -f $$r/$(TARGET_SUBDIR)/newlib/Makefile ] ; then \
       case "$(target_canonical)" in \
         i[3456]86-*-cygwin*) \
-          echo $$r/gcc/xgcc -B$$r/gcc/ -B$$r/$(TARGET_SUBDIR)/newlib/ -L$$r/$(TARGET_SUBDIR)/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/winsup/include -idirafter $$s/newlib/libc/include -idirafter $$s/newlib/libc/sys/cygwin -idirafter $$s/newlib/libc/sys/cygwin32 -nostdinc; \
+          echo $$r/gcc/xgcc -B$$r/gcc/ -B$(build_tooldir)/bin/ -B$$r/$(TARGET_SUBDIR)/newlib/ -L$$r/$(TARGET_SUBDIR)/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/winsup/cygwin/include -idirafter $$s/winsup/w32api/include -idirafter $$s/newlib/libc/include -idirafter $$s/newlib/libc/sys/cygwin -idirafter $$s/newlib/libc/sys/cygwin32 -nostdinc; \
           ;; \
         *) \
           echo $$r/gcc/xgcc -B$$r/gcc/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \
@@ -482,7 +485,7 @@ 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)' \
@@ -491,7 +494,7 @@ EXTRA_GCC_FLAGS = \
 	'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=/`" \
@@ -519,9 +522,6 @@ ALL_MODULES = \
 	all-bison \
 	all-byacc \
 	all-bzip2 \
-	$(start-sanitize-cygnus) \
-	all-cgen \
-	$(end-sanitize-cygnus) \
 	all-cvssrc \
 	all-db \
 	all-dejagnu \
@@ -532,9 +532,6 @@ ALL_MODULES = \
 	all-findutils \
 	all-find \
 	all-flex \
-	$(start-sanitize-cygnus) \
-	all-flexlm \
-	$(end-sanitize-cygnus) \
 	all-gas \
 	all-gawk \
 	all-gettext \
@@ -544,24 +541,14 @@ ALL_MODULES = \
 	all-grez \
 	all-gzip \
 	all-hello \
-	$(start-sanitize-ide) \
-	all-ilu \
-	$(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 \
@@ -578,9 +565,6 @@ ALL_MODULES = \
 	all-send-pr \
 	all-shellutils \
 	all-sim \
-	$(start-sanitize-cygnus) \
-	all-snavigator \
-	$(end-sanitize-cygnus) \
 	all-tar \
 	all-tcl \
 	all-tcl8.1 \
@@ -589,9 +573,6 @@ ALL_MODULES = \
 	all-tgas \
 	all-time \
 	all-uudecode \
-	$(start-sanitize-ide) \
-	all-vmake \
-	$(end-sanitize-ide) \
 	all-wdiff \
 	all-zip \
 	$(EXTRA_TARGET_HOST_ALL_MODULES)
@@ -625,9 +606,6 @@ CROSS_CHECK_MODULES = \
 	check-fileutils \
 	check-findutils \
 	check-find \
-	$(start-sanitize-cygnus) \
-	check-flexlm \
-	$(end-sanitize-cygnus) \
 	check-gas \
 	check-gawk \
 	check-gettext \
@@ -636,24 +614,14 @@ CROSS_CHECK_MODULES = \
 	check-grep \
 	check-gzip \
 	check-hello \
-	$(start-sanitize-ide) \
-	check-ilu \
-	$(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 \
@@ -668,9 +636,6 @@ CROSS_CHECK_MODULES = \
 	check-sed \
 	check-send-pr \
 	check-shellutils \
-	$(start-sanitize-cygnus) \
-	check-snavigator \
-	$(end-sanitize-cygnus) \
 	check-sim \
 	check-tar \
 	check-tcl \
@@ -679,9 +644,6 @@ CROSS_CHECK_MODULES = \
 	check-tgas \
 	check-time \
 	check-uudecode \
-	$(start-sanitize-ide) \
-	check-vmake \
-	$(end-sanitize-ide) \
 	check-wdiff \
 	$(EXTRA_TARGET_HOST_CHECK_MODULES)
 
@@ -716,9 +678,6 @@ INSTALL_MODULES = \
 	install-findutils \
 	install-find \
 	install-flex \
-	$(start-sanitize-cygnus) \
-	install-flexlm \
-	$(end-sanitize-cygnus) \
 	install-gas \
 	install-gawk \
 	install-gettext \
@@ -728,9 +687,6 @@ INSTALL_MODULES = \
 	install-grez \
 	install-gzip \
 	install-hello \
-	$(start-sanitize-ide) \
-	install-ilu \
-	$(end-sanitize-ide) \
 	install-indent \
 	install-inet \
 	install-intl \
@@ -738,16 +694,9 @@ INSTALL_MODULES = \
 	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 \
@@ -762,18 +711,12 @@ INSTALL_MODULES = \
 	install-send-pr \
 	install-shellutils \
 	install-sim \
-	$(start-sanitize-cygnus) \
-	install-snavigator \
-	$(end-sanitize-cygnus) \
 	install-tar \
 	install-texinfo \
 	install-textutils \
 	install-tgas \
 	install-time \
 	install-uudecode \
-	$(start-sanitize-ide) \
-	install-vmake \
-	$(end-sanitize-ide) \
 	install-wdiff \
 	install-zip \
 	$(EXTRA_TARGET_HOST_INSTALL_MODULES)
@@ -828,28 +771,17 @@ ALL_TARGET_MODULES = \
 	all-target-newlib \
 	all-target-libtermcap \
 	all-target-winsup \
-	$(start-sanitize-dsp) \
-	all-target-libdsp \
-	$(end-sanitize-dsp) \
 	all-target-libgloss \
 	all-target-libiberty \
 	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-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 = \
-	$(start-sanitize-dsp) \
-	configure-target-libdsp \
-	$(end-sanitize-dsp) \
 	configure-target-libio \
 	configure-target-libstdc++ \
 	configure-target-librx \
@@ -862,39 +794,23 @@ CONFIGURE_TARGET_MODULES = \
 	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-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 = \
-	$(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 \
-	$(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++ \
@@ -904,11 +820,6 @@ INSTALL_TARGET_MODULES = \
 	install-target-libgloss \
 	install-target-libiberty \
 	install-target-bsp \
-	$(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}.
@@ -923,9 +834,6 @@ CLEAN_MODULES = \
 	clean-bison \
 	clean-byacc \
 	clean-bzip2 \
-	$(start-sanitize-cygnus) \
-	clean-cgen \
-	$(end-sanitize-cygnus) \
 	clean-cvssrc \
 	clean-db \
 	clean-dejagnu \
@@ -936,9 +844,6 @@ CLEAN_MODULES = \
 	clean-findutils \
 	clean-find \
 	clean-flex \
-	$(start-sanitize-cygnus) \
-	clean-flexlm \
-	$(end-sanitize-cygnus) \
 	clean-gas \
 	clean-gawk \
 	clean-gettext \
@@ -948,24 +853,14 @@ CLEAN_MODULES = \
 	clean-grez \
 	clean-gzip \
 	clean-hello \
-	$(start-sanitize-ide) \
-	clean-ilu \
-	$(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 \
@@ -982,9 +877,6 @@ CLEAN_MODULES = \
 	clean-send-pr \
 	clean-shellutils \
 	clean-sim \
-	$(start-sanitize-cygnus) \
-	clean-snavigator \
-	$(end-sanitize-cygnus) \
 	clean-tar \
 	clean-tcl \
 	clean-texinfo \
@@ -992,17 +884,11 @@ CLEAN_MODULES = \
 	clean-tgas \
 	clean-time \
 	clean-uudecode \
-	$(start-sanitize-ide) \
-	clean-vmake \
-	$(end-sanitize-ide) \
 	clean-wdiff \
 	clean-zip
 
 # All of the target modules that can be cleaned
 CLEAN_TARGET_MODULES = \
-	$(start-sanitize-dsp) \
-	clean-target-libdsp \
-	$(end-sanitize-dsp) \
 	clean-target-libio \
 	clean-target-libstdc++ \
 	clean-target-librx \
@@ -1014,11 +900,6 @@ CLEAN_TARGET_MODULES = \
 	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-bsp \
 	clean-target-cygmon
 
@@ -1275,29 +1156,6 @@ 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.
@@ -1678,23 +1536,12 @@ 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-bsp: $(ALL_GCC)
-all-target-bsp: configure-target-bsp all-gas all-ld all-gcc
-# start-sanitize-java
-configure-target-boehm-gc: configure-target-newlib configure-target-qthreads
-all-target-boehm-gc: configure-target-boehm-gc
-# end-sanitize-java
+all-target-bsp: configure-target-bsp all-gcc all-binutils all-target-newlib
 all-byacc:
 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-target-cygmon: configure-target-cygmon all-gas all-ld all-gcc all-target-libiberty all-target-newlib all-target-libio all-target-libstub all-target-bsp
 all-db:
 all-dejagnu: all-tcl all-expect all-tk
 all-diff: all-libiberty
@@ -1708,9 +1555,6 @@ all-fileutils: all-libiberty
 all-findutils:
 all-find:
 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:
@@ -1718,9 +1562,6 @@ ALL_GCC = all-gcc
 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:
@@ -1732,39 +1573,21 @@ all-gui: all-gdb all-libproc all-target-librx
 all-guile:
 all-gzip: all-libiberty
 all-hello: all-libiberty
-# start-sanitize-ide
-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-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++
+check-target-libio:
 all-libgui: all-tcl all-tk all-tcl8.1 all-tk8.1 all-itcl
 all-libiberty:
-# start-sanitize-ide
-all-libide: all-ilu
-all-libidetcl: all-tcl all-tk all-itcl all-ilu all-libgui all-libide
-# end-sanitize-ide
-# start-sanitize-java
-configure-target-libjava: $(ALL_GCC) configure-target-boehm-gc configure-target-qthreads configure-target-newlib
-all-target-libjava: configure-target-libjava all-gcc all-zip all-target-newlib all-target-boehm-gc all-target-qthreads
-# end-sanitize-java
 configure-target-librx: $(ALL_GCC) configure-target-newlib
 all-target-librx: configure-target-librx
 configure-target-libstdc++: $(ALL_GCC)
@@ -1776,15 +1599,13 @@ all-m4: all-libiberty
 all-make: all-libiberty
 all-mmalloc:
 configure-target-newlib: $(ALL_GCC)
+configure-target-libtermcap: $(ALL_GCC)
 all-target-newlib: configure-target-newlib all-binutils all-gas all-gcc
+all-target-libtermcap: configure-target-libtermcap all-binutils all-gas all-gcc
 all-opcodes: all-bfd all-libiberty
 all-patch: all-libiberty
 all-perl:
 all-prms: all-libiberty
-# start-sanitize-java
-configure-target-qthreads: configure-target-newlib
-all-target-qthreads: configure-target-qthreads
-# end-sanitize-java
 all-rcs:
 all-readline:
 all-recode: all-libiberty
@@ -1792,9 +1613,6 @@ all-sed: all-libiberty
 all-send-pr: all-prms
 all-shellutils:
 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:
@@ -1806,11 +1624,8 @@ 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-tix all-libgui all-libide all-libidetcl
-# end-sanitize-ide
 all-wdiff:
-all-target-winsup: all-target-newlib all-target-libiberty all-target-libio configure-target-winsup 
+all-target-winsup: all-target-newlib all-target-libiberty all-target-libtermcap configure-target-winsup
 configure-target-winsup: configure-target-newlib
 all-uudecode: all-libiberty
 all-zip:
@@ -1818,9 +1633,7 @@ 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= \
@@ -1878,19 +1691,46 @@ ETC_SUPPORT= Makefile.in configure configure.in standards.texi \
 # this macro.
 SUPPORT_FILES = list-of-support-files-for-tool-in-question
 
-.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
+.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 taz \
+		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' \
 	<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="" \
@@ -1929,68 +1769,101 @@ taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) \
 	#
 	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/
 	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`
-	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"
-	-rm -f $(TOOL)-$(VER)
-	ln -s proto-toplev $(TOOL)-$(VER)
-	tar cfh $(TOOL)-$(VER).tar $(TOOL)-$(VER)
-	$(GZIPPROG) -v -9 $(TOOL)-$(VER).tar
-
-TEXINFO_SUPPORT= texinfo/texinfo.tex texinfo/gpl.texinfo texinfo/lgpl.texinfo
+	#
+	-rm -f $(PACKAGE)-$(VER)
+	ln -s proto-toplev $(PACKAGE)-$(VER)
+
+.PHONY: do-tar-bz2
+do-tar-bz2:
+	echo "==> Making $(PACKAGE)-$(VER).tar.bz2"
+	tar cfh $(PACKAGE)-$(VER).tar $(PACKAGE)-$(VER)
+	$(BZIPPROG) -v -9 $(PACKAGE)-$(VER).tar
+
+.PHONY: do-md5sum
+do-md5sum:
+	echo "==> Adding md5 checksum to top-level directory"
+	( cd proto-toplev && find * -follow -type f -print | xargs $(MD5PROG) ) > md5.sum
+	mv md5.sum proto-toplev
+
+TEXINFO_SUPPORT= texinfo/texinfo.tex
 DIST_SUPPORT= $(DEVO_SUPPORT) $(TEXINFO_SUPPORT)
 
-.PHONY: gas.tar.gz
-GAS_SUPPORT_DIRS= bfd include libiberty opcodes intl setup.com makefile.vms
-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 intl setup.com makefile.vms
-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
+.PHONY: gdb.tar.bz2
 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 \
-		SUPPORT_FILES="$(GDB_SUPPORT_DIRS) $(GDBTK_SUPPORT_DIRS)"
-
-.PHONY: newlib.tar.gz
+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.
@@ -2003,8 +1876,9 @@ NEWLIB_SUPPORT_DIRS=libgloss
 # 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.gz: $(DIST_SUPPORT) $(NEWLIB_SUPPORT_DIRS) newlib
+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