diff options
-rw-r--r-- | src/algebra/Makefile.am | 313 | ||||
-rw-r--r-- | src/algebra/Makefile.in | 312 |
2 files changed, 362 insertions, 263 deletions
diff --git a/src/algebra/Makefile.am b/src/algebra/Makefile.am index 0fe12f6d..07c1575e 100644 --- a/src/algebra/Makefile.am +++ b/src/algebra/Makefile.am @@ -374,6 +374,8 @@ strap-0/SYMBOL.$(FASLEXT): strap-0/ORDSET.$(FASLEXT) strap-0/BOP.$(FASLEXT): strap-0/ORDSET.$(FASLEXT) strap-0/OPERCAT.$(FASLEXT) +strap-0/ALIST.$(FASLEXT): strap-0/SETCAT.$(FASLEXT) strap-0/ALAGG.$(FASLEXT) + # Bootstrap stage 1 dependencies. # At this stage, we attempt to compile domains essential for completing # the bootstrap process (stage 2). Those that were compiled at stage 0 @@ -815,6 +817,12 @@ strap-1/STREAM.$(FASLEXT): strap-1/LZSTAGG.$(FASLEXT) strap-1/SMAGG.$(FASLEXT) strap-1/LZSTAGG.$(FASLEXT): strap-1/STAGG.$(FASLEXT) +strap-1/BOP.$(FASLEXT): strap-1/ORDSET.$(FASLEXT) strap-1/OPERCAT.$(FASLEXT) \ + strap-0/SYMBOL.$(FASLEXT) strap-0/NNI.$(FASLEXT) \ + strap-0/BOOLEAN.$(FASLEXT) strap-0/MAYBE.$(FASLEXT) \ + strap-0/LIST.$(FASLEXT) strap-0/ALIST.$(FASLEXT) \ + strap-0/OUTFORM.$(FASLEXT) strap-0/INFORM.$(FASLEXT) + # Bootstrap stage 2 dependencies. # At this stage we recompile everything from stage 1, including # a few more domains. @@ -829,7 +837,8 @@ strap-2/FRETRCT.$(FASLEXT): strap-2/RETRACT.$(FASLEXT) strap-1/INS.$(FASLEXT) strap-2/SETCAT.$(FASLEXT): strap-2/BASTYPE.$(FASLEXT) \ strap-2/KOERCE.$(FASLEXT) strap-1/SINT.$(FASLEXT) \ strap-1/STRING.$(FASLEXT) -strap-2/FINITE.$(FASLEXT): strap-2/SETCAT.$(FASLEXT) +strap-2/FINITE.$(FASLEXT): strap-2/SETCAT.$(FASLEXT) \ + strap-1/PI.$(FASLEXT) strap-1/NNI.$(FASLEXT) strap-2/ORDTYPE.$(FASLEXT): strap-2/BASTYPE.$(FASLEXT) strap-2/ORDSET.$(FASLEXT): strap-2/SETCAT.$(FASLEXT) \ strap-2/ORDTYPE.$(FASLEXT) @@ -1139,6 +1148,10 @@ strap-2/UNISEG.$(FASLEXT): strap-2/SEGCAT.$(FASLEXT) \ strap-2/SEGXCAT.$(FASLEXT) strap-2/ORDSET.$(FASLEXT) \ strap-2/SETCAT.$(FASLEXT) strap-1/STREAM.$(FASLEXT) +strap-2/PATTERN.$(FASLEXT): strap-2/SETCAT.$(FASLEXT) \ + strap-2/RETRACT.$(FASLEXT) strap-1/BOP.$(FASLEXT) \ + strap-1/NNI.$(FASLEXT) strap-1/ABELMON.$(FASLEXT) + # # @@ -1292,28 +1305,25 @@ SPADFILES= \ TESTS=$(INPUT)/INTHEORY.input $(INPUT)/VIEW2D.input $(INPUT)/TESTFR.input -# The root of the category hierarchy is the Type category. -# We require the basic integer domains are available at stage 2 of -# bootstrap. This sets in motion -# the buils of several other domains and categories as needed -# to ignite the algebra build. We require Category only because -# we would like not to have too many special cases for it. -oa_strap_ctors = \ - INT SINT NNI PI \ - LIST EQ -oa_strap_modules = $(patsubst %,strap-2/%.$(FASLEXT),$(oa_strap_ctors)) - -$(oa_algebra_layer_0_objects): $(oa_strap_modules) - +# $(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) + +$(OUT)/IEVALAB.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) \ + strap-2/LIST.$(FASLEXT) + +$(OUT)/EVALAB.$(FASLEXT): $(OUT)/IEVALAB.$(FASLEXT) \ + strap-2/EQ.$(FASLEXT) strap-2/LIST.$(FASLEXT) -$(OUT)/IEVALAB.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) -$(OUT)/EVALAB.$(FASLEXT): $(OUT)/IEVALAB.$(FASLEXT) $(OUT)/ELTAB.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) -$(OUT)/SETCAT.$(FASLEXT): $(OUT)/BASTYPE.$(FASLEXT) +$(OUT)/SETCAT.$(FASLEXT): $(OUT)/BASTYPE.$(FASLEXT) \ + strap-2/SINT.$(FASLEXT) strap-2/STRING.$(FASLEXT) $(OUT)/UTYPE.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) $(OUT)/AHYP.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) @@ -1322,41 +1332,7 @@ $(OUT)/ATTREG.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) $(OUT)/CONDUIT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) $(OUT)/CFCAT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) -$(OUT)/AGG.$(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) \ - $(OUT)/AGG.$(FASLEXT) -$(OUT)/QUAGG.$(FASLEXT): $(OUT)/BGAGG.$(FASLEXT) $(OUT)/FINAGG.$(FASLEXT) -$(OUT)/SKAGG.$(FASLEXT): $(OUT)/BGAGG.$(FASLEXT) $(OUT)/FINAGG.$(FASLEXT) -$(OUT)/DQAGG.$(FASLEXT): $(OUT)/QUAGG.$(FASLEXT) $(OUT)/SKAGG.$(FASLEXT) -$(OUT)/PRQAGG.$(FASLEXT): $(OUT)/BGAGG.$(FASLEXT) $(OUT)/FINAGG.$(FASLEXT) -#$(OUT)/DLAGG.$(FASLEXT): $(OUT)/RCAGG.$(FASLEXT) -#$(OUT)/URAGG.$(FASLEXT): $(OUT)/RCAGG.$(FASLEXT) -#$(OUT)/BRAGG.$(FASLEXT): $(OUT)/RCAGG.$(FASLEXT) -$(OUT)/FLAGG.$(FASLEXT): $(OUT)/BMODULE.$(FASLEXT) $(OUT)/PID.$(FASLEXT) \ - $(OUT)/OAGROUP.$(FASLEXT) $(OUT)/RETRACT.$(FASLEXT) \ - $(OUT)/LINEXP.$(FASLEXT) $(OUT)/PATMAB.$(FASLEXT) \ - $(OUT)/REAL.$(FASLEXT) $(OUT)/CHARZ.$(FASLEXT) \ - $(OUT)/DIFFSPC.$(FASLEXT) $(OUT)/FINAGG.$(FASLEXT) -$(OUT)/A1AGG.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/BOOLE-.$(FASLEXT) \ - $(OUT)/FLAGG.$(FASLEXT) $(OUT)/LOGIC-.$(FASLEXT) \ - $(OUT)/ORDTYPE-.$(FASLEXT) $(OUT)/SMAGG.$(FASLEXT) -$(OUT)/SRAGG.$(FASLEXT): $(OUT)/A1AGG.$(FASLEXT) -$(OUT)/STAGG.$(FASLEXT): $(OUT)/URAGG.$(FASLEXT) $(OUT)/LNAGG.$(FASLEXT) -$(OUT)/LNAGG.$(FASLEXT): $(OUT)/SEGCAT.$(FASLEXT) $(OUT)/SEGCAT.$(FASLEXT): $(OUT)/KRCFROM.$(FASLEXT) -$(OUT)/SETAGG.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/CLAGG.$(FASLEXT) -$(OUT)/STRING.$(FASLEXT): $(OUT)/SRAGG.$(FASLEXT) $(OUT)/ORDFIN.$(FASLEXT) -$(OUT)/DIOPS.$(FASLEXT): $(OUT)/STRING.$(FASLEXT) -$(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)/MSYSCMD.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) $(OUT)/KOERCE.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) $(OUT)/KRCFROM.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) @@ -1366,19 +1342,17 @@ $(OUT)/KVTFROM.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) $(OUT)/RETRACT.$(FASLEXT): $(OUT)/KRCFROM.$(FASLEXT) -$(OUT)/BASTYPE.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) +$(OUT)/BASTYPE.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) \ + strap-2/BOOLEAN.$(FASLEXT) + $(OUT)/SETCAT.$(FASLEXT) $(OUT)/SETCAT-.$(FASLEXT): $(OUT)/BASTYPE.$(FASLEXT) -$(OUT)/FINITE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) +$(OUT)/FINITE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) \ + strap-2/NNI.$(FASLEXT) strap-2/PI.$(FASLEXT) + $(OUT)/ORDSET.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) \ $(OUT)/ORDTYPE.$(FASLEXT) $(OUT)/FILECAT.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) -$(OUT)/SEXCAT.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/PID.$(FASLEXT) \ - $(OUT)/OAGROUP.$(FASLEXT) $(OUT)/LINEXP.$(FASLEXT) \ - $(OUT)/PATMAB.$(FASLEXT) $(OUT)/REAL.$(FASLEXT) \ - $(OUT)/CHARZ.$(FASLEXT) $(OUT)/AGG.$(FASLEXT) \ - $(OUT)/IXAGG.$(FASLEXT) $(OUT)/FLAGG.$(FASLEXT) \ - $(OUT)/ELAGG.$(FASLEXT) $(OUT)/STEP.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/PATMAB.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/REAL.$(FASLEXT): $(OUT)/KONVERT.$(FASLEXT) @@ -1434,47 +1408,58 @@ $(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)/FSAGG.$(FASLEXT): $(OUT)/FINAGG.$(FASLEXT) $(OUT)/FUNCTOR.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) -$(OUT)/HOAGG.$(FASLEXT): $(OUT)/FUNCTOR.$(FASLEXT) -$(OUT)/SMAGG.$(FASLEXT): $(OUT)/HOAGG.$(FASLEXT) -$(OUT)/FINAGG.$(FASLEXT): $(OUT)/HOAGG.$(FASLEXT) -$(OUT)/ELAGG.$(FASLEXT): $(OUT)/SMAGG.$(FASLEXT) strap-2/UNISEG.$(FASLEXT) -$(OUT)/CLAGG.$(FASLEXT): $(OUT)/HOAGG.$(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)/INS.$(FASLEXT): $(OUT)/UFD.$(FASLEXT) $(OUT)/EUCDOM.$(FASLEXT) \ + $(OUT)/OINTDOM.$(FASLEXT) $(OUT)/DIFRING.$(FASLEXT) \ + $(OUT)/KONVERT.$(FASLEXT) $(OUT)/RETRACT.$(FASLEXT) \ + $(OUT)/LINEXP.$(FASLEXT) $(OUT)/CFCAT.$(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/INFORM.$(FASLEXT) strap-2/SEXCAT.$(FASLEXT) \ + strap-2/PATTERN.$(FASLEXT) strap-2/PI.$(FASLEXT) \ + strap-2/NNI.$(FASLEXT) oa_algebra_layer_0 = \ - AHYP ATTREG CFCAT ELTAB KOERCE KONVERT \ + TYPE BINOPC BINOP IDEMOPC SGPOPC SGPOP \ + MONOPC FUNCTOR \ + BASTYPE BASTYPE- SETCAT SETCAT- SGROUP SGROUP- \ + LLINSET RLINSET LINSET ABELSG ABELSG- \ + ABELGRP ABELGRP- ABELMON ABELMON- ORDTYPE ORDTYPE- \ + RMODULE ALGEBRA ALGEBRA- \ + FINITE FINITE- MONOID MONOID- GROUP GROUP- \ + RING RING- OINTDOM \ + BMODULE STEP LMODULE \ + AHYP CFCAT ELTAB KOERCE KONVERT \ KRCFROM KVTFROM IEVALAB IEVALAB- EVALAB EVALAB- \ - RETRACT RETRACT- SETCAT SETCAT- VOID SEGCAT \ - MSYSCMD FINITE FINITE- IDEMOPC FUNCTOR OUT \ - PRIMCAT PRINT PTRANFN SPFCAT TYPE UTYPE \ - BMODULE SGPOPC BASTYPE BASTYPE- STEP LMODULE \ - RMODULE ALGEBRA ALGEBRA- SGROUP SGROUP- ABELSG \ - ABELSG- ORDSET SGPOP OASGP FILECAT SEXCAT \ + RETRACT RETRACT- VOID REPSQ REPDB \ + PRIMCAT PTRANFN SPFCAT UTYPE HOMOTOP \ + ORDSET OASGP SEXCAT DIFRING SRING OSGROUP \ MODULE MODULE- PID OAGROUP OAGROUP- OCAMON \ - OAMON OAMON- DIOID MONOPC SMAGG \ - RNG RNG- ORDFIN LLINSET RLINSET LINSET OAMONS \ - MKBCFUNC MKRECORD MKUCFUNC ITFUN2 \ - ITFUN3 STREAM1 STREAM2 STREAM3 ANY1 SEGBIND2 \ - COMBOPC EQ2 NONE1 CONDUIT IOMODE CTORKIND \ - AGG AGG- ELTAGG ELTAGG- IXAGG IXAGG- \ - BGAGG BGAGG- BRAGG BRAGG- ELAGG ELAGG- \ - DLAGG DQAGG QUAGG SKAGG PRQAGG ALAGG 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- \ - LIST DIFFDOM DIFFDOM- DIFFSPC DIFFSPC- DIFFMOD \ + OAMON OAMON- DIOID INTDOM INTDOM- \ + RNG RNG- ORDFIN OAMONS CABMON COMRING \ + GCDDOM GCDDOM- UFD UFD- ES ES- \ + FIELD FIELD- VECTCAT VECTCAT- RADCAT RADCAT- \ + MKBCFUNC MKRECORD MKUCFUNC ENTIRER ENTIRER- \ + DIFFDOM DIFFDOM- DIFFSPC DIFFSPC- DIFFMOD \ LINEXP PATMAB REAL CHARZ LOGIC LOGIC- \ - RTVALUE SYSPTR PDDOM PDDOM- PDSPC PDSPC- \ - DSEXT DSEXT- ORDTYPE ORDTYPE- ORDSTRCT \ - BOOLE BOOLE- REF ALIST PRIMARR SRING \ + PDDOM PDDOM- PDSPC PDSPC- \ + DSEXT DSEXT- ORDSTRCT \ + BOOLE BOOLE- PRIMARR SRING \ INS INS- DIVRING DIVRING- EUCDOM EUCDOM- \ - BINOPC BINOP FPS FPS- RNS RNS- \ - POLYCAT POLYCAT- QFCAT QFCAT- \ + FPS FPS- RNS RNS- \ + POLYCAT POLYCAT- QFCAT QFCAT- FEVALAB FEVALAB- \ INT NNI PI SINT SYMBOL DFLOAT oa_algebra_layer_0_nrlibs = \ @@ -1506,7 +1491,10 @@ $(OUT)/RING.$(FASLEXT): $(OUT)/RNG.$(FASLEXT) $(OUT)/SRING.$(FASLEXT) \ $(OUT)/LMODULE.$(FASLEXT) $(OUT)/KOERCE.$(FASLEXT) $(OUT)/MONOID.$(FASLEXT): $(OUT)/SGROUP.$(FASLEXT) $(OUT)/ABELGRP.$(FASLEXT): $(OUT)/CABMON.$(FASLEXT) $(OUT)/LLINSET.$(FASLEXT) -$(OUT)/ABELMON.$(FASLEXT): $(OUT)/ABELSG.$(FASLEXT) + +$(OUT)/ABELMON.$(FASLEXT): $(OUT)/ABELSG.$(FASLEXT) \ + $(OUT)/REPSQ.$(FASLEXT) + $(OUT)/ORDRING.$(FASLEXT): $(OUT)/OAGROUP.$(FASLEXT) $(OUT)/CHARZ.$(FASLEXT) \ $(OUT)/MONOID.$(FASLEXT) $(OUT)/COMRING.$(FASLEXT): $(OUT)/RING.$(FASLEXT) $(OUT)/BMODULE.$(FASLEXT) @@ -1522,7 +1510,6 @@ $(OUT)/ES.$(FASLEXT): $(OUT)/RING.$(FASLEXT) $(OUT)/CACHSET.$(FASLEXT) \ $(OUT)/PATAB.$(FASLEXT) $(OUT)/PRIMARR.$(FASLEXT) \ $(OUT)/MAYBE.$(FASLEXT) $(OUT)/CACHSET.$(FASLEXT): $(OUT)/ORDSET.$(FASLEXT) -$(OUT)/ALIST.$(FASLEXT): $(OUT)/ALAGG.$(FASLEXT) $(OUT)/PATAB.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) $(OUT)/BOOLEAN.$(FASLEXT): $(OUT)/PROPLOG.$(FASLEXT) $(OUT)/VECTCAT.$(FASLEXT): $(OUT)/RADCAT.$(FASLEXT) @@ -1543,18 +1530,79 @@ $(OUT)/MONOP.$(FASLEXT): $(OUT)/MONOPC.$(FASLEXT) $(OUT)/PAIR.$(FASLEXT) \ $(OUT)/IDPT.$(FASLEXT): $(OUT)/PAIR.$(FASLEXT) +$(OUT)/AGG.$(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) \ + $(OUT)/AGG.$(FASLEXT) +$(OUT)/QUAGG.$(FASLEXT): $(OUT)/BGAGG.$(FASLEXT) $(OUT)/FINAGG.$(FASLEXT) +$(OUT)/SKAGG.$(FASLEXT): $(OUT)/BGAGG.$(FASLEXT) $(OUT)/FINAGG.$(FASLEXT) +$(OUT)/DQAGG.$(FASLEXT): $(OUT)/QUAGG.$(FASLEXT) $(OUT)/SKAGG.$(FASLEXT) +$(OUT)/PRQAGG.$(FASLEXT): $(OUT)/BGAGG.$(FASLEXT) $(OUT)/FINAGG.$(FASLEXT) +#$(OUT)/DLAGG.$(FASLEXT): $(OUT)/RCAGG.$(FASLEXT) +#$(OUT)/URAGG.$(FASLEXT): $(OUT)/RCAGG.$(FASLEXT) +#$(OUT)/BRAGG.$(FASLEXT): $(OUT)/RCAGG.$(FASLEXT) +$(OUT)/FLAGG.$(FASLEXT): $(OUT)/BMODULE.$(FASLEXT) $(OUT)/PID.$(FASLEXT) \ + $(OUT)/OAGROUP.$(FASLEXT) $(OUT)/RETRACT.$(FASLEXT) \ + $(OUT)/LINEXP.$(FASLEXT) $(OUT)/PATMAB.$(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) \ + $(OUT)/ORDSET.$(FASLEXT) +$(OUT)/SRAGG.$(FASLEXT): $(OUT)/A1AGG.$(FASLEXT) +$(OUT)/STAGG.$(FASLEXT): $(OUT)/URAGG.$(FASLEXT) $(OUT)/LNAGG.$(FASLEXT) +$(OUT)/LNAGG.$(FASLEXT): $(OUT)/SEGCAT.$(FASLEXT) +$(OUT)/SETAGG.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/CLAGG.$(FASLEXT) +$(OUT)/DIOPS.$(FASLEXT): $(OUT)/STRING.$(FASLEXT) +$(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)/SMAGG.$(FASLEXT): $(OUT)/HOAGG.$(FASLEXT) +$(OUT)/FINAGG.$(FASLEXT): $(OUT)/HOAGG.$(FASLEXT) +$(OUT)/ELAGG.$(FASLEXT): $(OUT)/SMAGG.$(FASLEXT) strap-2/UNISEG.$(FASLEXT) +$(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) \ + $(OUT)/CHARZ.$(FASLEXT) $(OUT)/AGG.$(FASLEXT) \ + $(OUT)/IXAGG.$(FASLEXT) $(OUT)/FLAGG.$(FASLEXT) \ + $(OUT)/ELAGG.$(FASLEXT) + +$(OUT)/MSETAGG.$(FASLEXT): $(OUT)/MDAGG.$(FASLEXT) $(OUT)/SETAGG.$(FASLEXT) +$(OUT)/MDAGG.$(FASLEXT): $(OUT)/DIOPS.$(FASLEXT) + oa_algebra_layer_1 = \ - ABELGRP ABELGRP- ABELMON ABELMON- ITUPLE IDPT \ - CABMON MONOID MONOID- RING RING- COMRING \ - DIFRING SRING ENTIRER ENTIRER- INTDOM INTDOM- OINTDOM \ - GCDDOM GCDDOM- UFD UFD- ES ES- \ + ITUPLE IDPT ITFUN2 SEGCAT \ + FILECAT SMAGG \ PATAB PPCURVE PSCURVE CACHSET RESLATC \ IDENT OUTFORM BINDING BOOLEAN \ - ORDRING DROPT1 PLOT1 FEVALAB FEVALAB- IARRAY1 \ - OSGROUP MAYBE DATAARY PROPLOG HOMOTOP BYTEORD \ - FIELD FIELD- VECTCAT VECTCAT- MONOP \ + ORDRING DROPT1 PLOT1 IARRAY1 \ + MAYBE DATAARY PROPLOG BYTEORD \ + AGG AGG- ELTAGG ELTAGG- IXAGG IXAGG- \ + BGAGG BGAGG- BRAGG BRAGG- ELAGG ELAGG- \ + DLAGG DQAGG QUAGG SKAGG PRQAGG ALAGG 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 \ PROPERTY ARITY OPERCAT OPERCAT- PAIR STREAM \ - RADCAT RADCAT- PDMOD DMEXT LZSTAGG LZSTAGG- + COMBOPC EQ2 NONE1 CONDUIT IOMODE CTORKIND \ + PDMOD DMEXT LZSTAGG LZSTAGG- MSETAGG \ + ITFUN3 STREAM1 STREAM2 STREAM3 ANY1 SEGBIND2 \ + ALIST LIST RTVALUE SYSPTR ATTREG REF oa_algebra_layer_1_nrlibs = \ $(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_1)) @@ -1605,9 +1653,9 @@ oa_algebra_layer_4 = \ COLOR ONECOMP2 \ PALETTE PARPCURV PARPC2 PARSCURV PARSC2 PARSURF \ PARSU2 PATRES2 PATTERN1 PDECAT \ - REPSQ REPDB RFDIST RIDIST SPACEC SPLNODE \ + RFDIST RIDIST SPACEC SPLNODE \ SUCH TEX1 UDVO YSTREAM ENV \ - ATRIG ATRIG- GROUP GROUP- LALG LALG- + ATRIG ATRIG- LALG LALG- oa_algebra_layer_4_nrlibs = \ @@ -1628,7 +1676,7 @@ oa_algebra_layer_5 = \ INCRMAPS KERNEL2 MODMONOM MONADWU MONADWU- \ MRF2 NARNG NARNG- NSUP2 ODVAR OPQUERY \ ORDMON PATMATCH PERMCAT PDRING \ - SDVAR SUP2 TRIGCAT TRIGCAT- ULS2 UP2 \ + SDVAR SUP2 TRIGCAT TRIGCAT- UP2 \ ELABEXPR KERNEL oa_algebra_layer_5_nrlibs = \ @@ -1648,7 +1696,7 @@ $(OUT)/BYTE.$(FASLEXT): $(OUT)/LOGIC.$(FASLEXT) $(OUT)/SYSNNI.$(FASLEXT): $(OUT)/LOGIC.$(FASLEXT) $(OUT)/ORDFIN.$(FASLEXT) oa_algebra_layer_6 = \ - PROPFRML PROPFUN1 AUTOMOR CARTEN2 CHARPOL COMPLEX2 \ + PROPFRML PROPFUN1 AUTOMOR CHARPOL \ DIFEXT ES1 ES2 GRMOD GRMOD- \ HYPCAT HYPCAT- MODRING NASRING NASRING- \ SORTPAK ZMOD PROPFUN2 \ @@ -1681,7 +1729,7 @@ $(OUT)/ITAYLOR.$(FASLEXT): $(OUT)/STREAM.$(FASLEXT) $(OUT)/BTREE.$(FASLEXT): $(OUT)/TREE.$(FASLEXT) oa_algebra_layer_8 = \ - BSTREE BTOURN CARD DRAWHACK FACTFUNC TREE \ + BSTREE BTOURN CARD FACTFUNC TREE \ FR2 FRAC2 FRUTIL ITAYLOR MLO NAALG \ NAALG- OP ORDCOMP2 RANDSRC UNISEG2 XALG \ BTREE POLY SMP ARR2CAT ARR2CAT- @@ -1698,11 +1746,11 @@ $(OUT)/IDPOAMS.$(FASLEXT): $(OUT)/IDPOAM.$(FASLEXT) $(OUT)/IDPAG.$(FASLEXT): $(OUT)/IDPAM.$(FASLEXT) oa_algebra_layer_9 = \ - AMR AMR- DEGRED DLP EAB \ + AMR AMR- DLP EAB \ FAGROUP FAMONOID FLINEXP FLINEXP- FRETRCT FRETRCT- \ FSERIES FT IDPAG IDPOAMS INFINITY LA \ - OMLO ORTHPOL PRODUCT PADICCT PMPRED PMASS \ - PTFUNC2 RATRET RADUTIL UPXS2 \ + OMLO ORTHPOL PRODUCT PADICCT \ + RATRET RADUTIL \ XFALG ZLINDEP BBTREE TABLE INTABL \ SIG FMONCAT FST @@ -1716,9 +1764,6 @@ oa_algebra_layer_9_objects = \ $(OUT)/ANY.$(FASLEXT): $(OUT)/SEX.$(FASLEXT) $(OUT)/SEX.$(FASLEXT): $(OUT)/SEXOF.$(FASLEXT) -$(OUT)/LEXP.$(FASLEXT): $(OUT)/XPBWPOLY.$(FASLEXT) -$(OUT)/XPBWPOLY.$(FASLEXT): $(OUT)/XPOLYC.$(FASLEXT) \ - $(OUT)/PBWLB.$(FASLEXT) $(OUT)/PENDTREE.$(FASLEXT): $(OUT)/TREE.$(FASLEXT) $(OUT)/QFORM.$(FASLEXT): $(OUT)/SQMATRIX.$(FASLEXT) $(OUT)/SQMATRIX.$(FASLEXT): $(OUT)/SMATCAT.$(FASLEXT) \ @@ -1738,20 +1783,19 @@ $(OUT)/PFR.$(FASLEXT): $(OUT)/FR.$(FASLEXT) oa_algebra_layer_10 = \ BPADIC ANY LWORD FR \ SEXOF CRAPACK DEQUEUE DLIST \ - DRAWCX \ - DRAWPT FAMR FAMR- FLASORT \ + FAMR FAMR- FLASORT \ FLAGG2 FGROUP FM FM1 \ FPC FPC- FMONOID INDE \ - IPADIC IROOT IR2 LEXP \ + IPADIC IROOT IR2 \ LIECAT LIECAT- LIST2 LIST2MAP \ SEX HASHTBL MAGMA \ - MESH MOEBIUS MODFIELD MODOP \ + MOEBIUS MODFIELD MODOP \ MRING MTHING NCNTFRAC NCODIV \ NUMTUBE ODR OFMONOID ONECOMP \ ORDCOMP OREPCAT OREPCAT- OWP \ PADIC PATTERN2 PATLRES PARTPERM \ PBWLB PENDTREE PGE PGROEB \ - PINTERP PLOTTOOL PFR PMDOWN \ + PINTERP PFR PMDOWN \ PRTITION PMINS PMLSAGG PMTOOLS \ PSCAT PSCAT- QFORM QUEUE \ SQMATRIX SEG SEG2 MTSCAT \ @@ -1759,7 +1803,7 @@ oa_algebra_layer_10 = \ TOPSP TRANFUN TRANFUN- TUBE \ UDPO UNISEG VIEW VSPACE \ VSPACE- XPOLYC XPR BTAGG BTAGG- \ - FUNDESC XPBWPOLY SMATCAT SMATCAT- \ + FUNDESC SMATCAT SMATCAT- \ RMATRIX RMATCAT RMATCAT- DIRPROD \ DIRPCAT DIRPCAT- MATRIX \ MATCAT MATCAT- IARRAY2 FFIELDC FFIELDC- @@ -1812,6 +1856,9 @@ oa_algebra_layer_12_objects = \ $(OUT)/UPOLYC.$(FASLEXT): $(OUT)/PFECAT.$(FASLEXT) $(OUT)/SETMN.$(FASLEXT): $(OUT)/IBITS.$(FASLEXT) +$(OUT)/LEXP.$(FASLEXT): $(OUT)/XPBWPOLY.$(FASLEXT) +$(OUT)/XPBWPOLY.$(FASLEXT): $(OUT)/XPOLYC.$(FASLEXT) \ + $(OUT)/PBWLB.$(FASLEXT) oa_algebra_layer_13 = \ ASSOCEQ CARTEN CLIF CLIP \ @@ -1819,12 +1866,12 @@ oa_algebra_layer_13 = \ COORDSYS DBASE DHMATRIX DIOSP \ FAXF FAXF- FFPOLY2 \ FNLA GRAY HB IRSN \ - MHROWRED NUMODE NUMQUAD \ + MHROWRED NUMODE NUMQUAD MESH \ ODESYS ODETOOLS ORDFUNS PERMAN \ PFECAT PFECAT- PSEUDLIN \ - PTPACK REP2 SETMN \ - SYMFUNC VECTOR2 VECTOR CHAR \ - INBCON INBCON- OUTBCON OUTBCON- + PTPACK REP2 SETMN PLOTTOOL \ + SYMFUNC VECTOR2 VECTOR CHAR XPBWPOLY \ + INBCON INBCON- OUTBCON OUTBCON- LEXP oa_algebra_layer_13_nrlibs = \ $(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_13)) @@ -1865,7 +1912,7 @@ oa_algebra_layer_14 = \ MPC2 MPC3 MPOLY MPRFF \ MRATFAC MULTSQFR NORMRETR NPCOEF \ NSUP NTPOLFN ODP ODEPRIM \ - ODEPRRIC PADEPAC \ + ODEPRRIC \ PADICRAT PADICRC PCOMP PDECOMP \ PF PFBR PFBRU PFOTOOLS \ PFRPAC PGCD PINTERPA PLEQN \ @@ -1909,7 +1956,7 @@ $(OUT)/UTS.$(FASLEXT): $(OUT)/UTSCAT.$(FASLEXT) $(OUT)/PDDOM.$(FASLEXT) oa_algebra_layer_15 = \ DSMP EXPUPXS UPXS UPXSCONS \ - FRAMALG FRAMALG- MDAGG ODPOL \ + FRAMALG FRAMALG- ODPOL \ PLOT RMCAT2 ROIRC SDPOL \ ULS ULSCONS TUBETOOL UPXSCCA \ UPXSCCA- JVMBCODE BYTEBUF OVERSET \ @@ -1924,11 +1971,12 @@ oa_algebra_layer_15_objects = \ $(OUT)/SPACE3.$(FASLEXT): $(OUT)/SUBSPACE.$(FASLEXT) oa_algebra_layer_16 = \ - DPMM EFUPXS FFINTBAS FRIDEAL \ - FRIDEAL2 FRMOD \ - IBATOOL INTFACT \ - MSETAGG MONOGEN MONOGEN- NFINTBAS \ - SPACE3 FFF SUBSPACE + DPMM EFUPXS FFINTBAS FRIDEAL ULS2 \ + FRIDEAL2 FRMOD CARTEN2 COMPLEX2 DRAWHACK \ + IBATOOL INTFACT DEGRED PMPRED UPXS2 \ + MONOGEN MONOGEN- NFINTBAS PMASS PADEPAC \ + SPACE3 FFF SUBSPACE PTFUNC2 DRAWCX DRAWPT + oa_algebra_layer_16_nrlibs = \ $(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_16)) @@ -2079,6 +2127,9 @@ oa_algebra_layer_22_nrlibs = \ oa_algebra_layer_22_objects = \ $(addprefix $(OUT)/, \ $(addsuffix .$(FASLEXT),$(oa_algebra_layer_22))) + +$(OUT)/MSYSCMD.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) + oa_algebra_layer_23 = \ CPIMA IRURPK LAZM3PK LEXTRIPK \ NORMPK QCMPACK RURPK SFRGCD \ @@ -2100,7 +2151,7 @@ oa_algebra_layer_24 = \ QQUTAST DEFAST MACROAST SPADXPT SPADAST PARAMAST \ INBFILE OUTBFILE IOBFILE RGBCMDL RGBCSPC STEPAST \ CTOR IP4ADDR NETCLT INETCLTS \ - IRFORM COMPILER \ + IRFORM COMPILER MSYSCMD PRINT OUT \ ITFORM ELABOR TALGOP YDIAGRAM LINELT DBASIS \ LINFORM LINBASIS JVMOP JVMCFACC JVMFDACC JVMMDACC \ JVMCSTTG diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in index bef798ef..68de28dc 100644 --- a/src/algebra/Makefile.in +++ b/src/algebra/Makefile.in @@ -734,50 +734,35 @@ SPADFILES = \ $(OUTSRC)/zerodim.spad TESTS = $(INPUT)/INTHEORY.input $(INPUT)/VIEW2D.input $(INPUT)/TESTFR.input - -# The root of the category hierarchy is the Type category. -# We require the basic integer domains are available at stage 2 of -# bootstrap. This sets in motion -# the buils of several other domains and categories as needed -# to ignite the algebra build. We require Category only because -# we would like not to have too many special cases for it. -oa_strap_ctors = \ - INT SINT NNI PI \ - LIST EQ - -oa_strap_modules = $(patsubst %,strap-2/%.$(FASLEXT),$(oa_strap_ctors)) oa_algebra_layer_0 = \ - AHYP ATTREG CFCAT ELTAB KOERCE KONVERT \ + TYPE BINOPC BINOP IDEMOPC SGPOPC SGPOP \ + MONOPC FUNCTOR \ + BASTYPE BASTYPE- SETCAT SETCAT- SGROUP SGROUP- \ + LLINSET RLINSET LINSET ABELSG ABELSG- \ + ABELGRP ABELGRP- ABELMON ABELMON- ORDTYPE ORDTYPE- \ + RMODULE ALGEBRA ALGEBRA- \ + FINITE FINITE- MONOID MONOID- GROUP GROUP- \ + RING RING- OINTDOM \ + BMODULE STEP LMODULE \ + AHYP CFCAT ELTAB KOERCE KONVERT \ KRCFROM KVTFROM IEVALAB IEVALAB- EVALAB EVALAB- \ - RETRACT RETRACT- SETCAT SETCAT- VOID SEGCAT \ - MSYSCMD FINITE FINITE- IDEMOPC FUNCTOR OUT \ - PRIMCAT PRINT PTRANFN SPFCAT TYPE UTYPE \ - BMODULE SGPOPC BASTYPE BASTYPE- STEP LMODULE \ - RMODULE ALGEBRA ALGEBRA- SGROUP SGROUP- ABELSG \ - ABELSG- ORDSET SGPOP OASGP FILECAT SEXCAT \ + RETRACT RETRACT- VOID REPSQ REPDB \ + PRIMCAT PTRANFN SPFCAT UTYPE HOMOTOP \ + ORDSET OASGP SEXCAT DIFRING SRING OSGROUP \ MODULE MODULE- PID OAGROUP OAGROUP- OCAMON \ - OAMON OAMON- DIOID MONOPC SMAGG \ - RNG RNG- ORDFIN LLINSET RLINSET LINSET OAMONS \ - MKBCFUNC MKRECORD MKUCFUNC ITFUN2 \ - ITFUN3 STREAM1 STREAM2 STREAM3 ANY1 SEGBIND2 \ - COMBOPC EQ2 NONE1 CONDUIT IOMODE CTORKIND \ - AGG AGG- ELTAGG ELTAGG- IXAGG IXAGG- \ - BGAGG BGAGG- BRAGG BRAGG- ELAGG ELAGG- \ - DLAGG DQAGG QUAGG SKAGG PRQAGG ALAGG 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- \ - LIST DIFFDOM DIFFDOM- DIFFSPC DIFFSPC- DIFFMOD \ + OAMON OAMON- DIOID INTDOM INTDOM- \ + RNG RNG- ORDFIN OAMONS CABMON COMRING \ + GCDDOM GCDDOM- UFD UFD- ES ES- \ + FIELD FIELD- VECTCAT VECTCAT- RADCAT RADCAT- \ + MKBCFUNC MKRECORD MKUCFUNC ENTIRER ENTIRER- \ + DIFFDOM DIFFDOM- DIFFSPC DIFFSPC- DIFFMOD \ LINEXP PATMAB REAL CHARZ LOGIC LOGIC- \ - RTVALUE SYSPTR PDDOM PDDOM- PDSPC PDSPC- \ - DSEXT DSEXT- ORDTYPE ORDTYPE- ORDSTRCT \ - BOOLE BOOLE- REF ALIST PRIMARR SRING \ + PDDOM PDDOM- PDSPC PDSPC- \ + DSEXT DSEXT- ORDSTRCT \ + BOOLE BOOLE- PRIMARR SRING \ INS INS- DIVRING DIVRING- EUCDOM EUCDOM- \ - BINOPC BINOP FPS FPS- RNS RNS- \ - POLYCAT POLYCAT- QFCAT QFCAT- \ + FPS FPS- RNS RNS- \ + POLYCAT POLYCAT- QFCAT QFCAT- FEVALAB FEVALAB- \ INT NNI PI SINT SYMBOL DFLOAT oa_algebra_layer_0_nrlibs = \ @@ -788,17 +773,27 @@ oa_algebra_layer_0_objects = \ $(addsuffix .$(FASLEXT),$(oa_algebra_layer_0))) oa_algebra_layer_1 = \ - ABELGRP ABELGRP- ABELMON ABELMON- ITUPLE IDPT \ - CABMON MONOID MONOID- RING RING- COMRING \ - DIFRING SRING ENTIRER ENTIRER- INTDOM INTDOM- OINTDOM \ - GCDDOM GCDDOM- UFD UFD- ES ES- \ + ITUPLE IDPT ITFUN2 SEGCAT \ + FILECAT SMAGG \ PATAB PPCURVE PSCURVE CACHSET RESLATC \ IDENT OUTFORM BINDING BOOLEAN \ - ORDRING DROPT1 PLOT1 FEVALAB FEVALAB- IARRAY1 \ - OSGROUP MAYBE DATAARY PROPLOG HOMOTOP BYTEORD \ - FIELD FIELD- VECTCAT VECTCAT- MONOP \ + ORDRING DROPT1 PLOT1 IARRAY1 \ + MAYBE DATAARY PROPLOG BYTEORD \ + AGG AGG- ELTAGG ELTAGG- IXAGG IXAGG- \ + BGAGG BGAGG- BRAGG BRAGG- ELAGG ELAGG- \ + DLAGG DQAGG QUAGG SKAGG PRQAGG ALAGG 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 \ PROPERTY ARITY OPERCAT OPERCAT- PAIR STREAM \ - RADCAT RADCAT- PDMOD DMEXT LZSTAGG LZSTAGG- + COMBOPC EQ2 NONE1 CONDUIT IOMODE CTORKIND \ + PDMOD DMEXT LZSTAGG LZSTAGG- MSETAGG \ + ITFUN3 STREAM1 STREAM2 STREAM3 ANY1 SEGBIND2 \ + ALIST LIST RTVALUE SYSPTR ATTREG REF oa_algebra_layer_1_nrlibs = \ $(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_1)) @@ -836,9 +831,9 @@ oa_algebra_layer_4 = \ COLOR ONECOMP2 \ PALETTE PARPCURV PARPC2 PARSCURV PARSC2 PARSURF \ PARSU2 PATRES2 PATTERN1 PDECAT \ - REPSQ REPDB RFDIST RIDIST SPACEC SPLNODE \ + RFDIST RIDIST SPACEC SPLNODE \ SUCH TEX1 UDVO YSTREAM ENV \ - ATRIG ATRIG- GROUP GROUP- LALG LALG- + ATRIG ATRIG- LALG LALG- oa_algebra_layer_4_nrlibs = \ $(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_4)) @@ -853,7 +848,7 @@ oa_algebra_layer_5 = \ INCRMAPS KERNEL2 MODMONOM MONADWU MONADWU- \ MRF2 NARNG NARNG- NSUP2 ODVAR OPQUERY \ ORDMON PATMATCH PERMCAT PDRING \ - SDVAR SUP2 TRIGCAT TRIGCAT- ULS2 UP2 \ + SDVAR SUP2 TRIGCAT TRIGCAT- UP2 \ ELABEXPR KERNEL oa_algebra_layer_5_nrlibs = \ @@ -864,7 +859,7 @@ oa_algebra_layer_5_objects = \ $(addsuffix .$(FASLEXT),$(oa_algebra_layer_5))) oa_algebra_layer_6 = \ - PROPFRML PROPFUN1 AUTOMOR CARTEN2 CHARPOL COMPLEX2 \ + PROPFRML PROPFUN1 AUTOMOR CHARPOL \ DIFEXT ES1 ES2 GRMOD GRMOD- \ HYPCAT HYPCAT- MODRING NASRING NASRING- \ SORTPAK ZMOD PROPFUN2 \ @@ -891,7 +886,7 @@ oa_algebra_layer_7_objects = \ $(addsuffix .$(FASLEXT),$(oa_algebra_layer_7))) oa_algebra_layer_8 = \ - BSTREE BTOURN CARD DRAWHACK FACTFUNC TREE \ + BSTREE BTOURN CARD FACTFUNC TREE \ FR2 FRAC2 FRUTIL ITAYLOR MLO NAALG \ NAALG- OP ORDCOMP2 RANDSRC UNISEG2 XALG \ BTREE POLY SMP ARR2CAT ARR2CAT- @@ -904,11 +899,11 @@ oa_algebra_layer_8_objects = \ $(addsuffix .$(FASLEXT),$(oa_algebra_layer_8))) oa_algebra_layer_9 = \ - AMR AMR- DEGRED DLP EAB \ + AMR AMR- DLP EAB \ FAGROUP FAMONOID FLINEXP FLINEXP- FRETRCT FRETRCT- \ FSERIES FT IDPAG IDPOAMS INFINITY LA \ - OMLO ORTHPOL PRODUCT PADICCT PMPRED PMASS \ - PTFUNC2 RATRET RADUTIL UPXS2 \ + OMLO ORTHPOL PRODUCT PADICCT \ + RATRET RADUTIL \ XFALG ZLINDEP BBTREE TABLE INTABL \ SIG FMONCAT FST @@ -922,20 +917,19 @@ oa_algebra_layer_9_objects = \ oa_algebra_layer_10 = \ BPADIC ANY LWORD FR \ SEXOF CRAPACK DEQUEUE DLIST \ - DRAWCX \ - DRAWPT FAMR FAMR- FLASORT \ + FAMR FAMR- FLASORT \ FLAGG2 FGROUP FM FM1 \ FPC FPC- FMONOID INDE \ - IPADIC IROOT IR2 LEXP \ + IPADIC IROOT IR2 \ LIECAT LIECAT- LIST2 LIST2MAP \ SEX HASHTBL MAGMA \ - MESH MOEBIUS MODFIELD MODOP \ + MOEBIUS MODFIELD MODOP \ MRING MTHING NCNTFRAC NCODIV \ NUMTUBE ODR OFMONOID ONECOMP \ ORDCOMP OREPCAT OREPCAT- OWP \ PADIC PATTERN2 PATLRES PARTPERM \ PBWLB PENDTREE PGE PGROEB \ - PINTERP PLOTTOOL PFR PMDOWN \ + PINTERP PFR PMDOWN \ PRTITION PMINS PMLSAGG PMTOOLS \ PSCAT PSCAT- QFORM QUEUE \ SQMATRIX SEG SEG2 MTSCAT \ @@ -943,7 +937,7 @@ oa_algebra_layer_10 = \ TOPSP TRANFUN TRANFUN- TUBE \ UDPO UNISEG VIEW VSPACE \ VSPACE- XPOLYC XPR BTAGG BTAGG- \ - FUNDESC XPBWPOLY SMATCAT SMATCAT- \ + FUNDESC SMATCAT SMATCAT- \ RMATRIX RMATCAT RMATCAT- DIRPROD \ DIRPCAT DIRPCAT- MATRIX \ MATCAT MATCAT- IARRAY2 FFIELDC FFIELDC- @@ -996,12 +990,12 @@ oa_algebra_layer_13 = \ COORDSYS DBASE DHMATRIX DIOSP \ FAXF FAXF- FFPOLY2 \ FNLA GRAY HB IRSN \ - MHROWRED NUMODE NUMQUAD \ + MHROWRED NUMODE NUMQUAD MESH \ ODESYS ODETOOLS ORDFUNS PERMAN \ PFECAT PFECAT- PSEUDLIN \ - PTPACK REP2 SETMN \ - SYMFUNC VECTOR2 VECTOR CHAR \ - INBCON INBCON- OUTBCON OUTBCON- + PTPACK REP2 SETMN PLOTTOOL \ + SYMFUNC VECTOR2 VECTOR CHAR XPBWPOLY \ + INBCON INBCON- OUTBCON OUTBCON- LEXP oa_algebra_layer_13_nrlibs = \ $(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_13)) @@ -1040,7 +1034,7 @@ oa_algebra_layer_14 = \ MPC2 MPC3 MPOLY MPRFF \ MRATFAC MULTSQFR NORMRETR NPCOEF \ NSUP NTPOLFN ODP ODEPRIM \ - ODEPRRIC PADEPAC \ + ODEPRRIC \ PADICRAT PADICRC PCOMP PDECOMP \ PF PFBR PFBRU PFOTOOLS \ PFRPAC PGCD PINTERPA PLEQN \ @@ -1075,7 +1069,7 @@ oa_algebra_layer_14_objects = \ oa_algebra_layer_15 = \ DSMP EXPUPXS UPXS UPXSCONS \ - FRAMALG FRAMALG- MDAGG ODPOL \ + FRAMALG FRAMALG- ODPOL \ PLOT RMCAT2 ROIRC SDPOL \ ULS ULSCONS TUBETOOL UPXSCCA \ UPXSCCA- JVMBCODE BYTEBUF OVERSET \ @@ -1089,11 +1083,11 @@ oa_algebra_layer_15_objects = \ $(addsuffix .$(FASLEXT),$(oa_algebra_layer_15))) oa_algebra_layer_16 = \ - DPMM EFUPXS FFINTBAS FRIDEAL \ - FRIDEAL2 FRMOD \ - IBATOOL INTFACT \ - MSETAGG MONOGEN MONOGEN- NFINTBAS \ - SPACE3 FFF SUBSPACE + DPMM EFUPXS FFINTBAS FRIDEAL ULS2 \ + FRIDEAL2 FRMOD CARTEN2 COMPLEX2 DRAWHACK \ + IBATOOL INTFACT DEGRED PMPRED UPXS2 \ + MONOGEN MONOGEN- NFINTBAS PMASS PADEPAC \ + SPACE3 FFF SUBSPACE PTFUNC2 DRAWCX DRAWPT oa_algebra_layer_16_nrlibs = \ $(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_16)) @@ -1254,7 +1248,7 @@ oa_algebra_layer_24 = \ QQUTAST DEFAST MACROAST SPADXPT SPADAST PARAMAST \ INBFILE OUTBFILE IOBFILE RGBCMDL RGBCSPC STEPAST \ CTOR IP4ADDR NETCLT INETCLTS \ - IRFORM COMPILER \ + IRFORM COMPILER MSYSCMD PRINT OUT \ ITFORM ELABOR TALGOP YDIAGRAM LINELT DBASIS \ LINFORM LINBASIS JVMOP JVMCFACC JVMFDACC JVMMDACC \ JVMCSTTG @@ -1920,6 +1914,8 @@ strap-0/SYMBOL.$(FASLEXT): strap-0/ORDSET.$(FASLEXT) strap-0/BOP.$(FASLEXT): strap-0/ORDSET.$(FASLEXT) strap-0/OPERCAT.$(FASLEXT) +strap-0/ALIST.$(FASLEXT): strap-0/SETCAT.$(FASLEXT) strap-0/ALAGG.$(FASLEXT) + # Bootstrap stage 1 dependencies. # At this stage, we attempt to compile domains essential for completing # the bootstrap process (stage 2). Those that were compiled at stage 0 @@ -2361,6 +2357,12 @@ strap-1/STREAM.$(FASLEXT): strap-1/LZSTAGG.$(FASLEXT) strap-1/SMAGG.$(FASLEXT) strap-1/LZSTAGG.$(FASLEXT): strap-1/STAGG.$(FASLEXT) +strap-1/BOP.$(FASLEXT): strap-1/ORDSET.$(FASLEXT) strap-1/OPERCAT.$(FASLEXT) \ + strap-0/SYMBOL.$(FASLEXT) strap-0/NNI.$(FASLEXT) \ + strap-0/BOOLEAN.$(FASLEXT) strap-0/MAYBE.$(FASLEXT) \ + strap-0/LIST.$(FASLEXT) strap-0/ALIST.$(FASLEXT) \ + strap-0/OUTFORM.$(FASLEXT) strap-0/INFORM.$(FASLEXT) + # Bootstrap stage 2 dependencies. # At this stage we recompile everything from stage 1, including # a few more domains. @@ -2375,7 +2377,8 @@ strap-2/FRETRCT.$(FASLEXT): strap-2/RETRACT.$(FASLEXT) strap-1/INS.$(FASLEXT) strap-2/SETCAT.$(FASLEXT): strap-2/BASTYPE.$(FASLEXT) \ strap-2/KOERCE.$(FASLEXT) strap-1/SINT.$(FASLEXT) \ strap-1/STRING.$(FASLEXT) -strap-2/FINITE.$(FASLEXT): strap-2/SETCAT.$(FASLEXT) +strap-2/FINITE.$(FASLEXT): strap-2/SETCAT.$(FASLEXT) \ + strap-1/PI.$(FASLEXT) strap-1/NNI.$(FASLEXT) strap-2/ORDTYPE.$(FASLEXT): strap-2/BASTYPE.$(FASLEXT) strap-2/ORDSET.$(FASLEXT): strap-2/SETCAT.$(FASLEXT) \ strap-2/ORDTYPE.$(FASLEXT) @@ -2685,6 +2688,10 @@ strap-2/UNISEG.$(FASLEXT): strap-2/SEGCAT.$(FASLEXT) \ strap-2/SEGXCAT.$(FASLEXT) strap-2/ORDSET.$(FASLEXT) \ strap-2/SETCAT.$(FASLEXT) strap-1/STREAM.$(FASLEXT) +strap-2/PATTERN.$(FASLEXT): strap-2/SETCAT.$(FASLEXT) \ + strap-2/RETRACT.$(FASLEXT) strap-1/BOP.$(FASLEXT) \ + strap-1/NNI.$(FASLEXT) strap-1/ABELMON.$(FASLEXT) + # # @@ -2706,17 +2713,25 @@ strap-2/%.$(FASLEXT): %.spad initdb.$(FASLEXT) | strap-2 $(BOOTSTRAP) --strap=strap-1 --sysalg=strap-2 \ --output=$@ --optimize=3 $< -$(oa_algebra_layer_0_objects): $(oa_strap_modules) - +# $(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) + +$(OUT)/IEVALAB.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) \ + strap-2/LIST.$(FASLEXT) + +$(OUT)/EVALAB.$(FASLEXT): $(OUT)/IEVALAB.$(FASLEXT) \ + strap-2/EQ.$(FASLEXT) strap-2/LIST.$(FASLEXT) -$(OUT)/IEVALAB.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) -$(OUT)/EVALAB.$(FASLEXT): $(OUT)/IEVALAB.$(FASLEXT) $(OUT)/ELTAB.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) -$(OUT)/SETCAT.$(FASLEXT): $(OUT)/BASTYPE.$(FASLEXT) +$(OUT)/SETCAT.$(FASLEXT): $(OUT)/BASTYPE.$(FASLEXT) \ + strap-2/SINT.$(FASLEXT) strap-2/STRING.$(FASLEXT) $(OUT)/UTYPE.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) $(OUT)/AHYP.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) @@ -2725,41 +2740,7 @@ $(OUT)/ATTREG.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) $(OUT)/CONDUIT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) $(OUT)/CFCAT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) -$(OUT)/AGG.$(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) \ - $(OUT)/AGG.$(FASLEXT) -$(OUT)/QUAGG.$(FASLEXT): $(OUT)/BGAGG.$(FASLEXT) $(OUT)/FINAGG.$(FASLEXT) -$(OUT)/SKAGG.$(FASLEXT): $(OUT)/BGAGG.$(FASLEXT) $(OUT)/FINAGG.$(FASLEXT) -$(OUT)/DQAGG.$(FASLEXT): $(OUT)/QUAGG.$(FASLEXT) $(OUT)/SKAGG.$(FASLEXT) -$(OUT)/PRQAGG.$(FASLEXT): $(OUT)/BGAGG.$(FASLEXT) $(OUT)/FINAGG.$(FASLEXT) -#$(OUT)/DLAGG.$(FASLEXT): $(OUT)/RCAGG.$(FASLEXT) -#$(OUT)/URAGG.$(FASLEXT): $(OUT)/RCAGG.$(FASLEXT) -#$(OUT)/BRAGG.$(FASLEXT): $(OUT)/RCAGG.$(FASLEXT) -$(OUT)/FLAGG.$(FASLEXT): $(OUT)/BMODULE.$(FASLEXT) $(OUT)/PID.$(FASLEXT) \ - $(OUT)/OAGROUP.$(FASLEXT) $(OUT)/RETRACT.$(FASLEXT) \ - $(OUT)/LINEXP.$(FASLEXT) $(OUT)/PATMAB.$(FASLEXT) \ - $(OUT)/REAL.$(FASLEXT) $(OUT)/CHARZ.$(FASLEXT) \ - $(OUT)/DIFFSPC.$(FASLEXT) $(OUT)/FINAGG.$(FASLEXT) -$(OUT)/A1AGG.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/BOOLE-.$(FASLEXT) \ - $(OUT)/FLAGG.$(FASLEXT) $(OUT)/LOGIC-.$(FASLEXT) \ - $(OUT)/ORDTYPE-.$(FASLEXT) $(OUT)/SMAGG.$(FASLEXT) -$(OUT)/SRAGG.$(FASLEXT): $(OUT)/A1AGG.$(FASLEXT) -$(OUT)/STAGG.$(FASLEXT): $(OUT)/URAGG.$(FASLEXT) $(OUT)/LNAGG.$(FASLEXT) -$(OUT)/LNAGG.$(FASLEXT): $(OUT)/SEGCAT.$(FASLEXT) $(OUT)/SEGCAT.$(FASLEXT): $(OUT)/KRCFROM.$(FASLEXT) -$(OUT)/SETAGG.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/CLAGG.$(FASLEXT) -$(OUT)/STRING.$(FASLEXT): $(OUT)/SRAGG.$(FASLEXT) $(OUT)/ORDFIN.$(FASLEXT) -$(OUT)/DIOPS.$(FASLEXT): $(OUT)/STRING.$(FASLEXT) -$(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)/MSYSCMD.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) $(OUT)/KOERCE.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) $(OUT)/KRCFROM.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) @@ -2769,19 +2750,17 @@ $(OUT)/KVTFROM.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) $(OUT)/RETRACT.$(FASLEXT): $(OUT)/KRCFROM.$(FASLEXT) -$(OUT)/BASTYPE.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) +$(OUT)/BASTYPE.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) \ + strap-2/BOOLEAN.$(FASLEXT) + $(OUT)/SETCAT.$(FASLEXT) $(OUT)/SETCAT-.$(FASLEXT): $(OUT)/BASTYPE.$(FASLEXT) -$(OUT)/FINITE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) +$(OUT)/FINITE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) \ + strap-2/NNI.$(FASLEXT) strap-2/PI.$(FASLEXT) + $(OUT)/ORDSET.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) \ $(OUT)/ORDTYPE.$(FASLEXT) $(OUT)/FILECAT.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) -$(OUT)/SEXCAT.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/PID.$(FASLEXT) \ - $(OUT)/OAGROUP.$(FASLEXT) $(OUT)/LINEXP.$(FASLEXT) \ - $(OUT)/PATMAB.$(FASLEXT) $(OUT)/REAL.$(FASLEXT) \ - $(OUT)/CHARZ.$(FASLEXT) $(OUT)/AGG.$(FASLEXT) \ - $(OUT)/IXAGG.$(FASLEXT) $(OUT)/FLAGG.$(FASLEXT) \ - $(OUT)/ELAGG.$(FASLEXT) $(OUT)/STEP.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/PATMAB.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/REAL.$(FASLEXT): $(OUT)/KONVERT.$(FASLEXT) @@ -2837,14 +2816,28 @@ $(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)/FSAGG.$(FASLEXT): $(OUT)/FINAGG.$(FASLEXT) $(OUT)/FUNCTOR.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) -$(OUT)/HOAGG.$(FASLEXT): $(OUT)/FUNCTOR.$(FASLEXT) -$(OUT)/SMAGG.$(FASLEXT): $(OUT)/HOAGG.$(FASLEXT) -$(OUT)/FINAGG.$(FASLEXT): $(OUT)/HOAGG.$(FASLEXT) -$(OUT)/ELAGG.$(FASLEXT): $(OUT)/SMAGG.$(FASLEXT) strap-2/UNISEG.$(FASLEXT) -$(OUT)/CLAGG.$(FASLEXT): $(OUT)/HOAGG.$(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)/INS.$(FASLEXT): $(OUT)/UFD.$(FASLEXT) $(OUT)/EUCDOM.$(FASLEXT) \ + $(OUT)/OINTDOM.$(FASLEXT) $(OUT)/DIFRING.$(FASLEXT) \ + $(OUT)/KONVERT.$(FASLEXT) $(OUT)/RETRACT.$(FASLEXT) \ + $(OUT)/LINEXP.$(FASLEXT) $(OUT)/CFCAT.$(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/INFORM.$(FASLEXT) strap-2/SEXCAT.$(FASLEXT) \ + strap-2/PATTERN.$(FASLEXT) strap-2/PI.$(FASLEXT) \ + strap-2/NNI.$(FASLEXT) $(OUT)/HOMOTOP.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) $(OUT)/KRCFROM.$(FASLEXT) $(OUT)/ITUPLE.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) $(OUT)/STREAM.$(FASLEXT) @@ -2868,7 +2861,10 @@ $(OUT)/RING.$(FASLEXT): $(OUT)/RNG.$(FASLEXT) $(OUT)/SRING.$(FASLEXT) \ $(OUT)/LMODULE.$(FASLEXT) $(OUT)/KOERCE.$(FASLEXT) $(OUT)/MONOID.$(FASLEXT): $(OUT)/SGROUP.$(FASLEXT) $(OUT)/ABELGRP.$(FASLEXT): $(OUT)/CABMON.$(FASLEXT) $(OUT)/LLINSET.$(FASLEXT) -$(OUT)/ABELMON.$(FASLEXT): $(OUT)/ABELSG.$(FASLEXT) + +$(OUT)/ABELMON.$(FASLEXT): $(OUT)/ABELSG.$(FASLEXT) \ + $(OUT)/REPSQ.$(FASLEXT) + $(OUT)/ORDRING.$(FASLEXT): $(OUT)/OAGROUP.$(FASLEXT) $(OUT)/CHARZ.$(FASLEXT) \ $(OUT)/MONOID.$(FASLEXT) $(OUT)/COMRING.$(FASLEXT): $(OUT)/RING.$(FASLEXT) $(OUT)/BMODULE.$(FASLEXT) @@ -2884,7 +2880,6 @@ $(OUT)/ES.$(FASLEXT): $(OUT)/RING.$(FASLEXT) $(OUT)/CACHSET.$(FASLEXT) \ $(OUT)/PATAB.$(FASLEXT) $(OUT)/PRIMARR.$(FASLEXT) \ $(OUT)/MAYBE.$(FASLEXT) $(OUT)/CACHSET.$(FASLEXT): $(OUT)/ORDSET.$(FASLEXT) -$(OUT)/ALIST.$(FASLEXT): $(OUT)/ALAGG.$(FASLEXT) $(OUT)/PATAB.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) $(OUT)/BOOLEAN.$(FASLEXT): $(OUT)/PROPLOG.$(FASLEXT) $(OUT)/VECTCAT.$(FASLEXT): $(OUT)/RADCAT.$(FASLEXT) @@ -2905,6 +2900,57 @@ $(OUT)/MONOP.$(FASLEXT): $(OUT)/MONOPC.$(FASLEXT) $(OUT)/PAIR.$(FASLEXT) \ $(OUT)/IDPT.$(FASLEXT): $(OUT)/PAIR.$(FASLEXT) +$(OUT)/AGG.$(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) \ + $(OUT)/AGG.$(FASLEXT) +$(OUT)/QUAGG.$(FASLEXT): $(OUT)/BGAGG.$(FASLEXT) $(OUT)/FINAGG.$(FASLEXT) +$(OUT)/SKAGG.$(FASLEXT): $(OUT)/BGAGG.$(FASLEXT) $(OUT)/FINAGG.$(FASLEXT) +$(OUT)/DQAGG.$(FASLEXT): $(OUT)/QUAGG.$(FASLEXT) $(OUT)/SKAGG.$(FASLEXT) +$(OUT)/PRQAGG.$(FASLEXT): $(OUT)/BGAGG.$(FASLEXT) $(OUT)/FINAGG.$(FASLEXT) +#$(OUT)/DLAGG.$(FASLEXT): $(OUT)/RCAGG.$(FASLEXT) +#$(OUT)/URAGG.$(FASLEXT): $(OUT)/RCAGG.$(FASLEXT) +#$(OUT)/BRAGG.$(FASLEXT): $(OUT)/RCAGG.$(FASLEXT) +$(OUT)/FLAGG.$(FASLEXT): $(OUT)/BMODULE.$(FASLEXT) $(OUT)/PID.$(FASLEXT) \ + $(OUT)/OAGROUP.$(FASLEXT) $(OUT)/RETRACT.$(FASLEXT) \ + $(OUT)/LINEXP.$(FASLEXT) $(OUT)/PATMAB.$(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) \ + $(OUT)/ORDSET.$(FASLEXT) +$(OUT)/SRAGG.$(FASLEXT): $(OUT)/A1AGG.$(FASLEXT) +$(OUT)/STAGG.$(FASLEXT): $(OUT)/URAGG.$(FASLEXT) $(OUT)/LNAGG.$(FASLEXT) +$(OUT)/LNAGG.$(FASLEXT): $(OUT)/SEGCAT.$(FASLEXT) +$(OUT)/SETAGG.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/CLAGG.$(FASLEXT) +$(OUT)/DIOPS.$(FASLEXT): $(OUT)/STRING.$(FASLEXT) +$(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)/SMAGG.$(FASLEXT): $(OUT)/HOAGG.$(FASLEXT) +$(OUT)/FINAGG.$(FASLEXT): $(OUT)/HOAGG.$(FASLEXT) +$(OUT)/ELAGG.$(FASLEXT): $(OUT)/SMAGG.$(FASLEXT) strap-2/UNISEG.$(FASLEXT) +$(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) \ + $(OUT)/CHARZ.$(FASLEXT) $(OUT)/AGG.$(FASLEXT) \ + $(OUT)/IXAGG.$(FASLEXT) $(OUT)/FLAGG.$(FASLEXT) \ + $(OUT)/ELAGG.$(FASLEXT) + +$(OUT)/MSETAGG.$(FASLEXT): $(OUT)/MDAGG.$(FASLEXT) $(OUT)/SETAGG.$(FASLEXT) +$(OUT)/MDAGG.$(FASLEXT): $(OUT)/DIOPS.$(FASLEXT) + $(OUT)/FNCAT.$(FASLEXT): $(OUT)/HOMOTOP.$(FASLEXT) $(OUT)/SETCAT.$(FASLEXT) $(OUT)/SYNTAX.$(FASLEXT): $(OUT)/IDENT.$(FASLEXT) $(OUT)/COMMONOP.$(FASLEXT): $(OUT)/BOP.$(FASLEXT) @@ -2945,9 +2991,6 @@ $(OUT)/IDPAG.$(FASLEXT): $(OUT)/IDPAM.$(FASLEXT) $(OUT)/ANY.$(FASLEXT): $(OUT)/SEX.$(FASLEXT) $(OUT)/SEX.$(FASLEXT): $(OUT)/SEXOF.$(FASLEXT) -$(OUT)/LEXP.$(FASLEXT): $(OUT)/XPBWPOLY.$(FASLEXT) -$(OUT)/XPBWPOLY.$(FASLEXT): $(OUT)/XPOLYC.$(FASLEXT) \ - $(OUT)/PBWLB.$(FASLEXT) $(OUT)/PENDTREE.$(FASLEXT): $(OUT)/TREE.$(FASLEXT) $(OUT)/QFORM.$(FASLEXT): $(OUT)/SQMATRIX.$(FASLEXT) $(OUT)/SQMATRIX.$(FASLEXT): $(OUT)/SMATCAT.$(FASLEXT) \ @@ -2970,6 +3013,9 @@ $(OUT)/POINT.$(FASLEXT): $(OUT)/PTCAT.$(FASLEXT) $(OUT)/UPOLYC.$(FASLEXT): $(OUT)/PFECAT.$(FASLEXT) $(OUT)/SETMN.$(FASLEXT): $(OUT)/IBITS.$(FASLEXT) +$(OUT)/LEXP.$(FASLEXT): $(OUT)/XPBWPOLY.$(FASLEXT) +$(OUT)/XPBWPOLY.$(FASLEXT): $(OUT)/XPOLYC.$(FASLEXT) \ + $(OUT)/PBWLB.$(FASLEXT) $(OUT)/FS.$(FASLEXT): $(OUT)/UPOLYC.$(FASLEXT) $(OUT)/FILE.$(FASLEXT): $(OUT)/FNAME.$(FASLEXT) $(OUT)/EXPUPXS.$(FASLEXT): $(OUT)/UPXS.$(FASLEXT) @@ -2996,6 +3042,8 @@ $(OUT)/GSERIES.$(FASLEXT): $(OUT)/PDDOM.$(FASLEXT) $(OUT)/SULS.$(FASLEXT): $(OUT)/PDDOM.$(FASLEXT) $(OUT)/SUPXS.$(FASLEXT): $(OUT)/PDDOM.$(FASLEXT) +$(OUT)/MSYSCMD.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) + $(OUT)/SASTCAT.$(FASLEXT): $(OUT)/ASTCAT.$(FASLEXT) $(OUT)/LITERAL.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) $(OUT)/PARAMAST.$(FASLEXT): $(OUT)/IDENT.$(FASLEXT) $(OUT)/STRING.$(FASLEXT) |