From fcf291532cdcf5b208f005c19f59fef0bd6bae83 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Tue, 21 Apr 2009 07:15:31 +0000 Subject: * algebra/Makefile.pamphlet: Move aggregates to layer 0. --- src/algebra/Makefile.in | 69 ++++++++++++++++++++++++++++--------------- src/algebra/Makefile.pamphlet | 69 ++++++++++++++++++++++++++++--------------- 2 files changed, 92 insertions(+), 46 deletions(-) (limited to 'src/algebra') diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in index 9e5e044e..a8c1c23b 100644 --- a/src/algebra/Makefile.in +++ b/src/algebra/Makefile.in @@ -225,13 +225,24 @@ $(OUT)/CONDUIT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) $(OUT)/CFCAT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) + $(OUT)/AGG.$(FASLEXT) $(OUT)/AGG-.$(FASLEXT): $(OUT)/TYPE.$(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)/SKAGG.$(FASLEXT): $(OUT)/BGAGG.$(FASLEXT) $(OUT)/DQAGG.$(FASLEXT): $(OUT)/QUAGG.$(FASLEXT) $(OUT)/SKAGG.$(FASLEXT) $(OUT)/PRQAGG.$(FASLEXT): $(OUT)/BGAGG.$(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)/MSYSCMD.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) @@ -241,6 +252,8 @@ $(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) $(OUT)/SETCAT.$(FASLEXT) $(OUT)/SETCAT-.$(FASLEXT): $(OUT)/BASTYPE.$(FASLEXT) @@ -249,13 +262,22 @@ $(OUT)/ORDSET.$(FASLEXT) $(OUT)/ORDSET-.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/FILECAT.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/SEXCAT.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/STEP.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) +$(OUT)/PATMAB.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) +$(OUT)/REAL.$(FASLEXT): $(OUT)/KONVERT.$(FASLEXT) -$(OUT)/LMODULE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) -$(OUT)/RMODULE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/SGROUP.$(FASLEXT) $(OUT)/SGROUP-.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) - $(OUT)/ABELSG.$(FASLEXT) $(OUT)/ABELSG-.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) +$(OUT)/LMODULE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) +$(OUT)/RMODULE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) +$(OUT)/BMODULE.$(FASLEXT): $(OUT)/LMODULE.$(FASLEXT) \ + $(OUT)/RMODULE.$(FASLEXT) $(OUT)/SGROUP.$(FASLEXT) +$(OUT)/MODULE.$(FASLEXT): $(OUT)/BMODULE.$(FASLEXT) +$(OUT)/ALGEBRA.$(FASLEXT): $(OUT)/MODULE.$(FASLEXT) +$(OUT)/OAGROUP.$(FASLEXT): $(OUT)/OCAMON.$(FASLEXT) +$(OUT)/OCAMON.$(FASLEXT): $(OUT)/OAMON.$(FASLEXT) +$(OUT)/OAMON.$(FASLEXT): $(OUT)/OASGP.$(FASLEXT) +$(OUT)/OASGP.$(FASLEXT): $(OUT)/ORDSET.$(FASLEXT) $(OUT)/ABELSG.$(FASLEXT) $(OUT)/CTORKIND.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/IOMODE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) @@ -265,17 +287,21 @@ $(OUT)/PRINT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) axiom_algebra_layer_0 = \ AHYP ATTREG CFCAT ELTAB KOERCE KONVERT \ KRCFROM KVTFROM IEVALAB IEVALAB- EVALAB EVALAB- \ - MSYSCMD OM OMCONN OMDEV OUT \ + RETRACT RETRACT- \ + MSYSCMD FINITE OM OMCONN OMDEV OUT \ PRIMCAT PRINT PTRANFN SPFCAT TYPE UTYPE \ - PROPERTY BASTYPE BASTYPE- LMODULE \ - RMODULE FINITE STEP SGROUP SGROUP- ABELSG \ - ABELSG- ORDSET ORDSET- FILECAT SEXCAT \ + BMODULE PROPERTY BASTYPE BASTYPE- STEP LMODULE \ + RMODULE ALGEBRA ALGEBRA- SGROUP SGROUP- ABELSG \ + ABELSG- ORDSET ORDSET- OASGP FILECAT SEXCAT \ + MODULE MODULE- PID OAGROUP OCAMON OAMON \ MKBCFUNC MKRECORD MKUCFUNC DROPT1 PLOT1 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 + DLAGG DQAGG QUAGG SKAGG PRQAGG \ + FLAGG FLAGG- URAGG URAGG- LNAGG LNAGG- \ + LINEXP PATMAB REAL CHARZ axiom_algebra_layer_0_nrlibs = \ $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_0)) @@ -298,15 +324,14 @@ $(OUT)/EVALAB.$(FASLEXT) $(OUT)/EVALAB-.$(FASLEXT): \ $(OUT)/LOGIC.$(FASLEXT) $(OUT)/LOGIC-.$(FASLEXT): $(OUT)/BASTYPE.$(FASLEXT) $(OUT)/PROPLOG.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) -$(OUT)/RETRACT.$(FASLEXT) $(OUT)/RETRACT-.$(FASLEXT): $(OUT)/KRCFROM.$(FASLEXT) $(OUT)/MAYBE.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) $(OUT)/RETRACT.$(FASLEXT) $(OUT)/BYTEORD.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) axiom_algebra_layer_1 = \ FORTCAT ITUPLE \ - PATAB PPCURVE PSCURVE REAL RESLATC RETRACT \ - RETRACT- SEGCAT BINDING BMODULE LOGIC \ + PATAB PPCURVE PSCURVE RESLATC \ + SEGCAT BINDING LOGIC \ LOGIC- FEVALAB FEVALAB- \ OSGROUP MAYBE DATAARY PROPLOG HOMOTOP BYTEORD @@ -318,10 +343,9 @@ axiom_algebra_layer_1_objects = \ $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_1))) axiom_algebra_layer_2 = \ SYNTAX INTRET SEGXCAT CONTOUR LIST3 MKFUNC \ - OASGP KTVLOGIC FNCAT IDENT + KTVLOGIC FNCAT IDENT $(OUT)/FNCAT.$(FASLEXT): $(OUT)/HOMOTOP.$(FASLEXT) $(OUT)/SETCAT.$(FASLEXT) -$(OUT)/OASGP.$(FASLEXT): $(OUT)/ORDSET.$(FASLEXT) $(OUT)/ABELSG.$(FASLEXT) $(OUT)/SYNTAX.$(FASLEXT): $(OUT)/IDENT.$(FASLEXT) $(OUT/KTVLOGIC.$(FASLEXT): $(OUT)/PROPLOG.$(FASLEXT) @@ -350,11 +374,10 @@ axiom_algebra_layer_4 = \ FAMONC FORMULA1 IDPC NONE NUMINT \ ODECAT OMENC ONECOMP2 OPTCAT \ PALETTE PARPCURV PARPC2 PARSCURV PARSC2 PARSURF \ - PARSU2 PATMAB PATRES2 PATTERN1 PDECAT \ + PARSU2 PATRES2 PATTERN1 PDECAT \ REPSQ REPDB RFDIST RIDIST SPACEC SPLNODE \ SUCH TEX1 UDVO YSTREAM PAIR ENV \ - ATRIG ATRIG- GROUP GROUP- LALG LALG- \ - OAMON MODULE MODULE- + ATRIG ATRIG- GROUP GROUP- LALG LALG- axiom_algebra_layer_4_nrlibs = \ @@ -364,13 +387,13 @@ axiom_algebra_layer_4_objects = \ $(addprefix $(OUT)/, \ $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_4))) axiom_algebra_layer_5 = \ - CACHSET CHARNZ CHARZ DVARCAT DVARCAT- ELEMFUN \ + CACHSET CHARNZ DVARCAT DVARCAT- ELEMFUN \ ELEMFUN- ESTOOLS2 FCOMP FPATMAB IDPAM IDPO \ - INCRMAPS KERNEL2 LINEXP MODMONOM MONADWU MONADWU- \ + INCRMAPS KERNEL2 MODMONOM MONADWU MONADWU- \ MRF2 NARNG NARNG- NSUP2 ODVAR OPQUERY \ ORDFIN ORDMON PATMATCH PERMCAT PDRING PDRING- \ SDVAR SUP2 TRIGCAT TRIGCAT- ULS2 UP2 \ - ELABEXPR OCAMON + ELABEXPR axiom_algebra_layer_5_nrlibs = \ $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_5)) @@ -382,11 +405,11 @@ axiom_algebra_layer_5_objects = \ $(OUT)/CHARPOL.$(FASLEXT): $(OUT)/SETCAT-.$(FASLEXT) axiom_algebra_layer_6 = \ - ALGEBRA ALGEBRA- AUTOMOR CARTEN2 CHARPOL COMPLEX2 \ + AUTOMOR CARTEN2 CHARPOL COMPLEX2 \ DIFEXT DIFEXT- ES1 ES2 GRMOD GRMOD- \ HYPCAT HYPCAT- MKCHSET MODRING NASRING NASRING- \ SORTPAK ZMOD \ - PID OAGROUP OAMONS BYTE SYSINT SYSNNI + OAMONS BYTE SYSINT SYSNNI axiom_algebra_layer_6_nrlibs = \ $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_6)) @@ -394,8 +417,8 @@ axiom_algebra_layer_6_objects = \ $(addprefix $(OUT)/, \ $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_6))) axiom_algebra_layer_7 = \ - BTCAT BTCAT- LNAGG LNAGG- FMCAT IDPOAM \ - IFAMON GRALG GRALG- FLAGG FLAGG- \ + BTCAT BTCAT- FMCAT IDPOAM \ + IFAMON GRALG GRALG- \ INT8 INT16 INT32 INT64 UINT8 UINT16 \ UINT32 UINT64 diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet index a3a1ee35..a0b24743 100644 --- a/src/algebra/Makefile.pamphlet +++ b/src/algebra/Makefile.pamphlet @@ -179,13 +179,24 @@ $(OUT)/CONDUIT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) $(OUT)/CFCAT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) + $(OUT)/AGG.$(FASLEXT) $(OUT)/AGG-.$(FASLEXT): $(OUT)/TYPE.$(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)/SKAGG.$(FASLEXT): $(OUT)/BGAGG.$(FASLEXT) $(OUT)/DQAGG.$(FASLEXT): $(OUT)/QUAGG.$(FASLEXT) $(OUT)/SKAGG.$(FASLEXT) $(OUT)/PRQAGG.$(FASLEXT): $(OUT)/BGAGG.$(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)/MSYSCMD.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) @@ -195,6 +206,8 @@ $(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) $(OUT)/SETCAT.$(FASLEXT) $(OUT)/SETCAT-.$(FASLEXT): $(OUT)/BASTYPE.$(FASLEXT) @@ -203,13 +216,22 @@ $(OUT)/ORDSET.$(FASLEXT) $(OUT)/ORDSET-.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/FILECAT.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/SEXCAT.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/STEP.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) +$(OUT)/PATMAB.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) +$(OUT)/REAL.$(FASLEXT): $(OUT)/KONVERT.$(FASLEXT) -$(OUT)/LMODULE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) -$(OUT)/RMODULE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/SGROUP.$(FASLEXT) $(OUT)/SGROUP-.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) - $(OUT)/ABELSG.$(FASLEXT) $(OUT)/ABELSG-.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) +$(OUT)/LMODULE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) +$(OUT)/RMODULE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) +$(OUT)/BMODULE.$(FASLEXT): $(OUT)/LMODULE.$(FASLEXT) \ + $(OUT)/RMODULE.$(FASLEXT) $(OUT)/SGROUP.$(FASLEXT) +$(OUT)/MODULE.$(FASLEXT): $(OUT)/BMODULE.$(FASLEXT) +$(OUT)/ALGEBRA.$(FASLEXT): $(OUT)/MODULE.$(FASLEXT) +$(OUT)/OAGROUP.$(FASLEXT): $(OUT)/OCAMON.$(FASLEXT) +$(OUT)/OCAMON.$(FASLEXT): $(OUT)/OAMON.$(FASLEXT) +$(OUT)/OAMON.$(FASLEXT): $(OUT)/OASGP.$(FASLEXT) +$(OUT)/OASGP.$(FASLEXT): $(OUT)/ORDSET.$(FASLEXT) $(OUT)/ABELSG.$(FASLEXT) $(OUT)/CTORKIND.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/IOMODE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) @@ -219,17 +241,21 @@ $(OUT)/PRINT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT) axiom_algebra_layer_0 = \ AHYP ATTREG CFCAT ELTAB KOERCE KONVERT \ KRCFROM KVTFROM IEVALAB IEVALAB- EVALAB EVALAB- \ - MSYSCMD OM OMCONN OMDEV OUT \ + RETRACT RETRACT- \ + MSYSCMD FINITE OM OMCONN OMDEV OUT \ PRIMCAT PRINT PTRANFN SPFCAT TYPE UTYPE \ - PROPERTY BASTYPE BASTYPE- LMODULE \ - RMODULE FINITE STEP SGROUP SGROUP- ABELSG \ - ABELSG- ORDSET ORDSET- FILECAT SEXCAT \ + BMODULE PROPERTY BASTYPE BASTYPE- STEP LMODULE \ + RMODULE ALGEBRA ALGEBRA- SGROUP SGROUP- ABELSG \ + ABELSG- ORDSET ORDSET- OASGP FILECAT SEXCAT \ + MODULE MODULE- PID OAGROUP OCAMON OAMON \ MKBCFUNC MKRECORD MKUCFUNC DROPT1 PLOT1 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 + DLAGG DQAGG QUAGG SKAGG PRQAGG \ + FLAGG FLAGG- URAGG URAGG- LNAGG LNAGG- \ + LINEXP PATMAB REAL CHARZ axiom_algebra_layer_0_nrlibs = \ $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_0)) @@ -257,15 +283,14 @@ $(OUT)/EVALAB.$(FASLEXT) $(OUT)/EVALAB-.$(FASLEXT): \ $(OUT)/LOGIC.$(FASLEXT) $(OUT)/LOGIC-.$(FASLEXT): $(OUT)/BASTYPE.$(FASLEXT) $(OUT)/PROPLOG.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) -$(OUT)/RETRACT.$(FASLEXT) $(OUT)/RETRACT-.$(FASLEXT): $(OUT)/KRCFROM.$(FASLEXT) $(OUT)/MAYBE.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) $(OUT)/RETRACT.$(FASLEXT) $(OUT)/BYTEORD.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) axiom_algebra_layer_1 = \ FORTCAT ITUPLE \ - PATAB PPCURVE PSCURVE REAL RESLATC RETRACT \ - RETRACT- SEGCAT BINDING BMODULE LOGIC \ + PATAB PPCURVE PSCURVE RESLATC \ + SEGCAT BINDING LOGIC \ LOGIC- FEVALAB FEVALAB- \ OSGROUP MAYBE DATAARY PROPLOG HOMOTOP BYTEORD @@ -282,10 +307,9 @@ axiom_algebra_layer_1_objects = \ <>= axiom_algebra_layer_2 = \ SYNTAX INTRET SEGXCAT CONTOUR LIST3 MKFUNC \ - OASGP KTVLOGIC FNCAT IDENT + KTVLOGIC FNCAT IDENT $(OUT)/FNCAT.$(FASLEXT): $(OUT)/HOMOTOP.$(FASLEXT) $(OUT)/SETCAT.$(FASLEXT) -$(OUT)/OASGP.$(FASLEXT): $(OUT)/ORDSET.$(FASLEXT) $(OUT)/ABELSG.$(FASLEXT) $(OUT)/SYNTAX.$(FASLEXT): $(OUT)/IDENT.$(FASLEXT) $(OUT/KTVLOGIC.$(FASLEXT): $(OUT)/PROPLOG.$(FASLEXT) @@ -324,11 +348,10 @@ axiom_algebra_layer_4 = \ FAMONC FORMULA1 IDPC NONE NUMINT \ ODECAT OMENC ONECOMP2 OPTCAT \ PALETTE PARPCURV PARPC2 PARSCURV PARSC2 PARSURF \ - PARSU2 PATMAB PATRES2 PATTERN1 PDECAT \ + PARSU2 PATRES2 PATTERN1 PDECAT \ REPSQ REPDB RFDIST RIDIST SPACEC SPLNODE \ SUCH TEX1 UDVO YSTREAM PAIR ENV \ - ATRIG ATRIG- GROUP GROUP- LALG LALG- \ - OAMON MODULE MODULE- + ATRIG ATRIG- GROUP GROUP- LALG LALG- axiom_algebra_layer_4_nrlibs = \ @@ -343,13 +366,13 @@ axiom_algebra_layer_4_objects = \ <>= axiom_algebra_layer_5 = \ - CACHSET CHARNZ CHARZ DVARCAT DVARCAT- ELEMFUN \ + CACHSET CHARNZ DVARCAT DVARCAT- ELEMFUN \ ELEMFUN- ESTOOLS2 FCOMP FPATMAB IDPAM IDPO \ - INCRMAPS KERNEL2 LINEXP MODMONOM MONADWU MONADWU- \ + INCRMAPS KERNEL2 MODMONOM MONADWU MONADWU- \ MRF2 NARNG NARNG- NSUP2 ODVAR OPQUERY \ ORDFIN ORDMON PATMATCH PERMCAT PDRING PDRING- \ SDVAR SUP2 TRIGCAT TRIGCAT- ULS2 UP2 \ - ELABEXPR OCAMON + ELABEXPR axiom_algebra_layer_5_nrlibs = \ $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_5)) @@ -366,11 +389,11 @@ axiom_algebra_layer_5_objects = \ $(OUT)/CHARPOL.$(FASLEXT): $(OUT)/SETCAT-.$(FASLEXT) axiom_algebra_layer_6 = \ - ALGEBRA ALGEBRA- AUTOMOR CARTEN2 CHARPOL COMPLEX2 \ + AUTOMOR CARTEN2 CHARPOL COMPLEX2 \ DIFEXT DIFEXT- ES1 ES2 GRMOD GRMOD- \ HYPCAT HYPCAT- MKCHSET MODRING NASRING NASRING- \ SORTPAK ZMOD \ - PID OAGROUP OAMONS BYTE SYSINT SYSNNI + OAMONS BYTE SYSINT SYSNNI axiom_algebra_layer_6_nrlibs = \ $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_6)) @@ -386,8 +409,8 @@ axiom_algebra_layer_6_objects = \ <>= axiom_algebra_layer_7 = \ - BTCAT BTCAT- LNAGG LNAGG- FMCAT IDPOAM \ - IFAMON GRALG GRALG- FLAGG FLAGG- \ + BTCAT BTCAT- FMCAT IDPOAM \ + IFAMON GRALG GRALG- \ INT8 INT16 INT32 INT64 UINT8 UINT16 \ UINT32 UINT64 -- cgit v1.2.3