[Axiom-developer] 20081224.05.tpd.patch (algebra/Makefile collapse layer 4 into 1 and 2)

[daly]

Layer 4 collapses into layers 1 and 2.
The graph now eliminates layers 3 and 4 completely.
=========================================================================
diff --git a/changelog b/changelog
index 84caf07..e2be770 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,5 @@
+20081224 tpd src/axiom-website/patches.html 20081224.05.tpd.patch
+20081224 tpd src/algebra/Makefile collapse layer 4 into 1 and 2
 20081224 tpd src/axiom-website/patches.html 20081224.04.tpd.patch
 20081224 tpd src/algebra/Makefile move PARSC2 to layer 1
 20081224 tpd src/axiom-website/patches.html 20081224.03.tpd.patch
diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet
index d7734be..7966832 100644
--- a/src/algebra/Makefile.pamphlet
+++ b/src/algebra/Makefile.pamphlet
@@ -167,65 +167,66 @@ LAYER0COPY=\
 
 @
 \subsection{Layer 0}
-\subsubsection{Completed spad files}
-\begin{verbatim}
-print.spad.pamphlet   (PRINT)
-system.spad.pamphlet  (MSYSCMD)
-\end{verbatim}
-
+Depends on: Category Domain Package Bootstrap\\
+Used by next layer: BASTYPE CFCAT KOERCE KONVERT TYPE
 <<layer0>>=
 
 LAYER0=\
-  ${OUT}/AHYP.o    ${OUT}/ATTREG.o  ${OUT}/BASTYPE.o ${OUT}/BASTYPE-.o \
-  ${OUT}/CFCAT.o   ${OUT}/ELTAB.o   ${OUT}/ESCONT1.o ${OUT}/GRDEF.o \
-  ${OUT}/KOERCE.o  ${OUT}/KONVERT.o ${OUT}/MSYSCMD.o ${OUT}/ODEIFTBL.o \
-  ${OUT}/OM.o      ${OUT}/OMCONN.o  ${OUT}/OMDEV.o   ${OUT}/OUT.o      \
-  ${OUT}/PRIMCAT.o ${OUT}/PRINT.o   ${OUT}/PTRANFN.o ${OUT}/SPFCAT.o   \
-  ${OUT}/TYPE.o \
+  ${OUT}/AHYP.o     ${OUT}/ATTREG.o  ${OUT}/BASTYPE.o ${OUT}/BASTYPE-.o \
+  ${OUT}/CFCAT.o    ${OUT}/ELTAB.o   ${OUT}/ESCONT1.o ${OUT}/GRDEF.o \
+  ${OUT}/INTBIT.o   ${OUT}/KOERCE.o  ${OUT}/KONVERT.o ${OUT}/MSYSCMD.o \
+  ${OUT}/ODEIFTBL.o ${OUT}/OM.o      ${OUT}/OMCONN.o  ${OUT}/OMDEV.o  \
+  ${OUT}/OUT.o      ${OUT}/PRIMCAT.o ${OUT}/PRINT.o   ${OUT}/PTRANFN.o \
+  ${OUT}/RFDIST.o   ${OUT}/RIDIST.o  ${OUT}/SPFCAT.o  ${OUT}/TYPE.o \
   layer0done
 
 @
 \subsection{Layer 1}
-\subsubsection{Completed spad files}
-\begin{verbatim}
-ituple.spad.pamphlet   (ITFUN2 ITFUN3 ITUPLE)
-mkrecord.spad.pamphlet (MKRECORD)
-\end{verbatim}
+Depends on: BASTYPE CFCAT KOERCE KONVERT TYPE\\
+Used by next layer: FORTCAT RETRACT SETCAT
+
 
 <<layer1>>=
 
 LAYER1=\
-  ${OUT}/AGG.o     ${OUT}/AGG-.o \
-  ${OUT}/ANY1.o     ${OUT}/COMBOPC.o  ${OUT}/DROPT1.o   ${OUT}/EQ2.o      \
-  ${OUT}/FORTCAT.o  ${OUT}/ITFUN2.o   ${OUT}/ITFUN3.o   ${OUT}/ITUPLE.o   \
-  ${OUT}/LIST3.o \
-  ${OUT}/MKBCFUNC.o ${OUT}/MKFUNC.o \
-  ${OUT}/MKRECORD.o ${OUT}/MKUCFUNC.o ${OUT}/NONE1.o    \
-  ${OUT}/PARPCURV.o ${OUT}/PARPC2.o   ${OUT}/PARSCURV.o ${OUT}/PARSC2.o \
-  ${OUT}/PATAB.o    ${OUT}/PLOT1.o    ${OUT}/PPCURVE.o  ${OUT}/PSCURVE.o  \
-  ${OUT}/REAL.o     ${OUT}/RESLATC.o  ${OUT}/RETRACT.o  ${OUT}/RETRACT-.o \
-  ${OUT}/SEGBIND2.o ${OUT}/SEGCAT.o   ${OUT}/STREAM1.o  ${OUT}/STREAM2.o  \
-  ${OUT}/STREAM3.o \
+  ${OUT}/AGG.o      ${OUT}/AGG-.o     ${OUT}/ANON.o     ${OUT}/ANY1.o     \
+  ${OUT}/COLOR.o    ${OUT}/COMBOPC.o  ${OUT}/COMM.o     ${OUT}/COMPPROP.o \
+  ${OUT}/DROPT1.o   ${OUT}/ELTAGG.o   ${OUT}/ELTAGG-.o  ${OUT}/EQ2.o      \
+  ${OUT}/EXIT.o     ${OUT}/FILECAT.o  ${OUT}/FINITE.o   ${OUT}/FNCAT.o    \
+  ${OUT}/FORMULA1.o ${OUT}/FORTCAT.o  ${OUT}/IDPC.o     ${OUT}/IEVALAB.o  \
+  ${OUT}/IEVALAB-.o ${OUT}/ITFUN2.o   ${OUT}/ITFUN3.o   ${OUT}/ITUPLE.o   \
+  ${OUT}/LIST3.o    ${OUT}/LMODULE.o  ${OUT}/LOGIC.o    ${OUT}/LOGIC-.o   \
+  ${OUT}/MAPHACK1.o ${OUT}/MAPHACK2.o ${OUT}/MAPHACK3.o ${OUT}/MAPPKG1.o  \
+  ${OUT}/MAPPKG2.o  ${OUT}/MAPPKG3.o  ${OUT}/MKBCFUNC.o ${OUT}/MKFUNC.o   \
+  ${OUT}/MKRECORD.o ${OUT}/MKUCFUNC.o ${OUT}/MONAD.o    ${OUT}/MONAD-.o   \
+  ${OUT}/NIPROB.o   ${OUT}/NONE.o     ${OUT}/NONE1.o    ${OUT}/NUMINT.o   \
+  ${OUT}/ODECAT.o   ${OUT}/ODEPROB.o  ${OUT}/OMENC.o    ${OUT}/ONECOMP2.o \
+  ${OUT}/OPTCAT.o   ${OUT}/OPTPROB.o  ${OUT}/ORDSET.o   ${OUT}/ORDSET-.o  \
+  ${OUT}/PALETTE.o  ${OUT}/PARPCURV.o ${OUT}/PARPC2.o   ${OUT}/PARSCURV.o \
+  ${OUT}/PARSC2.o   ${OUT}/PARSURF.o  ${OUT}/PARSU2.o   ${OUT}/PATAB.o    \
+  ${OUT}/PATMAB.o   ${OUT}/PATRES2.o  ${OUT}/PATTERN1.o ${OUT}/PDECAT.o   \
+  ${OUT}/PDEPROB.o  ${OUT}/PLOT1.o    ${OUT}/PPCURVE.o  ${OUT}/PSCURVE.o  \
+  ${OUT}/REAL.o     ${OUT}/REPDB.o    ${OUT}/REPSQ.o    ${OUT}/RESLATC.o  \
+  ${OUT}/RETRACT.o  ${OUT}/RETRACT-.o ${OUT}/RMODULE.o  ${OUT}/SEGBIND2.o \
+  ${OUT}/SEGCAT.o   ${OUT}/SEXCAT.o   ${OUT}/SGROUP.o   ${OUT}/SGROUP-.o  \
+  ${OUT}/SPACEC.o   ${OUT}/SPLNODE.o  ${OUT}/STEP.o     ${OUT}/STREAM1.o  \
+  ${OUT}/STREAM2.o  ${OUT}/STREAM3.o  ${OUT}/SUCH.o     ${OUT}/TEX1.o     \
+  ${OUT}/UDVO.o     ${OUT}/YSTREAM.o \
   layer1done
 
+  
 @
 \subsection{Layer 2}
-\subsubsection{Completed spad files}
-
+Depends on: FORTCAT RETRACT SETCAT
 <<layer2>>=
 
 LAYER2=\
-  ${OUT}/FMC.o   ${OUT}/FMFUN.o   ${OUT}/FORTFN.o  ${OUT}/FVC.o  \
-  ${OUT}/FVFUN.o ${OUT}/INTRET.o  ${OUT}/SEGXCAT.o  \
+  ${OUT}/FAMONC.o ${OUT}/FMC.o   ${OUT}/FMFUN.o  ${OUT}/FORTFN.o  \
+  ${OUT}/FVC.o    ${OUT}/FVFUN.o ${OUT}/INTRET.o ${OUT}/SEGXCAT.o  \
   layer2done
 
 @
 \subsection{Layer 3}
-\subsubsection{Completed spad files}
-\begin{verbatim}
-grdef.spad.pamphlet (GRDEF)
-\end{verbatim}
-
 <<layer3>>=
 
 LAYER3=\
@@ -234,30 +235,9 @@ LAYER3=\
 @
 
 \subsubsection{Completed spad files}
-\begin{verbatim}
-paramete.spad.pamphlet (PARPCURV PARPC2 PARSCURV PARSC2 PARSURF PARSU2
-ystream.spad.pamphlet (YSTREAM)
-\end{verbatim}
-
 <<layer4>>=
 
 LAYER4=\
-  ${OUT}/ANON.o     ${OUT}/COLOR.o    ${OUT}/COMM.o     ${OUT}/COMPPROP.o \
-  ${OUT}/ELTAGG.o   ${OUT}/ELTAGG-.o  ${OUT}/EXIT.o     \
-  ${OUT}/FAMONC.o   ${OUT}/FILECAT.o  ${OUT}/FINITE.o   ${OUT}/FNCAT.o    \
-  ${OUT}/FORMULA1.o ${OUT}/IDPC.o     ${OUT}/IEVALAB.o  ${OUT}/IEVALAB-.o \
-  ${OUT}/INTBIT.o   ${OUT}/LMODULE.o  ${OUT}/LOGIC.o    ${OUT}/LOGIC-.o   \
-  ${OUT}/MAPHACK1.o ${OUT}/MAPHACK2.o ${OUT}/MAPHACK3.o ${OUT}/MAPPKG1.o  \
-  ${OUT}/MAPPKG2.o  ${OUT}/MAPPKG3.o  ${OUT}/MONAD.o    ${OUT}/MONAD-.o   \
-  ${OUT}/NIPROB.o   ${OUT}/NONE.o     ${OUT}/NUMINT.o   ${OUT}/ODECAT.o   \
-  ${OUT}/ODEPROB.o  ${OUT}/OMENC.o    ${OUT}/ONECOMP2.o ${OUT}/OPTCAT.o   \
-  ${OUT}/OPTPROB.o  ${OUT}/ORDSET.o   ${OUT}/ORDSET-.o  ${OUT}/PALETTE.o  \
-  ${OUT}/PARSURF.o  ${OUT}/PARSU2.o   ${OUT}/PATMAB.o   ${OUT}/PATRES2.o  \
-  ${OUT}/PATTERN1.o ${OUT}/PDECAT.o   ${OUT}/PDEPROB.o  ${OUT}/REPSQ.o    \
-  ${OUT}/REPDB.o    ${OUT}/RFDIST.o   ${OUT}/RIDIST.o   ${OUT}/RMODULE.o  \
-  ${OUT}/SEXCAT.o   ${OUT}/SGROUP.o   ${OUT}/SGROUP-.o  ${OUT}/SPACEC.o   \
-  ${OUT}/SPLNODE.o  ${OUT}/STEP.o     ${OUT}/SUCH.o     ${OUT}/TEX1.o     \
-  ${OUT}/UDVO.o     ${OUT}/YSTREAM.o \
   layer4done
 
 @
diff --git a/src/axiom-website/patches.html b/src/axiom-website/patches.html
index 1f4ea90..dbc6520 100644
--- a/src/axiom-website/patches.html
+++ b/src/axiom-website/patches.html
@@ -844,7 +844,9 @@ algebra/Makefile move PARPC2 to layer1<br/>
 <a href="patches/20081224.03.tpd.patch">20081224.03.tpd.patch</a>
 algebra/Makefile move PARSCURV to layer1<br/>
 <a href="patches/20081224.04.tpd.patch">20081224.04.tpd.patch</a>
-algebra/Makefile move PARS2 to layer1<br/>
+algebra/Makefile move PARCS2 to layer1<br/>
+<a href="patches/20081224.05.tpd.patch">20081224.05.tpd.patch</a>
+algebra/Makefile collapse layer 4 into 1 and 2<br/>
 
  </body>
 </html>