Makefiles in much better shape even though not all files have automatically

generated menus yet.

4 files changed, 43 insertions, 24 deletions

diff --git a/doc/supplements/powerpc/Makefile b/doc/supplements/powerpc/Makefile
index 98ce70f7b1..4aecbd4623 100644
--- a/doc/supplements/powerpc/Makefile
+++ b/doc/supplements/powerpc/Makefile
@@ -18,11 +18,10 @@ all: html info ps
 dirs:
 	$(make-dirs)
 
-COMMON_FILES=../../common/cpright.texi ../../common/setup.texi \
-  ../../common/timing.texi
+COMMON_FILES=../../common/cpright.texi ../../common/setup.texi
 
 GENERATED_FILES= \
-  wksheets.texi
+  timing.texi wksheets.texi
 
 FILES= $(PROJECT).texi \
   bsp.texi callconv.texi cpumodel.texi cputable.texi fatalerr.texi \
@@ -54,10 +53,47 @@ replace: timedata.texi
 #  Chapters which get automatic processing
 #
 
+# CPU Model
+# Calling Conventions
+# Memory Model
+
 intr.texi: intr.t PSIM_TIMES
 	${REPLACE} -p PSIM_TIMES intr.t
 	mv intr.t.fixed intr.texi
 
+# Fatal Error
+# BSP
+# CPU Table
+
+# Worksheets Chapter:
+#  1.  Obtain the Shared File
+#  2.  Replace Times and Sizes
+#  3.  Build Node Structure
+
+wksheets_NOTIMES.t: ../../common/wksheets.t
+	cp ../../common/wksheets.t wksheets_NOTIMES.t
+
+wksheets.t: wksheets_NOTIMES.t PSIM_TIMES
+	${REPLACE} -p PSIM_TIMES wksheets_NOTIMES.t
+	mv wksheets_NOTIMES.t.fixed wksheets.t
+
+wksheets.texi: wksheets.t Makefile
+	$(BMENU) -p "Processor Dependent Information Table CPU Dependent Information Table" \
+	    -u "Top" \
+	    -n "Timing Specification" ${*}.t
+
+# Timing Specification Chapter:
+#  1.  Copy the Shared File
+#  3.  Build Node Structure
+
+timing.t: ../../common/timing.t
+	cp ../../common/timing.t timing.t
+
+timing.texi: timing.t Makefile
+	$(BMENU) -p "Memory Requirements RTEMS RAM Workspace Worksheet" \
+            -u "Top" \
+            -n "PSIM Timing Data" ${*}.t
+
 timetbl.t: ../../common/timetbl.t
 	sed -e 's/TIMETABLE_NEXT_LINK/DMV177 Timing Data/' \
             <../../common/timetbl.t >timetbl.t
@@ -82,23 +118,6 @@ timedatadmv177.texi: timedatadmv177.t DMV177_TIMES
 	${REPLACE} -p DMV177_TIMES timedatadmv177.t
 	mv timedatadmv177.t.fixed timedatadmv177.texi
 
-# Worksheets Chapter:
-#  1.  Obtain the Shared File
-#  2.  Replace Times and Sizes
-#  3.  Build Node Structure
-
-wksheets_NOTIMES.t: ../../common/wksheets.t
-	cp ../../common/wksheets.t wksheets_NOTIMES.t
-
-wksheets.t: wksheets_NOTIMES.t PSIM_TIMES
-	${REPLACE} -p PSIM_TIMES wksheets_NOTIMES.t
-	mv wksheets_NOTIMES.t.fixed wksheets.t
-
-wksheets.texi: wksheets.t Makefile
-	$(BMENU) -p "Processor Dependent Information Table CPU Dependent Information Table" \
-	    -u "Top" \
-	    -n "PSIM Timing Data" ${*}.t
-
 html: dirs $(FILES)
 	-mkdir -p $(WWW_INSTALL)/c_$(PROJECT)
 	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/c_$(PROJECT) \
@@ -111,6 +130,6 @@ clean:
 	rm -f c_$(PROJECT) c_$(PROJECT)-*
 	rm -f timedata.texi timetbl.texi intr.texi $(GENERATED_FILES)
 	rm -f timedatadmv177.texi timetbldmv177.texi
-	rm -f timetbl.t wksheets.t wksheets_NOTIMES.t
+	rm -f timetbl.t wksheets.t wksheets_NOTIMES.t timing.t
 	rm -f *.fixed _*
 
diff --git a/doc/supplements/powerpc/powerpc.texi b/doc/supplements/powerpc/powerpc.texi
index 4e55a9f952..5d07269b62 100644
--- a/doc/supplements/powerpc/powerpc.texi
+++ b/doc/supplements/powerpc/powerpc.texi
@@ -71,7 +71,7 @@ END-INFO-DIR-ENTRY
 @include bsp.texi
 @include cputable.texi
 @include wksheets.texi
-@include ../../common/timing.texi
+@include timing.texi
 @include timedata.texi
 @include timedatadmv177.texi
 @ifinfo
diff --git a/doc/supplements/powerpc/timePSIM.t b/doc/supplements/powerpc/timePSIM.t
index 80bfd7bfaf..f5ea26e7fc 100644
--- a/doc/supplements/powerpc/timePSIM.t
+++ b/doc/supplements/powerpc/timePSIM.t
@@ -14,7 +14,7 @@
 @end tex
 
 @ifinfo
-@node RTEMS_BSP Timing Data, RTEMS_BSP Timing Data Introduction, Memory Requirements RTEMS RAM Workspace Worksheet, Top
+@node RTEMS_BSP Timing Data, RTEMS_BSP Timing Data Introduction, Timing Specification Terminology, Top
 @end ifinfo
 @chapter RTEMS_BSP Timing Data
 @ifinfo
diff --git a/doc/supplements/powerpc/timedata.t b/doc/supplements/powerpc/timedata.t
index 80bfd7bfaf..f5ea26e7fc 100644
--- a/doc/supplements/powerpc/timedata.t
+++ b/doc/supplements/powerpc/timedata.t
@@ -14,7 +14,7 @@
 @end tex
 
 @ifinfo
-@node RTEMS_BSP Timing Data, RTEMS_BSP Timing Data Introduction, Memory Requirements RTEMS RAM Workspace Worksheet, Top
+@node RTEMS_BSP Timing Data, RTEMS_BSP Timing Data Introduction, Timing Specification Terminology, Top
 @end ifinfo
 @chapter RTEMS_BSP Timing Data
 @ifinfo