[Axiom-developer] 20081225.02.tpd.patch (algebra/Makefile move layer 10, MAPPKG4)

[daly]

MAPPKG4 was misplaced and moved.
Layer 10 was renamed.
=======================================================================
diff --git a/changelog b/changelog
index ed0c328..7d0ef17 100644
--- a/changelog
+++ b/changelog
@@ -1,5 +1,7 @@
-20081224 tpd src/axiom-website/patches.html 20081225.01.tpd.patch
-20081224 tpd src/algebra/Makefile move layers 7,8,9
+20081225 tpd src/axiom-website/patches.html 20081225.02.tpd.patch
+20081225 tpd src/algebra/Makefile move layer 10, MAPPKG4
+20081225 tpd src/axiom-website/patches.html 20081225.01.tpd.patch
+20081225 tpd src/algebra/Makefile move layers 7,8,9
 20081224 tpd src/axiom-website/patches.html 20081224.06.tpd.patch
 20081224 tpd src/algebra/Makefile collapse layer 5 into layer 2
 20081224 tpd src/axiom-website/patches.html 20081224.05.tpd.patch
diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet
index f69c169..20cfb51 100644
--- a/src/algebra/Makefile.pamphlet
+++ b/src/algebra/Makefile.pamphlet
@@ -290,7 +290,9 @@ LAYER5=\
 
 @
 \subsection{Layer6}
-Depends on: MLO OAGROUP OAMONS PID XALG
+Depends on: MLO OAGROUP OAMONS PID XALG\\
+Used by next layer: AMR FIELD FIELD- FLAGG FLAGG- FRETRCT PADICCT RADCAT 
+XFALG
 <<layer6>>=
 
 LAYER6=\
@@ -299,64 +301,18 @@ LAYER6=\
   ${OUT}/FIELD.o    ${OUT}/FIELD-.o   ${OUT}/FLAGG.o   ${OUT}/FLAGG-.o   \
   ${OUT}/FLINEXP.o  ${OUT}/FLINEXP-.o ${OUT}/FRETRCT.o ${OUT}/FRETRCT-.o \
   ${OUT}/FSERIES.o  ${OUT}/FT.o       ${OUT}/IDPOAMS.o ${OUT}/INFINITY.o \
-  ${OUT}/LA.o       ${OUT}/OMLO.o     ${OUT}/ORTHPOL.o ${OUT}/PRODUCT.o  \
-  ${OUT}/PADICCT.o  ${OUT}/PMPRED.o   ${OUT}/PMASS.o   ${OUT}/PTFUNC2.o  \
-  ${OUT}/RADCAT.o   ${OUT}/RADCAT-.o  ${OUT}/RATRET.o  ${OUT}/RADUTIL.o  \
-  ${OUT}/UPXS2.o    ${OUT}/XFALG.o    ${OUT}/ZLINDEP.o \
+  ${OUT}/LA.o       ${OUT}/MAPPKG4.o  ${OUT}/OMLO.o    ${OUT}/ORTHPOL.o  \
+  ${OUT}/PRODUCT.o  ${OUT}/PADICCT.o  ${OUT}/PMPRED.o  ${OUT}/PMASS.o   \
+  ${OUT}/PTFUNC2.o  ${OUT}/RADCAT.o   ${OUT}/RADCAT-.o ${OUT}/RATRET.o  \
+  ${OUT}/RADUTIL.o  ${OUT}/UPXS2.o    ${OUT}/XFALG.o   ${OUT}/ZLINDEP.o \
   layer6done
 
 @
 \subsection{Layer7}
-
+Depends on: AMR FIELD FIELD- FLAGG FLAGG- FRETRCT PADICCT RADCAT XFALG 
 <<layer7>>=
 
 LAYER7=\
-  layer7done
-
-@
-\subsection{Layer8}
-
-<<layer8>>=
-
-LAYER8=\
-  layer8done
-
-@
-\subsection{Layer9}
-\subsubsection{Completed spad files}
-\begin{verbatim}
-degred.spad.pamphlet (DEGRED)
-retract.spad.pamphlet (RETRACT FRETRCT RATRET)
-\end{verbatim}
-
-<<layer9>>=
-
-LAYER9=\
-  layer9done
-
-@
-\subsection{Layer10}
-\subsubsection{Completed spad files}
-\begin{verbatim}
-complet.spad.pamphlet (ORDCOMP ORDCOMP2 ONECOMP ONECOMP2 INFINITY)
-cra.spad.pamphlet (CRAPACK)
-defaults.spad.pamphlet (REPSQ REPDB FLASORT)
-drawpak.spad.pamphlet (DRAWCX)
-mappkg.spad.pamphlet (MAPHACK1 MAPHACK2 MAPHACK3 MAPHACK4
-                      MAPPKG1 MAPPKG2 MAPPKG3 MAPPKG4)
-mesh.spad.pamphlet (MESH)
-partperm.spad.pamphlet (PARTPERM)
-pgrobner.spad.pamphlet (PGROEB)
-plottool.spad.pamphlet (PLOTTOOL)
-setorder.spad.pamphlet (UDPO UDVO)
-sttaylor.spad.pamphlet (STTAYLOR)
-tableau.spad.pamphlet (TABLBUMP TABLEAU)
-viewpack.spad.pamphlet (VIEW)
-\end{verbatim}
-
-<<layer10>>=
-
-LAYER10=\
   ${OUT}/A1AGG.o    ${OUT}/A1AGG-.o   ${OUT}/ARR2CAT.o  ${OUT}/ARR2CAT-.o \
   ${OUT}/ASP34.o    ${OUT}/BBTREE.o   ${OUT}/BFUNCT.o   ${OUT}/BPADIC.o   \
   ${OUT}/BTREE.o    ${OUT}/CRAPACK.o  ${OUT}/DEQUEUE.o  ${OUT}/DLIST.o    \
@@ -367,7 +323,6 @@ LAYER10=\
   ${OUT}/IPADIC.o   ${OUT}/IROOT.o    ${OUT}/IR2.o      ${OUT}/LEXP.o     \
   ${OUT}/LIECAT.o   ${OUT}/LIECAT-.o  ${OUT}/LIST2.o    ${OUT}/LIST2MAP.o \
   ${OUT}/LMOPS.o    ${OUT}/LZSTAGG.o  ${OUT}/LZSTAGG-.o ${OUT}/MAGMA.o    \
-  ${OUT}/MAPPKG4.o  \
   ${OUT}/MESH.o     ${OUT}/MOEBIUS.o  ${OUT}/MODFIELD.o ${OUT}/MODOP.o    \
   ${OUT}/MRING.o    ${OUT}/MTHING.o   ${OUT}/NCNTFRAC.o ${OUT}/NCODIV.o   \
   ${OUT}/NUMTUBE.o  ${OUT}/ODR.o      ${OUT}/OFMONOID.o ${OUT}/ONECOMP.o  \
@@ -382,6 +337,30 @@ LAYER10=\
   ${OUT}/TOPSP.o    ${OUT}/TRANFUN.o  ${OUT}/TRANFUN-.o ${OUT}/TUBE.o     \
   ${OUT}/UDPO.o     ${OUT}/UNISEG.o   ${OUT}/VIEW.o     ${OUT}/VSPACE.o   \
   ${OUT}/VSPACE-.o  ${OUT}/XPOLYC.o   ${OUT}/XPR.o \
+  layer7done
+
+@
+\subsection{Layer8}
+
+<<layer8>>=
+
+LAYER8=\
+  layer8done
+
+@
+\subsection{Layer9}
+
+<<layer9>>=
+
+LAYER9=\
+  layer9done
+
+@
+\subsection{Layer10}
+
+<<layer10>>=
+
+LAYER10=\
   layer10done
 
 @
diff --git a/src/axiom-website/patches.html b/src/axiom-website/patches.html
index b524223..bd746ae 100644
--- a/src/axiom-website/patches.html
+++ b/src/axiom-website/patches.html
@@ -851,6 +851,8 @@ algebra/Makefile collapse layer 4 into 1 and 2<br/>
 algebra/Makefile collapse layer 5 into layer 2<br/>
 <a href="patches/20081225.01.tpd.patch">20081225.01.tpd.patch</a>
 algebra/Makefile move layers 7,8,9 <br/>
+<a href="patches/20081225.01.tpd.patch">20081225.01.tpd.patch</a>
+algebra/Makefile move layer 10, MAPPKG4 <br/>
 
  </body>
 </html>