From 68437507ca493573a133be23bbc3edc281ad4dea Mon Sep 17 00:00:00 2001 From: Gabriel Dos Reis Date: Mon, 11 Jan 2016 04:48:50 -0800 Subject: Algebra layer 0 now starts with basic types This cuts down on the number of domains that need to be built during bootstrapping. --- src/algebra/Makefile.am | 411 +++++++++++++++++++++--------------------------- src/algebra/Makefile.in | 334 +++++++++++++++++---------------------- 2 files changed, 323 insertions(+), 422 deletions(-) (limited to 'src') diff --git a/src/algebra/Makefile.am b/src/algebra/Makefile.am index 2bbe75f7..5ead1fa7 100644 --- a/src/algebra/Makefile.am +++ b/src/algebra/Makefile.am @@ -1027,9 +1027,11 @@ strap-1/MULTFACT.$(FASLEXT): strap-0/MRATFAC.$(FASLEXT) \ strap-1/INDE.$(FASLEXT): strap-1/IDPOAMS.$(FASLEXT) strap-1/IDPC.$(FASLEXT) strap-1/IDPOAMS.$(FASLEXT): strap-1/IDPOAM.$(FASLEXT) strap-1/IDPC.$(FASLEXT): strap-1/SETCAT.$(FASLEXT) strap-1/FUNCTOR.$(FASLEXT) -strap-1/GENEEZ.$(FASLEXT): strap-1/VECTOR2.$(FASLEXT) +strap-1/GENEEZ.$(FASLEXT): strap-1/VECTOR2.$(FASLEXT) \ + strap-0/IROOT.$(FASLEXT) strap-1/MLIFT.$(FASLEXT): strap-1/NPCOEF.$(FASLEXT) strap-1/SUP2.$(FASLEXT) \ strap-1/PGCD.$(FASLEXT) strap-1/FACUTIL.$(FASLEXT) +strap-1/VECTOR2.$(FASLEXT): strap-0/FLAGG2.$(FASLEXT) strap-1/PMDOWN.$(FASLEXT): strap-1/PATRES2.$(FASLEXT) strap-1/BOP1.$(FASLEXT): strap-1/NONE.$(FASLEXT) strap-1/ARITY.$(FASLEXT) @@ -1127,6 +1129,48 @@ strap-1/HEADAST.$(FASLEXT): strap-0/PARAMAST.$(FASLEXT) strap-1/ITFORM.$(FASLEXT): strap-0/IRFORM.$(FASLEXT) strap-1/LINBASIS.$(FASLEXT): strap-0/DBASIS.$(FASLEXT) strap-1/FR2.$(FASLEXT): strap-0/COMPLEX.$(FASLEXT) +strap-1/SPADXPT.$(FASLEXT): strap-0/SASTCAT.$(FASLEXT) +strap-1/SPADAST.$(FASLEXT): strap-0/SPADXPT.$(FASLEXT) \ + strap-0/SPADXPT.$(FASLEXT) \ + strap-0/TYPEAST.$(FASLEXT) \ + strap-0/IMPTAST.$(FASLEXT) \ + strap-0/DEFAST.$(FASLEXT) \ + strap-0/MACROAST.$(FASLEXT) \ + strap-0/WHEREAST.$(FASLEXT) \ + strap-0/CATAST.$(FASLEXT) \ + strap-0/JOINAST.$(FASLEXT) \ + strap-0/CAPSLAST.$(FASLEXT) \ + strap-0/SIGAST.$(FASLEXT) \ + strap-0/ATTRAST.$(FASLEXT) \ + strap-0/MAPPAST.$(FASLEXT) \ + strap-0/IFAST.$(FASLEXT) \ + strap-0/RPTAST.$(FASLEXT) \ + strap-0/WHILEAST.$(FASLEXT) \ + strap-0/INAST.$(FASLEXT) \ + strap-0/STEPAST.$(FASLEXT) \ + strap-0/CLLCTAST.$(FASLEXT) \ + strap-0/LSTAST.$(FASLEXT) \ + strap-0/EXITAST.$(FASLEXT) \ + strap-0/RETAST.$(FASLEXT) \ + strap-0/CRCEAST.$(FASLEXT) \ + strap-0/PRTDAST.$(FASLEXT) \ + strap-0/RSTRCAST.$(FASLEXT) \ + strap-0/SEGAST.$(FASLEXT) \ + strap-0/SEQAST.$(FASLEXT) \ + strap-0/LETAST.$(FASLEXT) \ + strap-0/SUCHTAST.$(FASLEXT) \ + strap-0/COLONAST.$(FASLEXT) \ + strap-0/ADDAST.$(FASLEXT) \ + strap-0/CASEAST.$(FASLEXT) \ + strap-0/HASAST.$(FASLEXT) \ + strap-0/ISAST.$(FASLEXT) \ + strap-0/CATAST.$(FASLEXT) \ + strap-0/WHEREAST.$(FASLEXT) \ + strap-0/COMMAAST.$(FASLEXT) \ + strap-0/QQUTAST.$(FASLEXT) \ + strap-0/MACROAST.$(FASLEXT) + + # Bootstrap stage 2 dependencies. # At this stage we recompile everything from stage 1, including @@ -1197,7 +1241,8 @@ strap-2/MODULE.$(FASLEXT): strap-2/COMRING.$(FASLEXT) \ strap-2/BMODULE.$(FASLEXT) strap-2/LINSET.$(FASLEXT) strap-2/INTDOM.$(FASLEXT): strap-2/COMRING.$(FASLEXT) \ strap-2/ALGEBRA.$(FASLEXT) strap-2/ENTIRER.$(FASLEXT) \ - strap-1/FIELD.$(FASLEXT) + strap-1/FIELD.$(FASLEXT) \ + strap-1/GENEEZ.$(FASLEXT) strap-2/GCDDOM.$(FASLEXT): strap-2/INTDOM.$(FASLEXT) \ strap-1/LIST.$(FASLEXT) strap-1/SUP.$(FASLEXT) \ strap-1/LSAGG.$(FASLEXT) strap-1/PFECAT.$(FASLEXT) \ @@ -1239,6 +1284,7 @@ strap-2/REAL.$(FASLEXT): strap-2/KONVERT.$(FASLEXT) \ strap-2/CHARZ.$(FASLEXT): strap-2/RING.$(FASLEXT) strap-2/STEP.$(FASLEXT): strap-2/SETCAT.$(FASLEXT) strap-2/PATMAB.$(FASLEXT): strap-2/SETCAT.$(FASLEXT) +strap-2/PATRES.$(FASLEXT): strap-1/PATTERN1.$(FASLEXT) strap-2/UFD.$(FASLEXT): strap-2/GCDDOM.$(FASLEXT) \ strap-2/FR.$(FASLEXT) strap-1/BOOLEAN.$(FASLEXT) strap-2/INS.$(FASLEXT): strap-2/UFD.$(FASLEXT) strap-2/EUCDOM.$(FASLEXT) \ @@ -1423,7 +1469,7 @@ strap-2/SEX.$(FASLEXT): strap-2/SEXOF.$(FASLEXT) strap-2/OUTFORM.$(FASLEXT): strap-2/SETCAT.$(FASLEXT) \ strap-1/NUMFMT.$(FASLEXT) strap-1/VOID.$(FASLEXT) \ strap-1/DFLOAT.$(FASLEXT) strap-1/SYMBOL.$(FASLEXT) \ - strap-1/LIST.$(FASLEXT) + strap-1/LIST.$(FASLEXT) strap-1/NNI.$(FASLEXT) strap-2/SEXOF.$(FASLEXT): strap-2/SEXCAT.$(FASLEXT) strap-2/ANY.$(FASLEXT): strap-2/SETCAT.$(FASLEXT) \ strap-2/SEX.$(FASLEXT) strap-2/NONE.$(FASLEXT) @@ -1528,7 +1574,8 @@ strap-2/GALFACT.$(FASLEXT): strap-1/GALFACTU.$(FASLEXT) \ strap-1/GALPOLYU.$(FASLEXT) strap-1/MDDFACT.$(FASLEXT) \ strap-1/UPDECOMP.$(FASLEXT) strap-1/BRILL.$(FASLEXT) \ strap-1/CYCLOTOM.$(FASLEXT) strap-1/MSET.$(FASLEXT) \ - strap-1/GHENSEL.$(FASLEXT) + strap-1/GHENSEL.$(FASLEXT) \ + strap-1/IROOT.$(FASLEXT) strap-2/DFSFUN.$(FASLEXT): strap-1/COMPLEX.$(FASLEXT) \ strap-1/INTRET.$(FASLEXT) strap-1/MONOGEN.$(FASLEXT) \ @@ -1540,10 +1587,14 @@ strap-2/MULTFACT.$(FASLEXT): strap-1/MRATFAC.$(FASLEXT) \ strap-1/MPRFF.$(FASLEXT) strap-1/INNMFACT.$(FASLEXT) \ strap-1/GENUFACT.$(FASLEXT) -strap-2/MONOGEN.$(FASLEXT): strap-1/CPIMA.$(FASLEXT) +strap-2/MONOGEN.$(FASLEXT): strap-1/CPIMA.$(FASLEXT) \ + strap-1/FRAMALG.$(FASLEXT) \ + strap-1/FINRALG.$(FASLEXT) -strap-2/COMPCAT.$(FASLEXT): strap-1/CINTSLPE.$(FASLEXT) \ - strap-1/COMPLPAT.$(FASLEXT) strap-1/CPMATCH.$(FASLEXT) +strap-2/COMPCAT.$(FASLEXT): strap-2/MONOGEN.$(FASLEXT) \ + strap-1/CINTSLPE.$(FASLEXT) \ + strap-1/COMPLPAT.$(FASLEXT) \ + strap-1/CPMATCH.$(FASLEXT) strap-2/GENEEZ.$(FASLEXT): strap-1/EMR.$(FASLEXT) strap-2/MPRFF.$(FASLEXT): strap-1/MFINFACT.$(FASLEXT) strap-2/ACFS.$(FASLEXT): strap-2/ACF.$(FASLEXT) strap-1/FS.$(FASLEXT) @@ -1643,47 +1694,6 @@ strap-2/SPADAST.$(FASLEXT): strap-2/SASTCAT.$(FASLEXT) \ strap-2/MACROAST.$(FASLEXT) strap-2/DEFAST.$(FASLEXT): strap-1/HEADAST.$(FASLEXT) \ strap-1/SIG.$(FASLEXT) -strap-1/SPADAST.$(FASLEXT): strap-0/SPADXPT.$(FASLEXT) \ - strap-0/SPADXPT.$(FASLEXT) \ - strap-0/TYPEAST.$(FASLEXT) \ - strap-0/IMPTAST.$(FASLEXT) \ - strap-0/DEFAST.$(FASLEXT) \ - strap-0/MACROAST.$(FASLEXT) \ - strap-0/WHEREAST.$(FASLEXT) \ - strap-0/CATAST.$(FASLEXT) \ - strap-0/JOINAST.$(FASLEXT) \ - strap-0/CAPSLAST.$(FASLEXT) \ - strap-0/SIGAST.$(FASLEXT) \ - strap-0/ATTRAST.$(FASLEXT) \ - strap-0/MAPPAST.$(FASLEXT) \ - strap-0/IFAST.$(FASLEXT) \ - strap-0/RPTAST.$(FASLEXT) \ - strap-0/WHILEAST.$(FASLEXT) \ - strap-0/INAST.$(FASLEXT) \ - strap-0/STEPAST.$(FASLEXT) \ - strap-0/CLLCTAST.$(FASLEXT) \ - strap-0/LSTAST.$(FASLEXT) \ - strap-0/EXITAST.$(FASLEXT) \ - strap-0/RETAST.$(FASLEXT) \ - strap-0/CRCEAST.$(FASLEXT) \ - strap-0/PRTDAST.$(FASLEXT) \ - strap-0/RSTRCAST.$(FASLEXT) \ - strap-0/SEGAST.$(FASLEXT) \ - strap-0/SEQAST.$(FASLEXT) \ - strap-0/LETAST.$(FASLEXT) \ - strap-0/SUCHTAST.$(FASLEXT) \ - strap-0/COLONAST.$(FASLEXT) \ - strap-0/ADDAST.$(FASLEXT) \ - strap-0/CASEAST.$(FASLEXT) \ - strap-0/HASAST.$(FASLEXT) \ - strap-0/ISAST.$(FASLEXT) \ - strap-0/CATAST.$(FASLEXT) \ - strap-0/WHEREAST.$(FASLEXT) \ - strap-0/COMMAAST.$(FASLEXT) \ - strap-0/QQUTAST.$(FASLEXT) \ - strap-0/MACROAST.$(FASLEXT) - -strap-1/SPADXPT.$(FASLEXT): strap-0/SASTCAT.$(FASLEXT) strap-2/SASTCAT.$(FASLEXT): strap-2/HOMOTOP.$(FASLEXT) \ strap-1/ASTCAT.$(FASLEXT) strap-1/SYNTAX.$(FASLEXT) @@ -1692,6 +1702,7 @@ strap-2/TYPEAST.$(FASLEXT): strap-1/SPADAST.$(FASLEXT) strap-2/IRFORM.$(FASLEXT): strap-1/ITFORM.$(FASLEXT) strap-2/LINELT.$(FASLEXT): strap-1/LINBASIS.$(FASLEXT) strap-2/FR2.$(FASLEXT): strap-1/COMPLEX.$(FASLEXT) +strap-2/COMPLEX.$(FASLEXT): strap-2/COMPCAT.$(FASLEXT) # @@ -1847,55 +1858,114 @@ SPADFILES= \ TESTS=$(INPUT)/INTHEORY.input $(INPUT)/VIEW2D.input $(INPUT)/TESTFR.input # +oa_algebra_layer_0 = \ + TYPE UTYPE VOID EXIT \ + BOOLEAN INT NNI PI SINT SYMBOL \ + DFLOAT IDENT STRING PAIR MAYBE LIST + +$(OUT)/VOID.$(FASLEXT): strap-2/KOERCE.$(FASLEXT) \ + strap-2/OUTFORM.$(FASLEXT) +$(OUT)/EXIT.$(FASLEXT): strap-2/SETCAT.$(FASLEXT) \ + strap-2/OUTFORM.$(FASLEXT) + $(OUT)/SINT.$(FASLEXT): $(OUT)/INT.$(FASLEXT) $(OUT)/NNI.$(FASLEXT): $(OUT)/INT.$(FASLEXT) $(OUT)/PI.$(FASLEXT): $(OUT)/NNI.$(FASLEXT) -$(OUT)/INT.$(FASLEXT): $(OUT)/INS.$(FASLEXT) \ - strap-2/SUP.$(FASLEXT) strap-2/STRING.$(FASLEXT) \ - strap-2/MATRIX.$(FASLEXT) strap-2/VECTOR.$(FASLEXT) \ - strap-2/FR.$(FASLEXT) strap-2/INTSLPE.$(FASLEXT) \ - strap-2/UPSQFREE.$(FASLEXT) strap-2/GALFACT.$(FASLEXT) \ - strap-2/FRUTIL.$(FASLEXT) strap-2/FR2.$(FASLEXT) \ - strap-2/HEUGCD.$(FASLEXT) - -$(OUT)/BINOPC.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) - -$(OUT)/IEVALAB.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) \ +$(OUT)/INT.$(FASLEXT): strap-2/INT.$(FASLEXT) \ + strap-2/INFORM.$(FASLEXT) \ + strap-2/UPSQFREE.$(FASLEXT) \ + strap-2/GALFACT.$(FASLEXT) \ + strap-2/FR2.$(FASLEXT) \ + strap-2/FRUTIL.$(FASLEXT) \ + strap-2/HEUGCD.$(FASLEXT) \ + strap-2/PATRES.$(FASLEXT) \ + strap-2/PATTERN.$(FASLEXT) +$(OUT)/BOOLEAN.$(FASLEXT): strap-2/BOOLEAN.$(FASLEXT) \ + strap-2/PI.$(FASLEXT) \ + strap-2/INFORM.$(FASLEXT) +$(OUT)/DFOAT.$(FASLEXT): strap-2/FPS.$(FASLEXT) \ + strap-2/DFLOAT.$(FASLEXT) +$(OUT)/LIST.$(FASLEXT): strap-2/LSAGG.$(FASLEXT) \ strap-2/LIST.$(FASLEXT) - -$(OUT)/EVALAB.$(FASLEXT): $(OUT)/IEVALAB.$(FASLEXT) \ - strap-2/EQ.$(FASLEXT) strap-2/LIST.$(FASLEXT) - -$(OUT)/ELTAB.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) - -$(OUT)/SETCAT.$(FASLEXT): $(OUT)/BASTYPE.$(FASLEXT) \ +$(OUT)/SYMBOL.$(FASLEXT): strap-2/SYMBOL.$(FASLEXT) \ + strap-2/PMSYM.$(FASLEXT) \ + strap-2/UNISEG.$(FASLEXT) + +$(OUT)/STRING.$(FASLEXT): strap-2/STAGG.$(FASLEXT) \ + strap-2/STRING.$(FASLEXT) \ + strap-2/EQ.$(FASLEXT) +$(OUT)/IDENT.$(FASLEXT): strap-2/IDENT.$(FASLEXT) +$(OUT)/MAYBE.$(FASLEXT): $(OUT)/UTYPE.$(FASLEXT) \ + strap-2/KOERCE.$(FASLEXT) \ strap-2/OUTFORM.$(FASLEXT) \ - strap-2/SINT.$(FASLEXT) strap-2/STRING.$(FASLEXT) + strap-2/RETRACT.$(FASLEXT) -$(OUT)/UTYPE.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) -$(OUT)/AHYP.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) -$(OUT)/PRIMCAT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) -$(OUT)/ATTREG.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) -$(OUT)/CONDUIT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) -$(OUT)/CFCAT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) - -$(OUT)/SEGCAT.$(FASLEXT): $(OUT)/KRCFROM.$(FASLEXT) +oa_algebra_layer_0_nrlibs = \ + $(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_0)) -$(OUT)/KOERCE.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) -$(OUT)/KRCFROM.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) +oa_algebra_layer_0_objects = \ + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(oa_algebra_layer_0))) -$(OUT)/KONVERT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) -$(OUT)/KVTFROM.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) +oa_algebra_layer_1 = \ + BINOPC BINOP IDEMOPC SGPOPC SGPOP \ + MONOPC FUNCTOR COMOPC COMOP \ + BASTYPE BASTYPE- SETCAT SETCAT- SGROUP SGROUP- \ + LLINSET RLINSET LINSET ABELSG ABELSG- CHARNZ \ + ABELGRP ABELGRP- ABELMON ABELMON- ORDTYPE ORDTYPE- \ + RMODULE ALGEBRA ALGEBRA- FRETRCT FRETRCT- \ + FINITE FINITE- MONOID MONOID- GROUP GROUP- \ + RING RING- OINTDOM AMR AMR- \ + BMODULE STEP LMODULE PFECAT PFECAT- \ + AHYP CFCAT ELTAB KOERCE KONVERT \ + KRCFROM KVTFROM IEVALAB IEVALAB- EVALAB EVALAB- \ + RETRACT RETRACT- REPSQ REPDB FAMR FAMR- \ + PRIMCAT PTRANFN SPFCAT HOMOTOP DIFEXT \ + ORDSET OASGP DIFRING SRING OSGROUP PDRING \ + MODULE MODULE- PID OAGROUP OAGROUP- OCAMON \ + OAMON OAMON- DIOID INTDOM INTDOM- CACHSET \ + RNG RNG- ORDFIN OAMONS CABMON COMRING \ + GCDDOM GCDDOM- UFD UFD- ES ES- \ + FIELD FIELD- VECTCAT VECTCAT- RADCAT RADCAT- \ + ENTIRER ENTIRER- ORDRING FLINEXP FLINEXP- \ + DIFFDOM DIFFDOM- DIFFSPC DIFFSPC- DIFFMOD \ + LINEXP PATMAB REAL CHARZ LOGIC LOGIC- \ + PDDOM PDDOM- PDSPC PDSPC- FPATMAB \ + DSEXT DSEXT- ORDSTRCT \ + BOOLE BOOLE- SRING TRANFUN TRANFUN- \ + INS INS- DIVRING DIVRING- EUCDOM EUCDOM- \ + FPS FPS- RNS RNS- PATAB \ + POLYCAT POLYCAT- QFCAT QFCAT- FEVALAB FEVALAB- \ + ITUPLE IDPT ITFUN2 SEGCAT \ + FILECAT SMAGG MKRECORD MKFUNC \ + PPCURVE PSCURVE RESLATC \ + OUTFORM BINDING \ + IARRAY1 \ + DATAARY PROPLOG BYTEORD \ + AGG AGG- ELTAGG ELTAGG- IXAGG IXAGG- \ + BGAGG BGAGG- BRAGG BRAGG- ELAGG ELAGG- \ + DLAGG DQAGG QUAGG SKAGG PRQAGG ALAGG \ + FLAGG FLAGG- URAGG URAGG- LNAGG LNAGG- \ + A1AGG A1AGG- LSAGG LSAGG- SRAGG SRAGG- \ + FSAGG FSAGG- STAGG STAGG- CLAGG CLAGG- \ + RCAGG RCAGG- SETAGG SETAGG- HOAGG HOAGG- \ + TBAGG TBAGG- KDAGG KDAGG- DIAGG DIAGG- \ + DIOPS DIOPS- FINAGG FINAGG- MDAGG \ + MONOP PRIMARR SEXCAT \ + PROPERTY ARITY OPERCAT OPERCAT- STREAM \ + COMBOPC EQ2 NONE1 CONDUIT IOMODE CTORKIND \ + PDMOD DMEXT LZSTAGG LZSTAGG- MSETAGG \ + ITFUN3 STREAM1 STREAM2 STREAM3 ANY1 \ + ALIST RTVALUE SYSPTR ATTREG REF -$(OUT)/RETRACT.$(FASLEXT): $(OUT)/KRCFROM.$(FASLEXT) -$(OUT)/BASTYPE.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) \ - strap-2/BOOLEAN.$(FASLEXT) +$(OUT)/IEVALAB.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) -$(OUT)/SETCAT.$(FASLEXT): $(OUT)/BASTYPE.$(FASLEXT) +$(OUT)/EVALAB.$(FASLEXT): $(OUT)/IEVALAB.$(FASLEXT) \ + strap-2/EQ.$(FASLEXT) -$(OUT)/FINITE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) \ - strap-2/NNI.$(FASLEXT) strap-2/PI.$(FASLEXT) +$(OUT)/SETCAT.$(FASLEXT): strap-2/OUTFORM.$(FASLEXT) +$(OUT)/FINITE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/ORDSET.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) \ $(OUT)/ORDTYPE.$(FASLEXT) @@ -1905,13 +1975,12 @@ $(OUT)/PATMAB.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/REAL.$(FASLEXT): $(OUT)/KONVERT.$(FASLEXT) \ strap-2/FLOAT.$(FASLEXT) -$(OUT)/LOGIC.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) -$(OUT)/BOOLE.$(FASLEXT): $(OUT)/LOGIC.$(FASLEXT) - $(OUT)/SGROUP.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) \ - strap-2/PI.$(FASLEXT) strap-2/REPSQ.$(FASLEXT) + strap-2/REPSQ.$(FASLEXT) + +$(OUT)/ABELSG.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) \ + strap-2/REPDB.$(FASLEXT) -$(OUT)/ABELSG.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/LMODULE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) \ $(OUT)/LLINSET.$(FASLEXT) $(OUT)/SGROUP.$(FASLEXT) $(OUT)/RMODULE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/RLINSET.$(FASLEXT) @@ -1934,43 +2003,22 @@ $(OUT)/LINSET.$(FASLEXT): $(OUT)/LLINSET.$(FASLEXT) $(OUT)/RLINSET.$(FASLEXT) $(OUT)/CTORKIND.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/IOMODE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) -$(OUT)/PRINT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) -$(OUT)/RTVALUE.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) $(OUT)/SYSPTR.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) - -$(OUT)/DIFFDOM.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) -$(OUT)/DIFFSPC.$(FASLEXT): $(OUT)/DIFFDOM.$(FASLEXT) \ - strap-2/PI.$(FASLEXT) +$(OUT)/DIFFSPC.$(FASLEXT): $(OUT)/DIFFDOM.$(FASLEXT) $(OUT)/DIFFMOD.$(FASLEXT): $(OUT)/DIFFSPC.$(FASLEXT) -$(OUT)/PDDOM.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) $(OUT)/PDSPC.$(FASLEXT): $(OUT)/PDDOM.$(FASLEXT) -$(OUT)/DSEXT.$(FASLEXT): $(OUT)/DIFFSPC.$(FASLEXT) $(OUT)/PDSPC.$(FASLEXT) \ - strap-2/SYMBOL.$(FASLEXT) -$(OUT)/ORDTYPE.$(FASLEXT): $(OUT)/BASTYPE.$(FASLEXT) +$(OUT)/DSEXT.$(FASLEXT): $(OUT)/DIFFSPC.$(FASLEXT) $(OUT)/PDSPC.$(FASLEXT) $(OUT)/ORDSTRCT.$(FASLEXT): $(OUT)/ORDTYPE.$(FASLEXT) $(OUT)/HOMOTOP.$(FASLEXT) -$(OUT)/BINOP.$(FASLEXT): $(OUT)/BINOPC.$(FASLEXT) $(OUT)/SETCAT.$(FASLEXT) -$(OUT)/IDEMOPC.$(FASLEXT): $(OUT)/BINOPC.$(FASLEXT) $(OUT)/BASTYPE.$(FASLEXT) -$(OUT)/SGPOPC.$(FASLEXT): $(OUT)/BINOPC.$(FASLEXT) $(OUT)/BASTYPE.$(FASLEXT) -$(OUT)/SGPOP.$(FASLEXT): $(OUT)/SGPOPC.$(FASLEXT) $(OUT)/SETCAT.$(FASLEXT) \ - $(OUT)/BINOP.$(FASLEXT) $(OUT)/MONOPC.$(FASLEXT): $(OUT)/SGPOPC.$(FASLEXT) -$(OUT)/FUNCTOR.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) - -$(OUT)/REPSQ.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) \ - strap-2/PI.$(FASLEXT) -$(OUT)/REPDB.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) \ - strap-2/PI.$(FASLEXT) - -$(OUT)/ABELSG.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) \ - $(OUT)/REPDB.$(FASLEXT) +$(OUT)/REPSQ.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) +$(OUT)/REPDB.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/FEVALAB.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) \ $(OUT)/ELTAB.$(FASLEXT) $(OUT)/EVALAB.$(FASLEXT) \ - $(OUT)/IEVALAB.$(FASLEXT) strap-2/EQ.$(FASLEXT) \ - strap-2/LIST.$(FASLEXT) strap-2/SYMBOL.$(FASLEXT) + $(OUT)/IEVALAB.$(FASLEXT) strap-2/EQ.$(FASLEXT) $(OUT)/INS.$(FASLEXT): $(OUT)/UFD.$(FASLEXT) $(OUT)/EUCDOM.$(FASLEXT) \ $(OUT)/OINTDOM.$(FASLEXT) $(OUT)/DIFRING.$(FASLEXT) \ @@ -1979,10 +2027,9 @@ $(OUT)/INS.$(FASLEXT): $(OUT)/UFD.$(FASLEXT) $(OUT)/EUCDOM.$(FASLEXT) \ $(OUT)/REAL.$(FASLEXT) $(OUT)/CHARZ.$(FASLEXT) \ $(OUT)/STEP.$(FASLEXT) $(OUT)/PATMAB.$(FASLEXT) \ $(OUT)/FEVALAB.$(FASLEXT) strap-2/FRAC.$(FASLEXT) \ - strap-2/FLOAT.$(FASLEXT) strap-2/DFLOAT.$(FASLEXT) \ + strap-2/FLOAT.$(FASLEXT) \ strap-2/INFORM.$(FASLEXT) strap-2/SEXCAT.$(FASLEXT) \ - strap-2/PATTERN.$(FASLEXT) strap-2/PI.$(FASLEXT) \ - strap-2/NNI.$(FASLEXT) strap-2/INTFACT.$(FASLEXT) \ + strap-2/PATTERN.$(FASLEXT) strap-2/INTFACT.$(FASLEXT) \ strap-2/PRIMES.$(FASLEXT) strap-2/COMBINAT.$(FASLEXT) \ strap-2/PATRES.$(FASLEXT) strap-2/PMINS.$(FASLEXT) @@ -1998,9 +2045,7 @@ $(OUT)/MONOID.$(FASLEXT): $(OUT)/SGROUP.$(FASLEXT) $(OUT)/ABELGRP.$(FASLEXT): $(OUT)/CABMON.$(FASLEXT) $(OUT)/LLINSET.$(FASLEXT) $(OUT)/CABMON.$(FASLEXT): $(OUT)/ABELMON.$(FASLEXT) - -$(OUT)/ABELMON.$(FASLEXT): $(OUT)/ABELSG.$(FASLEXT) \ - $(OUT)/REPSQ.$(FASLEXT) +$(OUT)/ABELMON.$(FASLEXT): $(OUT)/ABELSG.$(FASLEXT) $(OUT)/FIELD.$(FASLEXT): $(OUT)/EUCDOM.$(FASLEXT) $(OUT)/UFD.$(FASLEXT) \ $(OUT)/DIVRING.$(FASLEXT) strap-2/FR.$(FASLEXT) @@ -2010,7 +2055,7 @@ $(OUT)/PID.$(FASLEXT): $(OUT)/GCDDOM.$(FASLEXT) $(OUT)/DIVRING.$(FASLEXT): $(OUT)/ENTIRER.$(FASLEXT) \ $(OUT)/ALGEBRA.$(FASLEXT) $(OUT)/REPSQ.$(FASLEXT) \ - strap-2/PI.$(FASLEXT) strap-2/FRAC.$(FASLEXT) + strap-2/FRAC.$(FASLEXT) $(OUT)/ORDRING.$(FASLEXT): $(OUT)/OAGROUP.$(FASLEXT) $(OUT)/CHARZ.$(FASLEXT) \ $(OUT)/MONOID.$(FASLEXT) @@ -2020,12 +2065,10 @@ $(OUT)/ENTIRER.$(FASLEXT): $(OUT)/RING.$(FASLEXT) $(OUT)/BMODULE.$(FASLEXT) $(OUT)/INTDOM.$(FASLEXT): $(OUT)/COMRING.$(FASLEXT) $(OUT)/ALGEBRA.$(FASLEXT) \ $(OUT)/ENTIRER.$(FASLEXT) strap-2/FIELD.$(FASLEXT) $(OUT)/OINTDOM.$(FASLEXT): $(OUT)/INTDOM.$(FASLEXT) $(OUT)/ORDRING.$(FASLEXT) -$(OUT)/GCDDOM.$(FASLEXT): $(OUT)/INTDOM.$(FASLEXT) \ - strap-2/LIST.$(FASLEXT) +$(OUT)/GCDDOM.$(FASLEXT): $(OUT)/INTDOM.$(FASLEXT) $(OUT)/UFD.$(FASLEXT): $(OUT)/GCDDOM.$(FASLEXT) strap-2/ES.$(FASLEXT) $(OUT)/ES.$(FASLEXT): $(OUT)/RING.$(FASLEXT) $(OUT)/CACHSET.$(FASLEXT) \ - $(OUT)/PATAB.$(FASLEXT) strap-2/IDENT.$(FASLEXT) \ - $(OUT)/MAYBE.$(FASLEXT) strap-2/PRIMARR.$(FASLEXT) \ + $(OUT)/PATAB.$(FASLEXT) strap-2/PRIMARR.$(FASLEXT) \ strap-2/REF.$(FASLEXT) strap-2/ALIST.$(FASLEXT) \ strap-2/NONE.$(FASLEXT) strap-2/KERNEL.$(FASLEXT) \ strap-2/COMMONOP.$(FASLEXT) strap-2/SYMBOL.$(FASLEXT) \ @@ -2043,13 +2086,11 @@ $(OUT)/DMEXT.$(FASLEXT): $(OUT)/DSEXT.$(FASLEXT) $(OUT)/DIFFMOD.$(FASLEXT) \ $(OUT)/PATAB.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) \ strap-2/PATTERN.$(FASLEXT) -$(OUT)/GROUP.$(FASLEXT): $(OUT)/MONOID.$(FASLEXT) $(OUT)/REPSQ.$(FASLEXT) \ - strap-2/PI.$(FASLEXT) strap-2/INT.$(FASLEXT) +$(OUT)/GROUP.$(FASLEXT): $(OUT)/MONOID.$(FASLEXT) $(OUT)/REPSQ.$(FASLEXT) $(OUT)/ORDFIN.$(FASLEXT): $(OUT)/ORDSET.$(FASLEXT) $(OUT)/FINITE.$(FASLEXT) -$(OUT)/RADCAT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) \ - strap-2/FRAC.$(FASLEXT) strap-2/INT.$(FASLEXT) +$(OUT)/RADCAT.$(FASLEXT): strap-2/FRAC.$(FASLEXT) $(OUT)/OSGROUP.$(FASLEXT): $(OUT)/ORDSET.$(FASLEXT) $(OUT)/SGROUP.$(FASLEXT) @@ -2066,7 +2107,7 @@ $(OUT)/POLYCAT.$(FASLEXT): $(OUT)/PDRING.$(FASLEXT) \ $(OUT)/FAMR.$(FASLEXT) $(OUT)/EVALAB.$(FASLEXT) \ $(OUT)/RETRACT.$(FASLEXT) $(OUT)/FLINEXP.$(FASLEXT) \ strap-2/VECTOR.$(FASLEXT) strap-2/MATRIX.$(FASLEXT) \ - strap-2/LIST.$(FASLEXT) strap-2/SUP.$(FASLEXT) \ + strap-2/SUP.$(FASLEXT) \ strap-2/INFORM.$(FASLEXT) strap-2/GENPGCD.$(FASLEXT) \ strap-2/PFBR.$(FASLEXT) strap-2/MULTSQFR.$(FASLEXT) \ strap-2/PSQFR.$(FASLEXT) strap-2/PMPLCAT.$(FASLEXT) \ @@ -2083,7 +2124,6 @@ $(OUT)/QFCAT.$(FASLEXT): $(OUT)/ALGEBRA.$(FASLEXT) \ $(OUT)/PFECAT.$(FASLEXT) $(OUT)/FIELD.$(FASLEXT) \ strap-2/MCDEN.$(FASLEXT) strap-2/PMQFCAT.$(FASLEXT) - $(OUT)/PDRING.$(FASLEXT): $(OUT)/PDSPC.$(FASLEXT) $(OUT)/DIFEXT.$(FASLEXT): $(OUT)/DSEXT.$(FASLEXT) $(OUT)/PFECAT.$(FASLEXT): $(OUT)/UFD.$(FASLEXT) $(OUT)/CHARZ.$(FASLEXT) \ @@ -2099,93 +2139,32 @@ $(OUT)/AMR.$(FASLEXT): $(OUT)/RING.$(FASLEXT) $(OUT)/OAMON.$(FASLEXT) \ $(OUT)/CHARNZ.$(FASLEXT) $(OUT)/INTDOM.$(FASLEXT) $(OUT)/FRETRCT.$(FASLEXT): $(OUT)/RETRACT.$(FASLEXT) \ - strap-2/INT.$(FASLEXT) strap-2/FRAC.$(FASLEXT) + strap-2/FRAC.$(FASLEXT) $(OUT)/FLINEXP.$(FASLEXT): $(OUT)/LINEXP.$(FASLEXT) \ strap-2/MATRIX.$(FASLEXT) $(OUT)/FPATMAB.$(FASLEXT): $(OUT)/PATMAB.$(FASLEXT) -$(OUT)/DIFFSPC.$(FASLEXT): $(OUT)/DIFFDOM.$(FASLEXT) \ - strap-2/NNI.$(FASLEXT) - -$(OUT)/PDSPC.$(FASLEXT): $(OUT)/PDDOM.$(FASLEXT) \ - strap-2/NNI.$(FASLEXT) +$(OUT)/DIFFSPC.$(FASLEXT): $(OUT)/DIFFDOM.$(FASLEXT) -$(OUT)/DFLOAT.$(FASLEXT): $(OUT)/FPS.$(FASLEXT) \ - $(OUT)/DIFRING.$(FASLEXT) $(OUT)/TRANFUN.$(FASLEXT) \ - $(OUT)/KONVERT.$(FASLEXT) \ - strap-2/DFSFUN.$(FASLEXT) +$(OUT)/PDSPC.$(FASLEXT): $(OUT)/PDDOM.$(FASLEXT) $(OUT)/TRANFUN.$(FASLEXT): $(OUT)/RING.$(FASLEXT) $(OUT)/FIELD.$(FASLEXT) \ strap-2/TRIGCAT.$(FASLEXT) \ strap-2/ATRIG.$(FASLEXT) strap-2/HYPCAT.$(FASLEXT) \ strap-2/AHYP.$(FASLEXT) strap-2/ELEMFUN.$(FASLEXT) -$(OUT)/SYMBOL.$(FASLEXT): $(OUT)/ORDSET.$(FASLEXT) \ - $(OUT)/KONVERT.$(FASLEXT) $(OUT)/KRCFROM.$(FASLEXT) \ - $(OUT)/RETRACT.$(FASLEXT) $(OUT)/KONVERT.$(FASLEXT) \ - $(OUT)/PATMAB.$(FASLEXT) strap-2/VOID.$(FASLEXT) \ - strap-2/BOOLEAN.$(FASLEXT) strap-2/ALIST.$(FASLEXT) \ - strap-2/PRIMARR.$(FASLEXT) strap-2/REF.$(FASLEXT) \ - strap-2/STRING.$(FASLEXT) strap-2/PMSYM.$(FASLEXT) - -$(OUT)/COMOPC.$(FASLEXT): $(OUT)/BINOPC.$(FASLEXT) - -$(OUT)/COMOP.$(FASLEXT): $(OUT)/COMOPC.$(FASLEXT) $(OUT)/KOERCE.$(FASLEXT) - -oa_algebra_layer_0 = \ - TYPE BINOPC BINOP IDEMOPC SGPOPC SGPOP \ - MONOPC FUNCTOR COMOPC COMOP \ - BASTYPE BASTYPE- SETCAT SETCAT- SGROUP SGROUP- \ - LLINSET RLINSET LINSET ABELSG ABELSG- CHARNZ \ - ABELGRP ABELGRP- ABELMON ABELMON- ORDTYPE ORDTYPE- \ - RMODULE ALGEBRA ALGEBRA- FRETRCT FRETRCT- \ - FINITE FINITE- MONOID MONOID- GROUP GROUP- \ - RING RING- OINTDOM AMR AMR- \ - BMODULE STEP LMODULE PFECAT PFECAT- \ - AHYP CFCAT ELTAB KOERCE KONVERT \ - KRCFROM KVTFROM IEVALAB IEVALAB- EVALAB EVALAB- \ - RETRACT RETRACT- REPSQ REPDB FAMR FAMR- \ - PRIMCAT PTRANFN SPFCAT UTYPE HOMOTOP DIFEXT \ - ORDSET OASGP DIFRING SRING OSGROUP PDRING \ - MODULE MODULE- PID OAGROUP OAGROUP- OCAMON \ - OAMON OAMON- DIOID INTDOM INTDOM- CACHSET \ - RNG RNG- ORDFIN OAMONS CABMON COMRING \ - GCDDOM GCDDOM- UFD UFD- ES ES- \ - FIELD FIELD- VECTCAT VECTCAT- RADCAT RADCAT- \ - ENTIRER ENTIRER- ORDRING FLINEXP FLINEXP- \ - DIFFDOM DIFFDOM- DIFFSPC DIFFSPC- DIFFMOD \ - LINEXP PATMAB REAL CHARZ LOGIC LOGIC- \ - PDDOM PDDOM- PDSPC PDSPC- FPATMAB \ - DSEXT DSEXT- ORDSTRCT \ - BOOLE BOOLE- SRING MAYBE TRANFUN TRANFUN- \ - INS INS- DIVRING DIVRING- EUCDOM EUCDOM- \ - FPS FPS- RNS RNS- PATAB \ - POLYCAT POLYCAT- QFCAT QFCAT- FEVALAB FEVALAB- \ - INT NNI PI SINT SYMBOL DFLOAT - -oa_algebra_layer_0_nrlibs = \ - $(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_0)) - -oa_algebra_layer_0_objects = \ - $(addprefix $(OUT)/, \ - $(addsuffix .$(FASLEXT),$(oa_algebra_layer_0))) - # FIXME: $(OUT)/ES.$(FASLEXT): strap-2/INFORM.$(FASLEXT) -$(OUT)/VOID.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) $(OUT)/HOMOTOP.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) $(OUT)/KRCFROM.$(FASLEXT) $(OUT)/ITUPLE.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) $(OUT)/STREAM.$(FASLEXT) $(OUT)/PPCURVE.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) $(OUT)/PSCURVE.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) -$(OUT)/PROPLOG.$(FASLEXT): $(OUT)/BOOLE.$(FASLEXT) $(OUT)/SETCAT.$(FASLEXT) - $(OUT)/BYTEORD.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) -$(OUT)/PROPERTY.$(FASLEXT): $(OUT)/IDENT.$(FASLEXT) $(OUT)/PAIR.$(FASLEXT) $(OUT)/BINDING.$(FASLEXT): $(OUT)/PROPERTY.$(FASLEXT) $(OUT)/OPERCAT.$(FASLEXT): $(OUT)/ARITY.$(FASLEXT) $(OUT)/STREAM.$(FASLEXT): $(OUT)/LZSTAGG.$(FASLEXT) \ @@ -2194,12 +2173,9 @@ $(OUT)/LZSTAGG.$(FASLEXT): $(OUT)/STAGG.$(FASLEXT) \ strap-2/CSTTOOLS.$(FASLEXT) -$(OUT)/MONOP.$(FASLEXT): $(OUT)/MONOPC.$(FASLEXT) $(OUT)/PAIR.$(FASLEXT) \ +$(OUT)/MONOP.$(FASLEXT): $(OUT)/MONOPC.$(FASLEXT) \ $(OUT)/SETCAT.$(FASLEXT) -$(OUT)/IDPT.$(FASLEXT): $(OUT)/PAIR.$(FASLEXT) - -$(OUT)/AGG.$(FASLEXT): $(OUT)/BOOLE.$(FASLEXT) $(OUT)/ELTAGG.$(FASLEXT): $(OUT)/AGG.$(FASLEXT) $(OUT)/SETCAT.$(FASLEXT) $(OUT)/IXAGG.$(FASLEXT): $(OUT)/ELTAGG.$(FASLEXT) $(OUT)/EVALAB.$(FASLEXT) $(OUT)/RCAGG.$(FASLEXT): $(OUT)/EVALAB.$(FASLEXT) $(OUT)/SETCAT.$(FASLEXT) \ @@ -2217,7 +2193,7 @@ $(OUT)/FLAGG.$(FASLEXT): $(OUT)/BMODULE.$(FASLEXT) $(OUT)/PID.$(FASLEXT) \ $(OUT)/REAL.$(FASLEXT) $(OUT)/CHARZ.$(FASLEXT) \ $(OUT)/DIFFSPC.$(FASLEXT) $(OUT)/FINAGG.$(FASLEXT) $(OUT)/A1AGG.$(FASLEXT): $(OUT)/FLAGG.$(FASLEXT) $(OUT)/SMAGG.$(FASLEXT) \ - strap-2/BOOLEAN.$(FASLEXT) strap-2/UNISEG.$(FASLEXT) \ + strap-2/UNISEG.$(FASLEXT) \ $(OUT)/ORDSET.$(FASLEXT) $(OUT)/SRAGG.$(FASLEXT): $(OUT)/A1AGG.$(FASLEXT) $(OUT)/STAGG.$(FASLEXT): $(OUT)/URAGG.$(FASLEXT) $(OUT)/LNAGG.$(FASLEXT) @@ -2228,9 +2204,8 @@ $(OUT)/DIAGG.$(FASLEXT): $(OUT)/DIOPS.$(FASLEXT) $(OUT)/KDAGG.$(FASLEXT): $(OUT)/DIAGG.$(FASLEXT) $(OUT)/IXAGG.$(FASLEXT) $(OUT)/TBAGG.$(FASLEXT): $(OUT)/KDAGG.$(FASLEXT) $(OUT)/ALAGG.$(FASLEXT): $(OUT)/TBAGG.$(FASLEXT) -$(OUT)/LIST.$(FASLEXT): $(OUT)/LSAGG.$(FASLEXT) $(OUT)/REF.$(FASLEXT) \ - $(OUT)/ALIST.$(FASLEXT) $(OUT)/PRIMARR.$(FASLEXT) -$(OUT)/HOAGG.$(FASLEXT): $(OUT)/FUNCTOR.$(FASLEXT) +$(OUT)/HOAGG.$(FASLEXT): $(OUT)/FUNCTOR.$(FASLEXT) \ + strap-2/EQ.$(FASLEXT) $(OUT)/SMAGG.$(FASLEXT): $(OUT)/HOAGG.$(FASLEXT) $(OUT)/FINAGG.$(FASLEXT): $(OUT)/HOAGG.$(FASLEXT) $(OUT)/ELAGG.$(FASLEXT): $(OUT)/SMAGG.$(FASLEXT) strap-2/UNISEG.$(FASLEXT) @@ -2238,8 +2213,6 @@ $(OUT)/CLAGG.$(FASLEXT): $(OUT)/HOAGG.$(FASLEXT) $(OUT)/FSAGG.$(FASLEXT): $(OUT)/FINAGG.$(FASLEXT) $(OUT)/ALIST.$(FASLEXT): $(OUT)/ALAGG.$(FASLEXT) -$(OUT)/STRING.$(FASLEXT): $(OUT)/SRAGG.$(FASLEXT) $(OUT)/ORDFIN.$(FASLEXT) - $(OUT)/SEXCAT.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/PID.$(FASLEXT) \ $(OUT)/OAGROUP.$(FASLEXT) $(OUT)/LINEXP.$(FASLEXT) \ $(OUT)/PATMAB.$(FASLEXT) $(OUT)/REAL.$(FASLEXT) \ @@ -2249,30 +2222,8 @@ $(OUT)/SEXCAT.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/PID.$(FASLEXT) \ $(OUT)/MSETAGG.$(FASLEXT): $(OUT)/MDAGG.$(FASLEXT) $(OUT)/SETAGG.$(FASLEXT) $(OUT)/MDAGG.$(FASLEXT): $(OUT)/DIOPS.$(FASLEXT) -$(OUT)/REF.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/IDENT.$(FASLEXT) +$(OUT)/REF.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) -oa_algebra_layer_1 = \ - ITUPLE IDPT ITFUN2 SEGCAT VOID EXIT \ - FILECAT SMAGG MKRECORD MKFUNC \ - PPCURVE PSCURVE RESLATC \ - IDENT OUTFORM BINDING BOOLEAN \ - IARRAY1 \ - DATAARY PROPLOG BYTEORD \ - AGG AGG- ELTAGG ELTAGG- IXAGG IXAGG- \ - BGAGG BGAGG- BRAGG BRAGG- ELAGG ELAGG- \ - DLAGG DQAGG QUAGG SKAGG PRQAGG ALAGG \ - FLAGG FLAGG- URAGG URAGG- LNAGG LNAGG- \ - A1AGG A1AGG- LSAGG LSAGG- SRAGG SRAGG- \ - FSAGG FSAGG- STAGG STAGG- CLAGG CLAGG- \ - RCAGG RCAGG- SETAGG SETAGG- HOAGG HOAGG- \ - TBAGG TBAGG- KDAGG KDAGG- DIAGG DIAGG- \ - DIOPS DIOPS- STRING FINAGG FINAGG- MDAGG \ - MONOP PRIMARR SEXCAT \ - PROPERTY ARITY OPERCAT OPERCAT- PAIR STREAM \ - COMBOPC EQ2 NONE1 CONDUIT IOMODE CTORKIND \ - PDMOD DMEXT LZSTAGG LZSTAGG- MSETAGG \ - ITFUN3 STREAM1 STREAM2 STREAM3 ANY1 \ - ALIST LIST RTVALUE SYSPTR ATTREG REF oa_algebra_layer_1_nrlibs = \ $(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_1)) diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in index ee2cb183..1a5d42e5 100644 --- a/src/algebra/Makefile.in +++ b/src/algebra/Makefile.in @@ -748,8 +748,22 @@ SPADFILES = \ $(OUTSRC)/zerodim.spad TESTS = $(INPUT)/INTHEORY.input $(INPUT)/VIEW2D.input $(INPUT)/TESTFR.input + +# oa_algebra_layer_0 = \ - TYPE BINOPC BINOP IDEMOPC SGPOPC SGPOP \ + TYPE UTYPE VOID EXIT \ + BOOLEAN INT NNI PI SINT SYMBOL \ + DFLOAT IDENT STRING PAIR MAYBE LIST + +oa_algebra_layer_0_nrlibs = \ + $(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_0)) + +oa_algebra_layer_0_objects = \ + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(oa_algebra_layer_0))) + +oa_algebra_layer_1 = \ + BINOPC BINOP IDEMOPC SGPOPC SGPOP \ MONOPC FUNCTOR COMOPC COMOP \ BASTYPE BASTYPE- SETCAT SETCAT- SGROUP SGROUP- \ LLINSET RLINSET LINSET ABELSG ABELSG- CHARNZ \ @@ -761,7 +775,7 @@ oa_algebra_layer_0 = \ AHYP CFCAT ELTAB KOERCE KONVERT \ KRCFROM KVTFROM IEVALAB IEVALAB- EVALAB EVALAB- \ RETRACT RETRACT- REPSQ REPDB FAMR FAMR- \ - PRIMCAT PTRANFN SPFCAT UTYPE HOMOTOP DIFEXT \ + PRIMCAT PTRANFN SPFCAT HOMOTOP DIFEXT \ ORDSET OASGP DIFRING SRING OSGROUP PDRING \ MODULE MODULE- PID OAGROUP OAGROUP- OCAMON \ OAMON OAMON- DIOID INTDOM INTDOM- CACHSET \ @@ -773,24 +787,14 @@ oa_algebra_layer_0 = \ LINEXP PATMAB REAL CHARZ LOGIC LOGIC- \ PDDOM PDDOM- PDSPC PDSPC- FPATMAB \ DSEXT DSEXT- ORDSTRCT \ - BOOLE BOOLE- SRING MAYBE TRANFUN TRANFUN- \ + BOOLE BOOLE- SRING TRANFUN TRANFUN- \ INS INS- DIVRING DIVRING- EUCDOM EUCDOM- \ FPS FPS- RNS RNS- PATAB \ - POLYCAT POLYCAT- QFCAT QFCAT- FEVALAB FEVALAB- \ - INT NNI PI SINT SYMBOL DFLOAT - -oa_algebra_layer_0_nrlibs = \ - $(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_0)) - -oa_algebra_layer_0_objects = \ - $(addprefix $(OUT)/, \ - $(addsuffix .$(FASLEXT),$(oa_algebra_layer_0))) - -oa_algebra_layer_1 = \ - ITUPLE IDPT ITFUN2 SEGCAT VOID EXIT \ + POLYCAT POLYCAT- QFCAT QFCAT- FEVALAB FEVALAB- \ + ITUPLE IDPT ITFUN2 SEGCAT \ FILECAT SMAGG MKRECORD MKFUNC \ PPCURVE PSCURVE RESLATC \ - IDENT OUTFORM BINDING BOOLEAN \ + OUTFORM BINDING \ IARRAY1 \ DATAARY PROPLOG BYTEORD \ AGG AGG- ELTAGG ELTAGG- IXAGG IXAGG- \ @@ -801,13 +805,13 @@ oa_algebra_layer_1 = \ FSAGG FSAGG- STAGG STAGG- CLAGG CLAGG- \ RCAGG RCAGG- SETAGG SETAGG- HOAGG HOAGG- \ TBAGG TBAGG- KDAGG KDAGG- DIAGG DIAGG- \ - DIOPS DIOPS- STRING FINAGG FINAGG- MDAGG \ + DIOPS DIOPS- FINAGG FINAGG- MDAGG \ MONOP PRIMARR SEXCAT \ - PROPERTY ARITY OPERCAT OPERCAT- PAIR STREAM \ + PROPERTY ARITY OPERCAT OPERCAT- STREAM \ COMBOPC EQ2 NONE1 CONDUIT IOMODE CTORKIND \ PDMOD DMEXT LZSTAGG LZSTAGG- MSETAGG \ ITFUN3 STREAM1 STREAM2 STREAM3 ANY1 \ - ALIST LIST RTVALUE SYSPTR ATTREG REF + ALIST RTVALUE SYSPTR ATTREG REF oa_algebra_layer_1_nrlibs = \ $(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_1)) @@ -2529,9 +2533,11 @@ strap-1/MULTFACT.$(FASLEXT): strap-0/MRATFAC.$(FASLEXT) \ strap-1/INDE.$(FASLEXT): strap-1/IDPOAMS.$(FASLEXT) strap-1/IDPC.$(FASLEXT) strap-1/IDPOAMS.$(FASLEXT): strap-1/IDPOAM.$(FASLEXT) strap-1/IDPC.$(FASLEXT): strap-1/SETCAT.$(FASLEXT) strap-1/FUNCTOR.$(FASLEXT) -strap-1/GENEEZ.$(FASLEXT): strap-1/VECTOR2.$(FASLEXT) +strap-1/GENEEZ.$(FASLEXT): strap-1/VECTOR2.$(FASLEXT) \ + strap-0/IROOT.$(FASLEXT) strap-1/MLIFT.$(FASLEXT): strap-1/NPCOEF.$(FASLEXT) strap-1/SUP2.$(FASLEXT) \ strap-1/PGCD.$(FASLEXT) strap-1/FACUTIL.$(FASLEXT) +strap-1/VECTOR2.$(FASLEXT): strap-0/FLAGG2.$(FASLEXT) strap-1/PMDOWN.$(FASLEXT): strap-1/PATRES2.$(FASLEXT) strap-1/BOP1.$(FASLEXT): strap-1/NONE.$(FASLEXT) strap-1/ARITY.$(FASLEXT) @@ -2629,6 +2635,46 @@ strap-1/HEADAST.$(FASLEXT): strap-0/PARAMAST.$(FASLEXT) strap-1/ITFORM.$(FASLEXT): strap-0/IRFORM.$(FASLEXT) strap-1/LINBASIS.$(FASLEXT): strap-0/DBASIS.$(FASLEXT) strap-1/FR2.$(FASLEXT): strap-0/COMPLEX.$(FASLEXT) +strap-1/SPADXPT.$(FASLEXT): strap-0/SASTCAT.$(FASLEXT) +strap-1/SPADAST.$(FASLEXT): strap-0/SPADXPT.$(FASLEXT) \ + strap-0/SPADXPT.$(FASLEXT) \ + strap-0/TYPEAST.$(FASLEXT) \ + strap-0/IMPTAST.$(FASLEXT) \ + strap-0/DEFAST.$(FASLEXT) \ + strap-0/MACROAST.$(FASLEXT) \ + strap-0/WHEREAST.$(FASLEXT) \ + strap-0/CATAST.$(FASLEXT) \ + strap-0/JOINAST.$(FASLEXT) \ + strap-0/CAPSLAST.$(FASLEXT) \ + strap-0/SIGAST.$(FASLEXT) \ + strap-0/ATTRAST.$(FASLEXT) \ + strap-0/MAPPAST.$(FASLEXT) \ + strap-0/IFAST.$(FASLEXT) \ + strap-0/RPTAST.$(FASLEXT) \ + strap-0/WHILEAST.$(FASLEXT) \ + strap-0/INAST.$(FASLEXT) \ + strap-0/STEPAST.$(FASLEXT) \ + strap-0/CLLCTAST.$(FASLEXT) \ + strap-0/LSTAST.$(FASLEXT) \ + strap-0/EXITAST.$(FASLEXT) \ + strap-0/RETAST.$(FASLEXT) \ + strap-0/CRCEAST.$(FASLEXT) \ + strap-0/PRTDAST.$(FASLEXT) \ + strap-0/RSTRCAST.$(FASLEXT) \ + strap-0/SEGAST.$(FASLEXT) \ + strap-0/SEQAST.$(FASLEXT) \ + strap-0/LETAST.$(FASLEXT) \ + strap-0/SUCHTAST.$(FASLEXT) \ + strap-0/COLONAST.$(FASLEXT) \ + strap-0/ADDAST.$(FASLEXT) \ + strap-0/CASEAST.$(FASLEXT) \ + strap-0/HASAST.$(FASLEXT) \ + strap-0/ISAST.$(FASLEXT) \ + strap-0/CATAST.$(FASLEXT) \ + strap-0/WHEREAST.$(FASLEXT) \ + strap-0/COMMAAST.$(FASLEXT) \ + strap-0/QQUTAST.$(FASLEXT) \ + strap-0/MACROAST.$(FASLEXT) # Bootstrap stage 2 dependencies. # At this stage we recompile everything from stage 1, including @@ -2699,7 +2745,8 @@ strap-2/MODULE.$(FASLEXT): strap-2/COMRING.$(FASLEXT) \ strap-2/BMODULE.$(FASLEXT) strap-2/LINSET.$(FASLEXT) strap-2/INTDOM.$(FASLEXT): strap-2/COMRING.$(FASLEXT) \ strap-2/ALGEBRA.$(FASLEXT) strap-2/ENTIRER.$(FASLEXT) \ - strap-1/FIELD.$(FASLEXT) + strap-1/FIELD.$(FASLEXT) \ + strap-1/GENEEZ.$(FASLEXT) strap-2/GCDDOM.$(FASLEXT): strap-2/INTDOM.$(FASLEXT) \ strap-1/LIST.$(FASLEXT) strap-1/SUP.$(FASLEXT) \ strap-1/LSAGG.$(FASLEXT) strap-1/PFECAT.$(FASLEXT) \ @@ -2741,6 +2788,7 @@ strap-2/REAL.$(FASLEXT): strap-2/KONVERT.$(FASLEXT) \ strap-2/CHARZ.$(FASLEXT): strap-2/RING.$(FASLEXT) strap-2/STEP.$(FASLEXT): strap-2/SETCAT.$(FASLEXT) strap-2/PATMAB.$(FASLEXT): strap-2/SETCAT.$(FASLEXT) +strap-2/PATRES.$(FASLEXT): strap-1/PATTERN1.$(FASLEXT) strap-2/UFD.$(FASLEXT): strap-2/GCDDOM.$(FASLEXT) \ strap-2/FR.$(FASLEXT) strap-1/BOOLEAN.$(FASLEXT) strap-2/INS.$(FASLEXT): strap-2/UFD.$(FASLEXT) strap-2/EUCDOM.$(FASLEXT) \ @@ -2925,7 +2973,7 @@ strap-2/SEX.$(FASLEXT): strap-2/SEXOF.$(FASLEXT) strap-2/OUTFORM.$(FASLEXT): strap-2/SETCAT.$(FASLEXT) \ strap-1/NUMFMT.$(FASLEXT) strap-1/VOID.$(FASLEXT) \ strap-1/DFLOAT.$(FASLEXT) strap-1/SYMBOL.$(FASLEXT) \ - strap-1/LIST.$(FASLEXT) + strap-1/LIST.$(FASLEXT) strap-1/NNI.$(FASLEXT) strap-2/SEXOF.$(FASLEXT): strap-2/SEXCAT.$(FASLEXT) strap-2/ANY.$(FASLEXT): strap-2/SETCAT.$(FASLEXT) \ strap-2/SEX.$(FASLEXT) strap-2/NONE.$(FASLEXT) @@ -3030,7 +3078,8 @@ strap-2/GALFACT.$(FASLEXT): strap-1/GALFACTU.$(FASLEXT) \ strap-1/GALPOLYU.$(FASLEXT) strap-1/MDDFACT.$(FASLEXT) \ strap-1/UPDECOMP.$(FASLEXT) strap-1/BRILL.$(FASLEXT) \ strap-1/CYCLOTOM.$(FASLEXT) strap-1/MSET.$(FASLEXT) \ - strap-1/GHENSEL.$(FASLEXT) + strap-1/GHENSEL.$(FASLEXT) \ + strap-1/IROOT.$(FASLEXT) strap-2/DFSFUN.$(FASLEXT): strap-1/COMPLEX.$(FASLEXT) \ strap-1/INTRET.$(FASLEXT) strap-1/MONOGEN.$(FASLEXT) \ @@ -3042,10 +3091,14 @@ strap-2/MULTFACT.$(FASLEXT): strap-1/MRATFAC.$(FASLEXT) \ strap-1/MPRFF.$(FASLEXT) strap-1/INNMFACT.$(FASLEXT) \ strap-1/GENUFACT.$(FASLEXT) -strap-2/MONOGEN.$(FASLEXT): strap-1/CPIMA.$(FASLEXT) +strap-2/MONOGEN.$(FASLEXT): strap-1/CPIMA.$(FASLEXT) \ + strap-1/FRAMALG.$(FASLEXT) \ + strap-1/FINRALG.$(FASLEXT) -strap-2/COMPCAT.$(FASLEXT): strap-1/CINTSLPE.$(FASLEXT) \ - strap-1/COMPLPAT.$(FASLEXT) strap-1/CPMATCH.$(FASLEXT) +strap-2/COMPCAT.$(FASLEXT): strap-2/MONOGEN.$(FASLEXT) \ + strap-1/CINTSLPE.$(FASLEXT) \ + strap-1/COMPLPAT.$(FASLEXT) \ + strap-1/CPMATCH.$(FASLEXT) strap-2/GENEEZ.$(FASLEXT): strap-1/EMR.$(FASLEXT) strap-2/MPRFF.$(FASLEXT): strap-1/MFINFACT.$(FASLEXT) strap-2/ACFS.$(FASLEXT): strap-2/ACF.$(FASLEXT) strap-1/FS.$(FASLEXT) @@ -3145,47 +3198,6 @@ strap-2/SPADAST.$(FASLEXT): strap-2/SASTCAT.$(FASLEXT) \ strap-2/MACROAST.$(FASLEXT) strap-2/DEFAST.$(FASLEXT): strap-1/HEADAST.$(FASLEXT) \ strap-1/SIG.$(FASLEXT) -strap-1/SPADAST.$(FASLEXT): strap-0/SPADXPT.$(FASLEXT) \ - strap-0/SPADXPT.$(FASLEXT) \ - strap-0/TYPEAST.$(FASLEXT) \ - strap-0/IMPTAST.$(FASLEXT) \ - strap-0/DEFAST.$(FASLEXT) \ - strap-0/MACROAST.$(FASLEXT) \ - strap-0/WHEREAST.$(FASLEXT) \ - strap-0/CATAST.$(FASLEXT) \ - strap-0/JOINAST.$(FASLEXT) \ - strap-0/CAPSLAST.$(FASLEXT) \ - strap-0/SIGAST.$(FASLEXT) \ - strap-0/ATTRAST.$(FASLEXT) \ - strap-0/MAPPAST.$(FASLEXT) \ - strap-0/IFAST.$(FASLEXT) \ - strap-0/RPTAST.$(FASLEXT) \ - strap-0/WHILEAST.$(FASLEXT) \ - strap-0/INAST.$(FASLEXT) \ - strap-0/STEPAST.$(FASLEXT) \ - strap-0/CLLCTAST.$(FASLEXT) \ - strap-0/LSTAST.$(FASLEXT) \ - strap-0/EXITAST.$(FASLEXT) \ - strap-0/RETAST.$(FASLEXT) \ - strap-0/CRCEAST.$(FASLEXT) \ - strap-0/PRTDAST.$(FASLEXT) \ - strap-0/RSTRCAST.$(FASLEXT) \ - strap-0/SEGAST.$(FASLEXT) \ - strap-0/SEQAST.$(FASLEXT) \ - strap-0/LETAST.$(FASLEXT) \ - strap-0/SUCHTAST.$(FASLEXT) \ - strap-0/COLONAST.$(FASLEXT) \ - strap-0/ADDAST.$(FASLEXT) \ - strap-0/CASEAST.$(FASLEXT) \ - strap-0/HASAST.$(FASLEXT) \ - strap-0/ISAST.$(FASLEXT) \ - strap-0/CATAST.$(FASLEXT) \ - strap-0/WHEREAST.$(FASLEXT) \ - strap-0/COMMAAST.$(FASLEXT) \ - strap-0/QQUTAST.$(FASLEXT) \ - strap-0/MACROAST.$(FASLEXT) - -strap-1/SPADXPT.$(FASLEXT): strap-0/SASTCAT.$(FASLEXT) strap-2/SASTCAT.$(FASLEXT): strap-2/HOMOTOP.$(FASLEXT) \ strap-1/ASTCAT.$(FASLEXT) strap-1/SYNTAX.$(FASLEXT) @@ -3194,6 +3206,7 @@ strap-2/TYPEAST.$(FASLEXT): strap-1/SPADAST.$(FASLEXT) strap-2/IRFORM.$(FASLEXT): strap-1/ITFORM.$(FASLEXT) strap-2/LINELT.$(FASLEXT): strap-1/LINBASIS.$(FASLEXT) strap-2/FR2.$(FASLEXT): strap-1/COMPLEX.$(FASLEXT) +strap-2/COMPLEX.$(FASLEXT): strap-2/COMPCAT.$(FASLEXT) # # @@ -3216,56 +3229,50 @@ strap-2/%.$(FASLEXT): %.spad initdb.$(FASLEXT) | strap-2 $(BOOTSTRAP) --strap=strap-1 --sysalg=strap-2 \ --output=$@ --optimize=3 $< -# +$(OUT)/VOID.$(FASLEXT): strap-2/KOERCE.$(FASLEXT) \ + strap-2/OUTFORM.$(FASLEXT) +$(OUT)/EXIT.$(FASLEXT): strap-2/SETCAT.$(FASLEXT) \ + strap-2/OUTFORM.$(FASLEXT) + $(OUT)/SINT.$(FASLEXT): $(OUT)/INT.$(FASLEXT) $(OUT)/NNI.$(FASLEXT): $(OUT)/INT.$(FASLEXT) $(OUT)/PI.$(FASLEXT): $(OUT)/NNI.$(FASLEXT) -$(OUT)/INT.$(FASLEXT): $(OUT)/INS.$(FASLEXT) \ - strap-2/SUP.$(FASLEXT) strap-2/STRING.$(FASLEXT) \ - strap-2/MATRIX.$(FASLEXT) strap-2/VECTOR.$(FASLEXT) \ - strap-2/FR.$(FASLEXT) strap-2/INTSLPE.$(FASLEXT) \ - strap-2/UPSQFREE.$(FASLEXT) strap-2/GALFACT.$(FASLEXT) \ - strap-2/FRUTIL.$(FASLEXT) strap-2/FR2.$(FASLEXT) \ - strap-2/HEUGCD.$(FASLEXT) - -$(OUT)/BINOPC.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) - -$(OUT)/IEVALAB.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) \ +$(OUT)/INT.$(FASLEXT): strap-2/INT.$(FASLEXT) \ + strap-2/INFORM.$(FASLEXT) \ + strap-2/UPSQFREE.$(FASLEXT) \ + strap-2/GALFACT.$(FASLEXT) \ + strap-2/FR2.$(FASLEXT) \ + strap-2/FRUTIL.$(FASLEXT) \ + strap-2/HEUGCD.$(FASLEXT) \ + strap-2/PATRES.$(FASLEXT) \ + strap-2/PATTERN.$(FASLEXT) +$(OUT)/BOOLEAN.$(FASLEXT): strap-2/BOOLEAN.$(FASLEXT) \ + strap-2/PI.$(FASLEXT) \ + strap-2/INFORM.$(FASLEXT) +$(OUT)/DFOAT.$(FASLEXT): strap-2/FPS.$(FASLEXT) \ + strap-2/DFLOAT.$(FASLEXT) +$(OUT)/LIST.$(FASLEXT): strap-2/LSAGG.$(FASLEXT) \ strap-2/LIST.$(FASLEXT) - -$(OUT)/EVALAB.$(FASLEXT): $(OUT)/IEVALAB.$(FASLEXT) \ - strap-2/EQ.$(FASLEXT) strap-2/LIST.$(FASLEXT) - -$(OUT)/ELTAB.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) - -$(OUT)/SETCAT.$(FASLEXT): $(OUT)/BASTYPE.$(FASLEXT) \ +$(OUT)/SYMBOL.$(FASLEXT): strap-2/SYMBOL.$(FASLEXT) \ + strap-2/PMSYM.$(FASLEXT) \ + strap-2/UNISEG.$(FASLEXT) + +$(OUT)/STRING.$(FASLEXT): strap-2/STAGG.$(FASLEXT) \ + strap-2/STRING.$(FASLEXT) \ + strap-2/EQ.$(FASLEXT) +$(OUT)/IDENT.$(FASLEXT): strap-2/IDENT.$(FASLEXT) +$(OUT)/MAYBE.$(FASLEXT): $(OUT)/UTYPE.$(FASLEXT) \ + strap-2/KOERCE.$(FASLEXT) \ strap-2/OUTFORM.$(FASLEXT) \ - strap-2/SINT.$(FASLEXT) strap-2/STRING.$(FASLEXT) - -$(OUT)/UTYPE.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) -$(OUT)/AHYP.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) -$(OUT)/PRIMCAT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) -$(OUT)/ATTREG.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) -$(OUT)/CONDUIT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) -$(OUT)/CFCAT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) + strap-2/RETRACT.$(FASLEXT) -$(OUT)/SEGCAT.$(FASLEXT): $(OUT)/KRCFROM.$(FASLEXT) +$(OUT)/IEVALAB.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) -$(OUT)/KOERCE.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) -$(OUT)/KRCFROM.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) - -$(OUT)/KONVERT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) -$(OUT)/KVTFROM.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) - -$(OUT)/RETRACT.$(FASLEXT): $(OUT)/KRCFROM.$(FASLEXT) - -$(OUT)/BASTYPE.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) \ - strap-2/BOOLEAN.$(FASLEXT) - -$(OUT)/SETCAT.$(FASLEXT): $(OUT)/BASTYPE.$(FASLEXT) +$(OUT)/EVALAB.$(FASLEXT): $(OUT)/IEVALAB.$(FASLEXT) \ + strap-2/EQ.$(FASLEXT) -$(OUT)/FINITE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) \ - strap-2/NNI.$(FASLEXT) strap-2/PI.$(FASLEXT) +$(OUT)/SETCAT.$(FASLEXT): strap-2/OUTFORM.$(FASLEXT) +$(OUT)/FINITE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/ORDSET.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) \ $(OUT)/ORDTYPE.$(FASLEXT) @@ -3275,13 +3282,12 @@ $(OUT)/PATMAB.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/REAL.$(FASLEXT): $(OUT)/KONVERT.$(FASLEXT) \ strap-2/FLOAT.$(FASLEXT) -$(OUT)/LOGIC.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) -$(OUT)/BOOLE.$(FASLEXT): $(OUT)/LOGIC.$(FASLEXT) - $(OUT)/SGROUP.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) \ - strap-2/PI.$(FASLEXT) strap-2/REPSQ.$(FASLEXT) + strap-2/REPSQ.$(FASLEXT) + +$(OUT)/ABELSG.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) \ + strap-2/REPDB.$(FASLEXT) -$(OUT)/ABELSG.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/LMODULE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) \ $(OUT)/LLINSET.$(FASLEXT) $(OUT)/SGROUP.$(FASLEXT) $(OUT)/RMODULE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/RLINSET.$(FASLEXT) @@ -3304,42 +3310,22 @@ $(OUT)/LINSET.$(FASLEXT): $(OUT)/LLINSET.$(FASLEXT) $(OUT)/RLINSET.$(FASLEXT) $(OUT)/CTORKIND.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/IOMODE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) -$(OUT)/PRINT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) -$(OUT)/RTVALUE.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) $(OUT)/SYSPTR.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) -$(OUT)/DIFFDOM.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) -$(OUT)/DIFFSPC.$(FASLEXT): $(OUT)/DIFFDOM.$(FASLEXT) \ - strap-2/PI.$(FASLEXT) +$(OUT)/DIFFSPC.$(FASLEXT): $(OUT)/DIFFDOM.$(FASLEXT) $(OUT)/DIFFMOD.$(FASLEXT): $(OUT)/DIFFSPC.$(FASLEXT) -$(OUT)/PDDOM.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) $(OUT)/PDSPC.$(FASLEXT): $(OUT)/PDDOM.$(FASLEXT) -$(OUT)/DSEXT.$(FASLEXT): $(OUT)/DIFFSPC.$(FASLEXT) $(OUT)/PDSPC.$(FASLEXT) \ - strap-2/SYMBOL.$(FASLEXT) -$(OUT)/ORDTYPE.$(FASLEXT): $(OUT)/BASTYPE.$(FASLEXT) +$(OUT)/DSEXT.$(FASLEXT): $(OUT)/DIFFSPC.$(FASLEXT) $(OUT)/PDSPC.$(FASLEXT) $(OUT)/ORDSTRCT.$(FASLEXT): $(OUT)/ORDTYPE.$(FASLEXT) $(OUT)/HOMOTOP.$(FASLEXT) -$(OUT)/BINOP.$(FASLEXT): $(OUT)/BINOPC.$(FASLEXT) $(OUT)/SETCAT.$(FASLEXT) -$(OUT)/IDEMOPC.$(FASLEXT): $(OUT)/BINOPC.$(FASLEXT) $(OUT)/BASTYPE.$(FASLEXT) -$(OUT)/SGPOPC.$(FASLEXT): $(OUT)/BINOPC.$(FASLEXT) $(OUT)/BASTYPE.$(FASLEXT) -$(OUT)/SGPOP.$(FASLEXT): $(OUT)/SGPOPC.$(FASLEXT) $(OUT)/SETCAT.$(FASLEXT) \ - $(OUT)/BINOP.$(FASLEXT) $(OUT)/MONOPC.$(FASLEXT): $(OUT)/SGPOPC.$(FASLEXT) -$(OUT)/FUNCTOR.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) - -$(OUT)/REPSQ.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) \ - strap-2/PI.$(FASLEXT) -$(OUT)/REPDB.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) \ - strap-2/PI.$(FASLEXT) - -$(OUT)/ABELSG.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) \ - $(OUT)/REPDB.$(FASLEXT) +$(OUT)/REPSQ.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) +$(OUT)/REPDB.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/FEVALAB.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) \ $(OUT)/ELTAB.$(FASLEXT) $(OUT)/EVALAB.$(FASLEXT) \ - $(OUT)/IEVALAB.$(FASLEXT) strap-2/EQ.$(FASLEXT) \ - strap-2/LIST.$(FASLEXT) strap-2/SYMBOL.$(FASLEXT) + $(OUT)/IEVALAB.$(FASLEXT) strap-2/EQ.$(FASLEXT) $(OUT)/INS.$(FASLEXT): $(OUT)/UFD.$(FASLEXT) $(OUT)/EUCDOM.$(FASLEXT) \ $(OUT)/OINTDOM.$(FASLEXT) $(OUT)/DIFRING.$(FASLEXT) \ @@ -3348,10 +3334,9 @@ $(OUT)/INS.$(FASLEXT): $(OUT)/UFD.$(FASLEXT) $(OUT)/EUCDOM.$(FASLEXT) \ $(OUT)/REAL.$(FASLEXT) $(OUT)/CHARZ.$(FASLEXT) \ $(OUT)/STEP.$(FASLEXT) $(OUT)/PATMAB.$(FASLEXT) \ $(OUT)/FEVALAB.$(FASLEXT) strap-2/FRAC.$(FASLEXT) \ - strap-2/FLOAT.$(FASLEXT) strap-2/DFLOAT.$(FASLEXT) \ + strap-2/FLOAT.$(FASLEXT) \ strap-2/INFORM.$(FASLEXT) strap-2/SEXCAT.$(FASLEXT) \ - strap-2/PATTERN.$(FASLEXT) strap-2/PI.$(FASLEXT) \ - strap-2/NNI.$(FASLEXT) strap-2/INTFACT.$(FASLEXT) \ + strap-2/PATTERN.$(FASLEXT) strap-2/INTFACT.$(FASLEXT) \ strap-2/PRIMES.$(FASLEXT) strap-2/COMBINAT.$(FASLEXT) \ strap-2/PATRES.$(FASLEXT) strap-2/PMINS.$(FASLEXT) @@ -3367,9 +3352,7 @@ $(OUT)/MONOID.$(FASLEXT): $(OUT)/SGROUP.$(FASLEXT) $(OUT)/ABELGRP.$(FASLEXT): $(OUT)/CABMON.$(FASLEXT) $(OUT)/LLINSET.$(FASLEXT) $(OUT)/CABMON.$(FASLEXT): $(OUT)/ABELMON.$(FASLEXT) - -$(OUT)/ABELMON.$(FASLEXT): $(OUT)/ABELSG.$(FASLEXT) \ - $(OUT)/REPSQ.$(FASLEXT) +$(OUT)/ABELMON.$(FASLEXT): $(OUT)/ABELSG.$(FASLEXT) $(OUT)/FIELD.$(FASLEXT): $(OUT)/EUCDOM.$(FASLEXT) $(OUT)/UFD.$(FASLEXT) \ $(OUT)/DIVRING.$(FASLEXT) strap-2/FR.$(FASLEXT) @@ -3379,7 +3362,7 @@ $(OUT)/PID.$(FASLEXT): $(OUT)/GCDDOM.$(FASLEXT) $(OUT)/DIVRING.$(FASLEXT): $(OUT)/ENTIRER.$(FASLEXT) \ $(OUT)/ALGEBRA.$(FASLEXT) $(OUT)/REPSQ.$(FASLEXT) \ - strap-2/PI.$(FASLEXT) strap-2/FRAC.$(FASLEXT) + strap-2/FRAC.$(FASLEXT) $(OUT)/ORDRING.$(FASLEXT): $(OUT)/OAGROUP.$(FASLEXT) $(OUT)/CHARZ.$(FASLEXT) \ $(OUT)/MONOID.$(FASLEXT) @@ -3389,12 +3372,10 @@ $(OUT)/ENTIRER.$(FASLEXT): $(OUT)/RING.$(FASLEXT) $(OUT)/BMODULE.$(FASLEXT) $(OUT)/INTDOM.$(FASLEXT): $(OUT)/COMRING.$(FASLEXT) $(OUT)/ALGEBRA.$(FASLEXT) \ $(OUT)/ENTIRER.$(FASLEXT) strap-2/FIELD.$(FASLEXT) $(OUT)/OINTDOM.$(FASLEXT): $(OUT)/INTDOM.$(FASLEXT) $(OUT)/ORDRING.$(FASLEXT) -$(OUT)/GCDDOM.$(FASLEXT): $(OUT)/INTDOM.$(FASLEXT) \ - strap-2/LIST.$(FASLEXT) +$(OUT)/GCDDOM.$(FASLEXT): $(OUT)/INTDOM.$(FASLEXT) $(OUT)/UFD.$(FASLEXT): $(OUT)/GCDDOM.$(FASLEXT) strap-2/ES.$(FASLEXT) $(OUT)/ES.$(FASLEXT): $(OUT)/RING.$(FASLEXT) $(OUT)/CACHSET.$(FASLEXT) \ - $(OUT)/PATAB.$(FASLEXT) strap-2/IDENT.$(FASLEXT) \ - $(OUT)/MAYBE.$(FASLEXT) strap-2/PRIMARR.$(FASLEXT) \ + $(OUT)/PATAB.$(FASLEXT) strap-2/PRIMARR.$(FASLEXT) \ strap-2/REF.$(FASLEXT) strap-2/ALIST.$(FASLEXT) \ strap-2/NONE.$(FASLEXT) strap-2/KERNEL.$(FASLEXT) \ strap-2/COMMONOP.$(FASLEXT) strap-2/SYMBOL.$(FASLEXT) \ @@ -3412,13 +3393,11 @@ $(OUT)/DMEXT.$(FASLEXT): $(OUT)/DSEXT.$(FASLEXT) $(OUT)/DIFFMOD.$(FASLEXT) \ $(OUT)/PATAB.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) \ strap-2/PATTERN.$(FASLEXT) -$(OUT)/GROUP.$(FASLEXT): $(OUT)/MONOID.$(FASLEXT) $(OUT)/REPSQ.$(FASLEXT) \ - strap-2/PI.$(FASLEXT) strap-2/INT.$(FASLEXT) +$(OUT)/GROUP.$(FASLEXT): $(OUT)/MONOID.$(FASLEXT) $(OUT)/REPSQ.$(FASLEXT) $(OUT)/ORDFIN.$(FASLEXT): $(OUT)/ORDSET.$(FASLEXT) $(OUT)/FINITE.$(FASLEXT) -$(OUT)/RADCAT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) \ - strap-2/FRAC.$(FASLEXT) strap-2/INT.$(FASLEXT) +$(OUT)/RADCAT.$(FASLEXT): strap-2/FRAC.$(FASLEXT) $(OUT)/OSGROUP.$(FASLEXT): $(OUT)/ORDSET.$(FASLEXT) $(OUT)/SGROUP.$(FASLEXT) @@ -3435,7 +3414,7 @@ $(OUT)/POLYCAT.$(FASLEXT): $(OUT)/PDRING.$(FASLEXT) \ $(OUT)/FAMR.$(FASLEXT) $(OUT)/EVALAB.$(FASLEXT) \ $(OUT)/RETRACT.$(FASLEXT) $(OUT)/FLINEXP.$(FASLEXT) \ strap-2/VECTOR.$(FASLEXT) strap-2/MATRIX.$(FASLEXT) \ - strap-2/LIST.$(FASLEXT) strap-2/SUP.$(FASLEXT) \ + strap-2/SUP.$(FASLEXT) \ strap-2/INFORM.$(FASLEXT) strap-2/GENPGCD.$(FASLEXT) \ strap-2/PFBR.$(FASLEXT) strap-2/MULTSQFR.$(FASLEXT) \ strap-2/PSQFR.$(FASLEXT) strap-2/PMPLCAT.$(FASLEXT) \ @@ -3467,55 +3446,32 @@ $(OUT)/AMR.$(FASLEXT): $(OUT)/RING.$(FASLEXT) $(OUT)/OAMON.$(FASLEXT) \ $(OUT)/CHARNZ.$(FASLEXT) $(OUT)/INTDOM.$(FASLEXT) $(OUT)/FRETRCT.$(FASLEXT): $(OUT)/RETRACT.$(FASLEXT) \ - strap-2/INT.$(FASLEXT) strap-2/FRAC.$(FASLEXT) + strap-2/FRAC.$(FASLEXT) $(OUT)/FLINEXP.$(FASLEXT): $(OUT)/LINEXP.$(FASLEXT) \ strap-2/MATRIX.$(FASLEXT) $(OUT)/FPATMAB.$(FASLEXT): $(OUT)/PATMAB.$(FASLEXT) -$(OUT)/DIFFSPC.$(FASLEXT): $(OUT)/DIFFDOM.$(FASLEXT) \ - strap-2/NNI.$(FASLEXT) +$(OUT)/DIFFSPC.$(FASLEXT): $(OUT)/DIFFDOM.$(FASLEXT) -$(OUT)/PDSPC.$(FASLEXT): $(OUT)/PDDOM.$(FASLEXT) \ - strap-2/NNI.$(FASLEXT) - -$(OUT)/DFLOAT.$(FASLEXT): $(OUT)/FPS.$(FASLEXT) \ - $(OUT)/DIFRING.$(FASLEXT) $(OUT)/TRANFUN.$(FASLEXT) \ - $(OUT)/KONVERT.$(FASLEXT) \ - strap-2/DFSFUN.$(FASLEXT) +$(OUT)/PDSPC.$(FASLEXT): $(OUT)/PDDOM.$(FASLEXT) $(OUT)/TRANFUN.$(FASLEXT): $(OUT)/RING.$(FASLEXT) $(OUT)/FIELD.$(FASLEXT) \ strap-2/TRIGCAT.$(FASLEXT) \ strap-2/ATRIG.$(FASLEXT) strap-2/HYPCAT.$(FASLEXT) \ strap-2/AHYP.$(FASLEXT) strap-2/ELEMFUN.$(FASLEXT) -$(OUT)/SYMBOL.$(FASLEXT): $(OUT)/ORDSET.$(FASLEXT) \ - $(OUT)/KONVERT.$(FASLEXT) $(OUT)/KRCFROM.$(FASLEXT) \ - $(OUT)/RETRACT.$(FASLEXT) $(OUT)/KONVERT.$(FASLEXT) \ - $(OUT)/PATMAB.$(FASLEXT) strap-2/VOID.$(FASLEXT) \ - strap-2/BOOLEAN.$(FASLEXT) strap-2/ALIST.$(FASLEXT) \ - strap-2/PRIMARR.$(FASLEXT) strap-2/REF.$(FASLEXT) \ - strap-2/STRING.$(FASLEXT) strap-2/PMSYM.$(FASLEXT) - -$(OUT)/COMOPC.$(FASLEXT): $(OUT)/BINOPC.$(FASLEXT) - -$(OUT)/COMOP.$(FASLEXT): $(OUT)/COMOPC.$(FASLEXT) $(OUT)/KOERCE.$(FASLEXT) - # FIXME: $(OUT)/ES.$(FASLEXT): strap-2/INFORM.$(FASLEXT) -$(OUT)/VOID.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) $(OUT)/HOMOTOP.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) $(OUT)/KRCFROM.$(FASLEXT) $(OUT)/ITUPLE.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) $(OUT)/STREAM.$(FASLEXT) $(OUT)/PPCURVE.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) $(OUT)/PSCURVE.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) -$(OUT)/PROPLOG.$(FASLEXT): $(OUT)/BOOLE.$(FASLEXT) $(OUT)/SETCAT.$(FASLEXT) - $(OUT)/BYTEORD.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) -$(OUT)/PROPERTY.$(FASLEXT): $(OUT)/IDENT.$(FASLEXT) $(OUT)/PAIR.$(FASLEXT) $(OUT)/BINDING.$(FASLEXT): $(OUT)/PROPERTY.$(FASLEXT) $(OUT)/OPERCAT.$(FASLEXT): $(OUT)/ARITY.$(FASLEXT) $(OUT)/STREAM.$(FASLEXT): $(OUT)/LZSTAGG.$(FASLEXT) \ @@ -3523,12 +3479,9 @@ $(OUT)/STREAM.$(FASLEXT): $(OUT)/LZSTAGG.$(FASLEXT) \ $(OUT)/LZSTAGG.$(FASLEXT): $(OUT)/STAGG.$(FASLEXT) \ strap-2/CSTTOOLS.$(FASLEXT) -$(OUT)/MONOP.$(FASLEXT): $(OUT)/MONOPC.$(FASLEXT) $(OUT)/PAIR.$(FASLEXT) \ +$(OUT)/MONOP.$(FASLEXT): $(OUT)/MONOPC.$(FASLEXT) \ $(OUT)/SETCAT.$(FASLEXT) -$(OUT)/IDPT.$(FASLEXT): $(OUT)/PAIR.$(FASLEXT) - -$(OUT)/AGG.$(FASLEXT): $(OUT)/BOOLE.$(FASLEXT) $(OUT)/ELTAGG.$(FASLEXT): $(OUT)/AGG.$(FASLEXT) $(OUT)/SETCAT.$(FASLEXT) $(OUT)/IXAGG.$(FASLEXT): $(OUT)/ELTAGG.$(FASLEXT) $(OUT)/EVALAB.$(FASLEXT) $(OUT)/RCAGG.$(FASLEXT): $(OUT)/EVALAB.$(FASLEXT) $(OUT)/SETCAT.$(FASLEXT) \ @@ -3546,7 +3499,7 @@ $(OUT)/FLAGG.$(FASLEXT): $(OUT)/BMODULE.$(FASLEXT) $(OUT)/PID.$(FASLEXT) \ $(OUT)/REAL.$(FASLEXT) $(OUT)/CHARZ.$(FASLEXT) \ $(OUT)/DIFFSPC.$(FASLEXT) $(OUT)/FINAGG.$(FASLEXT) $(OUT)/A1AGG.$(FASLEXT): $(OUT)/FLAGG.$(FASLEXT) $(OUT)/SMAGG.$(FASLEXT) \ - strap-2/BOOLEAN.$(FASLEXT) strap-2/UNISEG.$(FASLEXT) \ + strap-2/UNISEG.$(FASLEXT) \ $(OUT)/ORDSET.$(FASLEXT) $(OUT)/SRAGG.$(FASLEXT): $(OUT)/A1AGG.$(FASLEXT) $(OUT)/STAGG.$(FASLEXT): $(OUT)/URAGG.$(FASLEXT) $(OUT)/LNAGG.$(FASLEXT) @@ -3557,9 +3510,8 @@ $(OUT)/DIAGG.$(FASLEXT): $(OUT)/DIOPS.$(FASLEXT) $(OUT)/KDAGG.$(FASLEXT): $(OUT)/DIAGG.$(FASLEXT) $(OUT)/IXAGG.$(FASLEXT) $(OUT)/TBAGG.$(FASLEXT): $(OUT)/KDAGG.$(FASLEXT) $(OUT)/ALAGG.$(FASLEXT): $(OUT)/TBAGG.$(FASLEXT) -$(OUT)/LIST.$(FASLEXT): $(OUT)/LSAGG.$(FASLEXT) $(OUT)/REF.$(FASLEXT) \ - $(OUT)/ALIST.$(FASLEXT) $(OUT)/PRIMARR.$(FASLEXT) -$(OUT)/HOAGG.$(FASLEXT): $(OUT)/FUNCTOR.$(FASLEXT) +$(OUT)/HOAGG.$(FASLEXT): $(OUT)/FUNCTOR.$(FASLEXT) \ + strap-2/EQ.$(FASLEXT) $(OUT)/SMAGG.$(FASLEXT): $(OUT)/HOAGG.$(FASLEXT) $(OUT)/FINAGG.$(FASLEXT): $(OUT)/HOAGG.$(FASLEXT) $(OUT)/ELAGG.$(FASLEXT): $(OUT)/SMAGG.$(FASLEXT) strap-2/UNISEG.$(FASLEXT) @@ -3567,8 +3519,6 @@ $(OUT)/CLAGG.$(FASLEXT): $(OUT)/HOAGG.$(FASLEXT) $(OUT)/FSAGG.$(FASLEXT): $(OUT)/FINAGG.$(FASLEXT) $(OUT)/ALIST.$(FASLEXT): $(OUT)/ALAGG.$(FASLEXT) -$(OUT)/STRING.$(FASLEXT): $(OUT)/SRAGG.$(FASLEXT) $(OUT)/ORDFIN.$(FASLEXT) - $(OUT)/SEXCAT.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/PID.$(FASLEXT) \ $(OUT)/OAGROUP.$(FASLEXT) $(OUT)/LINEXP.$(FASLEXT) \ $(OUT)/PATMAB.$(FASLEXT) $(OUT)/REAL.$(FASLEXT) \ @@ -3578,7 +3528,7 @@ $(OUT)/SEXCAT.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/PID.$(FASLEXT) \ $(OUT)/MSETAGG.$(FASLEXT): $(OUT)/MDAGG.$(FASLEXT) $(OUT)/SETAGG.$(FASLEXT) $(OUT)/MDAGG.$(FASLEXT): $(OUT)/DIOPS.$(FASLEXT) -$(OUT)/REF.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/IDENT.$(FASLEXT) +$(OUT)/REF.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/OUTFORM.$(FASLEXT): strap-2/NUMFMT.$(FASLEXT) $(OUT)/FLAGG.$(FASLEXT): strap-2/FLASORT.$(FASLEXT) -- cgit v1.2.3