Description: <short summary of the patch>
 TODO: Put a short summary on the line above and replace this paragraph
 with a longer explanation of this change. Complete the meta-information
 with other relevant fields (see below for details). To make it easier, the
 information below has been extracted from the changelog. Adjust it or drop
 it.
 .
 axiom (20170501-14) unstable; urgency=medium
 .
   * support gcl27
Author: Camm Maguire <camm@debian.org>

---
The information above should follow the Patch Tagging Guidelines, please
checkout https://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: (upstream|backport|vendor|other), (<patch-url>|commit:<commit-id>)
Bug: <upstream-bugtracker-url>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: (no|not-needed|<patch-forwarded-url>)
Applied-Upstream: <version>, (<commit-url>|commit:<commid-id>)
Reviewed-By: <name and email of someone who approved/reviewed the patch>
Last-Update: 2025-02-10

--- axiom-20170501.orig/books/bookvol10.pamphlet
+++ axiom-20170501/books/bookvol10.pamphlet
@@ -519,29 +519,28 @@ LAYER0BOOTSTRAP=${OUT}/XPR.o
 \begin{chunk}{layer0 bootstrap}
 
 LAYER0BOOTSTRAP=\
-  ${MID}/ABELGRP.o  ${MID}/ABELGRP-.o ${MID}/ABELMON.o  ${MID}/ABELMON-.o \
-  ${MID}/ABELSG.o   ${MID}/ABELSG-.o  ${MID}/ALAGG.o    ${MID}/BOOLEAN.o  \
-  ${MID}/CABMON.o   ${MID}/CHAR.o     ${MID}/CLAGG.o    ${MID}/CLAGG-.o   \
-  ${MID}/COMRING.o  ${MID}/DFLOAT.o   ${MID}/DIFRING.o  ${MID}/DIFRING-.o \
-  ${MID}/DIVRING.o  ${MID}/DIVRING-.o ${MID}/ENTIRER.o  ${MID}/ES.o       \
-  ${MID}/ES-.o      ${MID}/EUCDOM.o   ${MID}/EUCDOM-.o  ${MID}/FFIELDC.o  \
-  ${MID}/FFIELDC-.o ${MID}/FPS.o      ${MID}/FPS-.o     ${MID}/GCDDOM.o   \
-  ${MID}/GCDDOM-.o  ${MID}/HOAGG.o    ${MID}/HOAGG-.o   ${MID}/ILIST.o    \
-  ${MID}/INS.o      ${MID}/INS-.o     ${MID}/INT.o      ${MID}/INTDOM.o   \
-  ${MID}/INTDOM-.o  ${MID}/ISTRING.o  ${MID}/LIST.o     ${MID}/LNAGG.o    \
-  ${MID}/LNAGG-.o   ${MID}/LSAGG.o    ${MID}/LSAGG-.o   ${MID}/MONOID.o   \
-  ${MID}/MONOID-.o  ${MID}/MTSCAT.o   ${MID}/NNI.o      ${MID}/OINTDOM.o  \
-  ${MID}/ORDRING.o  ${MID}/ORDRING-.o ${MID}/OUTFORM.o  ${MID}/PI.o       \
-  ${MID}/PRIMARR.o  ${MID}/POLYCAT.o  ${MID}/POLYCAT-.o ${MID}/PSETCAT.o  \
-  ${MID}/PSETCAT-.o ${MID}/QFCAT.o    ${MID}/QFCAT-.o   ${MID}/RCAGG.o    \
-  ${MID}/RCAGG-.o   ${MID}/REF.o      ${MID}/RING.o     ${MID}/RING-.o    \
-  ${MID}/RNG.o      ${MID}/RNS.o      ${MID}/RNS-.o     ${MID}/SETAGG.o   \
-  ${MID}/SETAGG-.o  ${MID}/SETCAT.o   ${MID}/SETCAT-.o  ${MID}/SINT.o     \
-  ${MID}/STAGG.o    ${MID}/STAGG-.o   ${MID}/SYMBOL.o   ${MID}/TSETCAT.o  \
-  ${MID}/TSETCAT-.o ${MID}/UFD.o      ${MID}/UFD-.o     ${MID}/ULSCAT.o   \
-  ${MID}/UPOLYC.o   ${MID}/UPOLYC-.o  ${MID}/URAGG.o    ${MID}/URAGG-.o   \
-  ${MID}/VECTOR.o \
-  layer0bootstrap
+  ${OUT}/ABELGRP.o  ${OUT}/ABELGRP-.o ${OUT}/ABELMON.o  ${OUT}/ABELMON-.o \
+  ${OUT}/ABELSG.o   ${OUT}/ABELSG-.o  ${OUT}/ALAGG.o    ${OUT}/BOOLEAN.o  \
+  ${OUT}/CABMON.o   ${OUT}/CHAR.o     ${OUT}/CLAGG.o    ${OUT}/CLAGG-.o   \
+  ${OUT}/COMRING.o  ${OUT}/DFLOAT.o   ${OUT}/DIFRING.o  ${OUT}/DIFRING-.o \
+  ${OUT}/DIVRING.o  ${OUT}/DIVRING-.o ${OUT}/ENTIRER.o  ${OUT}/ES.o       \
+  ${OUT}/ES-.o      ${OUT}/EUCDOM.o   ${OUT}/EUCDOM-.o  ${OUT}/FFIELDC.o  \
+  ${OUT}/FFIELDC-.o ${OUT}/FPS.o      ${OUT}/FPS-.o     ${OUT}/GCDDOM.o   \
+  ${OUT}/GCDDOM-.o  ${OUT}/HOAGG.o    ${OUT}/HOAGG-.o   ${OUT}/ILIST.o    \
+  ${OUT}/INS.o      ${OUT}/INS-.o     ${OUT}/INT.o      ${OUT}/INTDOM.o   \
+  ${OUT}/INTDOM-.o  ${OUT}/ISTRING.o  ${OUT}/LIST.o     ${OUT}/LNAGG.o    \
+  ${OUT}/LNAGG-.o   ${OUT}/LSAGG.o    ${OUT}/LSAGG-.o   ${OUT}/MONOID.o   \
+  ${OUT}/MONOID-.o  ${OUT}/MTSCAT.o   ${OUT}/NNI.o      ${OUT}/OINTDOM.o  \
+  ${OUT}/ORDRING.o  ${OUT}/ORDRING-.o ${OUT}/OUTFORM.o  ${OUT}/PI.o       \
+  ${OUT}/PRIMARR.o  ${OUT}/POLYCAT.o  ${OUT}/POLYCAT-.o ${OUT}/PSETCAT.o  \
+  ${OUT}/PSETCAT-.o ${OUT}/QFCAT.o    ${OUT}/QFCAT-.o   ${OUT}/RCAGG.o    \
+  ${OUT}/RCAGG-.o   ${OUT}/REF.o      ${OUT}/RING.o     ${OUT}/RING-.o    \
+  ${OUT}/RNG.o      ${OUT}/RNS.o      ${OUT}/RNS-.o     ${OUT}/SETAGG.o   \
+  ${OUT}/SETAGG-.o  ${OUT}/SETCAT.o   ${OUT}/SETCAT-.o  ${OUT}/SINT.o     \
+  ${OUT}/STAGG.o    ${OUT}/STAGG-.o   ${OUT}/SYMBOL.o   ${OUT}/TSETCAT.o  \
+  ${OUT}/TSETCAT-.o ${OUT}/UFD.o      ${OUT}/UFD-.o     ${OUT}/ULSCAT.o   \
+  ${OUT}/UPOLYC.o   ${OUT}/UPOLYC-.o  ${OUT}/URAGG.o    ${OUT}/URAGG-.o   \
+  ${OUT}/VECTOR.o 
 
 \end{chunk}
 \begin{chunk}{layer0 copy}
@@ -568,8 +567,7 @@ LAYER0COPY=\
   ${OUT}/STAGG.o    ${OUT}/STAGG-.o   ${OUT}/SYMBOL.o   ${OUT}/TSETCAT.o  \
   ${OUT}/TSETCAT-.o ${OUT}/UFD.o      ${OUT}/UFD-.o     ${OUT}/ULSCAT.o   \
   ${OUT}/UPOLYC.o   ${OUT}/UPOLYC-.o  ${OUT}/URAGG.o    ${OUT}/URAGG-.o   \
-  ${OUT}/VECTOR.o \
-  layer0copy
+  ${OUT}/VECTOR.o 
 
 \end{chunk}
 \subsection{Layer 0}
@@ -592,8 +590,7 @@ LAYER0=\
   ${OUT}/MAGCDOC.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
+  ${OUT}/RFDIST.o   ${OUT}/RIDIST.o   ${OUT}/SPFCAT.o  ${OUT}/TYPE.o 
 
 \end{chunk}
 \begin{chunk}{layerpic}
@@ -786,8 +783,7 @@ LAYER1=\
   ${OUT}/SGROUP-.o  ${OUT}/SPACEC.o   ${OUT}/SPLNODE.o  ${OUT}/STEP.o     \
   ${OUT}/STNSR.o    \
   ${OUT}/STREAM1.o  ${OUT}/STREAM2.o  ${OUT}/STREAM3.o  ${OUT}/SUCH.o     \
-  ${OUT}/TEX1.o     ${OUT}/UDVO.o     ${OUT}/YSTREAM.o \
-  layer1done
+  ${OUT}/TEX1.o     ${OUT}/UDVO.o     ${OUT}/YSTREAM.o 
 
 \end{chunk}
 \begin{chunk}{layerpic}
@@ -1272,8 +1268,7 @@ LAYER2=\
   ${OUT}/PATMATCH.o ${OUT}/PERMCAT.o  ${OUT}/PDRING.o   ${OUT}/PDRING-.o  \
   ${OUT}/PLACESC.o  ${OUT}/PRSPCAT.o  \
   ${OUT}/SDVAR.o    ${OUT}/SEGXCAT.o  ${OUT}/SUP2.o     ${OUT}/TRIGCAT.o  \
-  ${OUT}/TRIGCAT-.o ${OUT}/ULS2.o     ${OUT}/UP2.o \
-  layer2done
+  ${OUT}/TRIGCAT-.o ${OUT}/ULS2.o     ${OUT}/UP2.o 
 
 \end{chunk}
 \begin{chunk}{layerpic}
@@ -1721,8 +1716,7 @@ LAYER3=\
   ${OUT}/GRMOD-.o   ${OUT}/HYPCAT.o  ${OUT}/HYPCAT-.o  ${OUT}/LORER.o    \
   ${OUT}/MKCHSET.o  \
   ${OUT}/MODRING.o  ${OUT}/MODULE.o  ${OUT}/MODULE-.o  ${OUT}/NASRING.o  \
-  ${OUT}/NASRING-.o ${OUT}/OAMON.o   ${OUT}/SORTPAK.o  ${OUT}/ZMOD.o \
-  layer3done
+  ${OUT}/NASRING-.o ${OUT}/OAMON.o   ${OUT}/SORTPAK.o  ${OUT}/ZMOD.o 
 
 \end{chunk}
 
@@ -1963,8 +1957,7 @@ LAYER4=\
   ${OUT}/ALGEBRA.o ${OUT}/ALGEBRA-.o ${OUT}/BTCAT.o  ${OUT}/BTCAT-.o \
   ${OUT}/FMCAT.o   ${OUT}/IDPOAM.o   ${OUT}/IFAMON.o ${OUT}/GRALG.o  \
   ${OUT}/GRALG-.o  ${OUT}/NAALG.o    ${OUT}/NAALG-.o ${OUT}/OCAMON.o \
-  ${OUT}/PRQAGG.o  ${OUT}/QUAGG.o    ${OUT}/SKAGG.o  \
-  layer4done
+  ${OUT}/PRQAGG.o  ${OUT}/QUAGG.o    ${OUT}/SKAGG.o  
 
 \end{chunk}
 \begin{chunk}{layerpic}
@@ -2069,8 +2062,7 @@ LAYER5=\
   ${OUT}/DQAGG.o   ${OUT}/FACTFUNC.o ${OUT}/FMTC.o     ${OUT}/FR2.o      \
   ${OUT}/FRAC2.o   ${OUT}/FRUTIL.o   ${OUT}/ITAYLOR.o  ${OUT}/MLO.o      \
   ${OUT}/NEWTON.o  ${OUT}/OAGROUP.o  ${OUT}/OAMONS.o   ${OUT}/OP.o       \
-  ${OUT}/PID.o     ${OUT}/RANDSRC.o  ${OUT}/UNISEG2.o  ${OUT}/XALG.o     \
-  layer5done
+  ${OUT}/PID.o     ${OUT}/RANDSRC.o  ${OUT}/UNISEG2.o  ${OUT}/XALG.o     
 
 \end{chunk}
 \begin{chunk}{layerpic}
@@ -2238,8 +2230,7 @@ LAYER6=\
   ${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
+  ${OUT}/RADUTIL.o  ${OUT}/UPXS2.o    ${OUT}/XFALG.o   ${OUT}/ZLINDEP.o 
 
 \end{chunk}
 \begin{chunk}{layerpic}
@@ -2769,8 +2760,7 @@ LAYER7=\
   ${OUT}/STACK.o    ${OUT}/STTAYLOR.o ${OUT}/TABLBUMP.o ${OUT}/TABLEAU.o  \
   ${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
+  ${OUT}/VSPACE-.o  ${OUT}/XPOLYC.o   ${OUT}/XPR.o 
 
 \end{chunk}
 \begin{chunk}{layerpic}
@@ -4196,8 +4186,7 @@ LAYER8=\
   ${OUT}/UPSCAT-.o  ${OUT}/U8VEC.o    ${OUT}/U16VEC.o   ${OUT}/U32VEC.o   \
   ${OUT}/VECTCAT.o  ${OUT}/VECTCAT-.o ${OUT}/XDPOLY.o   \
   ${OUT}/XEXPPKG.o  ${OUT}/XF.o       ${OUT}/XF-.o      ${OUT}/XPBWPOLY.o \
-  ${OUT}/XPOLY.o    ${OUT}/XRPOLY.o \
-  layer8done
+  ${OUT}/XPOLY.o    ${OUT}/XRPOLY.o 
 
 \end{chunk}
 \begin{chunk}{layerpic}
@@ -4992,8 +4981,7 @@ LAYER9=\
   ${OUT}/LODO1.o    ${OUT}/LODO2.o    ${OUT}/LPOLY.o   \
   ${OUT}/LSMP.o     ${OUT}/LSMP1.o    ${OUT}/MAMA.o     ${OUT}/MATCAT2.o  \
   ${OUT}/PROJPL.o   ${OUT}/PTCAT.o    ${OUT}/STRICAT.o  ${OUT}/TRIMAT.o  \
-  ${OUT}/U8MAT.o    ${OUT}/U16MAT.o   ${OUT}/U32MAT.o \
-  layer9done
+  ${OUT}/U8MAT.o    ${OUT}/U16MAT.o   ${OUT}/U32MAT.o 
 
 \end{chunk}
 \begin{chunk}{layerpic}
@@ -5300,8 +5288,7 @@ LAYER10=\
   ${OUT}/NUMQUAD.o  ${OUT}/ODESYS.o   ${OUT}/ODETOOLS.o ${OUT}/ORDFUNS.o \
   ${OUT}/PERMAN.o   ${OUT}/PFECAT.o   ${OUT}/PFECAT-.o  ${OUT}/POINT.o   \
   ${OUT}/PSEUDLIN.o ${OUT}/PTPACK.o   ${OUT}/REP2.o     ${OUT}/SETMN.o   \
-  ${OUT}/SEX.o      ${OUT}/STRING.o   ${OUT}/SYMFUNC.o  ${OUT}/VECTOR2.o \
-  layer10done
+  ${OUT}/SEX.o      ${OUT}/STRING.o   ${OUT}/SYMFUNC.o  ${OUT}/VECTOR2.o 
 
 \end{chunk}
 \begin{chunk}{layerpic}
@@ -6017,8 +6004,7 @@ LAYER11=\
   ${OUT}/TWOFACT.o  ${OUT}/UNIFACT.o  ${OUT}/UP.o       ${OUT}/UPCDEN.o   \
   ${OUT}/UPDECOMP.o ${OUT}/UPDIVP.o   ${OUT}/UPMP.o     ${OUT}/UPOLYC2.o  \
   ${OUT}/UPXSCAT.o  ${OUT}/UPSQFREE.o ${OUT}/VIEWDEF.o  ${OUT}/VIEW2D.o   \
-  ${OUT}/VOID.o     ${OUT}/WEIER.o    ${OUT}/WP.o \
-  layer11done
+  ${OUT}/VOID.o     ${OUT}/WEIER.o    ${OUT}/WP.o 
 
 \end{chunk}
 \begin{chunk}{layerpic}
@@ -9690,8 +9676,7 @@ LAYER12=\
   ${OUT}/ODPOL.o   ${OUT}/PLOT.o     ${OUT}/RFP.o     \
   ${OUT}/RMCAT2.o  ${OUT}/ROIRC.o    ${OUT}/SDPOL.o   \
   ${OUT}/SMATCAT.o ${OUT}/SMATCAT-.o ${OUT}/TUBETOOL.o ${OUT}/UPXSCCA.o \
-  ${OUT}/UPXSCCA-.o \
-  layer12done
+  ${OUT}/UPXSCCA-.o 
 
 \end{chunk}
 \begin{chunk}{layerpic}
@@ -10079,8 +10064,7 @@ LAYER13=\
   ${OUT}/DPMM.o     ${OUT}/EFUPXS.o  ${OUT}/FFINTBAS.o ${OUT}/FRIDEAL.o  \
   ${OUT}/FRIDEAL2.o ${OUT}/FRMOD.o   ${OUT}/FSAGG.o    ${OUT}/FSAGG-.o   \
   ${OUT}/IBATOOL.o  ${OUT}/INTFACT.o ${OUT}/KDAGG.o    ${OUT}/KDAGG-.o   \
-  ${OUT}/MSETAGG.o  ${OUT}/MONOGEN.o ${OUT}/MONOGEN-.o ${OUT}/NFINTBAS.o \
-  layer13done
+  ${OUT}/MSETAGG.o  ${OUT}/MONOGEN.o ${OUT}/MONOGEN-.o ${OUT}/NFINTBAS.o 
 
 \end{chunk}
 \begin{chunk}{layerpic}
@@ -10359,8 +10343,7 @@ LAYER14=\
   ${OUT}/PRIMES.o   ${OUT}/PRJALGPK.o \
   ${OUT}/PWFFINTB.o ${OUT}/RDIST.o   ${OUT}/SAE.o      \
   ${OUT}/SAEFACT.o  ${OUT}/SAERFFC.o  ${OUT}/SGCF.o    ${OUT}/SPACE3.o   \
-  ${OUT}/TBAGG.o    ${OUT}/TBAGG-.o   ${OUT}/VIEW3D.o  ${OUT}/WFFINTBS.o \
-  layer14done
+  ${OUT}/TBAGG.o    ${OUT}/TBAGG-.o   ${OUT}/VIEW3D.o  ${OUT}/WFFINTBS.o 
 
 \end{chunk}
 \begin{chunk}{layerpic}
@@ -10804,8 +10787,7 @@ LAYER15=\
   ${OUT}/ALIST.o   ${OUT}/EQTBL.o   ${OUT}/GSTBL.o   ${OUT}/HASHTBL.o \
   ${OUT}/INTABL.o  ${OUT}/INTFTBL.o ${OUT}/INTPACK.o ${OUT}/IPF.o     \
   ${OUT}/KAFILE.o  ${OUT}/PATRES.o  ${OUT}/PDEPACK.o ${OUT}/STBL.o    \
-  ${OUT}/STRTBL.o  ${OUT}/TABLE.o   ${OUT}/TBCMPPK.o  \
-  layer15done
+  ${OUT}/STRTBL.o  ${OUT}/TABLE.o   ${OUT}/TBCMPPK.o  
 
 \end{chunk}
 \begin{chunk}{layerpic}
@@ -11055,8 +11037,7 @@ LAYER16=\
   ${OUT}/SAOS.o     ${OUT}/SCELL.o  \
   ${OUT}/SEGBIND.o  ${OUT}/SEM.o      ${OUT}/SET.o      ${OUT}/SPECOUT.o  \
   ${OUT}/SQMATRIX.o ${OUT}/SWITCH.o   ${OUT}/SYMS.o     ${OUT}/SYMTAB.o   \
-  ${OUT}/SYSSOLP.o  ${OUT}/UTSCAT.o   ${OUT}/UTSCAT-.o  ${OUT}/VARIABLE.o \
-  layer16done
+  ${OUT}/SYSSOLP.o  ${OUT}/UTSCAT.o   ${OUT}/UTSCAT-.o  ${OUT}/VARIABLE.o 
 
 \end{chunk}
 \begin{chunk}{layerpic}
@@ -13124,8 +13105,7 @@ LAYER17=\
   ${OUT}/SOLVETRA.o ${OUT}/SUMFS.o    ${OUT}/SUTS.o     ${OUT}/TOOLSIGN.o \
   ${OUT}/TRIGMNIP.o ${OUT}/TRMANIP.o  ${OUT}/UFPS.o     ${OUT}/ULSCCAT.o  \
   ${OUT}/ULSCCAT-.o ${OUT}/UPXSSING.o ${OUT}/UTSODE.o   ${OUT}/UTSODETL.o \
-  ${OUT}/UTSSOL.o   ${OUT}/UTS2.o     ${OUT}/WUTSET.o  \
-  layer17done
+  ${OUT}/UTSSOL.o   ${OUT}/UTS2.o     ${OUT}/WUTSET.o  
 
 \end{chunk}
 \begin{chunk}{layerpic}
@@ -15883,8 +15863,7 @@ LAYER18=\
   ${OUT}/RGCHAIN.o  ${OUT}/RSDCMPK.o  ${OUT}/SFRTCAT.o  ${OUT}/SOLVERAD.o \
   ${OUT}/SULS.o     ${OUT}/SUPXS.o    ${OUT}/UFPS1.o    ${OUT}/ULS.o      \
   ${OUT}/ULSCONS.o  ${OUT}/UPXS.o     ${OUT}/UPXSCONS.o ${OUT}/UTS.o      \
-  ${OUT}/UTSZ.o \
-  layer18done
+  ${OUT}/UTSZ.o 
 
 \end{chunk}
 \begin{chunk}{layerpic}
@@ -16723,8 +16702,7 @@ LAYER19=\
   ${OUT}/IRURPK.o   ${OUT}/LAZM3PK.o  ${OUT}/LEXTRIPK.o ${OUT}/NORMPK.o  \
   ${OUT}/PACEXT.o   \
   ${OUT}/RECOP.o    ${OUT}/RURPK.o    ${OUT}/SFRGCD.o   ${OUT}/SFQCMPK.o \
-  ${OUT}/SNTSCAT.o  ${OUT}/SRDCMPK.o  ${OUT}/SREGSET.o  ${OUT}/ZDSOLVE.o \
-  layer19done
+  ${OUT}/SNTSCAT.o  ${OUT}/SRDCMPK.o  ${OUT}/SREGSET.o  ${OUT}/ZDSOLVE.o 
 
 \end{chunk}
 \begin{chunk}{layerpic}
@@ -16973,8 +16951,7 @@ Next layer depends on: GUESS
 \begin{chunk}{layer20}
 
 LAYER20=\
-  ${OUT}/GUESS.o ${OUT}/INFCLSPT.o \
-  layer20done
+  ${OUT}/GUESS.o ${OUT}/INFCLSPT.o 
     
 \end{chunk}
 \begin{chunk}{layerpic}
@@ -17039,8 +17016,7 @@ Next layer depends on: GUESSF1 INFCLSPT
 
 LAYER21=\
   ${OUT}/GUESSAN.o  ${OUT}/GUESSINT.o ${OUT}/GUESSF1.o  ${OUT}/GUESSP.o \
-  ${OUT}/GUESSUP.o  ${OUT}/ICP.o      \
-  layer21done
+  ${OUT}/GUESSUP.o  ${OUT}/ICP.o      
 
 \end{chunk}
 \begin{chunk}{layerpic}
@@ -17149,8 +17125,7 @@ Depends on: GUESSF1
 \begin{chunk}{layer22}
 
 LAYER22=\
-  ${OUT}/GUESSF.o ${OUT}/INFCLSPS.o  \
-  layer22done
+  ${OUT}/GUESSF.o ${OUT}/INFCLSPS.o  
 \end{chunk}
 \begin{chunk}{layerpic}
 /* layer 22 */
@@ -17200,8 +17175,7 @@ Note that PAFF and PAFFFF form clique2.s
 \begin{chunk}{layer23}
 
 LAYER23=\
-  ${MID}/clique2.spad \
-  layer23done
+  ${MID}/clique2.spad 
 
 \end{chunk}
 \begin{chunk}{layerpic}
@@ -17279,12 +17253,17 @@ at once.
 \begin{chunk}{newcode}
 CLIQUE1FILES = ${OUT}/MYUP.o  ${OUT}/MYEXPR.o
 
-${MID}/clique1.spad: ${CLIQUE1FILES}
+${OUT}/MYEXPR.o: ${OUT}/MYUP.o
+
+${MID}/clique1.spad: ${IN}/MYUP.spad ${IN}/MYEXPR.spad
+	@ (cd ${MID} ; \
+	   cat ${IN}/MYUP.spad >clique1.spad ; \
+	   cat ${IN}/MYEXPR.spad >>clique1.spad ; )
+
+${CLIQUE1FILES}: ${MID}/clique1.spad
 	@echo sa01 making ${OUT}/MYUP.o from ${MID}/clique1.spad
 	@echo sa02 making ${OUT}/MYEXPR.o from ${MID}/clique1.spad
 	@ (cd ${MID} ; \
-	   cat ${IN}/MYUP.spad >clique1.spad ; \
-	   cat ${IN}/MYEXPR.spad >>clique1.spad ; \
 	   if [ -z "${NOISE}" ] ; then \
 	    echo ")co clique1.spad" | ${INTERPSYS}  ; \
            else \
@@ -17304,7 +17283,15 @@ CLIQUE2DEPS  = BLMETCT GPAFF PFORP PACOF
                DIV SETCATD PLACESC DIVCAT INFCLSPS INFCLCT DSTREE DSTRCAT \
                PRSPCAT UTSZ PACFFC PACPERC PROJPL PLACES INFCLSPT PROJPL ICP
 
-${MID}/clique2.spad: ${CLIQUE2FILES}
+${OUT}/PAFFFF.o: ${OUT}/PAFF.o 
+
+$(MID)/clique2.spad: ${IN}/PAFF.spad ${IN}/PAFFFF.spad
+	@echo sa03a making ${MID}/clique2.spad from ${IN}/PAFF.spad ${IN}/PAFFFF.spad
+	@ (cd ${MID} ; \
+	   cat ${IN}/PAFF.spad >clique2.spad ; \
+	   cat ${IN}/PAFFFF.spad >>clique2.spad ; )
+
+$(CLIQUE2FILES): $(MID)/clique2.spad
 	@echo sa03 making ${OUT}/PAFF.o from ${MID}/clique2.spad
 	@echo sa04 making ${OUT}/PAFFFF.o from ${MID}/clique2.spad
 	@ (cd ${MID} ; \
@@ -17545,14 +17532,14 @@ ${OUT}/%.o: ${MID}/%.nrlib/code.o
 \begin{chunk}{genericnrlibfiles}
 
 .PRECIOUS: ${MID}/%.nrlib/code.o
-${MID}/%.nrlib/code.o: ${MID}/%.spad
+${MID}/%.nrlib/code.o: ${IN}/%.spad
 	@ echo sa07 compiling $*.spad to $*.nrlib
 	@ if [ -z "${NOISE}" ] ; then \
 	   (cd ${MID} ; \
-	    echo ")co $*.spad" | ${INTERPSYS} ) ; \
+	    echo ")co $<" | ${INTERPSYS} ) ; \
            else \
 	   (cd ${MID} ; \
-	     echo ")co $*.spad" | ${INTERPSYS} ) 1>/dev/null 2>/dev/null ; \
+	     echo ")co $<" | ${INTERPSYS} ) 1>/dev/null 2>/dev/null ; \
 	   fi 
 
 \end{chunk}
@@ -17808,137 +17795,137 @@ from the source file.
 We output these as each stage completes.
 \begin{chunk}{stages}
 
-layer0bootstrap:
+layer0bootstrap: $(LAYER0BOOTSTRAP)
 	@ echo ==========================================
 	@ echo === algebra bootstrap complete bookvol10
 	@ echo ==========================================
 
-layer0copy:
+layer0copy: layer24done $(LAYER0COPY)
 	@ echo =======================================
 	@ echo === layer  0 copy complete bookvol10
 	@ echo =======================================
 
-layer0done:
+layer0done: layer0bootstrap $(LAYER0)
 	@ echo =======================================
 	@ echo === layer  0 of 24 complete bookvol10
 	@ echo =======================================
 
-layer1done:
+layer1done: layer0done $(LAYER1)
 	@ echo =======================================
 	@ echo === layer  1 of 24 complete bookvol10
 	@ echo =======================================
 
-layer2done:
+layer2done: layer1done $(LAYER2)
 	@ echo =======================================
 	@ echo === layer  2 of 24 complete bookvol10
 	@ echo =======================================
 
-layer3done:
+layer3done: layer2done $(LAYER3)
 	@ echo =======================================
 	@ echo === layer  3 of 24 complete bookvol10
 	@ echo =======================================
 
-layer4done:
+layer4done: layer3done $(LAYER4)
 	@ echo =======================================
 	@ echo === layer  4 of 24 complete bookvol10
 	@ echo =======================================
 
-layer5done:
+layer5done: layer4done $(LAYER5)
 	@ echo =======================================
 	@ echo === layer  5 of 24 complete bookvol10
 	@ echo =======================================
 
-layer6done:
+layer6done: layer5done $(LAYER6)
 	@ echo =======================================
 	@ echo === layer  6 of 24 complete bookvol10
 	@ echo =======================================
 
-layer7done:
+layer7done: layer6done $(LAYER7)
 	@ echo =======================================
 	@ echo === layer  7 of 24 complete bookvol10
 	@ echo =======================================
 
-layer8done:
+layer8done: layer7done $(LAYER8)
 	@ echo =======================================
 	@ echo === layer  8 of 24 complete bookvol10
 	@ echo =======================================
 
-layer9done:
+layer9done: layer8done $(LAYER9)
 	@ echo =======================================
 	@ echo === layer 9 of 24 complete bookvol10
 	@ echo =======================================
 
-layer10done:
+layer10done: layer9done $(LAYER10)
 	@ echo =======================================
 	@ echo === layer 10 of 24 complete bookvol10
 	@ echo =======================================
 
-layer11done:
+layer11done: layer10done $(LAYER11)
 	@ echo =======================================
 	@ echo === layer 11 of 24 complete bookvol10
 	@ echo =======================================
 
-layer12done:
+layer12done: layer11done $(LAYER12)
 	@ echo =======================================
 	@ echo === layer 12 of 24 complete bookvol10
 	@ echo =======================================
 
-layer13done:
+layer13done: layer12done $(LAYER13)
 	@ echo =======================================
 	@ echo === layer 13 of 24 complete bookvol10
 	@ echo =======================================
 
-layer14done:
+layer14done: layer13done $(LAYER14)
 	@ echo =======================================
 	@ echo === layer 14 of 24 complete bookvol10
 	@ echo =======================================
 
-layer15done:
+layer15done: layer14done $(LAYER15)
 	@ echo =======================================
 	@ echo === layer 15 of 24 complete bookvol10
 	@ echo =======================================
 
-layer16done:
+layer16done: layer15done $(LAYER16)
 	@ echo =======================================
 	@ echo === layer 16 of 24 complete bookvol10
 	@ echo =======================================
 
-layer17done:
+layer17done: layer16done $(LAYER17)
 	@ echo =======================================
 	@ echo === layer 17 of 24 complete bookvol10
 	@ echo =======================================
 
-layer18done:
+layer18done: layer17done $(LAYER18)
 	@ echo =======================================
 	@ echo === layer 18 of 24 complete bookvol10
 	@ echo =======================================
 
-layer19done:
+layer19done: layer18done $(LAYER19)
 	@ echo =======================================
 	@ echo === layer 19 of 24 complete bookvol10
 	@ echo =======================================
 
-layer20done:
+layer20done: layer19done $(LAYER20)
 	@ echo =======================================
 	@ echo === layer 20 of 24 complete bookvol10
 	@ echo =======================================
 
-layer21done:
+layer21done: layer20done $(LAYER21)
 	@ echo =======================================
 	@ echo === layer 21 of 24 complete bookvol10
 	@ echo =======================================
 
-layer22done:
+layer22done: layer21done $(LAYER22)
 	@ echo =======================================
 	@ echo === layer 22 of 24 complete bookvol10
 	@ echo =======================================
 
-layer23done:
+layer23done: layer22done $(LAYER23)
 	@ echo =======================================
 	@ echo === layer 23 of 24 complete bookvol10
 	@ echo =======================================
 
-layer24done:
+layer24done: layer23done $(LAYER24)
 	@ echo =======================================
 	@ echo === layer 24 of 24 complete bookvol10
 	@ echo =======================================
