Stylistic Cleanups to Headings and Cross References to Avoid Undue
[deliverable/binutils-gdb.git] / Makefile.in
index 2f5be57ac3134581a021eae04a2b6235d0b9f702..9c54d9edab97ccf82e029bd1ff46f248003d1dba 100644 (file)
@@ -51,9 +51,15 @@ INSTALL_DATA = $(INSTALL)
 
 AS = as
 AR = ar
-AR_FLAGS = qc
+AR_FLAGS = rc
+CC = cc
 CFLAGS = -g
-C++FLAGS = -g -O
+$(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)
-C++_FOR_BUILD = gcc
+CXX_FOR_BUILD = $(CXX)
 
-SUBDIRS = libiberty mmalloc glob readline opcodes bfd 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,7 @@ 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); \
@@ -95,12 +105,36 @@ CC_FOR_TARGET = ` \
     fi; \
   fi`
 
-C++_FOR_TARGET = ` \
+GCC_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 $(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); \
+    else \
+      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/xgcc -B$${rootme}/gcc/; \
+  else \
+    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 ; \
@@ -161,6 +195,7 @@ XTRAFLAGS = ` \
      echo ; \
   fi`
 
+
 #### host and target specific makefile fragments come in here.
 ###
 
@@ -168,12 +203,19 @@ XTRAFLAGS = ` \
 FLAGS_TO_PASS = \
        "AR=$(AR)" \
        "AR_FLAGS=$(AR_FLAGS)" \
+       "AR_FOR_TARGET=$(AR_FOR_TARGET)" \
        "BISON=$(BISON)" \
-       "C++FLAGS=$(C++FLAGS)" \
-       "C++_FOR_BUILD=$(C++_FOR_BUILD)"
+       "CXXFLAGS=$(CXXFLAGS)" \
+       "CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
        "CC=$(CC)" \
        "CC_FOR_BUILD=$(CC_FOR_BUILD)" \
        "CFLAGS=$(CFLAGS)" \
+$(start-sanitize-chill)\
+       "CHILLFLAGS=$(CHILLFLAGS)" \
+       "CHILL_FOR_TARGET=$(CHILL_FOR_TARGET)" \
+       "CHILL_LIB=$(CHILL_LIB)" \
+$(end-sanitize-chill)\
+       "GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \
        "INSTALL=$(INSTALL)" \
        "INSTALL_DATA=$(INSTALL_DATA)" \
        "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
@@ -182,10 +224,19 @@ FLAGS_TO_PASS = \
        "LOADLIBES=$(LOADLIBES)" \
        "MAKEINFO=$(MAKEINFO)" \
        "RANLIB=$(RANLIB)" \
+       "RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \
        "exec_prefix=$(exec_prefix)" \
        "prefix=$(prefix)" \
        "tooldir=$(tooldir)" 
 
+# 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=$(X11_LIB)"
+
 # 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 = \
@@ -193,8 +244,9 @@ TARGET_FLAGS_TO_PASS = \
        "AR_FLAGS=$(AR_FLAGS)" \
        "AS=$(AS_FOR_TARGET)" \
        "BISON=$(BISON)" \
-       "C++=$(C++_FOR_TARGET)" \
-       "C++_FOR_BUILD=$(C++_FOR_BUILD)" \
+       "CXX=$(CXX_FOR_TARGET)" \
+       "CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
+       "CXXFLAGS=$(CXXFLAGS)" \
        "CC=$(CC_FOR_TARGET)" \
        "CC_FOR_BUILD=$(CC_FOR_BUILD)" \
        "CFLAGS=$(CFLAGS)" \
@@ -212,20 +264,45 @@ TARGET_FLAGS_TO_PASS = \
        "prefix=$(prefix)" \
        "tooldir=$(tooldir)" 
 
+# 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.  Keep these in alphabetical order, please.
+GCC_FLAGS_TO_PASS = \
+       "AR=$(AR_FOR_TARGET)" \
+       "AR_FLAGS=$(AR_FLAGS)" \
+       "AR_FOR_TARGET=$(AR_FOR_TARGET)" \
+       "AS=$(AS)" \
+       "BISON=$(BISON)" \
+       "CXX=$(CXX)" \
+       "CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
+       "CXXFLAGS=$(CXXFLAGS)" \
+       "CC=$(CC)" \
+       "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)" \
+       "RANLIB=$(RANLIB_FOR_TARGET)" \
+       "RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \
+       "XTRAFLAGS=$(XTRAFLAGS)" \
+       "exec_prefix=$(exec_prefix)" \
+       "prefix=$(prefix)" \
+       "tooldir=$(tooldir)" 
+
 # 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 
 .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
+info check dvi:        
+       @rootme=`pwd` ; export rootme ; \
+         $(MAKE) $(FLAGS_TO_PASS) DO=$@ "DODIRS=$(SUBDIRS)" subdir_do
 
 install-info: install-info-dirs force
        -parent=`echo $(infodir)|sed -e 's@/[^/]*$$@@'`; \
@@ -240,29 +317,45 @@ install-dir.info:
        -if [ -d $(infodir) ] ; then true ; else mkdir $(infodir) ; fi
        $(INSTALL_DATA) dir.info $(infodir)/dir.info
 
-all.normal: all-autoconf all-libiberty all-mmalloc all-texinfo \
+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-gdb \
+       all-gcc all-binutils  all-libg++ all-readline all-z8ksim all-h8300sim all-gdb \
        all-make all-rcs all-cvs all-diff all-grep \
        all-patch all-emacs all-ispell all-etc \
-       all-newlib all-gprof all-send_pr all-libm all-deja-gnu
+       all-tcl all-tk all-expect \
+       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.cross: all-libiberty all-mmalloc all-gas all-byacc all-flex all-ld \
-        all-opcodes 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-make clean-diff clean-grep clean-rcs \
-       clean-cvs clean-patch clean-emacs clean-ispell \
-       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-z8ksim all-h8300sim all-bfd all-readline \
+       all-gdb all-binutils all-gcc all-newlib \
+       $(start-sanitize-chill) \
+       all-chillrt \
+       $(end-sanitize-chill) \
+       all-deja-gnu
+
+.PHONY: clean distclean mostlyclean realclean do_clean
+
+do_clean:
+       -rm -f *.a TEMP errs core *.o *~ \#* TAGS *.E
+
+clean mostlyclean: do_clean
+       @rootme=`pwd` ; export rootme ; \
+         $(MAKE) $(FLAGS_TO_PASS) DO=$@ "DODIRS=$(SUBDIRS)" subdir_do
+
+distclean realclean: do_clean
+       @rootme=`pwd` ; export rootme ; \
+         $(MAKE) $(FLAGS_TO_PASS) DO=$@ "DODIRS=$(SUBDIRS)" subdir_do
+       -rm -f Makefile config.status
+
+uninstall:
+       @echo "the uninstall target is not supported in this tree"
 
 install: $(INSTALL_TARGET) 
        -parent=`echo $(man1dir)|sed -e 's@/[^/]*$$@@'`; \
@@ -289,6 +382,7 @@ install-no-fixedincludes: install-dirs gcc-no-fixedincludes \
        install-deja-gnu \
        install-emacs \
        install-etc \
+       install-expect \
        install-flex \
        install-gas \
        install-gdb \
@@ -303,27 +397,50 @@ 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 \
        install-send_pr \
-       install-texinfo 
-       
+       install-tcl \
+       install-texinfo \
+       install-tk  \
+       install-z8ksim \
+       install-h8300sim \
+       install-fileutils install-find install-gawk install-m4 install-sed install-shellutils \
+       install-textutils install-time install-wdiff
+
+#
+# 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
@@ -334,14 +451,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 ; \
@@ -359,14 +468,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 ; \
@@ -384,14 +485,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 ; \
@@ -410,15 +503,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 ; \
@@ -434,17 +518,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
@@ -454,7 +528,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
@@ -469,15 +543,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 ; \
@@ -497,15 +562,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 ; \
@@ -525,15 +581,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 ; \
@@ -554,15 +601,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 ; \
@@ -582,15 +620,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 ; \
@@ -611,41 +640,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
@@ -669,15 +702,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 ; \
@@ -697,15 +721,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 ; \
@@ -715,20 +730,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
@@ -736,8 +743,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
@@ -752,15 +760,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 ; \
@@ -780,15 +779,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 ; \
@@ -808,15 +798,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 ; \
@@ -847,15 +828,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 ; \
@@ -875,15 +847,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 ; \
@@ -903,15 +866,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 ; \
@@ -931,15 +885,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 ; \
@@ -959,15 +904,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 ; \
@@ -987,15 +923,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 ; \
@@ -1015,15 +942,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 ; \
@@ -1043,15 +961,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 ; \
@@ -1068,16 +977,7 @@ all-emacs: force
        @if [ -f ./emacs/Makefile ] ; then \
                rootme=`pwd` ; export rootme ; \
                (cd ./emacs; \
-               $(MAKE) $(FLAGS_TO_PASS) all) ; \
-       else \
-               true ; \
-       fi
-
-clean-emacs: force
-       @if [ -f ./emacs/Makefile ] ; then \
-               rootme=`pwd` ; export rootme ; \
-               (cd ./emacs; \
-               $(MAKE) $(FLAGS_TO_PASS) clean) ; \
+               $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all) ; \
        else \
                true ; \
        fi
@@ -1086,7 +986,7 @@ install-emacs: force
        @if [ -f ./emacs/Makefile ] ; then \
                rootme=`pwd` ; export rootme ; \
                (cd ./emacs; \
-               $(MAKE) $(FLAGS_TO_PASS) install) ; \
+               $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install) ; \
        else \
                true ; \
        fi
@@ -1101,15 +1001,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 ; \
@@ -1129,15 +1020,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 ; \
@@ -1152,16 +1034,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
@@ -1170,14 +1043,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 ; \
@@ -1187,29 +1060,284 @@ all-libg++: all-gas all-ld all-gcc all-xiberty
                true ; \
        fi
 
-clean-libg++: force
+install-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) ; \
+               $(MAKE) $(TARGET_FLAGS_TO_PASS) install) ; \
+       else \
+               true ; \
+       fi
+### tcl
+all-tcl: 
+       @if [ -f ./tcl/Makefile ] ; then \
+               rootme=`pwd` ; export rootme ; \
+               srcroot=`cd $(srcdir); pwd`; export srcroot ; \
+               (cd ./tcl; \
+               $(MAKE) $(FLAGS_TO_PASS) all) ; \
        else \
                true ; \
        fi
 
-install-libg++: force
-       @if [ -f ./libg++/Makefile ] ; then \
+install-tcl: force
+       @if [ -f ./tcl/Makefile ] ; then \
                rootme=`pwd` ; export rootme ; \
-               srcroot=`cd $(srcdir); pwd` ; export srcroot ; \
-               (cd ./libg++; \
-               $(MAKE) $(TARGET_FLAGS_TO_PASS) install) ; \
+               srcroot=`cd $(srcdir); pwd`; export srcroot ; \
+               (cd ./tcl; \
+               $(MAKE) $(FLAGS_TO_PASS) install) ; \
+       else \
+               true ; \
+       fi
+
+
+### tk
+all-tk: all-tcl
+       @if [ -f ./tk/Makefile ] ; then \
+               rootme=`pwd` ; export rootme ; \
+               srcroot=`cd $(srcdir); pwd`; export srcroot ; \
+               (cd ./tk; \
+               $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all) ; \
+       else \
+               true ; \
+       fi
+
+install-tk: force
+       @if [ -f ./tk/Makefile ] ; then \
+               rootme=`pwd` ; export rootme ; \
+               srcroot=`cd $(srcdir); pwd`; export srcroot ; \
+               (cd ./tk; \
+               $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install) ; \
        else \
                true ; \
        fi
 
+### expect
+all-expect: all-tcl
+       @if [ -f ./expect/Makefile ] ; then \
+               rootme=`pwd` ; export rootme ; \
+               srcroot=`cd $(srcdir); pwd`; export srcroot ; \
+               (cd ./expect; \
+               $(MAKE) $(FLAGS_TO_PASS) all) ; \
+       else \
+               true ; \
+       fi
+
+install-expect: force
+       @if [ -f ./expect/Makefile ] ; then \
+               rootme=`pwd` ; export rootme ; \
+               srcroot=`cd $(srcdir); pwd`; export srcroot ; \
+               (cd ./expect; \
+               $(MAKE) $(FLAGS_TO_PASS) install) ; \
+       else \
+               true ; \
+       fi
+
+### z8ksim
+all-z8ksim: all-bfd 
+       @if [ -f ./z8ksim/Makefile ] ; then \
+               rootme=`pwd` ; export rootme ; \
+               (cd ./z8ksim; \
+               $(MAKE) $(FLAGS_TO_PASS) all) ; \
+       else \
+               true ; \
+       fi
+
+install-z8ksim: force
+       @if [ -f ./z8ksim/Makefile ] ; then \
+               rootme=`pwd` ; export rootme ; \
+               (cd ./z8ksim; \
+               $(MAKE) $(FLAGS_TO_PASS) install) ; \
+       else \
+               true ; \
+       fi
+
+### h8300sim:
+all-h8300sim:  all-bfd 
+       @if [ -f ./h8300sim/Makefile ] ; then \
+               rootme=`pwd` ; export rootme ; \
+               (cd ./h8300sim; \
+               $(MAKE) $(FLAGS_TO_PASS) all) ; \
+       else \
+               true ; \
+       fi
+
+install-h8300sim: force
+       @if [ -f ./h8300sim/Makefile ] ; then \
+               rootme=`pwd` ; export rootme ; \
+               (cd ./h8300sim; \
+               $(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
+
+install-fileutils: force
+       @if [ -f ./fileutils/Makefile ] ; then \
+               rootme=`pwd` ; export rootme ; \
+               (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
+
+### 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 ./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-m4: force
+       @if [ -f ./m4/Makefile ] ; then \
+               rootme=`pwd` ; export rootme ; \
+               (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
+
+install-sed: force
+       @if [ -f ./sed/Makefile ] ; then \
+               rootme=`pwd` ; export rootme ; \
+               (cd ./sed; $(MAKE) $(FLAGS_TO_PASS) install) ; \
+       else \
+               true ; \
+       fi
+
+### 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
+
+### 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
+
+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
 
 subdir_do:
+### start-sanitize-chill
+### 
+### WARNING: THIS IS VERY UGLY AND I DID NOT DO THIS WILLINGLY
+###
+### if you change the code for libg++ et al, also change the
+### code for chillrt
+###
+### end-sanitize-chill
        @for i in $(DODIRS); do \
          if [ -f ./$$i/localenv ] || [ -f ./$$i/Makefile ] ; then \
            case $$i in \
@@ -1220,6 +1348,22 @@ subdir_do:
                  $(MAKE) $(TARGET_FLAGS_TO_PASS) $(DO)) ; then true ; \
              else exit 1 ; fi \
              ;; \
+       $(start-sanitize-chill) \
+           chillrt) \
+             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 \
+             ;; \
+       $(end-sanitize-chill) \
+           gcc) \
+             if (rootme=`pwd` ; export rootme ; \
+                 srcroot=`cd $(srcdir); pwd` ; export srcroot ; \
+                 cd ./$$i ; \
+                 $(MAKE) $(GCC_FLAGS_TO_PASS) $(DO)) ; then true ; \
+             else exit 1 ; fi \
+             ;; \
            *) \
              if (rootme=`pwd` ; export rootme ; \
                  cd ./$$i ; \
@@ -1271,9 +1415,6 @@ install-dirs:
                fi ; \
        done
 
-MAKEINFODIRS= \
-       $(prefix)
-
 install-info-dirs:
        if [ -d $(prefix) ] ; then true ; else mkdir $(prefix) ; fi
 
@@ -1281,6 +1422,10 @@ dir.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:
@@ -1309,13 +1454,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
@@ -1325,7 +1470,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 \
@@ -1338,21 +1483,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' \
        <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"; \
@@ -1360,8 +1507,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
This page took 0.037588 seconds and 4 git commands to generate.