Nearly everything that can be is now automatically generated.

1 files changed, 87 insertions, 30 deletions

diff --git a/doc/supplements/i386/Makefile b/doc/supplements/i386/Makefile
index 7af3f7c92a..440f36d8c8 100644
--- a/doc/supplements/i386/Makefile
+++ b/doc/supplements/i386/Makefile
@@ -15,21 +15,23 @@ REPLACE=../../tools/word-replace
 
 all: html info ps
 
+GENERATED_FILES=\
+  cpumodel.texi callconv.texi memmodel.texi intr.texi fatalerr.texi \
+  bsp.texi cputable.texi timing.texi wksheets.texi timeFORCE386.texi
+
+FILES= $(PROJECT).texi \
+  preface.texi \
+  $(GENERATED_FILES)
+
+
 dirs:
 	$(make-dirs)
 
 COMMON_FILES=../../common/cpright.texi ../../common/setup.texi
 
-GENERATED_FILES= \
-  timing.texi wksheets.texi
-
-FILES= $(PROJECT).texi \
-  bsp.texi callconv.texi cpumodel.texi cputable.texi fatalerr.texi \
-  intr.texi memmodel.texi preface.texi timetbl.texi timedata.texi \
-  $(GENERATED_FILES)
-
 info: dirs c_i386
-	cp c_$(PROJECT) c_$(PROJECT)-* $(INFO_INSTALL)
+	cp c_$(PROJECT) $(INFO_INSTALL)
+	#cp c_$(PROJECT) c_$(PROJECT)-* $(INFO_INSTALL)
 
 c_i386: $(FILES)
 	$(MAKEINFO) $(PROJECT).texi
@@ -50,21 +52,55 @@ replace: timedata.texi
 #  Chapters which get automatic processing
 #
 
-# CPU Model
-# Calling Conventions
-# Memory Model
+cpumodel.texi: cpumodel.t Makefile
+	$(BMENU) -p "Preface" \
+	    -u "Top" \
+	    -n "Calling Conventions" ${*}.t
+
+callconv.texi: callconv.t Makefile
+	$(BMENU) -p "CPU Model Dependent Features Floating Point Unit" \
+	    -u "Top" \
+	    -n "Memory Model" ${*}.t
+
+memmodel.texi: memmodel.t Makefile
+	$(BMENU) -p "Calling Conventions User-Provided Routines" \
+	    -u "Top" \
+	    -n "Interrupt Processing" ${*}.t
 
 # Interrupt Chapter:
 #  1.  Replace Times and Sizes
 #  2.  Build Node Structure
 
-intr.texi: intr.t FORCE386_TIMES
-	${REPLACE} -p FORCE386_TIMES intr.t
-	mv intr.t.fixed intr.texi
+#intr.texi: intr.t FORCE386_TIMES
+#	${REPLACE} -p FORCE386_TIMES intr.t
+#	mv intr.t.fixed intr.texi
 
-# Fatal Error
-# BSP
-# CPU Table
+# Interrupt Chapter:
+#  1.  Replace Times and Sizes
+#  2.  Build Node Structure
+intr.t: intr_NOTIMES.t FORCE386_TIMES
+	${REPLACE} -p FORCE386_TIMES intr_NOTIMES.t
+	mv intr_NOTIMES.t.fixed intr.t
+
+intr.texi: intr.t Makefile
+	$(BMENU) -p "Memory Model Flat Memory Model" \
+	    -u "Top" \
+	    -n "Default Fatal Error Processing" ${*}.t
+
+fatalerr.texi: fatalerr.t Makefile
+	$(BMENU) -p "Interrupt Processing Interrupt Stack" \
+	    -u "Top" \
+	    -n "Board Support Packages" ${*}.t
+
+bsp.texi: bsp.t Makefile
+	$(BMENU) -p "Default Fatal Error Processing Default Fatal Error Handler Operations" \
+	    -u "Top" \
+	    -n "Processor Dependent Information Table" ${*}.t
+
+cputable.texi: cputable.t Makefile
+	$(BMENU) -p "Board Support Packages Processor Initialization" \
+	    -u "Top" \
+	    -n "Memory Requirements" ${*}.t
 
 # Worksheets Chapter:
 #  1.  Obtain the Shared File
@@ -95,19 +131,39 @@ timing.texi: timing.t Makefile
             -u "Top" \
             -n "CPU386 Timing Data" ${*}.t
 
-# Timing Chapter
-
-timetbl.t: ../../common/timetbl.t
-	sed -e 's/TIMETABLE_NEXT_LINK/Command and Variable Index/' \
-            <../../common/timetbl.t >timetbl.t
+# Timing Data for BSP Chapter:
+#  1.  Copy the Shared File
+#  2.  Replace Times and Sizes
+#  3.  Build Node Structure
 
-timetbl.texi: timetbl.t FORCE386_TIMES
-	${REPLACE} -p FORCE386_TIMES timetbl.t
-	mv timetbl.t.fixed timetbl.texi
+timeFORCE386_.t: ../../common/timetbl.t timeFORCE386.t
+	cat timeFORCE386.t ../../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
+	${REPLACE} -p FORCE386_TIMES timeFORCE386_.t
+	mv timeFORCE386_.t.fixed timeFORCE386_.t
+
+timeFORCE386.texi: timeFORCE386_.t Makefile
+	$(BMENU) -p "Timing Specification Terminology" \
+	    -u "Top" \
+	    -n "Command and Variable Index" timeFORCE386_.t
+	mv timeFORCE386_.texi timeFORCE386.texi
 
-timedata.texi: timedata.t FORCE386_TIMES
-	${REPLACE} -p FORCE386_TIMES timedata.t
-	mv timedata.t.fixed timedata.texi
+## Timing Chapter
+#
+#timetbl.t: ../../common/timetbl.t
+#	sed -e 's/TIMETABLE_NEXT_LINK/Command and Variable Index/' \
+#            <../../common/timetbl.t >timetbl.t
+#
+#timetbl.texi: timetbl.t FORCE386_TIMES
+#	${REPLACE} -p FORCE386_TIMES timetbl.t
+#	mv timetbl.t.fixed timetbl.texi
+#
+#timedata.texi: timedata.t FORCE386_TIMES
+#	${REPLACE} -p FORCE386_TIMES timedata.t
+#	mv timedata.t.fixed timedata.texi
 
 html: dirs $(FILES)
 	-mkdir -p $(WWW_INSTALL)/c_i386
@@ -120,6 +176,7 @@ clean:
 	rm -f $(PROJECT) $(PROJECT)-*
 	rm -f c_i386 c_i386-*
 	rm -f timedata.texi timetbl.texi intr.texi $(GENERATED_FILES)
-	rm -f timetbl.t wksheets.t wksheets_NOTIMES.t timing.t
+	rm -f timetbl.t wksheets.t wksheets_NOTIMES.t timing.t intr.t
+	rm -f timeFORCE386_.t
 	rm -f *.fixed _*