From 110445cba5510f44c0fbd2ff13d7126459c188c6 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Sat, 10 Jun 2000 19:41:09 +0000
Subject: Patch rtems-rc-4.5.0-21.diff from Ralf Corsepius
 <corsepiu@faw.uni-ulm.de> 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/<spec-file-name>
    * %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/ada_user/Makefile.am   |  3 +--
 doc/ada_user/ada_user.texi | 56 +++++++++++++++++++++++-----------------------
 2 files changed, 29 insertions(+), 30 deletions(-)

(limited to 'doc/ada_user')

diff --git a/doc/ada_user/Makefile.am b/doc/ada_user/Makefile.am
index 1249c3af26..9494c48a56 100644
--- a/doc/ada_user/Makefile.am
+++ b/doc/ada_user/Makefile.am
@@ -34,7 +34,7 @@ rtemspie.eps: $(top_srcdir)/user/rtemspie.eps
 	$(LN_S) $<
 states.eps: $(top_srcdir)/user/states.eps
 	$(LN_S) $<
-CLEANFILES += rtemspie.eps states.eps
+CLEANFILES += rtemspie.eps states.eps rtemsarc.png rtemspie.png states.png
 
 rtemsarc.png: $(top_srcdir)/user/rtemsarc.png
 	$(LN_S) $<
@@ -42,7 +42,6 @@ rtemspie.png: $(top_srcdir)/user/rtemspie.png
 	$(LN_S) $<
 states.png: $(top_srcdir)/user/states.png
 	$(LN_S) $<
-CLEANFILES += rtemsarc.png rtemspie.png states.png
 
 info_TEXINFOS = ada_user.texi
 ada_user_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES)
diff --git a/doc/ada_user/ada_user.texi b/doc/ada_user/ada_user.texi
index e9c401a5f2..d9a1c5d42d 100644
--- a/doc/ada_user/ada_user.texi
+++ b/doc/ada_user/ada_user.texi
@@ -26,7 +26,7 @@
 @c
 
 @include version.texi
-@include ../common/setup.texi
+@include common/setup.texi
 
 @ifset use-ascii
 @dircategory RTEMS On-Line Manual
@@ -70,39 +70,39 @@
 @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.
 @c  The alternative is to rework a sentence to avoid this problem.
 
-@include ../user/preface.texi
-@include ../user/overview.texi
-@include ../user/concepts.texi
-@include ../user/datatypes.texi
-@include ../user/init.texi
-@include ../user/task.texi
-@include ../user/intr.texi
-@include ../user/clock.texi
-@include ../user/timer.texi
-@include ../user/sem.texi
-@include ../user/msg.texi
-@include ../user/event.texi
-@include ../user/signal.texi
-@include ../user/part.texi
-@include ../user/region.texi
-@include ../user/dpmem.texi
-@include ../user/io.texi
-@include ../user/fatal.texi
-@include ../user/schedule.texi
-@include ../user/rtmon.texi
-@include ../user/bsp.texi
-@include ../user/userext.texi
-@include ../user/conf.texi
-@include ../user/mp.texi
-@include ../user/dirstat.texi
+@include user/preface.texi
+@include user/overview.texi
+@include user/concepts.texi
+@include user/datatypes.texi
+@include user/init.texi
+@include user/task.texi
+@include user/intr.texi
+@include user/clock.texi
+@include user/timer.texi
+@include user/sem.texi
+@include user/msg.texi
+@include user/event.texi
+@include user/signal.texi
+@include user/part.texi
+@include user/region.texi
+@include user/dpmem.texi
+@include user/io.texi
+@include user/fatal.texi
+@include user/schedule.texi
+@include user/rtmon.texi
+@include user/bsp.texi
+@include user/userext.texi
+@include user/conf.texi
+@include user/mp.texi
+@include user/dirstat.texi
 @include example.texi
-@include ../user/glossary.texi
+@include user/glossary.texi
 @ifinfo
 @node Top, Preface, (dir), (dir)
 @top ada_user
-- 
cgit v1.2.3