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/Makefile.am | 2 +- doc/supplements/hppa1_1/Makefile.am | 6 ++++-- doc/supplements/hppa1_1/hppa1_1.texi | 4 ++-- doc/supplements/i386/Makefile.am | 10 ++++++---- doc/supplements/i386/i386.texi | 4 ++-- doc/supplements/i386/timeFORCE386.t | 2 +- doc/supplements/i960/Makefile.am | 10 ++++++---- doc/supplements/i960/i960.texi | 4 ++-- doc/supplements/i960/timeCVME961.t | 2 +- doc/supplements/m68k/Makefile.am | 10 ++++++---- doc/supplements/m68k/m68k.texi | 4 ++-- doc/supplements/m68k/timeMVME136.t | 2 +- doc/supplements/m68k/timedata.t | 2 +- doc/supplements/mips64orion/Makefile.am | 10 ++++++---- doc/supplements/mips64orion/mips64orion.texi | 4 ++-- doc/supplements/mips64orion/timeBSP.t | 2 +- doc/supplements/powerpc/Makefile.am | 17 +++++++++-------- doc/supplements/powerpc/powerpc.texi | 4 ++-- doc/supplements/powerpc/timeDMV177.t | 2 +- doc/supplements/powerpc/timePSIM.t | 2 +- doc/supplements/sh/Makefile.am | 10 ++++++---- doc/supplements/sh/sh.texi | 4 ++-- doc/supplements/sh/timeBSP.t | 2 +- doc/supplements/sparc/Makefile.am | 10 ++++++---- doc/supplements/sparc/sparc.texi | 4 ++-- doc/supplements/sparc/timeERC32.t | 2 +- doc/supplements/supplement.am | 9 +++------ doc/supplements/template/Makefile.am | 10 ++++++---- doc/supplements/template/template.texi | 4 ++-- doc/supplements/template/timeBSP.t | 2 +- 30 files changed, 87 insertions(+), 73 deletions(-) (limited to 'doc/supplements') diff --git a/doc/supplements/Makefile.am b/doc/supplements/Makefile.am index 15760f2138..4c9f85b247 100644 --- a/doc/supplements/Makefile.am +++ b/doc/supplements/Makefile.am @@ -1,6 +1,6 @@ ## $Id$ -AUTOMAKE_OPTIONS = foreign +AUTOMAKE_OPTIONS = foreign 1.4 SUBDIRS = hppa1_1 i386 i960 m68k mips64orion powerpc sh sparc template diff --git a/doc/supplements/hppa1_1/Makefile.am b/doc/supplements/hppa1_1/Makefile.am index a8f34ddd75..743a30cd94 100644 --- a/doc/supplements/hppa1_1/Makefile.am +++ b/doc/supplements/hppa1_1/Makefile.am @@ -18,7 +18,8 @@ GENERATED_FILES = cpumodel.texi callconv.texi memmodel.texi intr.texi \ fatalerr.texi bsp.texi cputable.texi wksheets.texi timing.texi \ timeSIMHPPA.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 = preface.texi @@ -99,4 +100,5 @@ $(srcdir)/timeSIMHPPA.texi: timeSIMHPPA.t -u "Top" \ -n "Command and Variable Index" < $< > $@ -EXTRA_DIST = SIMHPPA_TIMES *.t +EXTRA_DIST = SIMHPPA_TIMES bsp.t callconv.t cpumodel.t cputable.t fatalerr.t \ + intr_NOTIMES.t memmodel.t timeSIMHPPA.t diff --git a/doc/supplements/hppa1_1/hppa1_1.texi b/doc/supplements/hppa1_1/hppa1_1.texi index e013320c00..3ad11c6f85 100644 --- a/doc/supplements/hppa1_1/hppa1_1.texi +++ b/doc/supplements/hppa1_1/hppa1_1.texi @@ -20,7 +20,7 @@ @c @include version.texi -@include ../../common/setup.texi +@include common/setup.texi @ifset use-ascii @dircategory RTEMS Target Supplements @@ -49,7 +49,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. 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 diff --git a/doc/supplements/i386/i386.texi b/doc/supplements/i386/i386.texi index 9e83acda86..f2af885e73 100644 --- a/doc/supplements/i386/i386.texi +++ b/doc/supplements/i386/i386.texi @@ -20,7 +20,7 @@ @c @include version.texi -@include ../../common/setup.texi +@include common/setup.texi @ifset use-ascii @dircategory RTEMS Target Supplements @@ -49,7 +49,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. diff --git a/doc/supplements/i386/timeFORCE386.t b/doc/supplements/i386/timeFORCE386.t index 00c79222b1..a515228ba9 100644 --- a/doc/supplements/i386/timeFORCE386.t +++ b/doc/supplements/i386/timeFORCE386.t @@ -6,7 +6,7 @@ @c $Id$ @c -@include ../../common/timemac.texi +@include common/timemac.texi @tex \global\advance \smallskipamount by -4pt @end tex diff --git a/doc/supplements/i960/Makefile.am b/doc/supplements/i960/Makefile.am index 43ab3e6c30..e2b888eb4c 100644 --- a/doc/supplements/i960/Makefile.am +++ b/doc/supplements/i960/Makefile.am @@ -17,7 +17,8 @@ include $(top_srcdir)/supplements/supplement.am GENERATED_FILES = cpumodel.texi callconv.texi memmodel.texi intr.texi \ fatalerr.texi bsp.texi cputable.texi timing.texi wksheets.texi \ timeCVME961.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 @@ -94,15 +95,16 @@ $(srcdir)/timing.texi: $(top_srcdir)/common/timing.t # 3. Build Node Structure $(srcdir)/timeCVME961.texi: $(top_srcdir)/common/timetbl.t timeCVME961.t - cat timeCVME961.t $(top_srcdir)/common/timetbl.t >timeCVME961_.t + cat $(srcdir)/timeCVME961.t $(top_srcdir)/common/timetbl.t >timeCVME961_.t @echo >>timeCVME961_.t @echo "@tex" >>timeCVME961_.t @echo "\\global\\advance \\smallskipamount by 4pt" >>timeCVME961_.t @echo "@end tex" >>timeCVME961_.t - ${REPLACE2} -p CVME961_TIMES timeCVME961_.t | \ + ${REPLACE2} -p $(srcdir)/CVME961_TIMES timeCVME961_.t | \ $(BMENU2) -p "Timing Specification Terminology" \ -u "Top" \ -n "Command and Variable Index" > $@ CLEANFILES += timeCVME961_.t -EXTRA_DIST = CVME961_TIMES *.t +EXTRA_DIST = CVME961_TIMES bsp.t callconv.t cpumodel.t cputable.t fatalerr.t \ + intr_NOTIMES.t memmodel.t timeCVME961.t diff --git a/doc/supplements/i960/i960.texi b/doc/supplements/i960/i960.texi index 93dc23d060..10119c6114 100644 --- a/doc/supplements/i960/i960.texi +++ b/doc/supplements/i960/i960.texi @@ -20,7 +20,7 @@ @c @include version.texi -@include ../../common/setup.texi +@include common/setup.texi @ifset use-ascii @dircategory RTEMS Target Supplements @@ -49,7 +49,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. diff --git a/doc/supplements/i960/timeCVME961.t b/doc/supplements/i960/timeCVME961.t index 3ddd6f630a..3d2198e9bd 100644 --- a/doc/supplements/i960/timeCVME961.t +++ b/doc/supplements/i960/timeCVME961.t @@ -6,7 +6,7 @@ @c $Id$ @c -@include ../../common/timemac.texi +@include common/timemac.texi @tex \global\advance \smallskipamount by -4pt @end tex diff --git a/doc/supplements/m68k/Makefile.am b/doc/supplements/m68k/Makefile.am index 51fbd2c884..748327d46b 100644 --- a/doc/supplements/m68k/Makefile.am +++ b/doc/supplements/m68k/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 \ timeMVME136.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)/timeMVME136.texi: $(top_srcdir)/common/timetbl.t timeMVME136.t - cat timeMVME136.t $(top_srcdir)/common/timetbl.t >timeMVME136_.t + cat $(srcdir)/timeMVME136.t $(top_srcdir)/common/timetbl.t >timeMVME136_.t @echo >>timeMVME136_.t @echo "@tex" >>timeMVME136_.t @echo "\\global\\advance \\smallskipamount by 4pt" >>timeMVME136_.t @echo "@end tex" >>timeMVME136_.t - ${REPLACE2} -p MVME136_TIMES timeMVME136_.t | \ + ${REPLACE2} -p $(srcdir)/MVME136_TIMES timeMVME136_.t | \ $(BMENU2) -p "Timing Specification Terminology" \ -u "Top" \ -n "Command and Variable Index" > $@ CLEANFILES += timeMVME136_.t -EXTRA_DIST = MVME136_TIMES *.t +EXTRA_DIST = MVME136_TIMES bsp.t callconv.t cpumodel.t cputable.t fatalerr.t \ + intr_NOTIMES.t memmodel.t timeMVME136.t timedata.t diff --git a/doc/supplements/m68k/m68k.texi b/doc/supplements/m68k/m68k.texi index 29e175dce3..255b8aa9cc 100644 --- a/doc/supplements/m68k/m68k.texi +++ b/doc/supplements/m68k/m68k.texi @@ -20,7 +20,7 @@ @c @include version.texi -@include ../../common/setup.texi +@include common/setup.texi @ifset use-ascii @dircategory RTEMS Target Supplements @@ -50,7 +50,7 @@ @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. diff --git a/doc/supplements/m68k/timeMVME136.t b/doc/supplements/m68k/timeMVME136.t index 7686dfc5b8..51acd561a9 100644 --- a/doc/supplements/m68k/timeMVME136.t +++ b/doc/supplements/m68k/timeMVME136.t @@ -6,7 +6,7 @@ @c $Id$ @c -@include ../../common/timemac.texi +@include common/timemac.texi @tex \global\advance \smallskipamount by -4pt @end tex diff --git a/doc/supplements/m68k/timedata.t b/doc/supplements/m68k/timedata.t index d050497d41..d09ac0f477 100644 --- a/doc/supplements/m68k/timedata.t +++ b/doc/supplements/m68k/timedata.t @@ -6,7 +6,7 @@ @c $Id$ @c -@include ../../common/timemac.texi +@include common/timemac.texi @tex \global\advance \smallskipamount by -4pt @end tex diff --git a/doc/supplements/mips64orion/Makefile.am b/doc/supplements/mips64orion/Makefile.am index 9bf19ff988..89620139ae 100644 --- a/doc/supplements/mips64orion/Makefile.am +++ b/doc/supplements/mips64orion/Makefile.am @@ -18,7 +18,8 @@ GENERATED_FILES = cpumodel.texi callconv.texi memmodel.texi intr.texi \ fatalerr.texi bsp.texi cputable.texi wksheets.texi timing.texi \ timeBSP.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)/timeBSP.texi: $(top_srcdir)/common/timetbl.t timeBSP.t - cat timeBSP.t $(top_srcdir)/common/timetbl.t >timeBSP_.t + cat $(srcdir)/timeBSP.t $(top_srcdir)/common/timetbl.t >timeBSP_.t @echo >>timeBSP_.t @echo "@tex" >>timeBSP_.t @echo "\\global\\advance \\smallskipamount by 4pt" >>timeBSP_.t @echo "@end tex" >>timeBSP_.t - ${REPLACE2} -p BSP_TIMES timeBSP_.t | \ + ${REPLACE2} -p $(srcdir)/BSP_TIMES timeBSP_.t | \ $(BMENU2) -p "Timing Specification Terminology" \ -u "Top" \ -n "Command and Variable Index" > $@ CLEANFILES += timeBSP_.t -EXTRA_DIST = BSP_TIMES *.t +EXTRA_DIST = BSP_TIMES bsp.t callconv.t cpumodel.t cputable.t fatalerr.t \ + intr_NOTIMES.t memmodel.t timeBSP.t diff --git a/doc/supplements/mips64orion/mips64orion.texi b/doc/supplements/mips64orion/mips64orion.texi index ca3090b11e..33218ec47e 100644 --- a/doc/supplements/mips64orion/mips64orion.texi +++ b/doc/supplements/mips64orion/mips64orion.texi @@ -20,7 +20,7 @@ @c @include version.texi -@include ../../common/setup.texi +@include common/setup.texi @ifset use-ascii @dircategory RTEMS Target Supplements @@ -50,7 +50,7 @@ @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. diff --git a/doc/supplements/mips64orion/timeBSP.t b/doc/supplements/mips64orion/timeBSP.t index f8cafd5f89..a64dc93ca9 100644 --- a/doc/supplements/mips64orion/timeBSP.t +++ b/doc/supplements/mips64orion/timeBSP.t @@ -6,7 +6,7 @@ @c $Id$ @c -@include ../../common/timemac.texi +@include common/timemac.texi @tex \global\advance \smallskipamount by -4pt @end tex diff --git a/doc/supplements/powerpc/Makefile.am b/doc/supplements/powerpc/Makefile.am index de1b709db0..3ce9f9c7e6 100644 --- a/doc/supplements/powerpc/Makefile.am +++ b/doc/supplements/powerpc/Makefile.am @@ -17,7 +17,8 @@ include $(top_srcdir)/supplements/supplement.am GENERATED_FILES = cpumodel.texi callconv.texi memmodel.texi intr.texi \ fatalerr.texi bsp.texi cputable.texi timing.texi wksheets.texi \ timePSIM.texi timeDMV177.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 @@ -93,16 +94,16 @@ $(srcdir)/timing.texi: $(top_srcdir)/common/timing.t # 3. Build Node Structure $(srcdir)/timePSIM.texi: $(top_srcdir)/common/timetbl.t timePSIM.t - cat timePSIM.t $(top_srcdir)/common/timetbl.t >timePSIM_.t + cat $(srcdir)/timePSIM.t $(top_srcdir)/common/timetbl.t >timePSIM_.t @echo >>timePSIM_.t @echo "@tex" >>timePSIM_.t @echo "\\global\\advance \\smallskipamount by 4pt" >>timePSIM_.t @echo "@end tex" >>timePSIM_.t - ${REPLACE2} -p PSIM_TIMES timePSIM_.t | \ + ${REPLACE2} -p $(srcdir)/PSIM_TIMES timePSIM_.t | \ $(BMENU2) -p "Timing Specification Terminology" \ -u "Top" \ -n "DMV177 Timing Data" > $@ -CLEANFILES += timePSIM_.t +CLEANFILES += timePSIM_.t timeDMV177_.t # Timing Data for DMV177 BSP Chapter: # 1. Copy the Shared File @@ -110,15 +111,15 @@ CLEANFILES += timePSIM_.t # 3. Build Node Structure $(srcdir)/timeDMV177.texi: $(top_srcdir)/common/timetbl.t timeDMV177.t - cat timeDMV177.t $(top_srcdir)/common/timetbl.t >timeDMV177_.t + cat $(srcdir)/timeDMV177.t $(top_srcdir)/common/timetbl.t >timeDMV177_.t @echo >>timeDMV177_.t @echo "@tex" >>timeDMV177_.t @echo "\\global\\advance \\smallskipamount by 4pt" >>timeDMV177_.t @echo "@end tex" >>timeDMV177_.t - ${REPLACE2} -p DMV177_TIMES timeDMV177_.t | \ + ${REPLACE2} -p $(srcdir)/DMV177_TIMES timeDMV177_.t | \ $(BMENU2) -p "PSIM Timing Data Rate Monotonic Manager" \ -u "Top" \ -n "Command and Variable Index" > $@ -CLEANFILES += timeDMV177_.t -EXTRA_DIST = DMV177_TIMES PSIM_TIMES *.t +EXTRA_DIST = DMV177_TIMES PSIM_TIMES bsp.t callconv.t cpumodel.t cputable.t \ + fatalerr.t intr_NOTIMES.t memmodel.t timeDMV177.t timePSIM.t diff --git a/doc/supplements/powerpc/powerpc.texi b/doc/supplements/powerpc/powerpc.texi index 1938d0ca07..552db3a2b5 100644 --- a/doc/supplements/powerpc/powerpc.texi +++ b/doc/supplements/powerpc/powerpc.texi @@ -20,7 +20,7 @@ @c @include version.texi -@include ../../common/setup.texi +@include common/setup.texi @ifset use-ascii @dircategory RTEMS Target Supplements @@ -49,7 +49,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. diff --git a/doc/supplements/powerpc/timeDMV177.t b/doc/supplements/powerpc/timeDMV177.t index c46bdfbd80..0688c53188 100644 --- a/doc/supplements/powerpc/timeDMV177.t +++ b/doc/supplements/powerpc/timeDMV177.t @@ -8,7 +8,7 @@ @c $Id$ @c -@include ../../common/timemac.texi +@include common/timemac.texi @tex \global\advance \smallskipamount by -4pt @end tex diff --git a/doc/supplements/powerpc/timePSIM.t b/doc/supplements/powerpc/timePSIM.t index 4a52100a95..ac22f32c1e 100644 --- a/doc/supplements/powerpc/timePSIM.t +++ b/doc/supplements/powerpc/timePSIM.t @@ -8,7 +8,7 @@ @c $Id$ @c -@include ../../common/timemac.texi +@include common/timemac.texi @tex \global\advance \smallskipamount by -4pt @end tex diff --git a/doc/supplements/sh/Makefile.am b/doc/supplements/sh/Makefile.am index 962f7e66db..4f84da7e36 100644 --- a/doc/supplements/sh/Makefile.am +++ b/doc/supplements/sh/Makefile.am @@ -18,7 +18,8 @@ GENERATED_FILES = cpumodel.texi callconv.texi memmodel.texi intr.texi \ fatalerr.texi bsp.texi cputable.texi wksheets.texi timing.texi \ timeBSP.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)/timeBSP.texi: $(top_srcdir)/common/timetbl.t timeBSP.t - cat timeBSP.t $(top_srcdir)/common/timetbl.t >timeBSP_.t + cat $(srcdir)/timeBSP.t $(top_srcdir)/common/timetbl.t >timeBSP_.t @echo >>timeBSP_.t @echo "@tex" >>timeBSP_.t @echo "\\global\\advance \\smallskipamount by 4pt" >>timeBSP_.t @echo "@end tex" >>timeBSP_.t - ${REPLACE2} -p BSP_TIMES timeBSP_.t | \ + ${REPLACE2} -p $(srcdir)/BSP_TIMES timeBSP_.t | \ $(BMENU2) -p "Timing Specification Terminology" \ -u "Top" \ -n "Command and Variable Index" > $@ CLEANFILES += timeBSP_.t -EXTRA_DIST = BSP_TIMES *.t +EXTRA_DIST = BSP_TIMES bsp.t callconv.t cpumodel.t cputable.t fatalerr.t \ + intr_NOTIMES.t memmodel.t timeBSP.t diff --git a/doc/supplements/sh/sh.texi b/doc/supplements/sh/sh.texi index 23e3a90223..22b8b2974d 100644 --- a/doc/supplements/sh/sh.texi +++ b/doc/supplements/sh/sh.texi @@ -20,7 +20,7 @@ @c @include version.texi -@include ../../common/setup.texi +@include common/setup.texi @ifset use-ascii @dircategory RTEMS Target Supplements @@ -50,7 +50,7 @@ @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. diff --git a/doc/supplements/sh/timeBSP.t b/doc/supplements/sh/timeBSP.t index f8cafd5f89..a64dc93ca9 100644 --- a/doc/supplements/sh/timeBSP.t +++ b/doc/supplements/sh/timeBSP.t @@ -6,7 +6,7 @@ @c $Id$ @c -@include ../../common/timemac.texi +@include common/timemac.texi @tex \global\advance \smallskipamount by -4pt @end tex diff --git a/doc/supplements/sparc/Makefile.am b/doc/supplements/sparc/Makefile.am index ee426a510b..6be8361560 100644 --- a/doc/supplements/sparc/Makefile.am +++ b/doc/supplements/sparc/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 \ timeERC32.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 = preface.texi @@ -93,15 +94,16 @@ $(srcdir)/timing.texi: $(top_srcdir)/common/timing.t # 3. Build Node Structure $(srcdir)/timeERC32.texi: $(top_srcdir)/common/timetbl.t timeERC32.t - cat timeERC32.t $(top_srcdir)/common/timetbl.t >timeERC32_.t + cat $(srcdir)/timeERC32.t $(top_srcdir)/common/timetbl.t >timeERC32_.t @echo >>timeERC32_.t @echo "@tex" >>timeERC32_.t @echo "\\global\\advance \\smallskipamount by 4pt" >>timeERC32_.t @echo "@end tex" >>timeERC32_.t - ${REPLACE2} -p ERC32_TIMES timeERC32_.t | \ + ${REPLACE2} -p $(srcdir)/ERC32_TIMES timeERC32_.t | \ $(BMENU2) -p "Timing Specification Terminology" \ -u "Top" \ -n "Command and Variable Index" > $@ CLEANFILES += timeERC32_.t -EXTRA_DIST = ERC32_TIMES *.t +EXTRA_DIST = ERC32_TIMES bsp.t callconv.t cpumodel.t cputable.t fatalerr.t \ + intr_NOTIMES.t memmodel.t timeERC32.t diff --git a/doc/supplements/sparc/sparc.texi b/doc/supplements/sparc/sparc.texi index 833dea597d..4297d4c9a8 100644 --- a/doc/supplements/sparc/sparc.texi +++ b/doc/supplements/sparc/sparc.texi @@ -20,7 +20,7 @@ @c @include version.texi -@include ../../common/setup.texi +@include common/setup.texi @ifset use-ascii @dircategory RTEMS Target Supplements @@ -49,7 +49,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. diff --git a/doc/supplements/sparc/timeERC32.t b/doc/supplements/sparc/timeERC32.t index 2eb8359ce9..39f4828b89 100644 --- a/doc/supplements/sparc/timeERC32.t +++ b/doc/supplements/sparc/timeERC32.t @@ -6,7 +6,7 @@ @c $Id$ @c -@include ../../common/timemac.texi +@include common/timemac.texi @tex \global\advance \smallskipamount by -4pt @end tex diff --git a/doc/supplements/supplement.am b/doc/supplements/supplement.am index 151cba30b0..e2c3905556 100644 --- a/doc/supplements/supplement.am +++ b/doc/supplements/supplement.am @@ -7,14 +7,11 @@ REPLACE2 = $(PERL) $(top_srcdir)/tools/word-replace2 MAINTAINERCLEANFILES += $(GENERATED_FILES) -CLEANFILES += *.fixed - html_projectdir = $(htmldir)/supplements/$(PROJECT) TEXI2WWW_ARGS=\ --I $(srcdir) \ +-I $(srcdir) -I $(top_srcdir) \ -dirfile ../../index.html \ --header $(top_builddir)/rtems_header.html \ --footer $(top_builddir)/rtems_footer.html \ +-header rtems_header.html \ +-footer rtems_footer.html \ -icons ../../images - diff --git a/doc/supplements/template/Makefile.am b/doc/supplements/template/Makefile.am index 4edf460b1a..89e810aec5 100644 --- a/doc/supplements/template/Makefile.am +++ b/doc/supplements/template/Makefile.am @@ -17,7 +17,8 @@ include $(top_srcdir)/supplements/supplement.am GENERATED_FILES = cpumodel.texi callconv.texi memmodel.texi intr.texi \ fatalerr.texi bsp.texi cputable.texi wksheets.texi timing.texi \ timeBSP.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 @@ -94,15 +95,16 @@ $(srcdir)/timing.texi: $(top_srcdir)/common/timing.t # 3. Build Node Structure $(srcdir)/timeBSP.texi: $(top_srcdir)/common/timetbl.t timeBSP.t - cat timeBSP.t $(top_srcdir)/common/timetbl.t >timeBSP_.t + cat $(srcdir)/timeBSP.t $(top_srcdir)/common/timetbl.t >timeBSP_.t @echo >>timeBSP_.t @echo "@tex" >>timeBSP_.t @echo "\\global\\advance \\smallskipamount by 4pt" >>timeBSP_.t @echo "@end tex" >>timeBSP_.t - ${REPLACE2} -p BSP_TIMES timeBSP_.t | \ + ${REPLACE2} -p $(srcdir)/BSP_TIMES timeBSP_.t | \ $(BMENU2) -p "Timing Specification Terminology" \ -u "Top" \ -n "Command and Variable Index" > $@ CLEANFILES += timeBSP_.t -EXTRA_DIST = BSP_TIMES *.t +EXTRA_DIST = BSP_TIMES bsp.t callconv.t cpumodel.t cputable.t fatalerr.t \ + intr_NOTIMES.t memmodel.t timeBSP.t diff --git a/doc/supplements/template/template.texi b/doc/supplements/template/template.texi index 3cb9bfd02d..92b83a9228 100644 --- a/doc/supplements/template/template.texi +++ b/doc/supplements/template/template.texi @@ -20,7 +20,7 @@ @c @include version.texi -@include ../../common/setup.texi +@include common/setup.texi @ifset use-ascii @dircategory RTEMS Target Supplements @@ -50,7 +50,7 @@ @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. diff --git a/doc/supplements/template/timeBSP.t b/doc/supplements/template/timeBSP.t index 3787442e7d..73f0b50a4f 100644 --- a/doc/supplements/template/timeBSP.t +++ b/doc/supplements/template/timeBSP.t @@ -6,7 +6,7 @@ @c $Id$ @c -@include ../../common/timemac.texi +@include common/timemac.texi @tex \global\advance \smallskipamount by -4pt @end tex -- cgit v1.2.3