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/user/Makefile.am | 8 ++++++-- doc/user/c_user.texi | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'doc/user') diff --git a/doc/user/Makefile.am b/doc/user/Makefile.am index c90de31c32..62869ed309 100644 --- a/doc/user/Makefile.am +++ b/doc/user/Makefile.am @@ -20,7 +20,8 @@ GENERATED_FILES = overview.texi concepts.texi datatypes.texi init.texi \ signal.texi part.texi region.texi dpmem.texi io.texi fatal.texi \ schedule.texi rtmon.texi bsp.texi userext.texi conf.texi mp.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 info_TEXINFOS = c_user.texi c_user_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES) @@ -159,4 +160,7 @@ $(srcdir)/mp.texi: mp.t noinst_DATA = states.gif rtemspie.gif -EXTRA_DIST = *.t $(PNG_FILES) $(EPS_IMAGES) $(noinst_DATA) +EXTRA_DIST = bsp.t concepts.t clock.t datatypes.t conf.t dpmem.t event.t \ + fatal.t init.t intr.t io.t mp.t msg.t overview.t part.t region.t rtmon.t \ + sem.t schedule.t signal.t task.t timer.t userext.t $(PNG_FILES) \ + $(EPS_IMAGES) $(noinst_DATA) diff --git a/doc/user/c_user.texi b/doc/user/c_user.texi index 26352db14a..dadf679aa1 100644 --- a/doc/user/c_user.texi +++ b/doc/user/c_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,7 +70,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