diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-06-01 15:29:01 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-06-01 15:29:01 +0000 |
commit | fc76a6aa19af9606f260993811ac0dee8ec4e886 (patch) | |
tree | 039d079cce65ec28746118f177fc9bea2e737b11 /doc/supplements/m68k | |
parent | Patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>: (diff) | |
download | rtems-fc76a6aa19af9606f260993811ac0dee8ec4e886.tar.bz2 |
Patch rtemsdoc-4.5.0-rc-8.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>.
Ralf's comments follow:
Changes:
* Enhanced versioning:
- Addition of automake's version.texi support
- Replacement of rtemsdoc's former versioning support by automake's
versioning support (Abandoning RTEMS-UPDATE-* etc.)
- Abandoning setup.texi.in
- Add EDITION to each documents Makefile.am
- version.texi support in project.am
- Addition of maintainer mode (currently only used to prevent incorrectly
updating timestamps when users touch automake's version.texi timestamp
files (stamp-vti)).
* Fixing info dir support
- Use texinfo's @dircategory and @direntry instead of infos *-DIR-ENTRY
- $(infodir)/dir is now correctly set up
* Avoid using temporary files
- Pipe texts through REPLACE2 into BMENU2 instead of using temporary files.
- Abandon using bmenu in favor of bmenu2 (bmenu could be removed now)
* Prepare Makefile.ams for building in a separate buildtree
- prefix files with $(srcdir) in Makefile.am for files which must be
generated inside of the source tree
Notes:
* rtemsdoc can not yet be build in a separate source-tree, but we
are very close to it.
* You as the maintainer of this package now should always use
--enable-maintainer-mode to configure rtemsdoc.
Diffstat (limited to 'doc/supplements/m68k')
-rw-r--r-- | doc/supplements/m68k/.cvsignore | 1 | ||||
-rw-r--r-- | doc/supplements/m68k/Makefile.am | 83 | ||||
-rw-r--r-- | doc/supplements/m68k/m68k.texi | 25 | ||||
-rw-r--r-- | doc/supplements/m68k/stamp-vti | 3 | ||||
-rw-r--r-- | doc/supplements/m68k/version.texi | 3 |
5 files changed, 56 insertions, 59 deletions
diff --git a/doc/supplements/m68k/.cvsignore b/doc/supplements/m68k/.cvsignore index 58ae87a3bb..647e292cc2 100644 --- a/doc/supplements/m68k/.cvsignore +++ b/doc/supplements/m68k/.cvsignore @@ -24,6 +24,7 @@ m68k.ps m68k.toc m68k.tp m68k.vr +mdate-sh memmodel.texi timeMVME136.texi timeMVME136_.t diff --git a/doc/supplements/m68k/Makefile.am b/doc/supplements/m68k/Makefile.am index dc7d8d072c..51fbd2c884 100644 --- a/doc/supplements/m68k/Makefile.am +++ b/doc/supplements/m68k/Makefile.am @@ -6,20 +6,21 @@ # $Id$ # -AUTOMAKE_OPTIONS = foreign +AUTOMAKE_OPTIONS = foreign 1.4 -PROJECT=m68k +PROJECT = m68k +EDITION = 1 include $(top_srcdir)/project.am include $(top_srcdir)/supplements/supplement.am -COMMON_FILES=$(top_srcdir)/common/cpright.texi $(top_builddir)/common/setup.texi +GENERATED_FILES = cpumodel.texi callconv.texi memmodel.texi intr.texi \ + fatalerr.texi bsp.texi cputable.texi timing.texi wksheets.texi \ + timeMVME136.texi -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 -FILES= preface.texi +FILES = preface.texi info_TEXINFOS = m68k.texi m68k_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES) @@ -28,65 +29,62 @@ m68k_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES) # Chapters which get automatic processing # -cpumodel.texi: cpumodel.t - $(BMENU) -p "Preface" \ +$(srcdir)/cpumodel.texi: cpumodel.t + $(BMENU2) -p "Preface" \ -u "Top" \ - -n "Calling Conventions" ${*}.t + -n "Calling Conventions" < $< > $@ -callconv.texi: callconv.t - $(BMENU) -p "CPU Model Dependent Features Extend Byte to Long Instruction" \ +$(srcdir)/callconv.texi: callconv.t + $(BMENU2) -p "CPU Model Dependent Features Extend Byte to Long Instruction" \ -u "Top" \ - -n "Memory Model" $< + -n "Memory Model" < $< > $@ -memmodel.texi: memmodel.t - $(BMENU) -p "Calling Conventions User-Provided Routines" \ +$(srcdir)/memmodel.texi: memmodel.t + $(BMENU2) -p "Calling Conventions User-Provided Routines" \ -u "Top" \ - -n "Interrupt Processing" $< + -n "Interrupt Processing" < $< > $@ # Interrupt Chapter: # 1. Replace Times and Sizes # 2. Build Node Structure -intr.texi: intr_NOTIMES.t MVME136_TIMES - ${REPLACE2} -p $(srcdir)/MVME136_TIMES $(srcdir)/intr_NOTIMES.t intr.t - $(BMENU) -p "Memory Model Flat Memory Model" \ +$(srcdir)/intr.texi: intr_NOTIMES.t MVME136_TIMES + ${REPLACE2} -p $(srcdir)/MVME136_TIMES $(srcdir)/intr_NOTIMES.t | \ + $(BMENU2) -p "Memory Model Flat Memory Model" \ -u "Top" \ - -n "Default Fatal Error Processing" intr.t -CLEANFILES += intr.t + -n "Default Fatal Error Processing" > $@ -fatalerr.texi: fatalerr.t - $(BMENU) -p "Interrupt Processing Interrupt Stack" \ +$(srcdir)/fatalerr.texi: fatalerr.t + $(BMENU2) -p "Interrupt Processing Interrupt Stack" \ -u "Top" \ - -n "Board Support Packages" $< + -n "Board Support Packages" < $< > $@ -bsp.texi: bsp.t - $(BMENU) -p "Default Fatal Error Processing Default Fatal Error Handler Operations" \ +$(srcdir)/bsp.texi: bsp.t + $(BMENU2) -p "Default Fatal Error Processing Default Fatal Error Handler Operations" \ -u "Top" \ - -n "Processor Dependent Information Table" $< + -n "Processor Dependent Information Table" < $< > $@ -cputable.texi: cputable.t - $(BMENU) -p "Board Support Packages Processor Initialization" \ +$(srcdir)/cputable.texi: cputable.t + $(BMENU2) -p "Board Support Packages Processor Initialization" \ -u "Top" \ - -n "Memory Requirements" $< - + -n "Memory Requirements" < $< > $@ # Worksheets Chapter: # 1. Obtain the Shared File # 2. Replace Times and Sizes # 3. Build Node Structure -wksheets.texi: $(top_srcdir)/common/wksheets.t MVME136_TIMES +$(srcdir)/wksheets.texi: $(top_srcdir)/common/wksheets.t MVME136_TIMES ${REPLACE2} -p $(srcdir)/MVME136_TIMES \ - $(top_srcdir)/common/wksheets.t wksheets.t - $(BMENU) -p "Processor Dependent Information Table CPU Dependent Information Table" \ + $(top_srcdir)/common/wksheets.t | \ + $(BMENU2) -p "Processor Dependent Information Table CPU Dependent Information Table" \ -u "Top" \ - -n "Timing Specification" wksheets.t -CLEANFILES += wksheets.t + -n "Timing Specification" > $@ # Timing Specification Chapter: # 1. Copy the Shared File # 3. Build Node Structure -timing.texi: $(top_srcdir)/common/timing.t +$(srcdir)/timing.texi: $(top_srcdir)/common/timing.t $(BMENU2) -p "Memory Requirements RTEMS RAM Workspace Worksheet" \ -u "Top" \ -n "MVME136 Timing Data" < $< > $@ @@ -96,17 +94,16 @@ timing.texi: $(top_srcdir)/common/timing.t # 2. Replace Times and Sizes # 3. Build Node Structure -timeMVME136.texi: $(top_srcdir)/common/timetbl.t timeMVME136.t +$(srcdir)/timeMVME136.texi: $(top_srcdir)/common/timetbl.t timeMVME136.t cat 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 timeMVME136_.t - $(BMENU) -p "Timing Specification Terminology" \ + ${REPLACE2} -p MVME136_TIMES timeMVME136_.t | \ + $(BMENU2) -p "Timing Specification Terminology" \ -u "Top" \ - -n "Command and Variable Index" timeMVME136_.t - mv timeMVME136_.texi timeMVME136.texi -CLEANFILES += timeMVME136_.t timeMVME136_.texi + -n "Command and Variable Index" > $@ +CLEANFILES += timeMVME136_.t EXTRA_DIST = MVME136_TIMES *.t diff --git a/doc/supplements/m68k/m68k.texi b/doc/supplements/m68k/m68k.texi index e2e7a833d7..29e175dce3 100644 --- a/doc/supplements/m68k/m68k.texi +++ b/doc/supplements/m68k/m68k.texi @@ -19,27 +19,20 @@ @c Master file for the Motorola MC68xxx Applications Supplement @c +@include version.texi @include ../../common/setup.texi -@ignore -@ifinfo -@format -START-INFO-DIR-ENTRY -* RTEMS Motorola MC68xxx Applications Supplement (m68k): -END-INFO-DIR-ENTRY -@end format -@end ifinfo -@end ignore +@ifset use-ascii +@dircategory RTEMS Target Supplements +@direntry +* RTEMS Motorola MC68xxx Applications Supplement: (m68k). +@end direntry +@end ifset @c @c Title Page Stuff @c -@set edition @value{RTEMS-EDITION} -@set version @value{RTEMS-VERSION} -@set update-date @value{RTEMS-UPDATE-DATE} -@set update-month @value{RTEMS-UPDATE-MONTH} - @c @c I don't really like having a short title page. --joel @c @@ -51,9 +44,9 @@ END-INFO-DIR-ENTRY @finalout @title RTEMS Motorola MC68xxx Applications Supplement -@subtitle Edition @value{edition}, for RTEMS @value{version} +@subtitle Edition @value{EDITION}, for RTEMS @value{VERSION} @sp 1 -@subtitle @value{update-month} +@subtitle @value{UPDATED} @author On-Line Applications Research Corporation @page diff --git a/doc/supplements/m68k/stamp-vti b/doc/supplements/m68k/stamp-vti new file mode 100644 index 0000000000..27e5ccd0cb --- /dev/null +++ b/doc/supplements/m68k/stamp-vti @@ -0,0 +1,3 @@ +@set UPDATED 1 June 2000 +@set EDITION 1 +@set VERSION 4.5.0-beta3 diff --git a/doc/supplements/m68k/version.texi b/doc/supplements/m68k/version.texi new file mode 100644 index 0000000000..27e5ccd0cb --- /dev/null +++ b/doc/supplements/m68k/version.texi @@ -0,0 +1,3 @@ +@set UPDATED 1 June 2000 +@set EDITION 1 +@set VERSION 4.5.0-beta3 |