From 42ec72d35c6381104f9147ed3d6d3e983adb705f Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Thu, 27 Jan 2000 23:49:44 +0000
Subject: Removed gnat and made final cleanup.

---
 scripts/gccnewlib/Makefile.am              |  5 +++-
 scripts/gccnewlib/gccnewlib_c_only.spec.in | 45 ++++++++++++++++++++++++------
 2 files changed, 40 insertions(+), 10 deletions(-)

(limited to 'scripts/gccnewlib')

diff --git a/scripts/gccnewlib/Makefile.am b/scripts/gccnewlib/Makefile.am
index b56767434f..38102acae9 100644
--- a/scripts/gccnewlib/Makefile.am
+++ b/scripts/gccnewlib/Makefile.am
@@ -8,6 +8,9 @@ C_ONLY_ARG = -a $(top_builddir)/gccnewlib/gccnewlib_c_only.spec.in
 
 MKGCCNEWLIBSPEC_DEPS = \
   $(top_builddir)/mkgccnewlibspec gccnewlib.spec.in $(top_builddir)/setup.cache
+MKGCCNEWLIB_C_ONLY_SPEC_DEPS = \
+  $(top_builddir)/mkgccnewlibspec gccnewlib_c_only.spec.in \
+  $(top_builddir)/setup.cache
 
 hppa1.1-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
 	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems
@@ -15,7 +18,7 @@ hppa1.1-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
 i386-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
 	$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . i386-rtems
 
-i960-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
+i960-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIB_C_ONLY_SPEC_DEPS)
 	$(MKGCCNEWLIBSPEC) $(C_ONLY_ARG) -cfg $(top_builddir)/setup.cache -o . i960-rtems
 
 m68k-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
diff --git a/scripts/gccnewlib/gccnewlib_c_only.spec.in b/scripts/gccnewlib/gccnewlib_c_only.spec.in
index 4f0fd44a5d..85b326c9d8 100644
--- a/scripts/gccnewlib/gccnewlib_c_only.spec.in
+++ b/scripts/gccnewlib/gccnewlib_c_only.spec.in
@@ -1,5 +1,5 @@
 #
-# spec file for building gcc for rtems
+# spec file for building gcc (C Only) for rtems
 # 
 # Copyright  (c)  1999  OARCorp, Huntsville, AL
 #
@@ -14,7 +14,7 @@ Group:	      rtems
 Release:      @Release@
 Copyright:    1999 OARCorp
 
-Provides:     	@target_alias@-gcc 
+Provides:     	rtems-base-gcc @target_alias@-gcc 
 Requires:     	@target_alias@-binutils
 
 Autoreqprov:  	on
@@ -55,6 +55,26 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
  your /usr/src/redhat/SOURCES directory ($RPM_SOURCE_DIR).
  Or you can try the ftp options of rpm :-)
 
+%package -n rtems-base-gcc
+Summary:      base package for rtems gcc and newlib C Library
+Group: rtems
+
+%description -n rtems-base-gcc
+
+RTEMS is an open source operating system for embedded systems.
+
+This is the files for gcc and newlib that are shared by all targets.
+
+%package -n @target_alias@-gcc
+Summary:      rtems gcc and newlib C Library for @target_alias@
+Group: rtems
+Requires: @target_alias@-binutils rtems-base-gcc
+
+%description -n @target_alias@-gcc
+RTEMS is an open source operating system for embedded systems.
+
+This is gcc and newlib C Library for @target_alias@.
+
 %prep
 # untar the sources inside @target_alias@-gcc-newlib
 %setup -c -n @target_alias@-gcc-newlib -a 0 -a 1
@@ -122,23 +142,32 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
     esac
   done
 
-%files -f build/files.gcc
+
+
+%files -n rtems-base-gcc
 %dir /opt/rtems/info
-%doc /opt/rtems/info/dir
+# %doc /opt/rtems/info/dir
 %doc /opt/rtems/info/cpp.info*
 %doc /opt/rtems/info/gcc.info*
 %doc /opt/rtems/info/libc.info*
 %doc /opt/rtems/info/libm.info*
 
+%dir /opt/rtems/bin
+/opt/rtems/bin/cpp@exe_ext@
+/opt/rtems/bin/gcov@exe_ext@
+
 %dir /opt/rtems/man
 %dir /opt/rtems/man/man1
 %doc /opt/rtems/man/man1/cccp.1
+
+%dir /opt/rtems/include
+/opt/rtems/include/g++-3
+
+%files -n @target_alias@-gcc -f build/files.gcc
+
 %doc /opt/rtems/man/man1/@target_alias@-gcc.1
 %doc /opt/rtems/man/man1/@target_alias@-g++.1
 
-%dir /opt/rtems/bin
-/opt/rtems/bin/cpp@exe_ext@
-/opt/rtems/bin/gcov@exe_ext@
 /opt/rtems/bin/@target_alias@-c++@exe_ext@
 /opt/rtems/bin/@target_alias@-g++@exe_ext@
 /opt/rtems/bin/@target_alias@-gcc@exe_ext@
@@ -147,8 +176,6 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
 
 %dir /opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/include
 
-%dir /opt/rtems/include
-/opt/rtems/include/g++-3
 /opt/rtems/@target_alias@
 
 %post
-- 
cgit v1.2.3