X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=Makefile.in;h=7802d6c9e8afcde0a75d70b6c079bc17683f32d3;hb=c7c9407366c9e9b97d27427978870f4b81d7ed5e;hp=28fade02ed8dbe498c55e9f9802efe294c78f8c2;hpb=52963fb7e9af7fc83cbdad45299edaf2dc9cc59a;p=deliverable%2Fbinutils-gdb.git

diff --git a/Makefile.in b/Makefile.in
index 28fade02ed..7802d6c9e8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -24,6 +24,9 @@ prefix = /usr/local
 exec_prefix = $(prefix)
 bindir = $(exec_prefix)/bin
 libdir = $(exec_prefix)/lib
+tooldir = $(libdir)
+
+program_transform_name =
 
 datadir = $(prefix)/lib
 mandir = $(prefix)/man
@@ -46,19 +49,31 @@ INSTALL = install -c
 INSTALL_PROGRAM = $(INSTALL)
 INSTALL_DATA = $(INSTALL)
 
+AS = as
 AR = ar
 AR_FLAGS = qc
+CFLAGS = -g
 RANLIB = ranlib
+NM = nm
+
+BISON = `if [ -f $${rootme}/byacc/byacc ] ; \
+	    then echo $${rootme}/byacc/byacc ; \
+	    else echo bison -y ; \
+	fi`
 
-BISON = `if [ -d $${rootme}/bison ] ; \
-	then echo $${rootme}/bison/bison -L $${rootme}/bison/ -y ; \
-	else echo bison -y ; fi`
+LEX = `if [ -f $${rootme}/flex/flex ] ; \
+	then echo $${rootme}/flex/flex ; \
+	else echo flex ; fi`
 
-MAKEINFO = `if [ -d $${rootme}/texinfo/C ] ; \
+MAKEINFO = `if [ -f $${rootme}/texinfo/C/makeinfo ] ; \
 	then echo $${rootme}/texinfo/C/makeinfo ; \
 	else echo makeinfo ; fi`
 
-SUBDIRS = libiberty mmalloc glob readline bfd gdb binutils ld gas gcc libg++ libgcc clib newlib
+# C compiler to use to create programs which must be run in the build
+# environment.
+CC_FOR_BUILD = $(CC)
+
+SUBDIRS = libiberty mmalloc glob readline opcodes bfd gdb  binutils ld gas tgas gcc libg++ newlib
 OTHERS = 
 
 ALL = all.normal
@@ -67,1719 +82,1082 @@ INSTALL_TARGET = install.all
 ### for debugging
 #GCCVERBOSE=-v
 
+CC_FOR_TARGET = ` \
+  if [ -f $${rootme}/gcc/Makefile ] ; then \
+    echo $${rootme}/gcc/gcc -B$${rootme}/gcc/; \
+  else \
+    if [ "$(host_cpu)-$(host_vendor)-$(host_os)" = "$(target_cpu)-$(target_vendor)-$(target_os)" ] ; then \
+      echo $(CC); \
+    else \
+      t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \
+    fi; \
+  fi`
+
+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 \
+      echo $(AS); \
+    else \
+       t='$(program_transform_name)'; echo as | sed -e '' $$t ; \
+    fi \
+  fi`
+
+AR_FOR_TARGET = ` \
+  if [ -f $${rootme}/binutils/Makefile ] ; then \
+    echo $${rootme}/binutils/ar ; \
+  else \
+    if [ "$(host_cpu)-$(host_vendor)-$(host_os)" = "$(target_cpu)-$(target_vendor)-$(target_os)" ] ; then \
+      echo $(AR); \
+    else \
+       t='$(program_transform_name)'; echo ar | sed -e '' $$t ; \
+    fi \
+  fi`
+
+RANLIB_FOR_TARGET = ` \
+  if [ -f $${rootme}/binutils/Makefile ] ; then \
+    echo $${rootme}/binutils/ranlib ; \
+  else \
+    if [ "$(host_cpu)-$(host_vendor)-$(host_os)" = "$(target_cpu)-$(target_vendor)-$(target_os)" ] ; then \
+      echo $(RANLIB); \
+    else \
+       t='$(program_transform_name)'; echo ranlib | sed -e '' $$t ; \
+    fi \
+  fi`
+
+NM_FOR_TARGET = ` \
+  if [ -f $${rootme}/binutils/Makefile ] ; then \
+    echo $${rootme}/binutils/nm ; \
+  else \
+    if [ "$(host_cpu)-$(host_vendor)-$(host_os)" = "$(target_cpu)-$(target_vendor)-$(target_os)" ] ; then \
+      echo $(NM); \
+    else \
+       t='$(program_transform_name)'; echo nm | sed -e '' $$t ; \
+    fi \
+  fi`
+
+XTRAFLAGS = ` \
+  if [ -f $${rootme}/gcc/Makefile ] ; then \
+    if [ -f $${rootme}/newlib/Makefile ] ; then \
+      echo -I$${rootme}/newlib/targ-include -I$${srcroot}/newlib/libc/include -I$${rootme}/gcc/include -nostdinc ; \
+    else \
+      echo -I$${rootme}/gcc/include ; \
+    fi ; \
+  else \
+     echo ; \
+  fi`
 
 #### host and target specific makefile fragments come in here.
 ###
 
+# Flags to pass down to sub-makes
+FLAGS_TO_PASS = \
+	"prefix=$(prefix)" \
+	"exec_prefix=$(exec_prefix)" \
+	"tooldir=$(tooldir)" \
+	"AR=$(AR)" \
+	"AR_FLAGS=$(AR_FLAGS)" \
+	"CC=$(CC)" \
+	"CFLAGS=$(CFLAGS)" \
+	"RANLIB=$(RANLIB)" \
+	"LOADLIBES=$(LOADLIBES)" \
+	"LDFLAGS=$(LDFLAGS)" \
+	"BISON=$(BISON)" \
+	"LEX=$(LEX)" \
+	"MAKEINFO=$(MAKEINFO)" \
+	"INSTALL=$(INSTALL)" \
+	"INSTALL_DATA=$(INSTALL_DATA)" \
+	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
+	"CC_FOR_BUILD=$(CC_FOR_BUILD)"
+
+# Flags to pass down to makes which are built with the target
+# environment (e.g. libg++, xiberty, newlib).
+TARGET_FLAGS_TO_PASS = \
+	"prefix=$(prefix)" \
+	"exec_prefix=$(exec_prefix)" \
+	"tooldir=$(tooldir)" \
+	"AR_FLAGS=$(AR_FLAGS)" \
+	"CFLAGS=$(CFLAGS)" \
+	"LOADLIBES=$(LOADLIBES)" \
+	"LDFLAGS=$(LDFLAGS)" \
+	"BISON=$(BISON)" \
+	"LEX=$(LEX)" \
+	"MAKEINFO=$(MAKEINFO)" \
+	"INSTALL=$(INSTALL)" \
+	"INSTALL_DATA=$(INSTALL_DATA)" \
+	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
+	"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
+	"CC=$(CC_FOR_TARGET)" \
+	"AS=$(AS_FOR_TARGET)" \
+	"AR=$(AR_FOR_TARGET)" \
+	"RANLIB=$(RANLIB_FOR_TARGET)" \
+	"NM=$(NM_FOR_TARGET)" \
+	"XTRAFLAGS=$(XTRAFLAGS)"
+
 .PHONY: all info install-info clean-info
+.NOEXPORT:
 
 all:	$(ALL)
 
-info:	cfg-paper.info configure.info
-	rootme=`pwd` ; export rootme ; $(MAKE) subdir_do DO=info "DODIRS=$(SUBDIRS)" "MAKEINFO=$(MAKEINFO)"
+info:	
+	@rootme=`pwd` ; export rootme ; $(MAKE) $(FLAGS_TO_PASS) subdir_do DO=info "DODIRS=$(SUBDIRS)" 
 
-check:; rootme=`pwd` ; export rootme ; $(MAKE) subdir_do DO=check \
-	"DODIRS=`echo $(SUBDIRS) | sed -e \"s/libg\+\+//\"" \
-	"MAKEINFO=$(MAKEINFO)"
-	if [ -d libg++ ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd libg++ ; \
-		 $(MAKE) check "CC=$${rootme}/gcc/gcc \
-		 -B$${rootme}/gcc/") ; \
-	fi
-		
+check:
+	@rootme=`pwd` ; export rootme ; $(MAKE) $(FLAGS_TO_PASS) DO=check "DODIRS=$(SUBDIRS)" subdir_do
 
 clean-info:
-	$(MAKE) subdir_do DO=clean-info "DODIRS=$(SUBDIRS)"
-	rm -f cfg-paper.info* configure.info*
-
-cfg-paper.info: cfg-paper.texi
-	rootme=`pwd` ; export rootme ; $(MAKEINFO) -o cfg-paper.info $(srcdir)/cfg-paper.texi
-
-configure.info: configure.texi
-	rootme=`pwd` ; export rootme ; $(MAKEINFO) -o configure.info $(srcdir)/configure.texi
+	@rootme='pwd' ; export rootme ; $(MAKE) $(FLAGS_TO_PASS) DO=clean-info "DODIRS=$(SUBDIRS)" subdir_do
 
 install-info: install-info-dirs force
-	[ -d $(infodir) ] || mkdir $(infodir)
-	$(MAKE) subdir_do DO=install-info "DODIRS=$(SUBDIRS)"
-	$(INSTALL_DATA) cfg-paper.info $(infodir)/cfg-paper.info
-	$(INSTALL_DATA) configure.info $(infodir)/configure.info
-	$(MAKE) dir.info 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
+	@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
 
 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_DATA) dir.info $(infodir)/dir.info
 
-# clib send_pr
-#	all-libgcc
-all.normal: .stmp-libiberty .stmp-mmalloc .stmp-texinfo .stmp-bison .stmp-byacc \
-	.stmp-bfd .stmp-ld .stmp-gas .stmp-gcc .stmp-binutils \
-	.stmp-libg++ .stmp-readline .stmp-gdb .stmp-make .stmp-cvs \
-	.stmp-grep .stmp-patch .stmp-emacs .stmp-ispell .stmp-fileutils \
-	.stmp-newlib
-all.cross: .stmp-libiberty .stmp-mmalloc .stmp-gas .stmp-bison .stmp-ld \
-	.stmp-bfd .stmp-libgcc .stmp-readline .stmp-gdb
-#	$(MAKE) subdir_do DO=all "DODIRS=$(SUBDIRS) $(OTHERS)"
-
-clean: clean-stamps clean-libiberty clean-mmalloc clean-texinfo clean-bfd \
-	clean-newlib clean-binutils \
-	clean-bison clean-byacc clean-ld clean-gas \
-	clean-gcc clean-libgcc clean-readline clean-glob clean-gdb \
-	clean-make clean-diff clean-grep clean-rcs clean-gdbm \
-	clean-cvs clean-patch clean-emacs clean-ispell clean-fileutils \
-	clean-libg++
+all.normal: 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-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.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
+
+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
 	-rm -rf *.a TEMP errs core *.o *~ \#* TAGS *.E
 
 clean-stamps:
-	-rm -f .stmp-*
+	-rm -f all-*
+
+install: $(INSTALL_TARGET) 
+	-parent=`echo $(man1dir)|sed -e 's@/[^/]*$$@@'`; \
+	if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi
+	-if [ -d $(man1dir) ] ; then true ; else mkdir $(man1dir) ; fi
+
+install.all: install-no-fixedincludes
+	@if [ -f ./gcc/Makefile ] ; then \
+		rootme=`pwd` ; export rootme ; \
+		(cd ./gcc; \
+		$(MAKE) $(FLAGS_TO_PASS) install-headers) ; \
+	else \
+		true ; \
+	fi
+
+install-no-fixedincludes: install-dirs gcc-no-fixedincludes \
+	install-autoconf \
+	install-bfd \
+	install-binutils \
+	install-opcodes \
+	install-byacc \
+	install-cvs \
+	install-diff \
+	install-emacs \
+	install-etc \
+	install-flex \
+	install-gas \
+	install-gdb \
+	install-glob \
+	install-gprof \
+	install-grep \
+	install-ispell \
+	install-ld \
+	install-libg++ \
+	install-libiberty \
+	install-libm \
+	install-make \
+	install-mmalloc \
+	install-newlib \
+	install-patch \
+	install-rcs \
+	install-readline \
+	install-send_pr \
+	install-texinfo 
+	
+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
+
+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
+
+### autoconf
+all-autoconf: force
+	@if [ -f ./autoconf/Makefile ] ; then \
+		rootme=`pwd` ; export rootme ; \
+		(cd ./autoconf; $(MAKE) $(FLAGS_TO_PASS) all) ; \
+	else \
+		true ; \
+	fi
 
-install: $(INSTALL_TARGET) $(srcdir)/configure.man
-	$(INSTALL_DATA) $(srcdir)/configure.man $(man1dir)/configure.1
+clean-autoconf: force
+	@if [ -f ./autoconf/Makefile ] ; then \
+		rootme=`pwd` ; export rootme ; \
+		(cd ./autoconf;	$(MAKE) $(FLAGS_TO_PASS) clean) ; \
+	else \
+		true ; \
+	fi
 
-install.all: install-dirs install-libiberty install-mmalloc install-texinfo \
-	install-bfd install-binutils install-bison install-byacc \
-	install-ld install-gas install-gcc \
-	install-libgcc install-readline install-glob install-gdb \
-	install-make install-cvs install-patch install-emacs \
-	install-ispell install-fileutils install-libg++ install-newlib
+install-autoconf: force
+	@if [ -f ./autoconf/Makefile ] ; then \
+		rootme=`pwd` ; export rootme ; \
+		(cd ./autoconf;	$(MAKE) $(FLAGS_TO_PASS) install) ; \
+	else \
+		true ; \
+	fi
+
+### etc
+all-etc: force
+	@if [ -f ./etc/Makefile ] ; then \
+		rootme=`pwd` ; export rootme ; \
+		(cd ./etc; $(MAKE) $(FLAGS_TO_PASS) all) ; \
+	else \
+		true ; \
+	fi
 
-install.cross: install-dirs install-libiberty install-mmalloc install-binutils \
-	install-bison install-byacc install-ld install-gas install-libgcc \
-	install-readline install-glob install-gdb install-mmalloc
+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 ; \
+		(cd ./etc; $(MAKE) $(FLAGS_TO_PASS) install) ; \
+	else \
+		true ; \
+	fi
 
 ### libiberty
-all-libiberty: .stmp-libiberty
-.stmp-libiberty:
-	if [ -d ./libiberty ] ; then \
+all-libiberty: force
+	@if [ -f ./libiberty/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./libiberty; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			all) ; \
+		$(MAKE) $(FLAGS_TO_PASS) all) ; \
 	else \
 		true ; \
 	fi
-	touch .stmp-libiberty
 
 clean-libiberty: force
-	if [ -d ./libiberty ] ; then \
+	@if [ -f ./libiberty/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./libiberty; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			clean) ; \
+		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
 	else \
 		true ; \
 	fi
 
 install-libiberty: force
-	if [ -d ./libiberty ] ; then \
+	@if [ -f ./libiberty/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./libiberty; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			install) ; \
+		$(MAKE) $(FLAGS_TO_PASS) install) ; \
+	else \
+		true ; \
+	fi
+
+### xiberty
+all-xiberty: all-gcc all-newlib
+	@if [ -f ./xiberty/Makefile ] ; then \
+		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) ; \
+	else \
+		true ; \
+	fi
+
+install-xiberty: force
+	@if [ -f ./xiberty/Makefile ] ; then \
+		rootme=`pwd` ; export rootme ; \
+		srcroot=`cd $(srcdir); pwd`; export srcroot ; \
+		(cd ./xiberty; \
+		$(MAKE) $(FLAGS_TO_PASS) install) ; \
 	else \
 		true ; \
 	fi
 
 ### mmalloc
-all-mmalloc: .stmp-mmalloc
-.stmp-mmalloc:
-	if [ -d ./mmalloc ] ; then \
+all-mmalloc: force
+	@if [ -f ./mmalloc/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./mmalloc; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			all) ; \
+		$(MAKE) $(FLAGS_TO_PASS) all) ; \
 	else \
 		true ; \
 	fi
-	touch .stmp-mmalloc
 
 clean-mmalloc: force
-	if [ -d ./mmalloc ] ; then \
+	@if [ -f ./mmalloc/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./mmalloc; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			clean) ; \
+		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
 	else \
 		true ; \
 	fi
 
 install-mmalloc: force
-	if [ -d ./mmalloc ] ; then \
+	@if [ -f ./mmalloc/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./mmalloc; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			install) ; \
+		$(MAKE) $(FLAGS_TO_PASS) install) ; \
 	else \
 		true ; \
 	fi
 
 ### texinfo
-all-texinfo: .stmp-libiberty .stmp-texinfo
-.stmp-texinfo:
-	if [ -d ./texinfo ] ; then \
-		rootme=`pwd` ; export rootme ; \
+all-texinfo: all-libiberty
+	@if [ -f ./texinfo/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./texinfo; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			all) ; \
+		$(MAKE) $(FLAGS_TO_PASS) all) ; \
 	else \
 		true ; \
 	fi
-	touch .stmp-texinfo
 
 clean-texinfo: force
-	if [ -d ./texinfo ] ; then \
+	@if [ -f ./texinfo/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./texinfo; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			clean) ; \
+		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
 	else \
 		true ; \
 	fi
 
 install-texinfo: force
-	if [ -d ./texinfo ] ; then \
+	@if [ -f ./texinfo/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./texinfo; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			install) ; \
+		$(MAKE) $(FLAGS_TO_PASS) install) ; \
 	else \
 		true ; \
 	fi
 
 ### bfd
-all-bfd: .stmp-bfd
-.stmp-bfd:
-	if [ -d ./bfd ] ; then \
+all-bfd: force
+	@if [ -f ./bfd/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./bfd; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			all) ; \
+		$(MAKE) $(FLAGS_TO_PASS) all) ; \
 	else \
 		true ; \
 	fi
-	touch .stmp-bfd
 
 clean-bfd: force
-	if [ -d ./bfd ] ; then \
+	@if [ -f ./bfd/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./bfd; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			clean) ; \
+		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
 	else \
 		true ; \
 	fi
 
 install-bfd: force
-	if [ -d ./bfd ] ; then \
+	@if [ -f ./bfd/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./bfd; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			install) ; \
+		$(MAKE) $(FLAGS_TO_PASS) install) ; \
+	else \
+		true ; \
+	fi
+
+
+### opcodes
+all-opcodes: force
+	@if [ -f ./opcodes/Makefile ] ; then \
+		rootme=`pwd` ; export rootme ; \
+		(cd ./opcodes; \
+		$(MAKE) $(FLAGS_TO_PASS) all) ; \
+	else \
+		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 ; \
+		(cd ./opcodes; \
+		$(MAKE) $(FLAGS_TO_PASS) install) ; \
 	else \
 		true ; \
 	fi
 
 ### binutils
-all-binutils: .stmp-libiberty .stmp-bfd .stmp-binutils
-.stmp-binutils:
-	if [ -d ./binutils ] ; then \
+all-binutils: all-opcodes all-libiberty all-bfd all-flex
+	@if [ -f ./binutils/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./binutils; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			all) ; \
+		$(MAKE) $(FLAGS_TO_PASS) all) ; \
 	else \
 		true ; \
 	fi
-	touch .stmp-binutils
 
 clean-binutils: force
-	if [ -d ./binutils ] ; then \
+	@if [ -f ./binutils/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./binutils; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			clean) ; \
+		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
 	else \
 		true ; \
 	fi
 
 install-binutils: force
-	if [ -d ./binutils ] ; then \
+	@if [ -f ./binutils/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./binutils; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			install) ; \
+		$(MAKE) $(FLAGS_TO_PASS) install) ; \
 	else \
 		true ; \
 	fi
 
 ### newlib
-all-newlib: .stmp-newlib
-.stmp-newlib:
-	if [ -d ./newlib ] ; then \
+all-newlib: all-binutils all-ld all-gas all-gcc
+	@if [ -f ./newlib/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
+		srcroot=`cd $(srcdir); pwd` ; export srcroot ; \
 		(cd ./newlib; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			all) ; \
+		$(MAKE) $(TARGET_FLAGS_TO_PASS) all) ; \
 	else \
 		true ; \
 	fi
-	touch .stmp-newlib
 
 clean-newlib: force
-	if [ -d ./newlib ] ; then \
+	@if [ -f ./newlib/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
+		srcroot=`cd $(srcdir); pwd` ; export srcroot ; \
 		(cd ./newlib; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			clean) ; \
+		$(MAKE) $(TARGET_FLAGS_TO_PASS) clean) ; \
 	else \
 		true ; \
 	fi
 
 install-newlib: force
-	if [ -d ./newlib ] ; then \
+	@if [ -f ./newlib/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
+		srcroot=`cd $(srcdir); pwd` ; export srcroot ; \
 		(cd ./newlib; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			install) ; \
+		$(MAKE) $(TARGET_FLAGS_TO_PASS) install) ; \
+	else \
+		true ; \
+	fi
+
+### gprof
+all-gprof: all-libiberty all-bfd
+	@if [ -f ./gprof/Makefile ] ; then \
+		rootme=`pwd` ; export rootme ; \
+		(cd ./gprof; \
+		$(MAKE) $(FLAGS_TO_PASS) all) ; \
+	else \
+		true ; \
+	fi
+
+clean-gprof: force
+	@if [ -f ./gprof/Makefile ] ; then \
+		rootme=`pwd` ; export rootme ; \
+		(cd ./gprof; \
+		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
+	else \
+		true ; \
+	fi
+
+install-gprof: force
+	@if [ -f ./gprof/Makefile ] ; then \
+		rootme=`pwd` ; export rootme ; \
+		(cd ./gprof; \
+		$(MAKE) $(FLAGS_TO_PASS) install) ; \
 	else \
 		true ; \
 	fi
 
 ### byacc
-all-byacc: .stmp-byacc
-.stmp-byacc:
-	if [ -d ./byacc ] ; then \
+all-byacc: force
+	@if [ -f ./byacc/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./byacc; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			all) ; \
+		$(MAKE) $(FLAGS_TO_PASS) all) ; \
 	else \
 		true ; \
 	fi
-	touch .stmp-byacc
 
 clean-byacc: force
-	if [ -d ./byacc ] ; then \
+	@if [ -f ./byacc/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./byacc; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			clean) ; \
+		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
 	else \
 		true ; \
 	fi
 
 install-byacc: force
-	if [ -d ./byacc ] ; then \
+	@if [ -f ./byacc/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./byacc; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			install) ; \
+		$(MAKE) $(FLAGS_TO_PASS) install) ; \
 	else \
 		true ; \
 	fi
 
-### bison
-all-bison: .stmp-libiberty .stmp-bison
-.stmp-bison:
-	if [ -d ./bison ] ; then \
+### flex
+all-flex: all-libiberty
+	@if [ -f ./flex/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
-		(cd ./bison; \
-		$(MAKE) \
-			"prefix=$(prefix)" \
-			"datadir=$(datadir)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			all) ; \
+		(cd ./flex; \
+		$(MAKE) $(FLAGS_TO_PASS) all) ; \
 	else \
 		true ; \
 	fi
-	touch .stmp-bison
 
-clean-bison: force
-	if [ -d ./bison ] ; then \
+clean-flex: force
+	@if [ -f ./flex/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
-		(cd ./bison; \
-		$(MAKE) \
-			"prefix=$(prefix)" \
-			"datadir=$(datadir)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			clean) ; \
+		(cd ./flex; \
+		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
 	else \
 		true ; \
 	fi
 
-install-bison: force
-	if [ -d ./bison ] ; then \
+install-flex: force
+	@if [ -f ./flex/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
-		(cd ./bison; \
-		$(MAKE) \
-			"prefix=$(prefix)" \
-			"datadir=$(datadir)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			install) ; \
+		(cd ./flex; \
+		$(MAKE) $(FLAGS_TO_PASS) install) ; \
 	else \
 		true ; \
 	fi
-
 ### gcc
-all-gcc: .stmp-libiberty .stmp-bison .stmp-gas .stmp-gcc
-.stmp-gcc:
-	if [ -d ./gcc ] ; then \
+all-gcc: all-libiberty all-byacc
+	@if [ -f ./gcc/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./gcc; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			all) ; \
+		$(MAKE) $(FLAGS_TO_PASS) all) ; \
 	else \
 		true ; \
 	fi
-	touch .stmp-gcc
 
 clean-gcc: force
-	if [ -d ./gcc ] ; then \
+	@if [ -f ./gcc/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./gcc; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			clean) ; \
+		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
 	else \
 		true ; \
 	fi
 
-install-gcc:
-	if [ -d ./gcc ] ; then \
+install-gcc: force
+	@if [ -f ./gcc/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./gcc; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			install) ; \
+		$(MAKE) $(FLAGS_TO_PASS) install) ; \
 	else \
 		true ; \
 	fi
 
 ### readline
-all-readline: .stmp-readline
-.stmp-readline:
-	if [ -d ./readline ] ; then \
+all-readline: force
+	@if [ -f ./readline/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./readline; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			all) ; \
+		$(MAKE) $(FLAGS_TO_PASS) all) ; \
 	else \
 		true ; \
 	fi
-	touch .stmp-readline
 
 clean-readline: force
-	if [ -d ./readline ] ; then \
+	@if [ -f ./readline/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./readline; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			clean) ; \
+		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
 	else \
 		true ; \
 	fi
 
 install-readline: force
-	if [ -d ./readline ] ; then \
+	@if [ -f ./readline/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./readline; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			install) ; \
+		$(MAKE) $(FLAGS_TO_PASS) install) ; \
 	else \
 		true ; \
 	fi
 
 ### glob
-all-glob: .stmp-glob
-.stmp-glob:
-	if [ -d ./glob ] ; then \
+all-glob: force
+	@if [ -f ./glob/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./glob; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			all) ; \
+		$(MAKE) $(FLAGS_TO_PASS) all) ; \
 	else \
 		true ; \
 	fi
-	touch .stmp-glob
 
 clean-glob: force
-	if [ -d ./glob ] ; then \
+	@if [ -f ./glob/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./glob; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			clean) ; \
+		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
 	else \
 		true ; \
 	fi
 
 install-glob: force
-	if [ -d ./glob ] ; then \
+	@if [ -f ./glob/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./glob; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			install) ; \
+		$(MAKE) $(FLAGS_TO_PASS) install) ; \
 	else \
 		true ; \
 	fi
 
 ### gas
-all-gas: .stmp-libiberty .stmp-bfd .stmp-gas
-.stmp-gas:
-	if [ -d ./gas ] ; then \
+all-gas: all-libiberty all-opcodes all-bfd
+	@if [ -f ./gas/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./gas; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			all) ; \
+		$(MAKE) $(FLAGS_TO_PASS) all) ; \
 	else \
 		true ; \
 	fi
-	touch .stmp-gas
 
 clean-gas: force
-	if [ -d ./gas ] ; then \
+	@if [ -f ./gas/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./gas; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			clean) ; \
+		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
 	else \
 		true ; \
 	fi
 
 install-gas: force
-	if [ -d ./gas ] ; then \
+	@if [ -f ./gas/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./gas; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			install) ; \
+		$(MAKE) $(FLAGS_TO_PASS) install) ; \
 	else \
 		true ; \
 	fi
 
-### ld
-all-ld: .stmp-libiberty .stmp-bfd .stmp-bison .stmp-ld
-.stmp-ld: 
-	if [ -d ./ld ] ; then \
+### gas
+all-tgas: all-libiberty all-bfd
+	@if [ -f ./tgas/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
-		(cd ./ld; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			all) ; \
+		(cd ./tgas; \
+		$(MAKE) $(FLAGS_TO_PASS) all) ; \
 	else \
 		true ; \
 	fi
-	touch .stmp-ld
 
-clean-ld: force
-	if [ -d ./ld ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./ld; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			clean) ; \
-	else \
-		true ; \
-	fi
 
-install-ld: force
-	if [ -d ./ld ] ; then \
+### ld
+all-ld: all-libiberty all-bfd all-byacc all-flex
+	@if [ -f ./ld/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./ld; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			install) ; \
-	else \
-		true ; \
-	fi
-
-### libgcc (and libgcc1)
-all-libgcc1: all-gas all-binutils .stmp-libgcc1
-.stmp-libgcc1:
-	if [ -d ./libgcc ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./libgcc; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			libgcc1.a) ; \
-	else \
-		true ; \
-	fi
-	touch .stmp-libgcc1
-
-clean-libgcc1: force
-	if [ -d ./libgcc ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./libgcc; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			clean-libgcc1) ; \
+		$(MAKE) $(FLAGS_TO_PASS) all) ; \
 	else \
 		true ; \
 	fi
 
-install-libgcc1: force
-	echo libgcc1 is a component, not an installable target
-
-all-libgcc: all-gas all-gcc all-binutils .stmp-libgcc
-.stmp-libgcc:
-	true
-	if [ -d ./libgcc ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./libgcc; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			all) ; \
-	else \
-		true ; \
-	fi
-	touch .stmp-libgcc
-
-clean-libgcc: force
-	if [ -d ./libgcc ] ; then \
+clean-ld: force
+	@if [ -f ./ld/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
-		(cd ./libgcc; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			clean) ; \
+		(cd ./ld; \
+		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
 	else \
 		true ; \
 	fi
 
-install-libgcc: force
-	if [ -d ./libgcc ] ; then \
+install-ld: force
+	@if [ -f ./ld/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
-		(cd ./libgcc; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			install) ; \
+		(cd ./ld; \
+		$(MAKE) $(FLAGS_TO_PASS) install) ; \
 	else \
 		true ; \
 	fi
 
 ### gdb
-all-gdb: .stmp-bfd .stmp-libiberty .stmp-mmalloc .stmp-readline .stmp-glob \
-	.stmp-bison .stmp-gdb
-.stmp-gdb: 
-	if [ -d ./gdb ] ; then \
+all-gdb: all-bfd all-opcodes all-libiberty all-mmalloc all-readline all-glob all-byacc
+	@if [ -f ./gdb/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./gdb; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			all) ; \
+		$(MAKE) $(FLAGS_TO_PASS) all) ; \
 	else \
 		true ; \
 	fi
-	touch .stmp-gdb
 
 clean-gdb: force
-	if [ -d ./gdb ] ; then \
+	@if [ -f ./gdb/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./gdb; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			clean) ; \
+		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
 	else \
 		true ; \
 	fi
 
 install-gdb: force
-	if [ -d ./gdb ] ; then \
+	@if [ -f ./gdb/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./gdb; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			install) ; \
+		$(MAKE) $(FLAGS_TO_PASS) install) ; \
 	else \
 		true ; \
 	fi
 
 ### make
-all-make: all-libiberty .stmp-make
-.stmp-make:
-	if [ -d ./make ] ; then \
+all-make: all-libiberty
+	@if [ -f ./make/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./make; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			all) ; \
+		$(MAKE) $(FLAGS_TO_PASS) all) ; \
 	else \
 		true ; \
 	fi
-	touch .stmp-make
 
 clean-make: force
-	if [ -d ./make ] ; then \
+	@if [ -f ./make/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./make; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			clean) ; \
+		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
 	else \
 		true ; \
 	fi
 
 install-make: force
-	if [ -d ./make ] ; then \
+	@if [ -f ./make/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./make; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			install) ; \
+		$(MAKE) $(FLAGS_TO_PASS) install) ; \
 	else \
 		true ; \
 	fi
 
 ### diff
-all-diff: .stmp-diff
-.stmp-diff:
-	if [ -d ./diff ] ; then \
+all-diff: force
+	@if [ -f ./diff/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./diff; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			all) ; \
+		$(MAKE) $(FLAGS_TO_PASS) all) ; \
 	else \
 		true ; \
 	fi
-	touch .stmp-diff
 
 clean-diff: force
-	if [ -d ./diff ] ; then \
+	@if [ -f ./diff/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./diff; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			clean) ; \
+		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
 	else \
 		true ; \
 	fi
 
 install-diff: force
-	if [ -d ./diff ] ; then \
+	@if [ -f ./diff/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./diff/; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			install) ; \
+		$(MAKE) $(FLAGS_TO_PASS) install) ; \
 	else \
 		true ; \
 	fi
 
 ### grep
-all-grep: .stmp-grep
-.stmp-grep:
-	if [ -d ./grep ] ; then \
+all-grep: force
+	@if [ -f ./grep/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./grep; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			all) ; \
+		$(MAKE) $(FLAGS_TO_PASS) all) ; \
 	else \
 		true ; \
 	fi
-	touch .stmp-grep
 
 clean-grep: force
-	if [ -d ./grep ] ; then \
+	@if [ -f ./grep/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./grep; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			clean) ; \
+		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
 	else \
 		true ; \
 	fi
 
 install-grep: force
-	if [ -d ./grep ] ; then \
+	@if [ -f ./grep/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./grep; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			install) ; \
+		$(MAKE) $(FLAGS_TO_PASS) install) ; \
 	else \
 		true ; \
 	fi
 
 ### rcs
-all-rcs: .stmp-diff .stmp-grep .stmp-rcs
-.stmp-rcs:
-	if [ -d ./rcs ] ; then \
+all-rcs: force
+	@if [ -f ./rcs/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./rcs; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			all) ; \
+		$(MAKE) $(FLAGS_TO_PASS) all) ; \
 	else \
 		true ; \
 	fi
-	touch .stmp-rcs
 
 clean-rcs: force
-	if [ -d ./rcs ] ; then \
+	@if [ -f ./rcs/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./rcs; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			clean) ; \
+		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
 	else \
 		true ; \
 	fi
 
-install-rcs: install-grep install-diff force
-	if [ -d ./rcs ] ; then \
+install-rcs: force
+	@if [ -f ./rcs/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./rcs; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			install) ; \
-	else \
-		true ; \
-	fi
-
-### gdbm
-all-gdbm: .stmp-gdbm
-.stmp-gdbm:
-	if [ -d ./gdbm ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./gdbm; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			all) ; \
-	else \
-		true ; \
-	fi
-	touch .stmp-gdbm
-
-clean-gdbm: force
-	if [ -d ./gdbm ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./gdbm; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			clean) ; \
-	else \
-		true ; \
-	fi
-
-install-gdbm: force
-	if [ -d ./gdbm ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./gdbm; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			install) ; \
+		$(MAKE) $(FLAGS_TO_PASS) install) ; \
 	else \
 		true ; \
 	fi
 
 ### cvs
-
-all-cvs: .stmp-cvs .stmp-rcs .stmp-grep .stmp-diff
-.stmp-cvs: .stmp-gdbm
-	if [ -d ./cvs ] ; then \
+all-cvs: force
+	@if [ -f ./cvs/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./cvs; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			all) ; \
+		$(MAKE) $(FLAGS_TO_PASS) all) ; \
 	else \
 		true ; \
 	fi
-	touch .stmp-cvs
 
-clean-cvs: clean-gdbm
-	if [ -d ./cvs ] ; then \
+clean-cvs: force
+	@if [ -f ./cvs/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./cvs; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			clean) ; \
+		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
 	else \
 		true ; \
 	fi
 
-install-cvs: install-rcs install-gdbm
-	if [ -d ./cvs ] ; then \
+install-cvs: force
+	@if [ -f ./cvs/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./cvs; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			install) ; \
+		$(MAKE) $(FLAGS_TO_PASS) install) ; \
 	else \
 		true ; \
 	fi
 
 ### patch
-all-patch: .stmp-patch
-.stmp-patch:
-	if [ -d ./patch ] ; then \
+all-patch: force
+	@if [ -f ./patch/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./patch; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			all) ; \
+		$(MAKE) $(FLAGS_TO_PASS) all) ; \
 	else \
 		true ; \
 	fi
-	touch .stmp-patch
 
-clean-patch:
-	if [ -d ./patch ] ; then \
+clean-patch: force
+	@if [ -f ./patch/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./patch; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			clean) ; \
+		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
 	else \
 		true ; \
 	fi
 
-install-patch:
-	if [ -d ./patch ] ; then \
+install-patch: force
+	@if [ -f ./patch/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./patch; \
-		$(MAKE) \
+		$(MAKE) $(FLAGS_TO_PASS) \
 			bindir=$(bindir) \
-			man1dir=$(man1dir) \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			install) ; \
+			man1dir=$(man1dir) install) ; \
 	else \
 		true ; \
 	fi
 
 ### emacs
-all-emacs: .stmp-emacs
-.stmp-emacs:
-	if [ -d ./emacs ] ; then \
+all-emacs: force
+	@if [ -f ./emacs/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./emacs; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			all) ; \
+		$(MAKE) $(FLAGS_TO_PASS) all) ; \
 	else \
 		true ; \
 	fi
-	touch .stmp-emacs
 
-clean-emacs:
-	if [ -d ./emacs ] ; then \
+clean-emacs: force
+	@if [ -f ./emacs/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./emacs; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			clean) ; \
+		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
 	else \
 		true ; \
 	fi
 
-install-emacs: install-rcs install-gdbm
-	if [ -d ./emacs ] ; then \
+install-emacs: force
+	@if [ -f ./emacs/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./emacs; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			install) ; \
+		$(MAKE) $(FLAGS_TO_PASS) install) ; \
 	else \
 		true ; \
 	fi
 
 ### ispell
-all-ispell: .stmp-emacs .stmp-ispell
-.stmp-ispell:
-	if [ -d ./ispell ] ; then \
+all-ispell: all-emacs
+	@if [ -f ./ispell/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./ispell; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			all) ; \
+		$(MAKE) $(FLAGS_TO_PASS) all) ; \
 	else \
 		true ; \
 	fi
-	touch .stmp-ispell
 
-clean-ispell:
-	if [ -d ./ispell ] ; then \
+clean-ispell: force
+	@if [ -f ./ispell/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./ispell; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			clean) ; \
+		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
 	else \
 		true ; \
 	fi
 
-install-ispell: install-rcs install-gdbm
-	if [ -d ./ispell ] ; then \
+install-ispell: force
+	@if [ -f ./ispell/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		(cd ./ispell; \
-		$(MAKE) \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			install) ; \
-	else \
-		true ; \
-	fi
-
-### fileutils
-all-fileutils: .stmp-fileutils
-.stmp-fileutils:
-	if [ -d ./fileutils ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./fileutils; \
-		$(MAKE) \
-			"prefix=$(prefix)" \
-			"datadir=$(datadir)" \
-			"mandir=$(mandir)" \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			all) ; \
-	else \
-		true ; \
-	fi
-	touch .stmp-fileutils
-
-clean-fileutils:
-	if [ -d ./fileutils ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./fileutils; \
-		$(MAKE) \
-			"prefix=$(prefix)" \
-			"datadir=$(datadir)" \
-			"mandir=$(mandir)" \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			clean) ; \
-	else \
-		true ; \
-	fi
-
-install-fileutils:
-	if [ -d ./fileutils ] ; then \
-		rootme=`pwd` ; export rootme ; \
-		(cd ./fileutils; \
-		$(MAKE) \
-			"prefix=$(prefix)" \
-			"datadir=$(datadir)" \
-			"mandir=$(mandir)" \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			install) ; \
+		$(MAKE) $(FLAGS_TO_PASS) install) ; \
 	else \
 		true ; \
 	fi
 
-### libg++
-GXX = `if [ -d $${rootme}/gcc ] ; \
-	then echo $${rootme}/gcc/gcc -B$${rootme}/gcc/ ; \
-	else echo gcc ; fi`
+### send_pr
+all-send_pr: force
+	@if [ -f ./send_pr/Makefile ] ; then \
+		rootme=`pwd` ; export rootme ; \
+		(cd ./send_pr; \
+		$(MAKE) $(FLAGS_TO_PASS) all) ; \
+	else \
+		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
 
-XTRAFLAGS = `if [ -d $${rootme}/gcc ] ; \
-	then echo -I$${rootme}/gcc/include ; \
-	else echo ; fi`
+install-send_pr: force
+	@if [ -f ./send_pr/Makefile ] ; then \
+		rootme=`pwd` ; export rootme ; \
+		(cd ./send_pr; \
+		$(MAKE) $(FLAGS_TO_PASS) install) ; \
+	else \
+		true ; \
+	fi
 
-all-libg++: .stmp-gas .stmp-ld .stmp-gcc .stmp-libg++
-.stmp-libg++: .stmp-gcc
-	if [ -d ./libg++ ] ; then \
+### libm
+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) ; \
+	else \
+		true ; \
+	fi
+
+install-libm: force
+	@if [ -f ./libm/Makefile ] ; then \
+		rootme=`pwd` ; export rootme ; \
+		(cd ./libm; \
+		$(MAKE) $(FLAGS_TO_PASS) install) ; \
+	else \
+		true ; \
+	fi
+
+### libg++
+
+all-libg++: all-gas all-ld all-gcc
+	@if [ -f ./libg++/Makefile ] ; then \
+		rootme=`pwd` ; export rootme ; \
+		srcroot=`cd $(srcdir); pwd` ; export srcroot ; \
 		(cd ./libg++; \
-		$(MAKE) \
-			"prefix=$(prefix)" \
-			"datadir=$(datadir)" \
-			"mandir=$(mandir)" \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=${GXX}" \
-			"XTRAFLAGS=${XTRAFLAGS}" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			all) ; \
+		$(MAKE) $(TARGET_FLAGS_TO_PASS) all) ; \
 	else \
 		true ; \
 	fi
-	touch .stmp-libg++
 
-clean-libg++:
-	if [ -d ./libg++ ] ; then \
+clean-libg++: force
+	@if [ -f ./libg++/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
+		srcroot=`cd $(srcdir); pwd` ; export srcroot ; \
 		(cd ./libg++; \
-		$(MAKE) \
-			"prefix=$(prefix)" \
-			"datadir=$(datadir)" \
-			"mandir=$(mandir)" \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			clean) ; \
+		$(MAKE) $(TARGET_FLAGS_TO_PASS) clean) ; \
 	else \
 		true ; \
 	fi
 
-install-libg++:
-	if [ -d ./libg++ ] ; then \
+install-libg++: force
+	@if [ -f ./libg++/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
+		srcroot=`cd $(srcdir); pwd` ; export srcroot ; \
 		(cd ./libg++; \
-		$(MAKE) \
-			"prefix=$(prefix)" \
-			"datadir=$(datadir)" \
-			"mandir=$(mandir)" \
-			"against=$(against)" \
-			"AR=$(AR)" \
-			"AR_FLAGS=$(AR_FLAGS)" \
-			"CC=$(CC)" \
-			"RANLIB=$(RANLIB)" \
-			"LOADLIBES=$(LOADLIBES)" \
-			"LDFLAGS=$(LDFLAGS)" \
-			"BISON=$(BISON)" \
-			"MAKEINFO=$(MAKEINFO)" \
-			install) ; \
+		$(MAKE) $(TARGET_FLAGS_TO_PASS) install) ; \
 	else \
 		true ; \
 	fi
@@ -1787,94 +1165,31 @@ install-libg++:
 ### other supporting targets
 # this is a bad hack.
 all.xclib:	all.normal
-	if [ -d clib ] ; then \
-		(cd clib ; $(MAKE)) ; \
+	if [ -f clib/Makefile ] ; then \
+		(cd clib ; $(MAKE) $(FLAGS_TO_PASS)) ; \
 	fi
 
 subdir_do:
-	for i in $(DODIRS); do \
-		if [ -f ./$$i/localenv ] ; then \
-			if (rootme=`pwd` ; export rootme ; cd ./$$i; \
-				$(MAKE) \
-					"against=$(against)" \
-					"BISON=$(BISON)" \
-					"MAKEINFO=$(MAKEINFO)" \
-					$(DO)) ; then true ; \
-				else exit 1 ; fi ; \
-		else if [ -d ./$$i ] ; then \
-			if (rootme=`pwd` ; export rootme ; cd ./$$i; \
-				$(MAKE) \
-					"against=$(against)" \
-					"AR=$(AR)" \
-					"AR_FLAGS=$(AR_FLAGS)" \
-					"CC=$(CC)" \
-					"RANLIB=$(RANLIB)" \
-					"LOADLIBES=$(LOADLIBES)" \
-					"LDFLAGS=$(LDFLAGS)" \
-					"BISON=$(BISON)" \
-					"MAKEINFO=$(MAKEINFO)" \
-					$(DO)) ; then true ; \
-			else exit 1 ; fi ; \
-		else true ; fi ; \
-	fi ; \
+	@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
 
-bootstrap:
-	$(MAKE) all info
-	$(MAKE) stage1
-	$(MAKE) pass "stagepass=stage1"
-	$(MAKE) stage2
-	$(MAKE) pass "stagepass=stage2"
-	$(MAKE) comparison
-
-bootstrap2:
-	$(MAKE) pass "stagepass=stage1"
-	$(MAKE) stage2
-	$(MAKE) pass "stagepass=stage2"
-	$(MAKE) comparison
-
-bootstrap3:
-	$(MAKE) pass "stagepass=stage2"
-	$(MAKE) comparison
-
-pass:
-	cp $(srcdir)/gcc/gstdarg.h ./gas/stdarg.h
-	$(MAKE) subdir_do "DO=all info" "DODIRS=$(SUBDIRS)" \
-		"CC=`pwd`/gcc/$(stagepass)/gcc \
-		-O $(GCCVERBOSE) -I`pwd`/gcc/include \
-		-B`pwd`/gcc/$(stagepass)/ \
-		-B`pwd`/gas/$(stagepass)/ \
-		-B`pwd`/ld/$(stagepass)/" \
-		"AR=`pwd`/binutils/$(stagepass)/ar" \
-		"LD=`pwd`/gcc/$(stagepass)/gcc $(GCCVERBOSE)" \
-		"RANLIB=`pwd`/binutils/$(stagepass)/ranlib" \
-		"LOADLIBES=`pwd`/libgcc/$(stagepass)/libgcc.a /lib/libc.a" \
-		"LDFLAGS=-nostdlib /lib/crt0.o \
-		-L`pwd`/libgcc/$(stagepass)/ \
-		-B`pwd`/ld/$(stagepass)/"
-
-
-stage1:
-	$(MAKE) subdir_do DO=stage1 "DODIRS=$(SUBDIRS)"
-
-stage2:
-	$(MAKE) subdir_do DO=stage2 "DODIRS=$(SUBDIRS)"
-
-stage3:
-	$(MAKE) subdir_do DO=stage3 "DODIRS=$(SUBDIRS)"
-
-stage4:
-	$(MAKE) subdir_do DO=stage4 "DODIRS=$(SUBDIRS)"
-
-against=stage2
-
-comparison:; $(MAKE) subdir_do DO=comparison against=$(against) "DODIRS=$(SUBDIRS)"
-
-de-stage1:; $(MAKE) subdir_do DO=de-stage1 "DODIRS=$(SUBDIRS)"
-de-stage2:; $(MAKE) subdir_do DO=de-stage2 "DODIRS=$(SUBDIRS)"
-de-stage3:; $(MAKE) subdir_do DO=de-stage3 "DODIRS=$(SUBDIRS)"
-de-stage4:; $(MAKE) subdir_do DO=de-stage4 "DODIRS=$(SUBDIRS)"
-
 # 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.
@@ -1882,15 +1197,16 @@ de-stage4:; $(MAKE) subdir_do DO=de-stage4 "DODIRS=$(SUBDIRS)"
 MAKEDIRS= \
 	$(prefix) \
 	$(exec_prefix) \
-	$(bindir) \
-	$(libdir) \
-	$(tooldir) \
-	$(includedir) \
-	$(datadir) \
-	$(docdir) \
-	$(mandir) \
-	$(man1dir) \
-	$(man5dir)
+	$(tooldir)
+
+#	$(bindir) \
+#	$(libdir) \
+#	$(includedir) \
+#	$(datadir) \
+#	$(docdir) \
+#	$(mandir) \
+#	$(man1dir) \
+#	$(man5dir)
 
 #	$(man2dir) \
 #	$(man3dir) \
@@ -1902,20 +1218,31 @@ MAKEDIRS= \
 install-dirs:
 	for i in $(MAKEDIRS) ; do \
 		echo Making $$i... ; \
-		[ -d $$i ] || mkdir $$i || exit 1 ; \
+		parent=`echo $$i|sed -e 's@/[^/]*$$@@'`; \
+		if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi ; \
+		if [ ! -d $$i ] ; then \
+			if mkdir $$i ; then \
+				true ; \
+			else \
+				exit 1 ; \
+			fi ; \
+		else \
+			true ; \
+		fi ; \
 	done
 
 MAKEINFODIRS= \
-	$(prefix) \
-	$(infodir)
+	$(prefix)
+
+#	$(infodir)
 
 install-info-dirs:
 	if [ -d $(prefix) ] ; then true ; else mkdir $(prefix) ; fi
-	if [ -d $(datadir) ] ; then true ; else mkdir $(datadir) ; fi
-	if [ -d $(infodir) ] ; then true ; else mkdir $(infodir) ; fi
+#	if [ -d $(datadir) ] ; then true ; else mkdir $(datadir) ; fi
+#	if [ -d $(infodir) ] ; then true ; else mkdir $(infodir) ; fi
 
 dir.info:
-	$(srcdir)/texinfo/gen-info-dir $(infodir) > dir.info.new
+	$(srcdir)/texinfo/gen-info-dir $(infodir) $(srcdir)/texinfo/dir.info-template > dir.info.new
 	mv -f dir.info.new dir.info
 
 etags tags: TAGS
@@ -1947,8 +1274,8 @@ 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
-GDB_SUPPORT_DIRS= bfd include libiberty mmalloc readline glob
+	config.sub config configure.man configure.texi move-if-change
+GDB_SUPPORT_DIRS= bfd include libiberty mmalloc opcodes readline glob
 GDB_SUPPORT_FILES= $(GDB_SUPPORT_DIRS) texinfo/fsf/texinfo.tex
 
 setup-dirs: force_update
@@ -1957,11 +1284,6 @@ setup-dirs: force_update
 	./configure -rm sun4
 	chmod og=u `find $(DEVO_SUPPORT) $(GDB_SUPPORT_FILES) -print`
 
-bfd.ilrt.tar.Z: setup-dirs
-	rm -f bfd.ilrt.tar.Z
-	tar cf - $(DEVO_SUPPORT) $(GDB_SUPPORT_FILES) \
-		| compress -v >bfd.ilrt.tar.Z
-
 gdb.tar.Z: setup-dirs
 	(cd gdb; $(MAKE) -f Makefile.in make-proto-gdb.dir)
 	$(MAKE) $(MFLAGS) -f Makefile.in make-gdb.tar.Z
@@ -1984,13 +1306,13 @@ make-gdb.tar.Z: $(DEVO_SUPPORT) $(GDB_SUPPORT_DIRS) gdb texinfo/fsf/texinfo.tex
 	sed '/^configdirs=/s/texinfo //' <configure.in >proto-toplev/configure.in
 	# Take out glob from buildable dirs
 	rm proto-toplev/Makefile.in
-	sed '/^SUBDIRS =/s/glob //' <Makefile.in >proto-toplev/Makefile.in
-	# Take out texinfo from buildable dirs
-	cp proto-toplev/Makefile.in temp.$$
-	sed '/^all\.normal: /s/all-texinfo //' <temp.$$ >temp1.$$
-	sed '/^clean: /s/clean-texinfo //' <temp1.$$ >temp.$$
-	sed '/^install\.all: /s/install-texinfo //' <temp.$$ >proto-toplev/Makefile.in
-	rm temp.$$ temp1.$$
+
+	sed -e '/^SUBDIRS =/s/glob //' \
+	    -e '/^all\.normal: /s/\all-texinfo //' \
+	    -e '/^clean: /s/clean-texinfo //' \
+	    -e '/^install\.all: /s/install-texinfo //' \
+	<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/