From 110445cba5510f44c0fbd2ff13d7126459c188c6 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Sat, 10 Jun 2000 19:41:09 +0000 Subject: Patch rtems-rc-4.5.0-21.diff from Ralf Corsepius which splits the current monolithic specs files into a sequence of subparts. These can be concatenated togather to make a the whole .spec file. This cleans up the maintenance problem of having "all languages" and a "C/C++ only" gccnewlib spec files. Plus it should make it easier to produce variants like the gdb-m68k-bdm which require special hackery. :) Ralf's comments: It addresses the way *.spec.in get composed inside of the source tree. Changes: * Each spec.in is broken into several files (*.add), one *.add file per sub-package. * Each Makefile.am composes spec.ins from the *.add files * Removal of redundant automake support files. * Default value for BuildRoot changed to /tmp/ * %clean stage added to *specs Advantages (IMHO). * The *.add files are easier to adminstrate and more flexible in comparison to the former *.specs.ins. * gccnewlib_c_only.spec.in now is composed from the same sources as gccnewlib.spec.in (less errors) * If using the default BuildRoot --clean now deletes all files that were generated while building. Notes: * rtems.spec.in has not yet been adapted to the scheme used for the other *spec.ins * Except for cosmetical changes the internals of the *.spec files should not have changed. To Apply: cvs rm -f scripts/binutils/binutils.spec.in cvs rm -f scripts/gccnewlib/gccnewlib.spec.in cvs rm -f scripts/gccnewlib/gccnewlib_c_only.spec.in cvs rm -f scripts/gdb/gdb.spec.in cvs rm -f scripts/config.sub cvs rm -f scripts/config.guess cvs rm -f scripts/install-sh cvs rm -f scripts/mkinstalldirs cvs rm -f scripts/missing patch -p1 < rtems-rc-4.5.0-21.diff cvs add scripts/*/*.add cvs add scripts/*/README --- doc/started_ada/Makefile.am | 5 +++-- doc/started_ada/started_ada.texi | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'doc/started_ada') diff --git a/doc/started_ada/Makefile.am b/doc/started_ada/Makefile.am index 63742d37d4..82d945803b 100644 --- a/doc/started_ada/Makefile.am +++ b/doc/started_ada/Makefile.am @@ -16,7 +16,8 @@ include $(top_srcdir)/project.am GENERATED_FILES = buildada.texi buildrt.texi gdb.texi intro.texi \ require.texi sample.texi -COMMON_FILES = $(top_srcdir)/common/setup.texi $(top_srcdir)/common/cpright.texi +COMMON_FILES = $(top_srcdir)/common/setup.texi \ + $(top_srcdir)/common/cpright.texi FILES = tversions.texi @@ -53,4 +54,4 @@ $(srcdir)/gdb.texi: gdb.t tversions.texi -u "Top" \ -n "" < $< > $@ -EXTRA_DIST = *.t +EXTRA_DIST = buildada.t gdb.t intro.t require.t sample.t diff --git a/doc/started_ada/started_ada.texi b/doc/started_ada/started_ada.texi index 375fab6212..4a304a082c 100644 --- a/doc/started_ada/started_ada.texi +++ b/doc/started_ada/started_ada.texi @@ -20,7 +20,7 @@ @c @include version.texi -@include ../common/setup.texi +@include common/setup.texi @c @c Now set all the tool version dependent information @@ -54,7 +54,7 @@ @subtitle @value{UPDATED} @author On-Line Applications Research Corporation @page -@include ../common/cpright.texi +@include common/cpright.texi @end titlepage @c This prevents a black box from being printed on "overflow" lines. -- cgit v1.2.3