Reorder dependencies.

2 files changed, 124 insertions, 145 deletions

diff --git a/src/algebra/Makefile.am b/src/algebra/Makefile.am
index 07c1575e..4bb2e217 100644
--- a/src/algebra/Makefile.am
+++ b/src/algebra/Makefile.am
@@ -232,7 +232,9 @@ strap-0/QFCAT.$(FASLEXT): strap-0/FIELD.$(FASLEXT) \
 strap-0/FPATMAB.$(FASLEXT): strap-0/PATMAB.$(FASLEXT)
 strap-0/PATAB.$(FASLEXT): strap-0/KONVERT.$(FASLEXT)
 strap-0/FLINEXP.$(FASLEXT): strap-0/LINEXP.$(FASLEXT)
-strap-0/FEVALAB.$(FASLEXT): strap-0/FUNCTOR.$(FASLEXT)
+strap-0/FEVALAB.$(FASLEXT): strap-0/SETCAT.$(FASLEXT) \
+	strap-0/FUNCTOR.$(FASLEXT) strap-0/ELTAB.$(FASLEXT) \
+	strap-0/EVALAB.$(FASLEXT) strap-0/IEVALAB.$(FASLEXT)
 strap-0/CHARNZ.$(FASLEXT): strap-0/RING.$(FASLEXT)
 strap-0/INS.$(FASLEXT): strap-0/UFD.$(FASLEXT) strap-0/EUCDOM.$(FASLEXT) \
 	strap-0/OINTDOM.$(FASLEXT) strap-0/DIFRING.$(FASLEXT) \
@@ -608,9 +610,9 @@ strap-1/QFCAT.$(FASLEXT): strap-1/FIELD.$(FASLEXT) \
 	strap-1/CHARNZ.$(FASLEXT) strap-1/EUCDOM.$(FASLEXT) \
 	strap-1/PFECAT.$(FASLEXT)
 
-strap-1/FEVALAB.$(FASLEXT): strap-1/FUNCTOR.$(FASLEXT) \
-	strap-1/EVALAB.$(FASLEXT) strap-1/IEVALAB.$(FASLEXT) \
-	strap-1/ELTAB.$(FASLEXT)
+strap-1/FEVALAB.$(FASLEXT): strap-1/SETCAT.$(FASLEXT) \
+	strap-1/FUNCTOR.$(FASLEXT) strap-1/EVALAB.$(FASLEXT) \
+	strap-1/IEVALAB.$(FASLEXT) strap-1/ELTAB.$(FASLEXT)
 
 strap-1/FPATMAB.$(FASLEXT): strap-1/PATMAB.$(FASLEXT)
 
@@ -949,15 +951,15 @@ strap-2/RNS.$(FASLEXT): strap-2/FIELD.$(FASLEXT) strap-2/ORDRING.$(FASLEXT) \
 	strap-2/CHARZ.$(FASLEXT)
 strap-2/RADCAT.$(FASLEXT): strap-1/INS.$(FASLEXT)
 strap-2/PFECAT.$(FASLEXT): strap-2/UFD.$(FASLEXT) strap-2/CHARZ.$(FASLEXT)
-strap-2/QFCAT.$(FASLEXT): strap-2/FIELD.$(FASLEXT) \
-	strap-2/ALGEBRA.$(FASLEXT) strap-2/RETRACT.$(FASLEXT) \
+strap-2/QFCAT.$(FASLEXT): strap-2/ALGEBRA.$(FASLEXT) \
+	strap-2/RETRACT.$(FASLEXT) \
 	strap-2/FEVALAB.$(FASLEXT) strap-2/DIFEXT.$(FASLEXT) \
 	strap-2/FLINEXP.$(FASLEXT) strap-2/PATAB.$(FASLEXT) \
 	strap-2/FPATMAB.$(FASLEXT) strap-2/ORDSET.$(FASLEXT) \
 	strap-2/OINTDOM.$(FASLEXT) strap-2/REAL.$(FASLEXT) \
 	strap-2/KONVERT.$(FASLEXT) strap-2/CHARZ.$(FASLEXT) \
 	strap-2/CHARNZ.$(FASLEXT) strap-2/EUCDOM.$(FASLEXT) \
-	strap-2/PFECAT.$(FASLEXT)
+	strap-2/PFECAT.$(FASLEXT) strap-1/FIELD.$(FASLEXT) 
 
 strap-2/FEVALAB.$(FASLEXT): strap-2/FUNCTOR.$(FASLEXT) \
 	strap-2/EVALAB.$(FASLEXT) strap-2/IEVALAB.$(FASLEXT) \
@@ -1361,7 +1363,7 @@ $(OUT)/LOGIC.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT)
 $(OUT)/BOOLE.$(FASLEXT): $(OUT)/LOGIC.$(FASLEXT)
 
 $(OUT)/SGROUP.$(FASLEXT) $(OUT)/SGROUP-.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) \
-	$(OUT)/PI.$(FASLEXT)
+	strap-2/PI.$(FASLEXT)
 $(OUT)/ABELSG.$(FASLEXT) $(OUT)/ABELSG-.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT)
 $(OUT)/LMODULE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) \
 	$(OUT)/LLINSET.$(FASLEXT) $(OUT)/SGROUP.$(FASLEXT)
@@ -1419,6 +1421,11 @@ $(OUT)/REPDB.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) \
 $(OUT)/ABELSG.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) \
 	$(OUT)/REPDB.$(FASLEXT)
 
+$(OUT)/FEVALAB.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) \
+	$(OUT)/ELTAB.$(FASLEXT) $(OUT)/EVALAB.$(FASLEXT) \
+	$(OUT)/IEVALAB.$(FASLEXT) strap-2/EQ.$(FASLEXT) \
+	strap-2/LIST.$(FASLEXT) strap-2/SYMBOL.$(FASLEXT)
+
 $(OUT)/INS.$(FASLEXT): $(OUT)/UFD.$(FASLEXT) $(OUT)/EUCDOM.$(FASLEXT) \
 	$(OUT)/OINTDOM.$(FASLEXT) $(OUT)/DIFRING.$(FASLEXT) \
 	$(OUT)/KONVERT.$(FASLEXT) $(OUT)/RETRACT.$(FASLEXT) \
@@ -1431,6 +1438,44 @@ $(OUT)/INS.$(FASLEXT): $(OUT)/UFD.$(FASLEXT) $(OUT)/EUCDOM.$(FASLEXT) \
 	strap-2/PATTERN.$(FASLEXT) strap-2/PI.$(FASLEXT) \
 	strap-2/NNI.$(FASLEXT)
 
+$(OUT)/MAYBE.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) $(OUT)/RETRACT.$(FASLEXT)
+
+$(OUT)/SRING.$(FASLEXT): $(OUT)/ABELMON.$(FASLEXT) $(OUT)/MONOID.$(FASLEXT)
+$(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)/REPSQ.$(FASLEXT)
+
+$(OUT)/ORDRING.$(FASLEXT): $(OUT)/OAGROUP.$(FASLEXT) $(OUT)/CHARZ.$(FASLEXT) \
+	$(OUT)/MONOID.$(FASLEXT)
+$(OUT)/COMRING.$(FASLEXT): $(OUT)/RING.$(FASLEXT) $(OUT)/BMODULE.$(FASLEXT)
+$(OUT)/DIFRING.$(FASLEXT): $(OUT)/RING.$(FASLEXT)
+$(OUT)/ENTIRER.$(FASLEXT): $(OUT)/RING.$(FASLEXT) $(OUT)/BMODULE.$(FASLEXT)
+$(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)/ES.$(FASLEXT)
+$(OUT)/ES.$(FASLEXT): $(OUT)/RING.$(FASLEXT) $(OUT)/CACHSET.$(FASLEXT) \
+	$(OUT)/PATAB.$(FASLEXT) strap-2/PRIMARR.$(FASLEXT) \
+	strap-2/REF.$(FASLEXT) strap-2/ALIST.$(FASLEXT) \
+	$(OUT)/MAYBE.$(FASLEXT)
+$(OUT)/CACHSET.$(FASLEXT): $(OUT)/ORDSET.$(FASLEXT)
+$(OUT)/BOOLEAN.$(FASLEXT): $(OUT)/PROPLOG.$(FASLEXT)
+$(OUT)/VECTCAT.$(FASLEXT): $(OUT)/RADCAT.$(FASLEXT)
+$(OUT)/IARRAY1.$(FASLEXT): $(OUT)/PRIMARR.$(FASLEXT)
+$(OUT)/DIFRING.$(FASLEXT): $(OUT)/DIFFSPC.$(FASLEXT)
+$(OUT)/PDMOD.$(FASLEXT): $(OUT)/RING.$(FASLEXT) $(OUT)/PDSPC.$(FASLEXT) \
+	$(OUT)/COMRING.$(FASLEXT) $(OUT)/MODULE.$(FASLEXT)
+$(OUT)/DMEXT.$(FASLEXT): $(OUT)/DSEXT.$(FASLEXT) $(OUT)/DIFFMOD.$(FASLEXT) \
+	$(OUT)/PDMOD.$(FASLEXT)
+$(OUT)/PATAB.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) \
+	strap-2/PATTERN.$(FASLEXT)
+
+
 oa_algebra_layer_0 = \
   TYPE     BINOPC   BINOP    IDEMOPC  SGPOPC   SGPOP    \
   MONOPC   FUNCTOR  \
@@ -1445,20 +1490,20 @@ oa_algebra_layer_0 = \
   KRCFROM  KVTFROM  IEVALAB  IEVALAB- EVALAB   EVALAB-  \
   RETRACT  RETRACT- VOID     REPSQ    REPDB    \
   PRIMCAT  PTRANFN  SPFCAT   UTYPE    HOMOTOP   \
-  ORDSET   OASGP    SEXCAT   DIFRING  SRING    OSGROUP  \
+  ORDSET   OASGP    DIFRING  SRING    OSGROUP  \
   MODULE   MODULE-  PID      OAGROUP  OAGROUP- OCAMON   \
-  OAMON    OAMON-   DIOID    INTDOM   INTDOM-  \
+  OAMON    OAMON-   DIOID    INTDOM   INTDOM-  CACHSET  \
   RNG      RNG-     ORDFIN   OAMONS   CABMON   COMRING  \
   GCDDOM   GCDDOM-  UFD      UFD-     ES        ES-     \
   FIELD    FIELD-   VECTCAT  VECTCAT- RADCAT   RADCAT-  \
-  MKBCFUNC MKRECORD MKUCFUNC ENTIRER  ENTIRER- \
+  MKBCFUNC MKRECORD MKUCFUNC ENTIRER  ENTIRER- ORDRING  \
   DIFFDOM  DIFFDOM- DIFFSPC  DIFFSPC- DIFFMOD  \
   LINEXP   PATMAB   REAL     CHARZ    LOGIC    LOGIC-   \
   PDDOM    PDDOM-   PDSPC    PDSPC-   \
   DSEXT    DSEXT-   ORDSTRCT          \
-  BOOLE    BOOLE-   PRIMARR  SRING    \
+  BOOLE    BOOLE-   SRING    MAYBE    \
   INS      INS-     DIVRING  DIVRING- EUCDOM   EUCDOM-  \
-  FPS      FPS-     RNS      RNS-     \
+  FPS      FPS-     RNS      RNS-     PATAB    \
   POLYCAT  POLYCAT- QFCAT    QFCAT-   FEVALAB  FEVALAB-  \
   INT      NNI      PI       SINT     SYMBOL   DFLOAT
 
@@ -1471,58 +1516,16 @@ oa_algebra_layer_0_objects = \
 
 $(OUT)/HOMOTOP.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) $(OUT)/KRCFROM.$(FASLEXT)
 $(OUT)/ITUPLE.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) $(OUT)/STREAM.$(FASLEXT)
-$(OUT)/PATAB.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT)
 $(OUT)/PPCURVE.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT)
 $(OUT)/PSCURVE.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT)
 
-$(OUT)/IEVALAB.$(FASLEXT) $(OUT)/IEVALAB-.$(FASLEXT): \
-	$(OUT)/SETCAT.$(FASLEXT)
-$(OUT)/EVALAB.$(FASLEXT) $(OUT)/EVALAB-.$(FASLEXT): \
-	$(OUT)/IEVALAB.$(FASLEXT)
-
 $(OUT)/PROPLOG.$(FASLEXT): $(OUT)/BOOLE.$(FASLEXT) $(OUT)/SETCAT.$(FASLEXT)
 
-$(OUT)/MAYBE.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) $(OUT)/RETRACT.$(FASLEXT)
-
 $(OUT)/BYTEORD.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT)
 
-$(OUT)/SRING.$(FASLEXT): $(OUT)/ABELMON.$(FASLEXT) $(OUT)/MONOID.$(FASLEXT)
-$(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)/REPSQ.$(FASLEXT)
-
-$(OUT)/ORDRING.$(FASLEXT): $(OUT)/OAGROUP.$(FASLEXT) $(OUT)/CHARZ.$(FASLEXT) \
-	$(OUT)/MONOID.$(FASLEXT)
-$(OUT)/COMRING.$(FASLEXT): $(OUT)/RING.$(FASLEXT) $(OUT)/BMODULE.$(FASLEXT)
-$(OUT)/DIFRING.$(FASLEXT): $(OUT)/RING.$(FASLEXT)
-$(OUT)/ENTIRER.$(FASLEXT): $(OUT)/RING.$(FASLEXT) $(OUT)/BMODULE.$(FASLEXT)
-$(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)/ES.$(FASLEXT)
-$(OUT)/ES.$(FASLEXT): $(OUT)/RING.$(FASLEXT) $(OUT)/CACHSET.$(FASLEXT) \
-	$(OUT)/REF.$(FASLEXT) $(OUT)/ALIST.$(FASLEXT) \
-	$(OUT)/PATAB.$(FASLEXT) $(OUT)/PRIMARR.$(FASLEXT) \
-	$(OUT)/MAYBE.$(FASLEXT)
-$(OUT)/CACHSET.$(FASLEXT): $(OUT)/ORDSET.$(FASLEXT)
-$(OUT)/PATAB.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT)
-$(OUT)/BOOLEAN.$(FASLEXT): $(OUT)/PROPLOG.$(FASLEXT)
-$(OUT)/VECTCAT.$(FASLEXT): $(OUT)/RADCAT.$(FASLEXT)
-$(OUT)/IARRAY1.$(FASLEXT): $(OUT)/PRIMARR.$(FASLEXT)
 $(OUT)/PROPERTY.$(FASLEXT): $(OUT)/IDENT.$(FASLEXT) $(OUT)/PAIR.$(FASLEXT)
 $(OUT)/BINDING.$(FASLEXT): $(OUT)/PROPERTY.$(FASLEXT)
 $(OUT)/OPERCAT.$(FASLEXT): $(OUT)/ARITY.$(FASLEXT)
-$(OUT)/REF.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/IDENT.$(FASLEXT)
-$(OUT)/DIFRING.$(FASLEXT): $(OUT)/DIFFSPC.$(FASLEXT)
-$(OUT)/PDMOD.$(FASLEXT): $(OUT)/RING.$(FASLEXT) $(OUT)/PDSPC.$(FASLEXT) \
-	$(OUT)/COMRING.$(FASLEXT) $(OUT)/MODULE.$(FASLEXT)
-$(OUT)/DMEXT.$(FASLEXT): $(OUT)/DSEXT.$(FASLEXT) $(OUT)/DIFFMOD.$(FASLEXT) \
-	$(OUT)/PDMOD.$(FASLEXT)
 $(OUT)/STREAM.$(FASLEXT): $(OUT)/LZSTAGG.$(FASLEXT)
 
 $(OUT)/MONOP.$(FASLEXT): $(OUT)/MONOPC.$(FASLEXT) $(OUT)/PAIR.$(FASLEXT) \
@@ -1554,7 +1557,7 @@ $(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)/DIOPS.$(FASLEXT): strap-2/STRING.$(FASLEXT)
 $(OUT)/DIAGG.$(FASLEXT): $(OUT)/DIOPS.$(FASLEXT)
 $(OUT)/KDAGG.$(FASLEXT): $(OUT)/DIAGG.$(FASLEXT) $(OUT)/IXAGG.$(FASLEXT)
 $(OUT)/TBAGG.$(FASLEXT): $(OUT)/KDAGG.$(FASLEXT)
@@ -1580,14 +1583,15 @@ $(OUT)/SEXCAT.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/PID.$(FASLEXT) \
 
 $(OUT)/MSETAGG.$(FASLEXT): $(OUT)/MDAGG.$(FASLEXT) $(OUT)/SETAGG.$(FASLEXT)
 $(OUT)/MDAGG.$(FASLEXT): $(OUT)/DIOPS.$(FASLEXT)
+$(OUT)/REF.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/IDENT.$(FASLEXT)
 
 oa_algebra_layer_1 = \
   ITUPLE    IDPT    ITFUN2   SEGCAT    \
   FILECAT  SMAGG    \
-  PATAB    PPCURVE  PSCURVE  CACHSET  RESLATC            \
+  PPCURVE  PSCURVE  RESLATC            \
   IDENT    OUTFORM  BINDING           BOOLEAN            \
-  ORDRING  DROPT1   PLOT1    IARRAY1  \
-  MAYBE    DATAARY  PROPLOG  BYTEORD  \
+  DROPT1   PLOT1    IARRAY1  \
+  DATAARY  PROPLOG  BYTEORD  \
   AGG      AGG-     ELTAGG   ELTAGG-  IXAGG    IXAGG-   \
   BGAGG    BGAGG-   BRAGG    BRAGG-   ELAGG    ELAGG-   \
   DLAGG    DQAGG    QUAGG    SKAGG    PRQAGG   ALAGG    ALAGG- \
@@ -1597,7 +1601,7 @@ oa_algebra_layer_1 = \
   RCAGG    RCAGG-   SETAGG   SETAGG-  HOAGG    HOAGG-   \
   TBAGG    TBAGG-   KDAGG    KDAGG-   DIAGG    DIAGG-   \
   DIOPS    DIOPS-   STRING   FINAGG   FINAGG-  MDAGG    \
-  MONOP              \
+  MONOP    PRIMARR  SEXCAT             \
   PROPERTY ARITY    OPERCAT  OPERCAT- PAIR      STREAM   \
   COMBOPC  EQ2      NONE1    CONDUIT  IOMODE   CTORKIND \
   PDMOD    DMEXT    LZSTAGG  LZSTAGG- MSETAGG   \
diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in
index 68de28dc..b92fb5f7 100644
--- a/src/algebra/Makefile.in
+++ b/src/algebra/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.2 from Makefile.am.
+# Makefile.in generated by automake 1.13.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -86,51 +86,23 @@
 # than a lattice.
 #
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
+am__make_dryrun = \
+  { \
+    am__dry=no; \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
     esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -748,20 +720,20 @@ oa_algebra_layer_0 = \
   KRCFROM  KVTFROM  IEVALAB  IEVALAB- EVALAB   EVALAB-  \
   RETRACT  RETRACT- VOID     REPSQ    REPDB    \
   PRIMCAT  PTRANFN  SPFCAT   UTYPE    HOMOTOP   \
-  ORDSET   OASGP    SEXCAT   DIFRING  SRING    OSGROUP  \
+  ORDSET   OASGP    DIFRING  SRING    OSGROUP  \
   MODULE   MODULE-  PID      OAGROUP  OAGROUP- OCAMON   \
-  OAMON    OAMON-   DIOID    INTDOM   INTDOM-  \
+  OAMON    OAMON-   DIOID    INTDOM   INTDOM-  CACHSET  \
   RNG      RNG-     ORDFIN   OAMONS   CABMON   COMRING  \
   GCDDOM   GCDDOM-  UFD      UFD-     ES        ES-     \
   FIELD    FIELD-   VECTCAT  VECTCAT- RADCAT   RADCAT-  \
-  MKBCFUNC MKRECORD MKUCFUNC ENTIRER  ENTIRER- \
+  MKBCFUNC MKRECORD MKUCFUNC ENTIRER  ENTIRER- ORDRING  \
   DIFFDOM  DIFFDOM- DIFFSPC  DIFFSPC- DIFFMOD  \
   LINEXP   PATMAB   REAL     CHARZ    LOGIC    LOGIC-   \
   PDDOM    PDDOM-   PDSPC    PDSPC-   \
   DSEXT    DSEXT-   ORDSTRCT          \
-  BOOLE    BOOLE-   PRIMARR  SRING    \
+  BOOLE    BOOLE-   SRING    MAYBE    \
   INS      INS-     DIVRING  DIVRING- EUCDOM   EUCDOM-  \
-  FPS      FPS-     RNS      RNS-     \
+  FPS      FPS-     RNS      RNS-     PATAB    \
   POLYCAT  POLYCAT- QFCAT    QFCAT-   FEVALAB  FEVALAB-  \
   INT      NNI      PI       SINT     SYMBOL   DFLOAT
 
@@ -775,10 +747,10 @@ oa_algebra_layer_0_objects = \
 oa_algebra_layer_1 = \
   ITUPLE    IDPT    ITFUN2   SEGCAT    \
   FILECAT  SMAGG    \
-  PATAB    PPCURVE  PSCURVE  CACHSET  RESLATC            \
+  PPCURVE  PSCURVE  RESLATC            \
   IDENT    OUTFORM  BINDING           BOOLEAN            \
-  ORDRING  DROPT1   PLOT1    IARRAY1  \
-  MAYBE    DATAARY  PROPLOG  BYTEORD  \
+  DROPT1   PLOT1    IARRAY1  \
+  DATAARY  PROPLOG  BYTEORD  \
   AGG      AGG-     ELTAGG   ELTAGG-  IXAGG    IXAGG-   \
   BGAGG    BGAGG-   BRAGG    BRAGG-   ELAGG    ELAGG-   \
   DLAGG    DQAGG    QUAGG    SKAGG    PRQAGG   ALAGG    ALAGG- \
@@ -788,7 +760,7 @@ oa_algebra_layer_1 = \
   RCAGG    RCAGG-   SETAGG   SETAGG-  HOAGG    HOAGG-   \
   TBAGG    TBAGG-   KDAGG    KDAGG-   DIAGG    DIAGG-   \
   DIOPS    DIOPS-   STRING   FINAGG   FINAGG-  MDAGG    \
-  MONOP              \
+  MONOP    PRIMARR  SEXCAT             \
   PROPERTY ARITY    OPERCAT  OPERCAT- PAIR      STREAM   \
   COMBOPC  EQ2      NONE1    CONDUIT  IOMODE   CTORKIND \
   PDMOD    DMEXT    LZSTAGG  LZSTAGG- MSETAGG   \
@@ -1342,7 +1314,7 @@ cscope cscopelist:
 	$(MAKE) $(AM_MAKEFLAGS) $<
 
 # Leading 'am--fnord' is there to ensure the list of targets does not
-# expand to empty, as could happen e.g. with make check TESTS=''.
+# exand to empty, as could happen e.g. with make check TESTS=''.
 am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
 am--force-recheck:
 	@:
@@ -1772,7 +1744,9 @@ strap-0/QFCAT.$(FASLEXT): strap-0/FIELD.$(FASLEXT) \
 strap-0/FPATMAB.$(FASLEXT): strap-0/PATMAB.$(FASLEXT)
 strap-0/PATAB.$(FASLEXT): strap-0/KONVERT.$(FASLEXT)
 strap-0/FLINEXP.$(FASLEXT): strap-0/LINEXP.$(FASLEXT)
-strap-0/FEVALAB.$(FASLEXT): strap-0/FUNCTOR.$(FASLEXT)
+strap-0/FEVALAB.$(FASLEXT): strap-0/SETCAT.$(FASLEXT) \
+	strap-0/FUNCTOR.$(FASLEXT) strap-0/ELTAB.$(FASLEXT) \
+	strap-0/EVALAB.$(FASLEXT) strap-0/IEVALAB.$(FASLEXT)
 strap-0/CHARNZ.$(FASLEXT): strap-0/RING.$(FASLEXT)
 strap-0/INS.$(FASLEXT): strap-0/UFD.$(FASLEXT) strap-0/EUCDOM.$(FASLEXT) \
 	strap-0/OINTDOM.$(FASLEXT) strap-0/DIFRING.$(FASLEXT) \
@@ -2148,9 +2122,9 @@ strap-1/QFCAT.$(FASLEXT): strap-1/FIELD.$(FASLEXT) \
 	strap-1/CHARNZ.$(FASLEXT) strap-1/EUCDOM.$(FASLEXT) \
 	strap-1/PFECAT.$(FASLEXT)
 
-strap-1/FEVALAB.$(FASLEXT): strap-1/FUNCTOR.$(FASLEXT) \
-	strap-1/EVALAB.$(FASLEXT) strap-1/IEVALAB.$(FASLEXT) \
-	strap-1/ELTAB.$(FASLEXT)
+strap-1/FEVALAB.$(FASLEXT): strap-1/SETCAT.$(FASLEXT) \
+	strap-1/FUNCTOR.$(FASLEXT) strap-1/EVALAB.$(FASLEXT) \
+	strap-1/IEVALAB.$(FASLEXT) strap-1/ELTAB.$(FASLEXT)
 
 strap-1/FPATMAB.$(FASLEXT): strap-1/PATMAB.$(FASLEXT)
 
@@ -2489,15 +2463,15 @@ strap-2/RNS.$(FASLEXT): strap-2/FIELD.$(FASLEXT) strap-2/ORDRING.$(FASLEXT) \
 	strap-2/CHARZ.$(FASLEXT)
 strap-2/RADCAT.$(FASLEXT): strap-1/INS.$(FASLEXT)
 strap-2/PFECAT.$(FASLEXT): strap-2/UFD.$(FASLEXT) strap-2/CHARZ.$(FASLEXT)
-strap-2/QFCAT.$(FASLEXT): strap-2/FIELD.$(FASLEXT) \
-	strap-2/ALGEBRA.$(FASLEXT) strap-2/RETRACT.$(FASLEXT) \
+strap-2/QFCAT.$(FASLEXT): strap-2/ALGEBRA.$(FASLEXT) \
+	strap-2/RETRACT.$(FASLEXT) \
 	strap-2/FEVALAB.$(FASLEXT) strap-2/DIFEXT.$(FASLEXT) \
 	strap-2/FLINEXP.$(FASLEXT) strap-2/PATAB.$(FASLEXT) \
 	strap-2/FPATMAB.$(FASLEXT) strap-2/ORDSET.$(FASLEXT) \
 	strap-2/OINTDOM.$(FASLEXT) strap-2/REAL.$(FASLEXT) \
 	strap-2/KONVERT.$(FASLEXT) strap-2/CHARZ.$(FASLEXT) \
 	strap-2/CHARNZ.$(FASLEXT) strap-2/EUCDOM.$(FASLEXT) \
-	strap-2/PFECAT.$(FASLEXT)
+	strap-2/PFECAT.$(FASLEXT) strap-1/FIELD.$(FASLEXT) 
 
 strap-2/FEVALAB.$(FASLEXT): strap-2/FUNCTOR.$(FASLEXT) \
 	strap-2/EVALAB.$(FASLEXT) strap-2/IEVALAB.$(FASLEXT) \
@@ -2769,7 +2743,7 @@ $(OUT)/LOGIC.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT)
 $(OUT)/BOOLE.$(FASLEXT): $(OUT)/LOGIC.$(FASLEXT)
 
 $(OUT)/SGROUP.$(FASLEXT) $(OUT)/SGROUP-.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) \
-	$(OUT)/PI.$(FASLEXT)
+	strap-2/PI.$(FASLEXT)
 $(OUT)/ABELSG.$(FASLEXT) $(OUT)/ABELSG-.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT)
 $(OUT)/LMODULE.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) \
 	$(OUT)/LLINSET.$(FASLEXT) $(OUT)/SGROUP.$(FASLEXT)
@@ -2827,6 +2801,11 @@ $(OUT)/REPDB.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) \
 $(OUT)/ABELSG.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) \
 	$(OUT)/REPDB.$(FASLEXT)
 
+$(OUT)/FEVALAB.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) \
+	$(OUT)/ELTAB.$(FASLEXT) $(OUT)/EVALAB.$(FASLEXT) \
+	$(OUT)/IEVALAB.$(FASLEXT) strap-2/EQ.$(FASLEXT) \
+	strap-2/LIST.$(FASLEXT) strap-2/SYMBOL.$(FASLEXT)
+
 $(OUT)/INS.$(FASLEXT): $(OUT)/UFD.$(FASLEXT) $(OUT)/EUCDOM.$(FASLEXT) \
 	$(OUT)/OINTDOM.$(FASLEXT) $(OUT)/DIFRING.$(FASLEXT) \
 	$(OUT)/KONVERT.$(FASLEXT) $(OUT)/RETRACT.$(FASLEXT) \
@@ -2839,23 +2818,8 @@ $(OUT)/INS.$(FASLEXT): $(OUT)/UFD.$(FASLEXT) $(OUT)/EUCDOM.$(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)
-$(OUT)/PATAB.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT)
-$(OUT)/PPCURVE.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT)
-$(OUT)/PSCURVE.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT)
-
-$(OUT)/IEVALAB.$(FASLEXT) $(OUT)/IEVALAB-.$(FASLEXT): \
-	$(OUT)/SETCAT.$(FASLEXT)
-$(OUT)/EVALAB.$(FASLEXT) $(OUT)/EVALAB-.$(FASLEXT): \
-	$(OUT)/IEVALAB.$(FASLEXT)
-
-$(OUT)/PROPLOG.$(FASLEXT): $(OUT)/BOOLE.$(FASLEXT) $(OUT)/SETCAT.$(FASLEXT)
-
 $(OUT)/MAYBE.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) $(OUT)/RETRACT.$(FASLEXT)
 
-$(OUT)/BYTEORD.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT)
-
 $(OUT)/SRING.$(FASLEXT): $(OUT)/ABELMON.$(FASLEXT) $(OUT)/MONOID.$(FASLEXT)
 $(OUT)/RING.$(FASLEXT): $(OUT)/RNG.$(FASLEXT) $(OUT)/SRING.$(FASLEXT) \
 	$(OUT)/LMODULE.$(FASLEXT) $(OUT)/KOERCE.$(FASLEXT)
@@ -2876,23 +2840,33 @@ $(OUT)/OINTDOM.$(FASLEXT): $(OUT)/INTDOM.$(FASLEXT) $(OUT)/ORDRING.$(FASLEXT)
 $(OUT)/GCDDOM.$(FASLEXT): $(OUT)/INTDOM.$(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)/PRIMARR.$(FASLEXT) \
+	$(OUT)/PATAB.$(FASLEXT) strap-2/PRIMARR.$(FASLEXT) \
+	strap-2/REF.$(FASLEXT) strap-2/ALIST.$(FASLEXT) \
 	$(OUT)/MAYBE.$(FASLEXT)
 $(OUT)/CACHSET.$(FASLEXT): $(OUT)/ORDSET.$(FASLEXT)
-$(OUT)/PATAB.$(FASLEXT): $(OUT)/TYPE.$(FASLEXT)
 $(OUT)/BOOLEAN.$(FASLEXT): $(OUT)/PROPLOG.$(FASLEXT)
 $(OUT)/VECTCAT.$(FASLEXT): $(OUT)/RADCAT.$(FASLEXT)
 $(OUT)/IARRAY1.$(FASLEXT): $(OUT)/PRIMARR.$(FASLEXT)
-$(OUT)/PROPERTY.$(FASLEXT): $(OUT)/IDENT.$(FASLEXT) $(OUT)/PAIR.$(FASLEXT)
-$(OUT)/BINDING.$(FASLEXT): $(OUT)/PROPERTY.$(FASLEXT)
-$(OUT)/OPERCAT.$(FASLEXT): $(OUT)/ARITY.$(FASLEXT)
-$(OUT)/REF.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/IDENT.$(FASLEXT)
 $(OUT)/DIFRING.$(FASLEXT): $(OUT)/DIFFSPC.$(FASLEXT)
 $(OUT)/PDMOD.$(FASLEXT): $(OUT)/RING.$(FASLEXT) $(OUT)/PDSPC.$(FASLEXT) \
 	$(OUT)/COMRING.$(FASLEXT) $(OUT)/MODULE.$(FASLEXT)
 $(OUT)/DMEXT.$(FASLEXT): $(OUT)/DSEXT.$(FASLEXT) $(OUT)/DIFFMOD.$(FASLEXT) \
 	$(OUT)/PDMOD.$(FASLEXT)
+$(OUT)/PATAB.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) \
+	strap-2/PATTERN.$(FASLEXT)
+
+$(OUT)/HOMOTOP.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) $(OUT)/KRCFROM.$(FASLEXT)
+$(OUT)/ITUPLE.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT) $(OUT)/STREAM.$(FASLEXT)
+$(OUT)/PPCURVE.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT)
+$(OUT)/PSCURVE.$(FASLEXT): $(OUT)/KOERCE.$(FASLEXT)
+
+$(OUT)/PROPLOG.$(FASLEXT): $(OUT)/BOOLE.$(FASLEXT) $(OUT)/SETCAT.$(FASLEXT)
+
+$(OUT)/BYTEORD.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT)
+
+$(OUT)/PROPERTY.$(FASLEXT): $(OUT)/IDENT.$(FASLEXT) $(OUT)/PAIR.$(FASLEXT)
+$(OUT)/BINDING.$(FASLEXT): $(OUT)/PROPERTY.$(FASLEXT)
+$(OUT)/OPERCAT.$(FASLEXT): $(OUT)/ARITY.$(FASLEXT)
 $(OUT)/STREAM.$(FASLEXT): $(OUT)/LZSTAGG.$(FASLEXT)
 
 $(OUT)/MONOP.$(FASLEXT): $(OUT)/MONOPC.$(FASLEXT) $(OUT)/PAIR.$(FASLEXT) \
@@ -2924,7 +2898,7 @@ $(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)/DIOPS.$(FASLEXT): strap-2/STRING.$(FASLEXT)
 $(OUT)/DIAGG.$(FASLEXT): $(OUT)/DIOPS.$(FASLEXT)
 $(OUT)/KDAGG.$(FASLEXT): $(OUT)/DIAGG.$(FASLEXT) $(OUT)/IXAGG.$(FASLEXT)
 $(OUT)/TBAGG.$(FASLEXT): $(OUT)/KDAGG.$(FASLEXT)
@@ -2950,6 +2924,7 @@ $(OUT)/SEXCAT.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/PID.$(FASLEXT) \
 
 $(OUT)/MSETAGG.$(FASLEXT): $(OUT)/MDAGG.$(FASLEXT) $(OUT)/SETAGG.$(FASLEXT)
 $(OUT)/MDAGG.$(FASLEXT): $(OUT)/DIOPS.$(FASLEXT)
+$(OUT)/REF.$(FASLEXT): $(OUT)/SETCAT.$(FASLEXT) $(OUT)/IDENT.$(FASLEXT)
 
 $(OUT)/FNCAT.$(FASLEXT): $(OUT)/HOMOTOP.$(FASLEXT) $(OUT)/SETCAT.$(FASLEXT)
 $(OUT)/SYNTAX.$(FASLEXT): $(OUT)/IDENT.$(FASLEXT)