Generated files removed.

11 files changed, 155 insertions, 307 deletions

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 01acec5f32..4dd357a165 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = . binutils gccnewlib
+SUBDIRS = . binutils gccnewlib gdb
 
 noinst_SCRIPTS = \
 setup \
@@ -11,14 +11,9 @@ mkbspspec \
 mkgccnewlibspec \
 mkgdbspec \
 mkrpms \
-mkspec \
-mktoolspec
+mkspec
 
-TEMPLATES = \
-gccnewlib.spec.in \
-gdb.spec.in \
-rtems.spec.in \
-toolchain.spec.in
+TEMPLATES = 
 
 noinst_DATA = \
 setup.def $(TEMPLATES)
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 7ec019bd85..cebcc16270 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -68,13 +68,12 @@ VERSION = @VERSION@
 
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = . binutils gccnewlib
+SUBDIRS = . binutils gccnewlib gdb
 
-noinst_SCRIPTS =  setup buildall mkbinutils_subpackage_version mkbinutilspec mkbspspec mkgccnewlibspec mkgdbspec mkrpms mkspec mktoolspec
+noinst_SCRIPTS =  setup buildall mkbinutils_subpackage_version mkbinutilspec mkbspspec mkgccnewlibspec mkgdbspec mkrpms mkspec
 
 
-TEMPLATES =  gccnewlib.spec.in gdb.spec.in rtems.spec.in toolchain.spec.in
-
+TEMPLATES = 
 
 noinst_DATA =  setup.def $(TEMPLATES)
 
@@ -87,14 +86,14 @@ CONFIGURE_DEPENDENCIES = setup.cache
 DISTCLEANFILES = setup.cache
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES =  mkbinutilspec mkgccnewlibspec
+CONFIG_CLEAN_FILES =  mkbinutilspec mkgccnewlibspec mkgdbspec
 SCRIPTS =  $(noinst_SCRIPTS)
 
 DATA =  $(noinst_DATA)
 
 DIST_COMMON =  README Makefile.am Makefile.in TODO aclocal.m4 configure \
 configure.in install-sh missing mkbinutilspec.in mkgccnewlibspec.in \
-mkinstalldirs
+mkgdbspec.in mkinstalldirs
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -104,9 +103,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -121,6 +120,8 @@ mkbinutilspec: $(top_builddir)/config.status mkbinutilspec.in
 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 mkgccnewlibspec: $(top_builddir)/config.status mkgccnewlibspec.in
 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+mkgdbspec: $(top_builddir)/config.status mkgdbspec.in
+	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -249,6 +250,11 @@ distdir: $(DISTFILES)
 	-rm -rf $(distdir)
 	mkdir $(distdir)
 	-chmod 777 $(distdir)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
diff --git a/scripts/binutils/Makefile.in b/scripts/binutils/Makefile.in
index 45661afd71..80ac5df826 100644
--- a/scripts/binutils/Makefile.in
+++ b/scripts/binutils/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -46,9 +46,10 @@ AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -93,14 +94,14 @@ DIST_COMMON =  Makefile.am Makefile.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps binutils/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --foreign binutils/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -132,10 +133,15 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = binutils
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign binutils/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -164,7 +170,7 @@ uninstall: uninstall-am
 all-am: Makefile $(DATA)
 all-redirect: all-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs:
 	$(mkinstalldirs)  $(DESTDIR)$(RPM_SPECSdir)
 
diff --git a/scripts/buildall b/scripts/buildall
index 4da2e25b97..c91d6e9a2c 100644
--- a/scripts/buildall
+++ b/scripts/buildall
@@ -19,20 +19,23 @@ ALL_TARGETS="i386-rtems i960-rtems m68k-rtems \
 #TARGETS=${ALL_TARGETS}
 TARGETS="sh-rtems"
 
-testing=no
-
 binutils=990901
 gcc=2.95.1
 gdb=4.18
 newlib=1.8.2
 buildroot=/opt/tmp
 
+testing=yes
+do_binutils=yes
+do_gdb=yes
+do_gccnewlib=yes
+staging_dir=/usr3/rtems_cds/test_cd/linux
+
 #
 #  Now get started
 #
 start=`date`
 
-
 echo PATH=$PATH
 
 if [ ${testing} = yes ] ; then
@@ -64,76 +67,105 @@ then
 dst=/usr/src/SPECS;
 fi
 
+if [ ${testing} = no ] ; then
+  cd ${RTEMS_DIR}/scripts
+  ./configure || exit 1
+  make        || exit 1
+fi
+
 #  Now generate all the specs
 for target in ${TARGETS}
 do
-  ${ECHO} ${RTEMS_DIR}/mkspec ${target}
+  tspecs=`find . -name "${target}*"`
+  ${ECHO} cp -r ${tspecs} ${dst}
 done
 
 # clean up a bit before we start
 cd ${dst}
 test -d log || mkdir log
 
-
 #  do all the tools
 for target in ${TARGETS}
 do
-  logfile=log/${target}-binutils
-  specfile=${dst}/${target}-binutils-${binutils}.spec
-  echo "rpm -ba --buildroot=${buildroot} ${specfile} >${logfile} 2>&1"
-  if [ ${testing} = no ] ; then
-    rpm -ba --buildroot=${buildroot} ${specfile} >${logfile} 2>&1
-  fi
-  ${ECHO} rm -rf ${dst}/../BUILD/${target}-binutils*
-  ${ECHO} rm -rf ${buildroot}/opt
-
-  # now build gdb
-  logfile=log/${target}-gdb
-  specfile=${dst}/${target}-gdb-${gdb}.spec
-  echo "rpm -ba --buildroot=${buildroot} ${specfile} >${logfile} 2>&1"
-  if [ ${testing} = no ] ; then
-    rpm -ba --buildroot=${buildroot} ${specfile} >${logfile} 2>&1
+  if [ ${do_binutils} = yes ] ; then
+    logfile=log/${target}-binutils
+    specfile=${dst}/${target}-binutils-${binutils}.spec
+    echo "rpm -ba --buildroot=${buildroot} ${specfile} >${logfile} 2>&1"
+    if [ ${testing} = no ] ; then
+      rpm -ba --buildroot=${buildroot} ${specfile} >${logfile} 2>&1
+    fi
+    ${ECHO} rm -rf ${dst}/../BUILD/${target}-binutils*
+    ${ECHO} rm -rf ${buildroot}/opt
+  else
+    echo Skipping binutils for ${target}
   fi
-  ${ECHO} rm -rf ${dst}/../BUILD/${target}-gdb*
-  ${ECHO} rm -rf ${buildroot}/opt
-
-  # now build gcc/newlib
-  #    NOTE: This requires having binutils installed and we immediately
-  #          remove it once finished.
-  ${ECHO} rpm -i ${dst}/../RPMS/i386/${target}-binutils-${binutils}-0.i386.rpm
-
-  logfile=log/${target}-gccnewlib
-  specfile=${dst}/${target}-gcc-${gcc}-newlib-${newlib}.spec
-  echo "rpm -ba --buildroot=${buildroot} ${specfile} >${logfile} 2>&1"
-  if [ ${testing} = no ] ; then
-    rpm -ba --buildroot=${buildroot} ${specfile} >${logfile} 2>&1
-  fi
-  ${ECHO} rm -rf ${dst}/../BUILD/${target}-gcc*
-  ${ECHO} rm -rf ${buildroot}/opt
 
-  echo uninstalling binutils for ${target} 
-  if [ ${testing} = no ] ; then
-    rpm -e `rpm -qa | grep rtems`
+  if [ ${do_gdb} = yes ] ; then
+    # now build gdb
+    logfile=log/${target}-gdb
+    specfile=${dst}/${target}-gdb-${gdb}.spec
+    echo "rpm -ba --buildroot=${buildroot} ${specfile} >${logfile} 2>&1"
+    if [ ${testing} = no ] ; then
+      rpm -ba --buildroot=${buildroot} ${specfile} >${logfile} 2>&1
+    fi
+    ${ECHO} rm -rf ${dst}/../BUILD/${target}-gdb*
+    ${ECHO} rm -rf ${buildroot}/opt
+  else
+    echo Skipping gdb for ${target}
   fi
-done
 
-staging_dir=/usr3/rtems_cds/test_cd/linux
-
-${ECHO} mkdir ${staging_dir}
-${ECHO} mkdir ${staging_dir}/RPMS
-${ECHO} mkdir ${staging_dir}/SRPMS
-
-echo Moving RPMs to CD staging directory
-for file in `ls -1 ${dst}/../RPMS/i386/*.rpm 2>/dev/null`
-do
-  ${ECHO} mv ${file} ${staging_dir}/RPMS
+  if [ ${do_gccnewlib} = yes ] ; then
+    # now build gcc/newlib
+    #    NOTE: This requires having binutils installed and we immediately
+    #          remove it once finished.
+    binutils_rpm=${dst}/../RPMS/i386/${target}-binutils-${binutils}-0.i386.rpm
+    if [ ! -f ${binutils_rpm} ] ; then
+      echo There is no RPM for binutils for ${target}.
+      echo Looked for ${binutils_rpm}.
+    fi
+    ${ECHO} rpm -i ${binutils_rpm}
+
+    logfile=log/${target}-gccnewlib
+    specfile=${dst}/${target}-gcc-${gcc}-newlib-${newlib}.spec
+    echo "rpm -ba --buildroot=${buildroot} ${specfile} >${logfile} 2>&1"
+    if [ ${testing} = no ] ; then
+      rpm -ba --buildroot=${buildroot} ${specfile} >${logfile} 2>&1
+    fi
+    ${ECHO} rm -rf ${dst}/../BUILD/${target}-gcc*
+    ${ECHO} rm -rf ${buildroot}/opt
+
+    echo uninstalling binutils for ${target} 
+    if [ ${testing} = no ] ; then
+      rpm -e `rpm -qa | grep rtems`
+    fi
+  else
+    echo Skipping gcc/newlib for ${target}
+  fi
 done
 
-echo Moving SRPMs to CD staging directory
-for file in `ls -1 ${dst}/../SRPMS/*.rpm 2>/dev/null`
-do
-  ${ECHO} mv ${file} ${staging_dir}/SRPMS
-done
+if [ X${staging_dir} != X ] ; then
+  echo "Moving files to a staging directory for distribution."
+  echo "Plus it saves space in /usr. :)"
+  echo
+  echo Making staging directory..
+  ${ECHO} mkdir ${staging_dir}
+  ${ECHO} mkdir ${staging_dir}/RPMS
+  ${ECHO} mkdir ${staging_dir}/SRPMS
+
+  echo Moving RPMs to CD staging directory
+  for file in `ls -1 ${dst}/../RPMS/i386/*.rpm 2>/dev/null`
+  do
+    echo Moving ${file}
+    ${ECHO} mv ${file} ${staging_dir}/RPMS
+  done
+
+  echo Moving SRPMs to CD staging directory
+  for file in `ls -1 ${dst}/../SRPMS/*.rpm 2>/dev/null`
+  do
+    echo Moving ${file}
+    ${ECHO} mv ${file} ${staging_dir}/SRPMS
+  done
+fi
 
 # Now we are done
 
diff --git a/scripts/gccnewlib/Makefile.in b/scripts/gccnewlib/Makefile.in
index 3cd1057641..01883328e9 100644
--- a/scripts/gccnewlib/Makefile.in
+++ b/scripts/gccnewlib/Makefile.in
@@ -100,9 +100,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps gccnewlib/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --foreign gccnewlib/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -134,6 +134,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = gccnewlib
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign gccnewlib/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
diff --git a/scripts/gdb/Makefile.in b/scripts/gdb/Makefile.in
index 0f132e3e7c..0da6ac8bcd 100644
--- a/scripts/gdb/Makefile.in
+++ b/scripts/gdb/Makefile.in
@@ -68,14 +68,14 @@ VERSION = @VERSION@
 
 AUTOMAKE_OPTIONS = foreign
 
-MKBINUTILSSPEC = $(SHELL) $(top_srcdir)/mkbinutilspec
+MKGDBSPEC = $(SHELL) $(top_srcdir)/mkgdbspec
 
-MKBINUTILSSPEC_DEPS = ../mkbinutilspec binutils.spec.in ../setup.cache
+MKGDBSPEC_DEPS = ../mkgdbspec gdb.spec.in ../setup.cache
 
-TEMPLATES =  binutils.spec.in
+TEMPLATES =  gdb.spec.in
 
 
-RPM_SPECS_DATA =  i386-rtems-$(BINUTILSVERS).spec sh-rtems-$(BINUTILSVERS).spec powerpc-rtems-$(BINUTILSVERS).spec sparc-rtems-$(BINUTILSVERS).spec m68k-rtems-$(BINUTILSVERS).spec mips64orion-rtems-$(BINUTILSVERS).spec i960-rtems-$(BINUTILSVERS).spec hppa1.1-rtems-$(BINUTILSVERS).spec
+RPM_SPECS_DATA =  i386-rtems-$(GDBVERS).spec sh-rtems-$(GDBVERS).spec powerpc-rtems-$(GDBVERS).spec sparc-rtems-$(GDBVERS).spec m68k-rtems-$(GDBVERS).spec mips64orion-rtems-$(GDBVERS).spec i960-rtems-$(GDBVERS).spec hppa1.1-rtems-$(GDBVERS).spec
 
 
 noinst_DATA =  $(TEMPLATES)
@@ -99,9 +99,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps binutils/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --foreign gdb/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -130,9 +130,14 @@ TAGS:
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
-subdir = binutils
+subdir = gdb
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign gdb/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
@@ -206,29 +211,29 @@ mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-i386-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . i386-rtems
+i386-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKGDBSPEC) -cfg ../setup.cache -o . i386-rtems
 
-sh-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . sh-rtems
+sh-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKGDBSPEC) -cfg ../setup.cache -o . sh-rtems
 
-powerpc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . powerpc-rtems
+powerpc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKGDBSPEC) -cfg ../setup.cache -o . powerpc-rtems
 
-sparc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . sparc-rtems
+sparc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKGDBSPEC) -cfg ../setup.cache -o . sparc-rtems
 
-m68k-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . m68k-rtems
+m68k-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKGDBSPEC) -cfg ../setup.cache -o . m68k-rtems
 
-mips64orion-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . mips64orion-rtems
+mips64orion-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKGDBSPEC) -cfg ../setup.cache -o . mips64orion-rtems
 
-i960-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . i960-rtems
+i960-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKGDBSPEC) -cfg ../setup.cache -o . i960-rtems
 
-hppa1.1-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
-	$(MKBINUTILSSPEC) -cfg ../setup.cache -o . hppa1.1-rtems
+hppa1.1-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKGDBSPEC) -cfg ../setup.cache -o . hppa1.1-rtems
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/scripts/mkbinutilspec b/scripts/mkbinutilspec
deleted file mode 100644
index 06be1a079d..0000000000
--- a/scripts/mkbinutilspec
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh 
-#
-#  Usage: mkbinutilspec CPU
-#
-
-RTEMS_DIR=`dirname $0`
-
-CFG=user.cfg
-dst=/usr/src/redhat/SPECS
-
-usage()
-{
-  echo "$0 [options] <target_alias>"
-  echo "  options:"
-  echo "    -cfg <user.cfg>"
-  echo "    -o <rpm-spec-dir>"
-  exit 1 ;
-}
-
-while test $# -ge 2; do
-case $1 in
--cfg) 
-  shift
-  CFG=$1
-  shift
-  ;;
--o)
-  shift
-  dst=$1
-  shift
-  ;;
--*)
-  echo "invalid option $1";
-  usage
-  ;;
-esac
-done
-
-if test ! $# -eq 1;
-then
-  echo "Invalid number of arguments"
-  usage
-fi
-
-# target to build for
-target_alias=$1
-
-# RPM release number
-rpm_release=0
-
-. ./$CFG
-
-specfile=${dst}/$target_alias-binutils-${binutils_version}.spec
-
-sed -e "s%@Release@%${rpm_release}%g" \
-    -e "s%@target_alias@%${target_alias}%g" \
-    -e "s%@binutils_version@%${binutils_version}%g" \
-    -e "s%@binutils_patch_version@%${binutils_patch_version}%g" \
-< ${RTEMS_DIR}/binutils/binutils.spec.in \
-> ${specfile}
-
-echo Generated ${specfile}
diff --git a/scripts/mkgccnewlibspec b/scripts/mkgccnewlibspec
deleted file mode 100644
index fad489254c..0000000000
--- a/scripts/mkgccnewlibspec
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/sh 
-#
-#  Usage: mktoolspec CPU
-#
-
-RTEMS_DIR=`dirname $0`
-
-CFG=user.cfg
-dst=/usr/src/redhat/SPECS
-
-usage()
-{
-  echo "$0 [options] <target_alias>"
-  echo "  options:"
-  echo "    -cfg <user.cfg>"
-  echo "    -o <rpm-spec-dir>"
-  exit 1 ;
-}
-
-while test $# -ge 2; do
-case $1 in
--cfg) 
-  shift
-  CFG=$1
-  shift
-  ;;
--o)
-  shift
-  dst=$1
-  shift
-  ;;
--*)
-  echo "invalid option $1";
-  usage
-  ;;
-esac
-done
-
-if test ! $# -eq 1;
-then
-  echo "Invalid number of arguments"
-  usage
-fi
-
-# target to build for
-target_alias=$1
-
-# RPM release number
-rpm_release=0
-
-. ./$CFG
-
-specfile=${dst}/$target_alias-gcc-${gcc_version}-newlib-${newlib_version}.spec
-
-sed -e "s%@Release@%${rpm_release}%g" \
-    -e "s%@target_alias@%${target_alias}%g" \
-    -e "s%@gcc_version@%${gcc_version}%g" \
-    -e "s%@gcc_patch_version@%${gcc_patch_version}%g" \
-    -e "s%@newlib_version@%${newlib_version}%g" \
-    -e "s%@newlib_patch_version@%${newlib_patch_version}%g" \
-< ${RTEMS_DIR}/gccnewlib/gccnewlib.spec.in \
-> ${specfile}
-
-echo Generated ${specfile}.
diff --git a/scripts/mkgdbspec b/scripts/mkgdbspec
deleted file mode 100644
index b14b50e3e7..0000000000
--- a/scripts/mkgdbspec
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh 
-#
-#  Usage: mkgdbspec CPU
-#
-
-RTEMS_DIR=`dirname $0`
-CFG=user.cfg
-dst=/usr/src/redhat/SPECS
-
-usage()
-
-  echo "$0 [options] <target_alias>"
-  echo "  options:"
-  echo "    -cfg <user.cfg>"
-  echo "    -o <rpm-spec-dir>"
-  exit 1 ;
-
-
-while test $# -ge 2; do
-case $1 in
--cfg)
-  shift
-  CFG=$1
-  shift
-  ;;
--o)
-  shift
-  dst=$1
-  shift
-  ;;
--*)
-  echo "invalid option $1";
-  usage
-  ;;
-esac
-done
-
-if test ! $# -eq 1;
-then
-  echo "Invalid number of arguments"
-  usage
-fi
-
-# target to build for
-target_alias=$1
-
-rpm_release=0
-
-sed -e "s%@Release@%${rpm_release}%g" \
-    -e "s%@target_alias@%${target_alias}%g" \
-    -e "s%@gdb_version@%${gdb_version}%g" \
-    -e "s%@gdb_patch_version@%${gdb_patch_version}%g" \
-< ${RTEMS_DIR}/gdb.spec.in \
-> ${dst}/$target_alias-gdb.spec
-
-case ${target} in
-  powerpc*)
-     echo "/opt/rtems/bin/@target_alias@-run" 
-     ;;
-  sparc*)
-     echo "/opt/rtems/bin/@target_alias@-run" 
-     echo "/opt/rtems/bin/@target_alias@-sis" 
-     ;;
-  *) ;;
-esac >> ${dst}/$target_alias-gdb.spec
-
-echo Generated ${dst}/$target_alias-gdb.spec.
diff --git a/scripts/mkgdbspec.in b/scripts/mkgdbspec.in
index 2274670ed7..b512be6921 100644
--- a/scripts/mkgdbspec.in
+++ b/scripts/mkgdbspec.in
@@ -49,12 +49,13 @@ rpm_release=0
 
 . ./$CFG
 
-specfile=${dst}/$target_alias-gdb.spec
+specfile=${dst}/$target_alias-gdb-${gdb_version}.spec
+
 sed -e "s%@Release@%${rpm_release}%g" \
     -e "s%@target_alias@%${target_alias}%g" \
     -e "s%@gdb_version@%${gdb_version}%g" \
     -e "s%@gdb_patch_version@%${gdb_patch_version}%g" \
-< ${RTEMS_DIR}/gdb.spec.in \
+< ${RTEMS_DIR}/gdb/gdb.spec.in \
 > ${specfile}
 
 case ${target} in
diff --git a/scripts/setup.cache b/scripts/setup.cache
deleted file mode 100644
index f85bf452c2..0000000000
--- a/scripts/setup.cache
+++ /dev/null
@@ -1,9 +0,0 @@
-# RTEMS tools setup
-binutils_version=2.9.5
-binutils_patch_version=19991015
-newlib_version=1.8.2
-newlib_patch_version=19991015
-gcc_version=2.95.1
-gcc_patch_version=19991015
-gdb_version=4.18
-gdb_patch_version=19991015