From 472141e074a2028f72b59ec1fb18c64da2b7cb36 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Sun, 1 Feb 2009 00:41:29 +0000
Subject: 	* algebra/Makefile.pamphlet: Tidy layer 0 dependency. 	SETCAT
 and SETCAT- are no longer required for bootstrap. 	* algebra/SETCAT.lsp:
 Remove. 	* algebra/SETCAT-.lsp: Likewise.

---
 src/algebra/Makefile.pamphlet | 46 +++++++++++++++++++++++++++++++++++++------
 1 file changed, 40 insertions(+), 6 deletions(-)

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

diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet
index 43631245..207cee78 100644
--- a/src/algebra/Makefile.pamphlet
+++ b/src/algebra/Makefile.pamphlet
@@ -66,11 +66,6 @@ compile the spad code we must load the compiled definition of [[RING]].
 In this case we must compile the cached lisp code before we try to 
 compile the spad file.
 
-The cycle for [[SETCAT]] is longer consisting of: [[SETCAT]] needs
-{\bf SINT} needs {\bf UFD} needs {\bf GCDDOM} needs {\bf COMRING} needs
-{\bf RING} needs {\bf RNG} needs {\bf ABELGRP} needs {\bf CABMON} needs
-{\bf ABELMON} needs {\bf ABELSG} needs {\bf SETCAT}.
-
 It is highly recommended that you try to become a developer of Axiom
 and read the archived mailing lists before you decide to change a
 cached file. In the fullness of time we will rewrite the whole algebra
@@ -154,7 +149,7 @@ axiom_algebra_bootstrap = \
   PSETCAT- QFCAT    QFCAT-   RCAGG    \
   RCAGG-   REF      RING     RING-    \
   RNG      RNS      RNS-     SETAGG   \
-  SETAGG-  SETCAT   SETCAT-  SINT     \
+  SETAGG-                    SINT     \
   STAGG    STAGG-   SYMBOL   TSETCAT  \
   TSETCAT- UFD      UFD-     ULSCAT   \
   UPOLYC   UPOLYC-  URAGG    URAGG-   \
@@ -183,6 +178,42 @@ system.spad.pamphlet  (MSYSCMD)
 
 <<layer0>>=
 
+$(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)/ELTAB.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT)
+$(OUT)/MSYSCMD.$(FASLEXT): $(OUT)/TYPE.$(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)/BASTYPE.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT)
+$(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)/STEP.$(FASLEXT): $(OUT)/SETCAT.$(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)/CTORKIND.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT)
+$(OUT)/IOMODE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT)
+
+$(OUT)/PRINT.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT)
+
 axiom_algebra_layer_0 = \
   AHYP     ATTREG   CFCAT    ELTAB    KOERCE   KONVERT  \
   KRCFROM  KVTFROM                                      \
@@ -336,6 +367,9 @@ sortpak.spad.pamphlet (SORTPAK)
 \end{verbatim}
 
 <<layer6>>=
+
+$(OUT)/CHARPOL.$(FASLEXT): $(OUT)/SETCAT-.$(FASLEXT)
+
 axiom_algebra_layer_6 = \
   ALGEBRA ALGEBRA- AUTOMOR  CARTEN2 CHARPOL  COMPLEX2 \
   DIFEXT  DIFEXT-  ES1      ES2     GRMOD    GRMOD-   \
-- 
cgit v1.2.3