From 007980660ba03555922525f9f7ee5b0f59ef41b1 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Thu, 23 Apr 2009 15:19:26 +0000
Subject: 	* interp/c-util.boot (extendsCategoryForm): Use current
 category 	body instead of previous previous version of it. 	*
 algebra/Makefile.pamphlet: Remove ES from bootstrap layer. 	Build it (and
 dependencies) at layer 1. 	* algebra/strap/ES.lsp: Remove. 	*
 algebra/strap/ES-.lsp: Likewise. 	* algebra/boolean.spad.pamphlet
 (Boolean): Don't use outputForm.

---
 src/algebra/Makefile.pamphlet | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

(limited to 'src/algebra/Makefile.pamphlet')

diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet
index 87a7a534..5e09d224 100644
--- a/src/algebra/Makefile.pamphlet
+++ b/src/algebra/Makefile.pamphlet
@@ -136,8 +136,8 @@ axiom_algebra_bootstrap = \
   ABELSG   ABELSG-  ALAGG    BOOLEAN  \
   CABMON   CHAR     CLAGG    CLAGG-   \
   COMRING  DFLOAT   DIFRING  DIFRING- \
-  DIVRING  DIVRING- ENTIRER  ES       \
-  ES-      EUCDOM   EUCDOM-  FFIELDC  \
+  DIVRING  DIVRING- ENTIRER           \
+           EUCDOM   EUCDOM-  FFIELDC  \
   FFIELDC- FPS      FPS-     GCDDOM   \
   GCDDOM-  HOAGG    HOAGG-   ILIST    \
   INS      INS-     INT      INTDOM   \
@@ -158,8 +158,8 @@ axiom_algebra_bootstrap = \
 axiom_algebra_bootstrap_last_layer = \
                              BOOLEAN  \
            DFLOAT                     \
-  DIVRING  DIVRING-          ES       \
-  ES-      EUCDOM   EUCDOM-  FFIELDC  \
+  DIVRING  DIVRING-                   \
+           EUCDOM   EUCDOM-  FFIELDC  \
   FFIELDC- FPS      FPS-              \
   INS      INS-     INT               \
            MTSCAT   NNI               \
@@ -273,7 +273,7 @@ $(OUT)/RNG.$(FASLEXT): $(OUT)/SGROUP.$(FASLEXT)
 $(OUT)/CTORKIND.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT)
 $(OUT)/IOMODE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT)
 
-$(OUT)/REF.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT)
+$(OUT)/REF.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/IDENT.$(FASLEXT)
 $(OUT)/PRINT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT)
 
 axiom_algebra_layer_0 = \
@@ -345,16 +345,21 @@ $(OUT)/INTDOM.$(FASLEXT): $(OUT)/COMRING.$(FASLEXT) $(OUT)/ALGEBRA.$(FASLEXT) \
 	$(OUT)/ENTIRER.$(FASLEXT) $(OUT)/FIELD.$(FASLEXT)
 $(OUT)/OINTDOM.$(FASLEXT): $(OUT)/INTDOM.$(FASLEXT) $(OUT)/ORDRING.$(FASLEXT)
 $(OUT)/GCDDOM.$(FASLEXT): $(OUT)/INTDOM.$(FASLEXT)
-$(OUT)/UFD.$(FASLEXT): $(OUT)/GCDDOM.$(FASLEXT)
-
+$(OUT)/UFD.$(FASLEXT): $(OUT)/GCDDOM.$(FASLEXT) $(OUT)/ES.$(FASLEXT)
+$(OUT)/ES.$(FASLEXT): $(OUT)/RING.$(FASLEXT) $(OUT)/CACHSET.$(FASLEXT) \
+	$(OUT)/REF.$(FASLEXT) $(OUT)/ALIST.$(FASLEXT) \
+	$(OUT)/PATAB.$(FASLEXT)
+$(OUT)/CACHSET.$(FASLEXT): $(OUT)/ORDSET.$(FASLEXT)
+$(OUT)/ALIST.$(FASLEXT): $(OUT)/ALAGG.$(FASLEXT)
+$(OUT)/PATAB.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT)
 
 axiom_algebra_layer_1 = \
   ABELGRP  ABELGRP- ABELMON  ABELMON- FORTCAT   ITUPLE   \
   CABMON   MONOID   MONOID-  RING     RING-     COMRING  \
   DIFRING  DIFRING- ENTIRER  INTDOM   INTDOM-   OINTDOM  \
-  GCDDOM   GCDDOM-  UFD      UFD-                        \
-  PATAB    PPCURVE  PSCURVE           RESLATC            \
-  IDENT    SEGCAT   BINDING                              \
+  GCDDOM   GCDDOM-  UFD      UFD-     ES        ES-      \
+  PATAB    PPCURVE  PSCURVE  CACHSET  RESLATC   REF      \
+  IDENT    SEGCAT   BINDING  ALIST                       \
   ORDRING  ORDRING-          FEVALAB  FEVALAB-           \
   OSGROUP  MAYBE    DATAARY  PROPLOG  HOMOTOP   BYTEORD  \
   FIELD   FIELD-
@@ -372,7 +377,7 @@ axiom_algebra_layer_1_objects = \
 <<layer2>>=
 axiom_algebra_layer_2 = \
   SYNTAX  INTRET   SEGXCAT CONTOUR  LIST3   MKFUNC   \
-  REF     KTVLOGIC FNCAT
+          KTVLOGIC FNCAT
 
 $(OUT)/FNCAT.$(FASLEXT): $(OUT)/HOMOTOP.$(FASLEXT) $(OUT)/SETCAT.$(FASLEXT)
 $(OUT)/SYNTAX.$(FASLEXT): $(OUT)/IDENT.$(FASLEXT)
@@ -432,7 +437,7 @@ axiom_algebra_layer_4_objects = \
 
 <<layer5>>=
 axiom_algebra_layer_5 = \
-  CACHSET  CHARNZ            DVARCAT  DVARCAT- ELEMFUN  \
+           CHARNZ            DVARCAT  DVARCAT- ELEMFUN  \
   ELEMFUN- ESTOOLS2 FCOMP    FPATMAB  IDPAM    IDPO     \
   INCRMAPS KERNEL2           MODMONOM MONADWU  MONADWU- \
   MRF2     NARNG    NARNG-   NSUP2    ODVAR    OPQUERY  \
@@ -636,7 +641,7 @@ axiom_algebra_layer_13_objects = \
 
 <<layer14>>=
 axiom_algebra_layer_14 = \
-                   ALIST    FS       FS-      ACF      ACF-     \
+  FS       FS-      ACF      ACF-     \
   ACFS    ACFS-    BALFACT  BEZOUT   BINARY   BINFILE  BOUNDZRO \
   BPADICRT BRILL    CDEN     CHVAR    \
   COMMUPC  CONTFRAC CVMP     CYCLOTOM \
-- 
cgit v1.2.3