From fdbfff18679d1521fe289e2274d512c0cd67793d Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 26 Apr 2000 18:05:33 +0000 Subject: Patches rtemsdoc-4.5.0-rc.diff from Ralf Corsepius that addresses the following: The patch below should * fix the *pdf cleanup handling * fix dependencies between pdf-documents and texi-files It also contains an attempt to let networking/schedule.t use states.pdf instead of ascii graphics, but though each pdf image looks nice, it comes out weirdly distorted in the main pdf document. --- doc/ada_user/Makefile.am | 2 +- doc/networking/Makefile.am | 2 +- doc/project.am | 3 +++ doc/rgdb_specs/Makefile.am | 12 ++++++---- doc/tools/Makefile.am | 2 +- doc/user/Makefile.am | 11 ++++++--- doc/user/schedule.t | 58 +++++++++++++++++++++++----------------------- 7 files changed, 50 insertions(+), 40 deletions(-) (limited to 'doc') diff --git a/doc/ada_user/Makefile.am b/doc/ada_user/Makefile.am index 5548c9d193..49f121a738 100644 --- a/doc/ada_user/Makefile.am +++ b/doc/ada_user/Makefile.am @@ -48,5 +48,5 @@ html_project_DATA += rtemsarc.png rtemspie.png states.png endif $(PROJECT).dvi: rtemspie.eps states.eps -$(PROJECT).pdf: rtemspie.pdf states.pdf +PDF_IMAGES = rtemspie.pdf states.pdf diff --git a/doc/networking/Makefile.am b/doc/networking/Makefile.am index 42c499b219..cb818dd7b1 100644 --- a/doc/networking/Makefile.am +++ b/doc/networking/Makefile.am @@ -27,7 +27,7 @@ networking_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES) $(PROJECT).dvi: networkflow.eps PCIreg.eps recvbd.eps -$(PROJECT).pdf: networkflow.pdf PCIreg.pdf recvbd.pdf +PDF_IMAGES = networkflow.pdf PCIreg.pdf recvbd.pdf if USE_HTML html_project_DATA += networkflow.jpg networkflow.png PCIreg.jpg recvbd.jpg diff --git a/doc/project.am b/doc/project.am index 0d1e03c6c6..4ab87ebb59 100644 --- a/doc/project.am +++ b/doc/project.am @@ -35,8 +35,11 @@ if TEXI2PDF MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2PDF) $< endif +$(PROJECT).pdf: $(PROJECT).texi $($(PROJECT)_TEXINFOS) $(PDF_IMAGES) CLEANFILES += $(PROJECT).pdf +MOSTLYCLEANFILES += $(PDF_IMAGES) + ## HTML SUFFIXES += .html diff --git a/doc/rgdb_specs/Makefile.am b/doc/rgdb_specs/Makefile.am index af58592c16..d3e678d306 100644 --- a/doc/rgdb_specs/Makefile.am +++ b/doc/rgdb_specs/Makefile.am @@ -25,6 +25,8 @@ rgdb_specs_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES) JPEG_FILES = layers.jpg process.jpg seqinit.jpg seqbreak.jpg seqdetach.jpg +PDF_IMAGES = layers.pdf process.pdf seqdetach.pdf seqbreak.pdf seqinit.pdf + if USE_HTML html_project_DATA += $(JPEG_FILES) endif @@ -74,10 +76,10 @@ conclusion.texi: conclusion.t -n "" $< noinst_DATA = \ -layers.eps layers.pdf \ -process.eps process.pdf \ -seqdetach.eps seqdetach.pdf \ -seqbreak.eps seqbreak.pdf \ -seqinit.eps seqinit.pdf +layers.eps \ +process.eps \ +seqdetach.eps \ +seqbreak.eps \ +seqinit.eps EXTRA_DIST = *.t $(noinst_DATA) $(JPEG_FILES) diff --git a/doc/tools/Makefile.am b/doc/tools/Makefile.am index 278b42e7ef..6795f987f5 100644 --- a/doc/tools/Makefile.am +++ b/doc/tools/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 EXTRA_DIST = \ -update word-replace +update word-replace word-replace2 SUBDIRS = \ bmenu \ diff --git a/doc/user/Makefile.am b/doc/user/Makefile.am index fc81acf71c..04580543ab 100644 --- a/doc/user/Makefile.am +++ b/doc/user/Makefile.am @@ -26,6 +26,12 @@ info_TEXINFOS = c_user.texi c_user_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES) PNG_FILES = rtemsarc.png rtemspie.png states.png + +EPS_IMAGES = rtemspie.eps states.eps +$(PROJECT).dvi: $(EPS_IMAGES) + +PDF_IMAGES = rtemspie.pdf states.pdf + if USE_HTML html_project_DATA += $(PNG_FILES) endif @@ -151,7 +157,6 @@ mp.texi: mp.t -n "Directive Status Codes" $< noinst_DATA = \ -states.gif states.eps \ -rtemspie.gif rtemspie.eps +states.gif rtemspie.gif -EXTRA_DIST = *.t $(PNG_FILES) $(noinst_DATA) +EXTRA_DIST = *.t $(PNG_FILES) $(EPS_IMAGES) $(noinst_DATA) diff --git a/doc/user/schedule.t b/doc/user/schedule.t index c80b3200ee..f42d6caa90 100644 --- a/doc/user/schedule.t +++ b/doc/user/schedule.t @@ -242,36 +242,36 @@ for other system resources. @ifset use-tex @c @page -@c @image{states,5in,4in} @example -@group - +-------------------------------------------------------------+ - | Non-existent | - | +-------------------------------------------------------+ | - | | | | - | | | | - | | Creating +---------+ Deleting | | - | | -------------------> | Dormant | -------------------> | | - | | +---------+ | | - | | | | | - | | Starting | | | - | | | | | - | | V Deleting | | - | | +-------> +-------+ -------------------> | | - | | Yielding / +----- | Ready | ------+ | | - | | / / +-------+ <--+ \ | | - | | / / \ \ Blocking | | - | | / / Dispatching Readying \ \ | | - | | / V \ V | | - | | +-----------+ Blocking +---------+ | | - | | | Executing | --------------> | Blocked | | | - | | +-----------+ +---------+ | | - | | | | - | | | | - | +-------------------------------------------------------+ | - | Non-existent | - +-------------------------------------------------------------+ -@end group +@image{states,,3in} +@c @group +@c +-------------------------------------------------------------+ +@c | Non-existent | +@c | +-------------------------------------------------------+ | +@c | | | | +@c | | | | +@c | | Creating +---------+ Deleting | | +@c | | -------------------> | Dormant | -------------------> | | +@c | | +---------+ | | +@c | | | | | +@c | | Starting | | | +@c | | | | | +@c | | V Deleting | | +@c | | +-------> +-------+ -------------------> | | +@c | | Yielding / +----- | Ready | ------+ | | +@c | | / / +-------+ <--+ \ | | +@c | | / / \ \ Blocking | | +@c | | / / Dispatching Readying \ \ | | +@c | | / V \ V | | +@c | | +-----------+ Blocking +---------+ | | +@c | | | Executing | --------------> | Blocked | | | +@c | | +-----------+ +---------+ | | +@c | | | | +@c | | | | +@c | +-------------------------------------------------------+ | +@c | Non-existent | +@c +-------------------------------------------------------------+ +@c @end group @end example @end ifset -- cgit v1.2.3