From fc76a6aa19af9606f260993811ac0dee8ec4e886 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 1 Jun 2000 15:29:01 +0000 Subject: Patch rtemsdoc-4.5.0-rc-8.diff from Ralf Corsepius . 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. --- doc/networking/.cvsignore | 1 + doc/networking/Makefile.am | 59 ++++++++++++++++++++---------------------- doc/networking/networking.texi | 25 +++++++----------- doc/networking/stamp-vti | 3 +++ doc/networking/version.texi | 3 +++ 5 files changed, 44 insertions(+), 47 deletions(-) create mode 100644 doc/networking/stamp-vti create mode 100644 doc/networking/version.texi (limited to 'doc/networking') diff --git a/doc/networking/.cvsignore b/doc/networking/.cvsignore index 5c709ff18c..9e3bdd2268 100644 --- a/doc/networking/.cvsignore +++ b/doc/networking/.cvsignore @@ -4,6 +4,7 @@ PCIreg.pdf decdriver.texi driver.texi index.html +mdate-sh networkapp.texi networkflow.pdf networking diff --git a/doc/networking/Makefile.am b/doc/networking/Makefile.am index cb818dd7b1..5843f2bc06 100644 --- a/doc/networking/Makefile.am +++ b/doc/networking/Makefile.am @@ -6,21 +6,20 @@ # $Id$ # -AUTOMAKE_OPTIONS = foreign - -PROJECT=networking +AUTOMAKE_OPTIONS = foreign 1.4 +PROJECT = networking +EDITION = 1 include $(top_srcdir)/project.am -# FIXME: Why -c ? -BMENU+= -c +BMENU2 += -c -COMMON_FILES=$(top_srcdir)/common/cpright.texi $(top_builddir)/common/setup.texi +GENERATED_FILES = networkapp.texi driver.texi networktasks.texi testing.texi \ + servers.texi decdriver.texi -GENERATED_FILES=networkapp.texi driver.texi networktasks.texi testing.texi \ - servers.texi decdriver.texi +COMMON_FILES = $(top_srcdir)/common/setup.texi $(top_srcdir)/common/cpright.texi -FILES= networktasks.texi preface.texi +FILES = networktasks.texi preface.texi info_TEXINFOS = networking.texi networking_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES) @@ -33,39 +32,37 @@ if USE_HTML html_project_DATA += networkflow.jpg networkflow.png PCIreg.jpg recvbd.jpg endif -networktasks.texi: networktasks.t - $(BMENU) -p "Preface" \ +$(srcdir)/networktasks.texi: networktasks.t + $(BMENU2) -p "Preface" \ -u "Top" \ - -n "Networking Driver" $< + -n "Networking Driver" < $< > $@ -driver.texi: driver.t - $(BMENU) -p "Network Task Structure and Data Flow" \ +$(srcdir)/driver.texi: driver.t + $(BMENU2) -p "Network Task Structure and Data Flow" \ -u "Top" \ - -n "Using Networking in an RTEMS Application" $< + -n "Using Networking in an RTEMS Application" < $< > $@ -networkapp.texi: networkapp.t - $(BMENU) -p "Write the Driver Statistic-Printing Function" \ +$(srcdir)/networkapp.texi: networkapp.t + $(BMENU2) -p "Write the Driver Statistic-Printing Function" \ -u "Top" \ - -n "Testing the Driver" $< + -n "Testing the Driver" < $< > $@ -testing.texi: testing.t - $(BMENU) -p "Time Synchronization Using NTP" \ +$(srcdir)/testing.texi: testing.t + $(BMENU2) -p "Time Synchronization Using NTP" \ -u "Top" \ - -n "Network Servers" $< + -n "Network Servers" < $< > $@ -servers.texi: servers.t - $(BMENU) -p "Throughput" \ +$(srcdir)/servers.texi: servers.t + $(BMENU2) -p "Throughput" \ -u "Top" \ - -n "DEC 21140 Driver" $< + -n "DEC 21140 Driver" < $< > $@ -decdriver.texi: decdriver.t - $(BMENU) -p "Using Hooks" \ +$(srcdir)/decdriver.texi: decdriver.t + $(BMENU2) -p "Using Hooks" \ -u "Top" \ - -n "Command and Variable Index" $< + -n "Command and Variable Index" < $< > $@ -PICTURE_FILES = \ -PCIreg.eps PCIreg.jpg \ -networkflow.eps networkflow.jpg networkflow.png \ -recvbd.eps recvbd.jpg +PICTURE_FILES = PCIreg.eps PCIreg.jpg networkflow.eps networkflow.jpg \ + networkflow.png recvbd.eps recvbd.jpg EXTRA_DIST = *.t $(PICTURE_FILES) diff --git a/doc/networking/networking.texi b/doc/networking/networking.texi index 5d255727e5..555d4d386c 100644 --- a/doc/networking/networking.texi +++ b/doc/networking/networking.texi @@ -19,27 +19,20 @@ @c Master file for the network Supplement @c +@include version.texi @include ../common/setup.texi -@ignore -@ifinfo -@format -START-INFO-DIR-ENTRY -* RTEMS Network Supplement: -END-INFO-DIR-ENTRY -@end format -@end ifinfo -@end ignore +@ifset use-ascii +@dircategory RTEMS On-Line Manual +@direntry +* RTEMS Network Supplement: (networking). +@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 Network 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 @include ../common/cpright.texi diff --git a/doc/networking/stamp-vti b/doc/networking/stamp-vti new file mode 100644 index 0000000000..27e5ccd0cb --- /dev/null +++ b/doc/networking/stamp-vti @@ -0,0 +1,3 @@ +@set UPDATED 1 June 2000 +@set EDITION 1 +@set VERSION 4.5.0-beta3 diff --git a/doc/networking/version.texi b/doc/networking/version.texi new file mode 100644 index 0000000000..27e5ccd0cb --- /dev/null +++ b/doc/networking/version.texi @@ -0,0 +1,3 @@ +@set UPDATED 1 June 2000 +@set EDITION 1 +@set VERSION 4.5.0-beta3 -- cgit v1.2.3