X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=Makefile.in;h=d8c903a08c31d96ee2c27a3fe4f5c821ef1e979f;hb=256b4f378a3822e7c9d0908687dc61669fee2b43;hp=fbb76bbb60fed027fa5167031f39f3c387699125;hpb=d1bea4c7607e82895925dd8e0e38889c9c4750b2;p=deliverable%2Fbinutils-gdb.git

diff --git a/Makefile.in b/Makefile.in
index fbb76bbb60..d8c903a08c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -51,8 +51,14 @@ INSTALL_DATA = $(INSTALL)
 
 AS = as
 AR = ar
-AR_FLAGS = qc
+AR_FLAGS = rc
+CC = cc
 CFLAGS = -g
+$(start-sanitize-chill)
+CHILLFLAGS = $(CFLAGS)
+CHILL_LIB = -lchill
+$(end-sanitize-chill)
+CXX = gcc
 CXXFLAGS = -g -O
 RANLIB = ranlib
 NM = nm
@@ -70,12 +76,16 @@ MAKEINFO = `if [ -f $${rootme}/texinfo/C/makeinfo ] ; \
 	then echo $${rootme}/texinfo/C/makeinfo ; \
 	else echo makeinfo ; fi`
 
-# C compiler to use to create programs which must be run in the build
+
+# libraries that may need to be augmented on a system-by-system basis
+X11_LIB = -lX11
+
+# compilers to use to create programs which must be run in the build
 # environment.
 CC_FOR_BUILD = $(CC)
-CXX_FOR_BUILD = gcc
+CXX_FOR_BUILD = $(CXX)
 
-SUBDIRS = libiberty mmalloc glob readline opcodes bfd z8ksim gdb binutils ld gas tgas gcc libg++ newlib deja-gnu
+SUBDIRS = "this is set via configure, don't edit this"
 OTHERS = 
 
 ALL = all.normal
@@ -86,7 +96,30 @@ INSTALL_TARGET = install.all
 
 CC_FOR_TARGET = ` \
   if [ -f $${rootme}/gcc/Makefile ] ; then \
-    echo $${rootme}/gcc/gcc -B$${rootme}/gcc/; \
+    echo $${rootme}/gcc/xgcc -B$${rootme}/gcc/; \
+  else \
+    if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
+      echo $(CC); \
+    else \
+      t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \
+    fi; \
+  fi`
+
+GCC_FOR_TARGET = ` \
+  if [ -f $${rootme}/gcc/Makefile ] ; then \
+    echo $${rootme}/gcc/xgcc -B$${rootme}/gcc/; \
+  else \
+    if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
+      echo $(CC); \
+    else \
+      t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \
+    fi; \
+  fi`
+
+$(start-sanitize-chill)
+CHILL_FOR_TARGET = ` \
+  if [ -f $${rootme}/gcc/Makefile ] ; then \
+    echo $${rootme}/gcc/xgcc -B$${rootme}/gcc/ -L$${rootme}/chillrt/; \
   else \
     if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
       echo $(CC); \
@@ -94,13 +127,14 @@ CC_FOR_TARGET = ` \
       t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \
     fi; \
   fi`
+$(end-sanitize-chill)
 
 CXX_FOR_TARGET = ` \
   if [ -f $${rootme}/gcc/Makefile ] ; then \
-    echo $${rootme}/gcc/gcc -B$${rootme}/gcc/; \
+    echo $${rootme}/gcc/xgcc -B$${rootme}/gcc/; \
   else \
-    if [ "$(host_cpu)-$(host_vendor)-$(host_os)" = "$(target_cpu)-$(target_vendor)-$(target_os)" ] ; then \
-      echo gcc; \
+    if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
+      echo $(CXX); \
     else \
       t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \
     fi; \
@@ -110,7 +144,7 @@ AS_FOR_TARGET = ` \
   if [ -f $${rootme}/gas/Makefile ] ; then \
     echo $${rootme}/gas/as.new ; \
   else \
-    if [ "$(host_cpu)-$(host_vendor)-$(host_os)" = "$(target_cpu)-$(target_vendor)-$(target_os)" ] ; then \
+    if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
       echo $(AS); \
     else \
        t='$(program_transform_name)'; echo as | sed -e '' $$t ; \
@@ -150,6 +184,7 @@ NM_FOR_TARGET = ` \
     fi \
   fi`
 
+# FIXME: This is badly named.
 XTRAFLAGS = ` \
   if [ -f $${rootme}/gcc/Makefile ] ; then \
     if [ -f $${rootme}/newlib/Makefile ] ; then \
@@ -161,19 +196,29 @@ XTRAFLAGS = ` \
      echo ; \
   fi`
 
+
 #### host and target specific makefile fragments come in here.
 ###
 
-# Flags to pass down to sub-makes -- please keep these in alphabetical order
-FLAGS_TO_PASS = \
-	"AR=$(AR)" \
+# Flags to pass down to all sub-makes.
+# Please keep these in alphabetical order.
+BASE_FLAGS_TO_PASS = \
 	"AR_FLAGS=$(AR_FLAGS)" \
+	"AR_FOR_TARGET=$(AR_FOR_TARGET)" \
+	"AS_FOR_TARGET=$(AS_FOR_TARGET)" \
 	"BISON=$(BISON)" \
-	"CXXFLAGS=$(CXXFLAGS)" \
-	"CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
-	"CC=$(CC)" \
 	"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
+	"CC_FOR_TARGET=$(CC_FOR_TARGET)" \
 	"CFLAGS=$(CFLAGS)" \
+$(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)" \
+	"CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \
+	"GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \
 	"INSTALL=$(INSTALL)" \
 	"INSTALL_DATA=$(INSTALL_DATA)" \
 	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
@@ -181,97 +226,159 @@ FLAGS_TO_PASS = \
 	"LEX=$(LEX)" \
 	"LOADLIBES=$(LOADLIBES)" \
 	"MAKEINFO=$(MAKEINFO)" \
-	"RANLIB=$(RANLIB)" \
+	"NM_FOR_TARGET=$(NM_FOR_TARGET)" \
+	"RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \
+	"XTRAFLAGS_FOR_TARGET=$(XTRAFLAGS)" \
 	"exec_prefix=$(exec_prefix)" \
 	"prefix=$(prefix)" \
 	"tooldir=$(tooldir)" 
 
+# Flags to pass down to most sub-makes, in which we're building with
+# the host environment.
+# Because of the way do-info, et. al., use this, this must not contain
+# any backquotes.
+EXTRA_HOST_FLAGS = \
+	"AR=$(AR)" \
+	"AS=$(AS)" \
+	"CC=$(CC)" \
+	"CXX=$(CXX)" \
+	"NM=$(NM)" \
+	"RANLIB=$(RANLIB)" \
+	"XTRAFLAGS="
+
+FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)
+
 # Flags that are concerned with the location of the X11 include files
 # and library files
 X11_FLAGS_TO_PASS = \
 	"X11_INCLUDE_FLAGS=$(X11_INCLUDE_FLAGS)" \
-	"X11_LIB_FLAGS=$(X11_LIB_FLAGS)"
+	"X11_LIB_FLAGS=$(X11_LIB_FLAGS)" \
+	"X11_LIB=$(X11_LIB)"
+
+# Shell case of subdirectories which are built with the target environment.
+TARGET_LIBS=libg++ | xiberty | newlib
+$(start-sanitize-chill)
+TARGET_LIBS=libg++ | xiberty | newlib | chillrt
+$(end-sanitize-chill)
+
+# Flags to pass down to makes which are built with the target environment.
+# The double $ decreases the length of the command line; the variables
+# are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them.
+# Because of the way do-info, et. al., use this, this must not contain
+# any backquotes.
+EXTRA_TARGET_FLAGS = \
+	'AR=$$(AR_FOR_TARGET)' \
+	'AS=$$(AS_FOR_TARGET)' \
+	'CC=$$(CC_FOR_TARGET)' \
+	'CXX=$$(CXX_FOR_TARGET)' \
+	'NM=$$(NM_FOR_TARGET)' \
+	'RANLIB=$$(RANLIB_FOR_TARGET)' \
+	'XTRAFLAGS=$$(XTRAFLAGS_FOR_TARGET)'
+
+TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
+
+# Flags to pass down to gcc.  gcc builds a library, libgcc.a, so it
+# unfortunately needs the native compiler and the target ar and
+# ranlib.
+# Because of the way do-info, et. al., use this, this must not contain
+# any backquotes.
+EXTRA_GCC_FLAGS = \
+	'AR=$$(AR_FOR_TARGET)' \
+	"AS=$(AS)" \
+	"CC=$(CC)" \
+	"CXX=$(CXX)" \
+	"NM=$(NM)" \
+	'RANLIB=$$(RANLIB_FOR_TARGET)' \
+	"XTRAFLAGS="
 
-# Flags to pass down to makes which are built with the target
-# environment (e.g. libg++, xiberty, newlib).  -- keep these in alpha order please
-TARGET_FLAGS_TO_PASS = \
-	"AR=$(AR_FOR_TARGET)" \
-	"AR_FLAGS=$(AR_FLAGS)" \
-	"AS=$(AS_FOR_TARGET)" \
-	"BISON=$(BISON)" \
-	"CXX=$(CXX_FOR_TARGET)" \
-	"CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
-	"CXXFLAGS=$(CXXFLAGS)" \
-	"CC=$(CC_FOR_TARGET)" \
-	"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
-	"CFLAGS=$(CFLAGS)" \
-	"INSTALL=$(INSTALL)" \
-	"INSTALL_DATA=$(INSTALL_DATA)" \
-	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
-	"LDFLAGS=$(LDFLAGS)" \
-	"LEX=$(LEX)" \
-	"LOADLIBES=$(LOADLIBES)" \
-	"MAKEINFO=$(MAKEINFO)" \
-	"NM=$(NM_FOR_TARGET)" \
-	"RANLIB=$(RANLIB_FOR_TARGET)" \
-	"XTRAFLAGS=$(XTRAFLAGS)" \
-	"exec_prefix=$(exec_prefix)" \
-	"prefix=$(prefix)" \
-	"tooldir=$(tooldir)" 
+GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS)
 
 # The first rule in the file had better be this one.  Don't put any above it.
 all:	$(ALL)
 
-.PHONY: all info install-info clean-info
+.PHONY: all check dvi info install-info install-info-dirs
+.PHONY: do-info do-check do-dvi do-install-info
+.PHONY: do-clean do-mostlyclean do-distclean do-realclean
 .NOEXPORT:
 
-info:	
-	@rootme=`pwd` ; export rootme ; $(MAKE) $(FLAGS_TO_PASS) subdir_do DO=info "DODIRS=$(SUBDIRS)" 
-
-check:
-	@rootme=`pwd` ; export rootme ; $(MAKE) $(FLAGS_TO_PASS) DO=check "DODIRS=$(SUBDIRS)" subdir_do
-
-clean-info:
-	@rootme='pwd' ; export rootme ; $(MAKE) $(FLAGS_TO_PASS) DO=clean-info "DODIRS=$(SUBDIRS)" subdir_do
+# Do a target for all the subdirectories.  A ``make do-X'' will do a
+# ``make X'' in all subdirectories (because, in general, X depends on
+# fdo-X, a ``make X'' will also do this, but it may do additional work
+# as well).
+# This target ensures that $(BASE_FLAGS_TO_PASS) appears only once,
+# because it is so large that it can easily overflow the command line
+# length limit on some systems.
+do-info do-check do-dvi do-install-info do-clean do-mostlyclean do-distclean do-realclean:
+	@target=`echo $@ | sed -e 's/^do-//'`; \
+	rootme=`pwd`; export rootme; \
+	srcroot=`cd $(srcdir); pwd`; export srcroot; \
+	for i in $(SUBDIRS); do \
+	  if [ -f ./$$i/localenv ] || [ -f ./$$i/Makefile ]; then \
+	    case $$i in \
+	    $(TARGET_LIBS) ) \
+	      extra_flags=`echo $(EXTRA_TARGET_FLAGS)`; \
+	      ;; \
+	    gcc) \
+	      extra_flags=`echo $(EXTRA_GCC_FLAGS)`; \
+	      ;; \
+	    *) \
+	      extra_flags=`echo $(EXTRA_HOST_FLAGS)`; \
+	      ;; \
+	    esac ; \
+	    export extra_flags; \
+	    if (cd ./$$i; \
+	        $(MAKE) $(BASE_FLAGS_TO_PASS) $${extra_flags} $${target}); \
+	    then true; else exit 1; fi; \
+	  else true; fi; \
+	done
 
-install-info: install-info-dirs force
-	-parent=`echo $(infodir)|sed -e 's@/[^/]*$$@@'`; \
-	if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi
-	-if [ -d $(infodir) ] ; then true ; else mkdir $(infodir) ; fi
-	@rootme='pwd' ; export rootme ; $(MAKE) $(FLAGS_TO_PASS) DO=install-info "DODIRS=$(SUBDIRS)" subdir_do
-	@rootme='pwd' ; export rootme ; $(MAKE) $(FLAGS_TO_PASS) dir.info install-dir.info
+info: do-info
+check: do-check
+dvi: do-dvi
 
-install-dir.info:
-	-parent=`echo $(infodir)|sed -e 's@/[^/]*$$@@'`; \
-	if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi
-	-if [ -d $(infodir) ] ; then true ; else mkdir $(infodir) ; fi
+install-info: install-info-dirs do-install-info dir.info
 	$(INSTALL_DATA) dir.info $(infodir)/dir.info
 
-all.normal: all-autoconf all-libiberty all-mmalloc all-texinfo \
+do-install-info: install-info-dirs
+
+all.normal: all-m4 all-autoconf all-libiberty all-mmalloc all-texinfo \
 	all-byacc all-flex all-opcodes all-bfd all-ld all-gas all-tgas \
-	all-gcc all-binutils  all-libg++ all-readline all-z8ksim all-gdb \
+	all-gcc all-binutils  all-libg++ all-readline all-sim all-gdb \
 	all-make all-rcs all-cvs all-diff all-grep \
 	all-patch all-emacs all-ispell all-etc \
 	all-tcl all-tk all-expect \
-	all-newlib all-gprof all-send_pr all-libm all-deja-gnu
+	all-newlib \
+	$(start-sanitize-chill) \
+	all-chillrt \
+	$(end-sanitize-chill) \
+	all-gprof all-send_pr all-libm all-deja-gnu \
+	all-fileutils all-find all-gawk all-sed all-shellutils \
+	all-textutils all-time all-wdiff all-uudecode 
+
 
 all.cross: all-libiberty all-mmalloc all-gas all-byacc all-flex all-ld \
-	 all-opcodes all-z8ksim all-bfd all-readline all-gdb all-binutils all-gcc \
-	all-newlib all-deja-gnu
-
-clean: clean-autoconf clean-libiberty clean-mmalloc clean-texinfo \
-	clean-bfd clean-newlib clean-binutils clean-flex \
-	clean-byacc clean-ld clean-gas clean-etc clean-opcodes \
-	clean-gcc clean-readline clean-glob clean-gdb clean-z8ksim \
-	clean-make clean-diff clean-grep clean-rcs \
-	clean-cvs clean-patch clean-emacs clean-ispell \
-	clean-tcl clean-tk clean-expect \
-	clean-libg++ clean-gprof clean-send_pr clean-libm clean-xiberty \
-	clean-deja-gnu
-	-rm -rf *.a TEMP errs core *.o *~ \#* TAGS *.E
-
-clean-stamps:
-	-rm -f all-*
+	all-opcodes all-bfd all-readline all-sim \
+	all-gdb all-binutils all-gcc all-newlib \
+	$(start-sanitize-chill) \
+	all-chillrt \
+	$(end-sanitize-chill) \
+	all-deja-gnu
+
+.PHONY: clean distclean mostlyclean realclean local-clean local-distclean
+
+local-clean:
+	-rm -f *.a TEMP errs core *.o *~ \#* TAGS *.E
+
+local-distclean:
+	-rm -f Makefile config.status
+
+clean: do-clean local-clean
+mostlyclean: do-mostlyclean local-clean
+distclean: do-distclean local-clean local-distclean
+realclean: do-realclean local-clean local-distclean
+
+uninstall:
+	@echo "the uninstall target is not supported in this tree"
 
 install: $(INSTALL_TARGET) 
 	-parent=`echo $(man1dir)|sed -e 's@/[^/]*$$@@'`; \
@@ -313,6 +420,9 @@ install-no-fixedincludes: install-dirs gcc-no-fixedincludes \
 	install-make \
 	install-mmalloc \
 	install-newlib \
+	$(start-sanitize-chill) \
+	install-chillrt \
+	$(end-sanitize-chill) \
 	install-patch \
 	install-rcs \
 	install-readline \
@@ -320,23 +430,39 @@ install-no-fixedincludes: install-dirs gcc-no-fixedincludes \
 	install-tcl \
 	install-texinfo \
 	install-tk  \
-	install-z8ksim
+	install-sim \
+	install-fileutils install-find install-gawk install-m4 install-sed install-shellutils \
+	install-textutils install-time install-wdiff install-uudecode
 
+#
+# Install the gcc headers files, but not the fixed include files,
+# which we are not allowed to distribute.  This rule is very dependent
+# on the workings of the gcc Makefile.in.
+#
 gcc-no-fixedincludes:
-	@if [ -f ./gcc/Makefile ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./gcc; \
-		$(MAKE) $(FLAGS_TO_PASS) install install-man \
-			"INSTALL_HEADERS=install-common-headers install-float-h install-limits-h") ; \
-	else \
-		true ; \
-	fi
+	@if [ -f ./gcc/Makefile ]; then \
+	  rm -rf gcc/tmp-include; \
+	  mv gcc/include gcc/tmp-include 2>/dev/null; \
+	  mkdir gcc/include; \
+	  touch gcc/stmp-fixincludes; \
+	  rm -f gcc/stmp-headers; \
+	  rootme=`pwd`; export rootme; \
+	  srcroot=`cd $(srcdir); pwd` ; export srcroot; \
+	  (cd ./gcc; \
+	   $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
+	  rm -rf gcc/include; \
+	  mv gcc/tmp-include gcc/include 2>/dev/null; \
+	else true; fi
 
 install.cross: install-dirs install-libiberty install-mmalloc \
         install-binutils install-opcodes install-byacc install-flex \
         install-ld install-gas install-readline \
         install-glob install-gdb install-mmalloc \
-        install-newlib install-gcc install-etc install-deja-gnu
+        install-newlib \
+	$(start-sanitize-chill) \
+	install-chillrt \
+	$(end-sanitize-chill) \
+	install-gcc install-etc install-deja-gnu
 
 ### deja-gnu
 all-deja-gnu: force
@@ -347,14 +473,6 @@ all-deja-gnu: force
 		true ; \
 	fi
 
-clean-deja-gnu: force
-	@if [ -f ./deja-gnu/Makefile ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./deja-gnu;	$(MAKE) $(FLAGS_TO_PASS) clean) ; \
-	else \
-		true ; \
-	fi
-
 install-deja-gnu: force
 	@if [ -f ./deja-gnu/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
@@ -372,14 +490,6 @@ all-autoconf: force
 		true ; \
 	fi
 
-clean-autoconf: force
-	@if [ -f ./autoconf/Makefile ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./autoconf;	$(MAKE) $(FLAGS_TO_PASS) clean) ; \
-	else \
-		true ; \
-	fi
-
 install-autoconf: force
 	@if [ -f ./autoconf/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
@@ -397,14 +507,6 @@ all-etc: force
 		true ; \
 	fi
 
-clean-etc: force
-	@if [ -f ./etc/Makefile ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./etc; $(MAKE) $(FLAGS_TO_PASS) clean) ; \
-	else \
-		true ; \
-	fi
-
 install-etc: force
 	@if [ -f ./etc/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
@@ -423,15 +525,6 @@ all-libiberty: force
 		true ; \
 	fi
 
-clean-libiberty: force
-	@if [ -f ./libiberty/Makefile ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./libiberty; \
-		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
-	else \
-		true ; \
-	fi
-
 install-libiberty: force
 	@if [ -f ./libiberty/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
@@ -447,17 +540,7 @@ all-xiberty: all-gcc all-newlib
 		rootme=`pwd` ; export rootme ; \
 		srcroot=`cd $(srcdir); pwd`; export srcroot ; \
 		(cd ./xiberty; \
-		$(MAKE) $(FLAGS_TO_PASS) all) ; \
-	else \
-		true ; \
-	fi
-
-clean-xiberty: force
-	@if [ -f ./xiberty/Makefile ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		srcroot=`cd $(srcdir); pwd`; export srcroot ; \
-		(cd ./xiberty; \
-		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
+		$(MAKE) $(TARGET_FLAGS_TO_PASS) all) ; \
 	else \
 		true ; \
 	fi
@@ -467,7 +550,7 @@ install-xiberty: force
 		rootme=`pwd` ; export rootme ; \
 		srcroot=`cd $(srcdir); pwd`; export srcroot ; \
 		(cd ./xiberty; \
-		$(MAKE) $(FLAGS_TO_PASS) install) ; \
+		$(MAKE) $(TARGET_FLAGS_TO_PASS) install) ; \
 	else \
 		true ; \
 	fi
@@ -482,15 +565,6 @@ all-mmalloc: force
 		true ; \
 	fi
 
-clean-mmalloc: force
-	@if [ -f ./mmalloc/Makefile ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./mmalloc; \
-		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
-	else \
-		true ; \
-	fi
-
 install-mmalloc: force
 	@if [ -f ./mmalloc/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
@@ -510,15 +584,6 @@ all-texinfo: all-libiberty
 		true ; \
 	fi
 
-clean-texinfo: force
-	@if [ -f ./texinfo/Makefile ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./texinfo; \
-		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
-	else \
-		true ; \
-	fi
-
 install-texinfo: force
 	@if [ -f ./texinfo/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
@@ -538,15 +603,6 @@ all-bfd: force
 		true ; \
 	fi
 
-clean-bfd: force
-	@if [ -f ./bfd/Makefile ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./bfd; \
-		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
-	else \
-		true ; \
-	fi
-
 install-bfd: force
 	@if [ -f ./bfd/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
@@ -567,15 +623,6 @@ all-opcodes: force
 		true ; \
 	fi
 
-clean-opcodes: force
-	@if [ -f ./opcodes/Makefile ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./opcodes; \
-		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
-	else \
-		true ; \
-	fi
-
 install-opcodes: force
 	@if [ -f ./opcodes/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
@@ -595,15 +642,6 @@ all-binutils: all-opcodes all-libiberty all-bfd all-flex
 		true ; \
 	fi
 
-clean-binutils: force
-	@if [ -f ./binutils/Makefile ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./binutils; \
-		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
-	else \
-		true ; \
-	fi
-
 install-binutils: force
 	@if [ -f ./binutils/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
@@ -624,41 +662,45 @@ all-newlib: all-binutils all-ld all-gas all-gcc
 		true ; \
 	fi
 
-clean-newlib: force
+install-newlib: force
 	@if [ -f ./newlib/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		srcroot=`cd $(srcdir); pwd` ; export srcroot ; \
 		(cd ./newlib; \
-		$(MAKE) $(TARGET_FLAGS_TO_PASS) clean) ; \
+		$(MAKE) $(TARGET_FLAGS_TO_PASS) install) ; \
 	else \
 		true ; \
 	fi
 
-install-newlib: force
-	@if [ -f ./newlib/Makefile ] ; then \
+### start-sanitize-chill
+### chillrt
+all-chillrt: all-binutils all-ld all-gas all-gcc all-newlib
+	@if [ -f ./chillrt/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		srcroot=`cd $(srcdir); pwd` ; export srcroot ; \
-		(cd ./newlib; \
-		$(MAKE) $(TARGET_FLAGS_TO_PASS) install) ; \
+		(cd ./chillrt; \
+		$(MAKE) $(TARGET_FLAGS_TO_PASS) all) ; \
 	else \
 		true ; \
 	fi
 
-### gprof
-all-gprof: all-libiberty all-bfd
-	@if [ -f ./gprof/Makefile ] ; then \
+install-chillrt: force
+	@if [ -f ./chillrt/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
-		(cd ./gprof; \
-		$(MAKE) $(FLAGS_TO_PASS) all) ; \
+		srcroot=`cd $(srcdir); pwd` ; export srcroot ; \
+		(cd ./chillrt; \
+		$(MAKE) $(TARGET_FLAGS_TO_PASS) install) ; \
 	else \
 		true ; \
 	fi
+### end-sanitize-chill
 
-clean-gprof: force
+### gprof
+all-gprof: all-libiberty all-bfd
 	@if [ -f ./gprof/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./gprof; \
-		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
+		$(MAKE) $(FLAGS_TO_PASS) all) ; \
 	else \
 		true ; \
 	fi
@@ -682,15 +724,6 @@ all-byacc: force
 		true ; \
 	fi
 
-clean-byacc: force
-	@if [ -f ./byacc/Makefile ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./byacc; \
-		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
-	else \
-		true ; \
-	fi
-
 install-byacc: force
 	@if [ -f ./byacc/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
@@ -710,15 +743,6 @@ all-flex: all-libiberty
 		true ; \
 	fi
 
-clean-flex: force
-	@if [ -f ./flex/Makefile ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./flex; \
-		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
-	else \
-		true ; \
-	fi
-
 install-flex: force
 	@if [ -f ./flex/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
@@ -728,20 +752,12 @@ install-flex: force
 		true ; \
 	fi
 ### gcc
-all-gcc: all-libiberty all-byacc all-binutils
-	@if [ -f ./gcc/Makefile ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./gcc; \
-		$(MAKE) $(FLAGS_TO_PASS) all) ; \
-	else \
-		true ; \
-	fi
-
-clean-gcc: force
+all-gcc: all-libiberty all-byacc all-binutils all-gas
 	@if [ -f ./gcc/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
+		srcroot=`cd $(srcdir); pwd` ; export srcroot ; \
 		(cd ./gcc; \
-		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
+		$(MAKE) $(GCC_FLAGS_TO_PASS) all) ; \
 	else \
 		true ; \
 	fi
@@ -749,8 +765,9 @@ clean-gcc: force
 install-gcc: force
 	@if [ -f ./gcc/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
+		srcroot=`cd $(srcdir); pwd` ; export srcroot ; \
 		(cd ./gcc; \
-		$(MAKE) $(FLAGS_TO_PASS) install) ; \
+		$(MAKE) $(GCC_FLAGS_TO_PASS) install) ; \
 	else \
 		true ; \
 	fi
@@ -765,15 +782,6 @@ all-readline: force
 		true ; \
 	fi
 
-clean-readline: force
-	@if [ -f ./readline/Makefile ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./readline; \
-		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
-	else \
-		true ; \
-	fi
-
 install-readline: force
 	@if [ -f ./readline/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
@@ -793,15 +801,6 @@ all-glob: force
 		true ; \
 	fi
 
-clean-glob: force
-	@if [ -f ./glob/Makefile ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./glob; \
-		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
-	else \
-		true ; \
-	fi
-
 install-glob: force
 	@if [ -f ./glob/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
@@ -821,15 +820,6 @@ all-gas: all-libiberty all-opcodes all-bfd
 		true ; \
 	fi
 
-clean-gas: force
-	@if [ -f ./gas/Makefile ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./gas; \
-		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
-	else \
-		true ; \
-	fi
-
 install-gas: force
 	@if [ -f ./gas/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
@@ -860,15 +850,6 @@ all-ld: all-libiberty all-bfd all-byacc all-flex
 		true ; \
 	fi
 
-clean-ld: force
-	@if [ -f ./ld/Makefile ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./ld; \
-		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
-	else \
-		true ; \
-	fi
-
 install-ld: force
 	@if [ -f ./ld/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
@@ -888,15 +869,6 @@ all-gdb: all-bfd all-opcodes all-libiberty all-mmalloc all-readline all-glob all
 		true ; \
 	fi
 
-clean-gdb: force
-	@if [ -f ./gdb/Makefile ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./gdb; \
-		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
-	else \
-		true ; \
-	fi
-
 install-gdb: force
 	@if [ -f ./gdb/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
@@ -916,15 +888,6 @@ all-make: all-libiberty
 		true ; \
 	fi
 
-clean-make: force
-	@if [ -f ./make/Makefile ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./make; \
-		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
-	else \
-		true ; \
-	fi
-
 install-make: force
 	@if [ -f ./make/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
@@ -944,15 +907,6 @@ all-diff: force
 		true ; \
 	fi
 
-clean-diff: force
-	@if [ -f ./diff/Makefile ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./diff; \
-		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
-	else \
-		true ; \
-	fi
-
 install-diff: force
 	@if [ -f ./diff/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
@@ -972,15 +926,6 @@ all-grep: force
 		true ; \
 	fi
 
-clean-grep: force
-	@if [ -f ./grep/Makefile ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./grep; \
-		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
-	else \
-		true ; \
-	fi
-
 install-grep: force
 	@if [ -f ./grep/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
@@ -1000,15 +945,6 @@ all-rcs: force
 		true ; \
 	fi
 
-clean-rcs: force
-	@if [ -f ./rcs/Makefile ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./rcs; \
-		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
-	else \
-		true ; \
-	fi
-
 install-rcs: force
 	@if [ -f ./rcs/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
@@ -1028,15 +964,6 @@ all-cvs: force
 		true ; \
 	fi
 
-clean-cvs: force
-	@if [ -f ./cvs/Makefile ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./cvs; \
-		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
-	else \
-		true ; \
-	fi
-
 install-cvs: force
 	@if [ -f ./cvs/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
@@ -1056,15 +983,6 @@ all-patch: force
 		true ; \
 	fi
 
-clean-patch: force
-	@if [ -f ./patch/Makefile ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./patch; \
-		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
-	else \
-		true ; \
-	fi
-
 install-patch: force
 	@if [ -f ./patch/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
@@ -1086,15 +1004,6 @@ all-emacs: force
 		true ; \
 	fi
 
-clean-emacs: force
-	@if [ -f ./emacs/Makefile ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./emacs; \
-		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
-	else \
-		true ; \
-	fi
-
 install-emacs: force
 	@if [ -f ./emacs/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
@@ -1114,15 +1023,6 @@ all-ispell: all-emacs
 		true ; \
 	fi
 
-clean-ispell: force
-	@if [ -f ./ispell/Makefile ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./ispell; \
-		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
-	else \
-		true ; \
-	fi
-
 install-ispell: force
 	@if [ -f ./ispell/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
@@ -1142,15 +1042,6 @@ all-send_pr: force
 		true ; \
 	fi
 
-clean-send_pr: force
-	@if [ -f ./send_pr/Makefile ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./send_pr; \
-		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
-	else \
-		true ; \
-	fi
-
 install-send_pr: force
 	@if [ -f ./send_pr/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
@@ -1165,16 +1056,7 @@ all-libm: force
 	@if [ -f ./libm/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./libm; \
-		$(MAKE) $(FLAGS_TO_PASS) all) ; \
-	else \
-		true ; \
-	fi
-
-clean-libm: force
-	@if [ -f ./libm/Makefile ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./libm; \
-		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
+		$(MAKE) $(TARGET_FLAGS_TO_PASS) all) ; \
 	else \
 		true ; \
 	fi
@@ -1183,14 +1065,14 @@ install-libm: force
 	@if [ -f ./libm/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./libm; \
-		$(MAKE) $(FLAGS_TO_PASS) install) ; \
+		$(MAKE) $(TARGET_FLAGS_TO_PASS) install) ; \
 	else \
 		true ; \
 	fi
 
 ### libg++
 
-all-libg++: all-gas all-ld all-gcc all-xiberty
+all-libg++: all-gas all-ld all-gcc all-xiberty all-newlib
 	@if [ -f ./libg++/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		srcroot=`cd $(srcdir); pwd` ; export srcroot ; \
@@ -1200,16 +1082,6 @@ all-libg++: all-gas all-ld all-gcc all-xiberty
 		true ; \
 	fi
 
-clean-libg++: force
-	@if [ -f ./libg++/Makefile ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		srcroot=`cd $(srcdir); pwd` ; export srcroot ; \
-		(cd ./libg++; \
-		$(MAKE) $(TARGET_FLAGS_TO_PASS) clean) ; \
-	else \
-		true ; \
-	fi
-
 install-libg++: force
 	@if [ -f ./libg++/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
@@ -1230,16 +1102,6 @@ all-tcl:
 		true ; \
 	fi
 
-clean-tcl: force
-	@if [ -f ./tcl/Makefile ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		srcroot=`cd $(srcdir); pwd`; export srcroot ; \
-		(cd ./tcl; \
-		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
-	else \
-		true ; \
-	fi
-
 install-tcl: force
 	@if [ -f ./tcl/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
@@ -1262,16 +1124,6 @@ all-tk: all-tcl
 		true ; \
 	fi
 
-clean-tk: force
-	@if [ -f ./tk/Makefile ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		srcroot=`cd $(srcdir); pwd`; export srcroot ; \
-		(cd ./tk; \
-		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
-	else \
-		true ; \
-	fi
-
 install-tk: force
 	@if [ -f ./tk/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
@@ -1293,82 +1145,208 @@ all-expect: all-tcl
 		true ; \
 	fi
 
-clean-expect: force
+install-expect: force
 	@if [ -f ./expect/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		srcroot=`cd $(srcdir); pwd`; export srcroot ; \
 		(cd ./expect; \
-		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
+		$(MAKE) $(FLAGS_TO_PASS) install) ; \
 	else \
 		true ; \
 	fi
 
-install-expect: force
-	@if [ -f ./expect/Makefile ] ; then \
+### sim
+all-sim: all-bfd 
+	@if [ -f ./sim/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
-		srcroot=`cd $(srcdir); pwd`; export srcroot ; \
-		(cd ./expect; \
+		(cd ./sim; \
+		$(MAKE) $(FLAGS_TO_PASS) all) ; \
+	else \
+		true ; \
+	fi
+
+install-sim: force
+	@if [ -f ./sim/Makefile ] ; then \
+		rootme=`pwd` ; export rootme ; \
+		(cd ./sim; \
 		$(MAKE) $(FLAGS_TO_PASS) install) ; \
 	else \
 		true ; \
 	fi
 
+### fileutils
+all-fileutils: force
+	@if [ -f ./fileutils/Makefile ] ; then \
+	  rootme=`pwd` ; export rootme ; \
+		(cd ./fileutils; $(MAKE) $(FLAGS_TO_PASS) all) ; \
+	else \
+		true ; \
+	fi
 
-### z8ksim
-all-z8ksim: all-bfd 
-	@if [ -f ./z8ksim/Makefile ] ; then \
+install-fileutils: force
+	@if [ -f ./fileutils/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
-		(cd ./z8ksim; \
-		$(MAKE) $(FLAGS_TO_PASS) all) ; \
+		(cd ./fileutils; $(MAKE) $(FLAGS_TO_PASS) install) ; \
+	else \
+		true ; \
+	fi
+
+### find
+all-find: force
+	@if [ -f ./find/Makefile ] ; then \
+	  rootme=`pwd` ; export rootme ; \
+		(cd ./find; $(MAKE) $(FLAGS_TO_PASS) all) ; \
+	else \
+		true ; \
+	fi
+
+install-find: force
+	@if [ -f ./find/Makefile ] ; then \
+		rootme=`pwd` ; export rootme ; \
+		(cd ./find; $(MAKE) $(FLAGS_TO_PASS) install) ; \
 	else \
 		true ; \
 	fi
 
-clean-z8ksim: force
-	@if [ -f ./z8ksim/Makefile ] ; then \
+### gawk
+all-gawk: force
+	@if [ -f ./gawk/Makefile ] ; then \
+	  rootme=`pwd` ; export rootme ; \
+		(cd ./gawk; $(MAKE) $(FLAGS_TO_PASS) all) ; \
+	else \
+		true ; \
+	fi
+
+install-gawk: force
+	@if [ -f ./gawk/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
-		(cd ./z8ksim; \
-		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
+		(cd ./gawk; $(MAKE) $(FLAGS_TO_PASS) install) ; \
+	else \
+		true ; \
+	fi
+
+### m4
+all-m4: all-libiberty
+	@if [ -f ./m4/Makefile ] ; then \
+	  rootme=`pwd` ; export rootme ; \
+		(cd ./m4; $(MAKE) $(FLAGS_TO_PASS) all) ; \
 	else \
 		true ; \
 	fi
 
-install-z8ksim: force
-	@if [ -f ./z8ksim/Makefile ] ; then \
+install-m4: force
+	@if [ -f ./m4/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
-		(cd ./z8ksim; \
-		$(MAKE) $(FLAGS_TO_PASS) install) ; \
+		(cd ./m4; $(MAKE) $(FLAGS_TO_PASS) install) ; \
 	else \
 		true ; \
 	fi
 
+### sed
+all-sed: force
+	@if [ -f ./sed/Makefile ] ; then \
+	  rootme=`pwd` ; export rootme ; \
+		(cd ./sed; $(MAKE) $(FLAGS_TO_PASS) all) ; \
+	else \
+		true ; \
+	fi
 
-### other supporting targets
+install-sed: force
+	@if [ -f ./sed/Makefile ] ; then \
+		rootme=`pwd` ; export rootme ; \
+		(cd ./sed; $(MAKE) $(FLAGS_TO_PASS) install) ; \
+	else \
+		true ; \
+	fi
 
-subdir_do:
-	@for i in $(DODIRS); do \
-	  if [ -f ./$$i/localenv ] || [ -f ./$$i/Makefile ] ; then \
-	    case $$i in \
-	    libg++ | xiberty | newlib) \
-	      if (rootme=`pwd` ; export rootme ; \
-		  srcroot=`cd $(srcdir); pwd` ; export srcroot ; \
-		  cd ./$$i ; \
-		  $(MAKE) $(TARGET_FLAGS_TO_PASS) $(DO)) ; then true ; \
-	      else exit 1 ; fi \
-	      ;; \
-	    *) \
-	      if (rootme=`pwd` ; export rootme ; \
-		  cd ./$$i ; \
-		  $(MAKE) $(FLAGS_TO_PASS) $(DO)) ; then true ; \
-	      else exit 1 ; fi \
-	      ;; \
-	    esac ; \
-	  else true ; fi ; \
-	done
+### time
+all-time: force
+	@if [ -f ./time/Makefile ] ; then \
+	  rootme=`pwd` ; export rootme ; \
+		(cd ./time; $(MAKE) $(FLAGS_TO_PASS) all) ; \
+	else \
+		true ; \
+	fi
+
+install-time: force
+	@if [ -f ./time/Makefile ] ; then \
+		rootme=`pwd` ; export rootme ; \
+		(cd ./time; $(MAKE) $(FLAGS_TO_PASS) install) ; \
+	else \
+		true ; \
+	fi
+
+### wdiff
+all-wdiff: force
+	@if [ -f ./wdiff/Makefile ] ; then \
+	  rootme=`pwd` ; export rootme ; \
+		(cd ./wdiff; $(MAKE) $(FLAGS_TO_PASS) all) ; \
+	else \
+		true ; \
+	fi
+
+install-wdiff: force
+	@if [ -f ./wdiff/Makefile ] ; then \
+		rootme=`pwd` ; export rootme ; \
+		(cd ./wdiff; $(MAKE) $(FLAGS_TO_PASS) install) ; \
+	else \
+		true ; \
+	fi
+
+### uudecode
+all-uudecode: all-libiberty
+	@if [ -f ./uudecode/Makefile ] ; then \
+	  rootme=`pwd` ; export rootme ; \
+		(cd ./uudecode; $(MAKE) $(FLAGS_TO_PASS) all) ; \
+	else \
+		true ; \
+	fi
+
+install-uudecode: force
+	@if [ -f ./uudecode/Makefile ] ; then \
+		rootme=`pwd` ; export rootme ; \
+		(cd ./uudecode; $(MAKE) $(FLAGS_TO_PASS) install) ; \
+	else \
+		true ; \
+	fi
+
+### shellutils
+all-shellutils: force
+	@if [ -f ./shellutils/Makefile ] ; then \
+	  rootme=`pwd` ; export rootme ; \
+		(cd ./shellutils; $(MAKE) $(FLAGS_TO_PASS) all) ; \
+	else \
+		true ; \
+	fi
+
+install-shellutils: force
+	@if [ -f ./shellutils/Makefile ] ; then \
+		rootme=`pwd` ; export rootme ; \
+		(cd ./shellutils; $(MAKE) $(FLAGS_TO_PASS) install) ; \
+	else \
+		true ; \
+	fi
+
+### textutils
+all-textutils: force
+	@if [ -f ./textutils/Makefile ] ; then \
+	  rootme=`pwd` ; export rootme ; \
+		(cd ./textutils; $(MAKE) $(FLAGS_TO_PASS) all) ; \
+	else \
+		true ; \
+	fi
 
-# The "else true" stuff is for Ultrix; the shell returns the exit code
-# of the "if" command, if no commands are run in the "then" or "else" part,
-# causing Make to quit.
+install-textutils: force
+	@if [ -f ./textutils/Makefile ] ; then \
+		rootme=`pwd` ; export rootme ; \
+		(cd ./textutils; $(MAKE) $(FLAGS_TO_PASS) install) ; \
+	else \
+		true ; \
+	fi
+
+
+
+### other supporting targets
 
 MAKEDIRS= \
 	$(prefix) \
@@ -1407,16 +1385,20 @@ install-dirs:
 		fi ; \
 	done
 
-MAKEINFODIRS= \
-	$(prefix)
-
 install-info-dirs:
 	if [ -d $(prefix) ] ; then true ; else mkdir $(prefix) ; fi
+	-parent=`echo $(infodir)|sed -e 's@/[^/]*$$@@'`; \
+	if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi
+	-if [ -d $(infodir) ] ; then true ; else mkdir $(infodir) ; fi
 
-dir.info:
+dir.info: do-install-info
 	$(srcdir)/texinfo/gen-info-dir $(infodir) $(srcdir)/texinfo/dir.info-template > dir.info.new
 	mv -f dir.info.new dir.info
 
+dist:
+	@echo "Building a full distribution of this tree isn't done"
+	@echo "via 'make dist'.  Check out the etc/ subdirectory" 
+
 etags tags: TAGS
 
 TAGS:
@@ -1445,13 +1427,13 @@ Makefile: $(srcdir)/Makefile.in $(host_makefile_frag) $(target_makefile_frag)
 #
 # Build GDB distributions that contain BFD, Include, Libiberty, Readline, etc
 
-DEVO_SUPPORT= README cfg-paper.texi Makefile.in configure configure.in \
-	config.sub config configure.man configure.texi move-if-change \
+DEVO_SUPPORT= README Makefile.in configure configure.in \
+	config.guess config.sub config etc move-if-change \
 	COPYING.LIB
 GDB_SUPPORT_DIRS= bfd include libiberty mmalloc opcodes readline glob
-GDB_SUPPORT_FILES= $(GDB_SUPPORT_DIRS) texinfo/fsf/texinfo.tex
+GDB_SUPPORT_FILES= $(GDB_SUPPORT_DIRS)
 
-setup-dirs: force_update
+setup-dirs: force
 	./configure sun4
 	make clean
 	./configure -rm sun4
@@ -1461,7 +1443,7 @@ gdb.tar.Z: setup-dirs
 	(cd gdb; $(MAKE) -f Makefile.in make-proto-gdb.dir)
 	$(MAKE) $(MFLAGS) -f Makefile.in make-gdb.tar.Z
 
-make-gdb.tar.Z: $(DEVO_SUPPORT) $(GDB_SUPPORT_DIRS) gdb texinfo/fsf/texinfo.tex
+make-gdb.tar.Z: $(DEVO_SUPPORT) $(GDB_SUPPORT_DIRS) gdb texinfo/texinfo.tex
 	rm -rf proto-toplev; mkdir proto-toplev
 	ln -s ../gdb/proto-gdb.dir proto-toplev/gdb
 	(cd proto-toplev; for i in $(DEVO_SUPPORT) $(GDB_SUPPORT_DIRS); do \
@@ -1474,21 +1456,23 @@ make-gdb.tar.Z: $(DEVO_SUPPORT) $(GDB_SUPPORT_DIRS) gdb texinfo/fsf/texinfo.tex
 	ln proto-toplev/gdb/COPYING proto-toplev/include/COPYING
 	rm                          proto-toplev/readline/COPYING
 	ln proto-toplev/gdb/COPYING proto-toplev/readline/COPYING
-	# Take out texinfo from configurable dirs
+
+	# Take out texinfo and glob from configurable dirs
 	rm proto-toplev/configure.in
-	sed '/^configdirs=/s/texinfo //' <configure.in >proto-toplev/configure.in
-	# Take out glob from buildable dirs
-	rm proto-toplev/Makefile.in
+	sed -e '/^host_tools=/s/texinfo //' \
+	    -e '/^host_libs=/s/glob //' \
+	    <configure.in >proto-toplev/configure.in
 
-	sed -e '/^SUBDIRS =/s/glob //' \
-	    -e '/^all\.normal: /s/\all-texinfo //' \
-	    -e '/^clean: /s/clean-texinfo //' \
-	    -e '/^install\.all: /s/install-texinfo //' \
+	# Take out texinfo from a few places; make simple BISON=bison line.
+	rm proto-toplev/Makefile.in
+	sed -e '/^all\.normal: /s/\all-texinfo //' \
+	    -e '/^	install-texinfo /d' \
+	    -e '\/^BISON =/,\/^$$/c\
+		BISON = bison -y' \
 	<Makefile.in >proto-toplev/Makefile.in
 
 	mkdir proto-toplev/texinfo
-	mkdir proto-toplev/texinfo/fsf
-	ln -s ../../../texinfo/fsf/texinfo.tex proto-toplev/texinfo/fsf/
+	ln -s ../../texinfo/texinfo.tex proto-toplev/texinfo/
 	chmod og=u `find proto-toplev -print`
 	(VER=`sed <gdb/Makefile.in -n 's/VERSION = //p'`; \
 		echo "==> Making gdb-$$VER.tar.Z"; \
@@ -1496,8 +1480,5 @@ make-gdb.tar.Z: $(DEVO_SUPPORT) $(GDB_SUPPORT_DIRS) gdb texinfo/fsf/texinfo.tex
 		tar cfh - gdb-$$VER \
 		| compress -v >gdb-$$VER.tar.Z)
 
-force_update:
-
-nothing:
 
 # end of Makefile.in