From 95a8891a808572509f7449aa32022df42f8b7ab8 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Mon, 26 Apr 2010 02:05:39 +0000 Subject: * algebra/carten.spad.pamphlet (CartesianTensor): Satisfy instantiation of Eltable. * algebra/clifford.spad.pamphlet (QuadraticForm): Likewise. * algebra/domain.spad.pamphlet (DomainTemplate): Likewise. * algebra/files.spad.pamphlet (Library): Likewise. * algebra/aggcat.spad.pamphlet (LinearAggregate): Extend instantiation of Eltable. * algebra/naalg.spad.pamphlet (FiniteRankNonAssociativeAlgebra): Likewise. * algebra/pscat.spad.pamphlet (UnivariatePowerSeriesCategory): Likewise. * algebra/sex.spad.pamphlet (SExpressionCategory): Likewise. * algebra/Makefile.pamphlet: Update rules. --- src/algebra/Makefile.pamphlet | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'src/algebra/Makefile.pamphlet') diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet index e5f1d98f..4377820b 100644 --- a/src/algebra/Makefile.pamphlet +++ b/src/algebra/Makefile.pamphlet @@ -218,6 +218,8 @@ $(OUT)/A1AGG.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/LOGIC.$(FASLEXT) \ $(OUT)/SRAGG.$(FASLEXT): $(OUT)/A1AGG.$(FASLEXT) $(OUT)/ISTRING.$(FASLEXT): $(OUT)/SRAGG.$(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)/STRICAT.$(FASLEXT): $(OUT)/SRAGG.$(FASLEXT) $(OUT)/STRING.$(FASLEXT): $(OUT)/STRICAT.$(FASLEXT) $(OUT)/ORDFIN.$(FASLEXT) @@ -245,7 +247,12 @@ $(OUT)/SETCAT.$(FASLEXT) $(OUT)/SETCAT-.$(FASLEXT): $(OUT)/BASTYPE.$(FASLEXT) $(OUT)/FINITE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/ORDSET.$(FASLEXT) $(OUT)/ORDSET-.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/FILECAT.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) -$(OUT)/SEXCAT.$(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) @@ -264,6 +271,7 @@ $(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)/OAMONS.$(FASLEXT): $(OUT)/OAMON.$(FASLEXT) $(OUT)/OASGP.$(FASLEXT): $(OUT)/ORDSET.$(FASLEXT) $(OUT)/ABELSG.$(FASLEXT) $(OUT)/RNG.$(FASLEXT): $(OUT)/SGROUP.$(FASLEXT) @@ -284,14 +292,14 @@ $(OUT)/OUT.$(FASLEXT): $(OUT)/VOID.$(FASLEXT) axiom_algebra_layer_0 = \ AHYP ATTREG CFCAT ELTAB KOERCE KONVERT \ KRCFROM KVTFROM IEVALAB IEVALAB- EVALAB EVALAB- \ - RETRACT RETRACT- SETCAT SETCAT- VOID \ + RETRACT RETRACT- SETCAT SETCAT- VOID SEGCAT \ MSYSCMD FINITE OM OMCONN OMDEV OUT \ PRIMCAT PRINT PTRANFN SPFCAT TYPE UTYPE \ BMODULE BASTYPE BASTYPE- STEP LMODULE \ RMODULE ALGEBRA ALGEBRA- SGROUP SGROUP- ABELSG \ ABELSG- ORDSET ORDSET- OASGP FILECAT SEXCAT \ MODULE MODULE- PID OAGROUP OCAMON OAMON \ - RNG ORDFIN LLINSET RLINSET LINSET \ + RNG ORDFIN LLINSET RLINSET LINSET OAMONS \ MKBCFUNC MKRECORD MKUCFUNC DROPT1 PLOT1 ITFUN2 \ ITFUN3 STREAM1 STREAM2 STREAM3 ANY1 SEGBIND2 \ COMBOPC EQ2 NONE1 CONDUIT IOMODE CTORKIND \ @@ -373,7 +381,7 @@ axiom_algebra_layer_1 = \ DIFRING DIFRING- ENTIRER INTDOM INTDOM- OINTDOM \ GCDDOM GCDDOM- UFD UFD- ES ES- \ PATAB PPCURVE PSCURVE CACHSET RESLATC REF \ - IDENT SEGCAT BINDING ALIST BOOLEAN PRIMARR \ + IDENT BINDING ALIST BOOLEAN PRIMARR \ ORDRING ORDRING- FEVALAB FEVALAB- \ OSGROUP MAYBE DATAARY PROPLOG HOMOTOP BYTEORD \ FIELD FIELD- VECTCAT VECTCAT- IARRAY1 BOOLE \ @@ -398,7 +406,7 @@ axiom_algebra_layer_2 = \ $(OUT)/FNCAT.$(FASLEXT): $(OUT)/HOMOTOP.$(FASLEXT) $(OUT)/SETCAT.$(FASLEXT) $(OUT)/SYNTAX.$(FASLEXT): $(OUT)/IDENT.$(FASLEXT) $(OUT)/COMMONOP.$(FASLEXT): $(OUT)/BOP.$(FASLEXT) -$(OUT)/DOMTMPLT.$(FASLEXT): $(OUT)/SYNTAX.$(FASLEXT) +$(OUT)/DOMTMPLT.$(FASLEXT): $(OUT)/SYNTAX.$(FASLEXT) $(OUT)/OAMONS.$(FASLEXT) $(OUT)/FCTRDATA.$(FASLEXT): $(OUT)/DOMTMPLT.$(FASLEXT) axiom_algebra_layer_2_nrlibs = \ @@ -492,7 +500,7 @@ axiom_algebra_layer_6 = \ DIFEXT DIFEXT- ES1 ES2 GRMOD GRMOD- \ HYPCAT HYPCAT- MODRING NASRING NASRING- \ SORTPAK ZMOD PROPFUN2 \ - KTVLOGIC OAMONS BYTE SYSINT SYSNNI + KTVLOGIC BYTE SYSINT SYSNNI axiom_algebra_layer_6_nrlibs = \ $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_6)) -- cgit v1.2.3