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/supplements/i386/Makefile.am | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'doc/supplements/i386/Makefile.am') diff --git a/doc/supplements/i386/Makefile.am b/doc/supplements/i386/Makefile.am index 60f24391cc..a1ec1760cb 100644 --- a/doc/supplements/i386/Makefile.am +++ b/doc/supplements/i386/Makefile.am @@ -18,7 +18,8 @@ GENERATED_FILES = cpumodel.texi callconv.texi memmodel.texi intr.texi \ fatalerr.texi bsp.texi cputable.texi timing.texi wksheets.texi \ timeFORCE386.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 $(top_srcdir)/common/timemac.texi FILES = preface.texi @@ -95,15 +96,16 @@ $(srcdir)/timing.texi: $(top_srcdir)/common/timing.t # 3. Build Node Structure $(srcdir)/timeFORCE386.texi: $(top_srcdir)/common/timetbl.t timeFORCE386.t - cat timeFORCE386.t $(top_srcdir)/common/timetbl.t >timeFORCE386_.t + cat $(srcdir)/timeFORCE386.t $(top_srcdir)/common/timetbl.t >timeFORCE386_.t @echo >>timeFORCE386_.t @echo "@tex" >>timeFORCE386_.t @echo "\\global\\advance \\smallskipamount by 4pt" >>timeFORCE386_.t @echo "@end tex" >>timeFORCE386_.t - ${REPLACE2} -p FORCE386_TIMES timeFORCE386_.t | \ + ${REPLACE2} -p $(srcdir)/FORCE386_TIMES timeFORCE386_.t | \ $(BMENU2) -p "Timing Specification Terminology" \ -u "Top" \ -n "Command and Variable Index" > $@ CLEANFILES += timeFORCE386_.t -EXTRA_DIST = FORCE386_TIMES *.t +EXTRA_DIST = FORCE386_TIMES bsp.t callconv.t cpumodel.t cputable.t \ + fatalerr.t intr_NOTIMES.t memmodel.t timeFORCE386.t -- cgit v1.2.3