Add some algebra dependencies

2 files changed, 101 insertions, 34 deletions

diff --git a/src/algebra/Makefile.am b/src/algebra/Makefile.am
index c86a99fe..306669ba 100644
--- a/src/algebra/Makefile.am
+++ b/src/algebra/Makefile.am
@@ -400,7 +400,7 @@ strap-1/ORDSET.$(FASLEXT): strap-1/SETCAT.$(FASLEXT) \
 	strap-1/ORDTYPE.$(FASLEXT)
 
 strap-1/FINITE.$(FASLEXT): strap-1/SETCAT.$(FASLEXT) \
-	strap-0/PI.$(FASLEXT)
+	strap-0/OAMONS.$(FASLEXT) strap-0/PI.$(FASLEXT)
 
 strap-1/ORDFIN.$(FASLEXT): strap-1/ORDSET.$(FASLEXT) \
 	strap-1/FINITE.$(FASLEXT)
diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in
index 44cbb2de..36c17a22 100644
--- a/src/algebra/Makefile.in
+++ b/src/algebra/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -86,23 +86,51 @@
 # than a lattice.
 #
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+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 \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        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;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  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;; \
+    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))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -1308,7 +1336,7 @@ cscope cscopelist:
 	$(MAKE) $(AM_MAKEFLAGS) $<
 
 # Leading 'am--fnord' is there to ensure the list of targets does not
-# exand to empty, as could happen e.g. with make check TESTS=''.
+# expand 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:
 	@:
@@ -1775,7 +1803,8 @@ strap-0/AMR.$(FASLEXT): strap-0/RING.$(FASLEXT) strap-0/BMODULE.$(FASLEXT) \
 	strap-0/FUNCTOR.$(FASLEXT)
 strap-0/FAMR.$(FASLEXT): strap-0/AMR.$(FASLEXT) \
 	strap-0/FRETRCT.$(FASLEXT)
-strap-0/POLYCAT.$(FASLEXT): strap-0/PDRING.$(FASLEXT) \
+strap-0/POLYCAT.$(FASLEXT): strap-0/PFECAT.$(FASLEXT) \
+	strap-0/PDRING.$(FASLEXT) \
 	strap-0/FAMR.$(FASLEXT) strap-0/EVALAB.$(FASLEXT) \
 	strap-0/RETRACT.$(FASLEXT) strap-0/FLINEXP.$(FASLEXT)
 strap-0/PDRING.$(FASLEXT): strap-0/RING.$(FASLEXT) \
@@ -1877,6 +1906,8 @@ strap-0/PATTERN.$(FASLEXT): strap-0/SETCAT.$(FASLEXT) \
 
 strap-0/SYMBOL.$(FASLEXT): strap-0/ORDSET.$(FASLEXT)
 
+strap-0/BOP.$(FASLEXT): strap-0/ORDSET.$(FASLEXT) strap-0/OPERCAT.$(FASLEXT)
+
 # Bootstrap stage 1 dependencies.
 # At this stage, we attempt to compile domains essential for completing
 # the bootstrap process (stage 2).  Those that were compiled at stage 0
@@ -1902,7 +1933,8 @@ strap-1/ORDTYPE.$(FASLEXT): strap-1/BASTYPE.$(FASLEXT)
 strap-1/ORDSET.$(FASLEXT): strap-1/SETCAT.$(FASLEXT) \
 	strap-1/ORDTYPE.$(FASLEXT)
 
-strap-1/FINITE.$(FASLEXT): strap-1/SETCAT.$(FASLEXT)
+strap-1/FINITE.$(FASLEXT): strap-1/SETCAT.$(FASLEXT) \
+	strap-0/OAMONS.$(FASLEXT) strap-0/PI.$(FASLEXT)
 
 strap-1/ORDFIN.$(FASLEXT): strap-1/ORDSET.$(FASLEXT) \
 	strap-1/FINITE.$(FASLEXT)
@@ -1910,7 +1942,8 @@ strap-1/ORDFIN.$(FASLEXT): strap-1/ORDSET.$(FASLEXT) \
 strap-1/PID.$(FASLEXT): strap-1/GCDDOM.$(FASLEXT) \
 	strap-0/MAYBE.$(FASLEXT)
 
-strap-1/GCDDOM.$(FASLEXT): strap-0/INTDOM.$(FASLEXT)
+strap-1/GCDDOM.$(FASLEXT): strap-1/INTDOM.$(FASLEXT) \
+	strap-0/LIST.$(FASLEXT) strap-0/SUP.$(FASLEXT)
 
 strap-1/EUCDOM.$(FASLEXT): strap-1/PID.$(FASLEXT) \
 	strap-0/BOOLEAN.$(FASLEXT) strap-0/LSAGG.$(FASLEXT)
@@ -2024,10 +2057,15 @@ strap-1/INS.$(FASLEXT): strap-1/UFD.$(FASLEXT) strap-1/EUCDOM.$(FASLEXT) \
 	strap-1/LINEXP.$(FASLEXT) strap-1/CFCAT.$(FASLEXT) \
 	strap-1/REAL.$(FASLEXT) strap-1/CHARZ.$(FASLEXT) \
 	strap-1/STEP.$(FASLEXT) strap-1/PATMAB.$(FASLEXT) \
-	strap-0/PATTERN.$(FASLEXT)
+	strap-0/PATTERN.$(FASLEXT) strap-0/INFORM.$(FASLEXT) \
+	strap-0/NNI.$(FASLEXT) strap-0/FRAC.$(FASLEXT)
 
 strap-1/PATMAB.$(FASLEXT): strap-1/SETCAT.$(FASLEXT)
 
+strap-1/PATTERN.$(FASLEXT): strap-1/SETCAT.$(FASLEXT) \
+	strap-1/RETRACT.$(FASLEXT) strap-0/SYMBOL.$(FASLEXT) \
+	strap-0/BOP.$(FASLEXT)
+
 strap-1/LINEXP.$(FASLEXT): strap-1/LMODULE.$(FASLEXT)
 
 strap-1/FPS.$(FASLEXT): strap-1/RNS.$(FASLEXT)
@@ -2110,7 +2148,9 @@ strap-1/FPATMAB.$(FASLEXT): strap-1/PATMAB.$(FASLEXT)
 
 strap-1/PATAB.$(FASLEXT): strap-1/KONVERT.$(FASLEXT)
 
-strap-1/FLINEXP.$(FASLEXT): strap-1/LINEXP.$(FASLEXT)
+strap-1/FLINEXP.$(FASLEXT): strap-1/LINEXP.$(FASLEXT) \
+	strap-0/MATRIX.$(FASLEXT) strap-0/INT.$(FASLEXT) \
+	strap-0/VECTOR.$(FASLEXT)
 
 strap-1/OPERCAT.$(FASLEXT): strap-1/SETCAT.$(FASLEXT) \
 	strap-0/OUTFORM.$(FASLEXT) strap-0/BOOLEAN.$(FASLEXT)
@@ -2140,7 +2180,15 @@ strap-1/RCAGG.$(FASLEXT): strap-1/HOAGG.$(FASLEXT)
 
 strap-1/ELAGG.$(FASLEXT): strap-1/LNAGG.$(FASLEXT) strap-1/SMAGG.$(FASLEXT)
 
-strap-1/SRAGG.$(FASLEXT): strap-1/A1AGG.$(FASLEXT)
+strap-1/SRAGG.$(FASLEXT): strap-1/A1AGG.$(FASLEXT) \
+	strap-0/CHAR.$(FASLEXT) strap-0/CCLASS.$(FASLEXT) \
+	strap-0/STRING.$(FASLEXT)
+
+strap-0/CCLASS.$(FASLEXT): strap-0/SETCAT.$(FASLEXT) \
+	strap-0/KONVERT.$(FASLEXT) strap-0/FSAGG.$(FASLEXT)
+
+strap-0/FSAGG.$(FASLEXT): strap-0/DIAGG.$(FASLEXT) \
+	strap-0/SETAGG.$(FASLEXT) strap-0/FINAGG.$(FASLEXT)
 
 strap-1/A1AGG.$(FASLEXT): strap-1/FLAGG.$(FASLEXT) strap-1/SMAGG.$(FASLEXT)
 
@@ -2171,7 +2219,8 @@ strap-1/ELTAB.$(FASLEXT): strap-1/TYPE.$(FASLEXT)
 
 strap-1/EVALAB.$(FASLEXT): strap-1/IEVALAB.$(FASLEXT)
 
-strap-1/IEVALAB.$(FASLEXT): strap-1/SETCAT.$(FASLEXT)
+strap-1/IEVALAB.$(FASLEXT): strap-1/SETCAT.$(FASLEXT) \
+	strap-0/EQ.$(FASLEXT) strap-0/LIST.$(FASLEXT)
 
 strap-1/SEXCAT.$(FASLEXT): strap-1/SETCAT.$(FASLEXT) \
 	strap-1/KVTFROM.$(FASLEXT) strap-1/ELTAB.$(FASLEXT)
@@ -2305,10 +2354,11 @@ strap-2/KOERCE.$(FASLEXT): strap-2/TYPE.$(FASLEXT)
 strap-2/KONVERT.$(FASLEXT): strap-2/TYPE.$(FASLEXT)
 strap-2/RETRACT.$(FASLEXT): strap-2/KRCFROM.$(FASLEXT)
 strap-2/BASTYPE.$(FASLEXT): strap-2/TYPE.$(FASLEXT) \
-	strap-1/BOOLEAN.$(FASLEXT)
+	strap-1/BOOLEAN.$(FASLEXT) strap-1/KOERCE.$(FASLEXT)
 strap-2/FRETRCT.$(FASLEXT): strap-2/RETRACT.$(FASLEXT) strap-1/INS.$(FASLEXT)
 strap-2/SETCAT.$(FASLEXT): strap-2/BASTYPE.$(FASLEXT) \
-	strap-2/KOERCE.$(FASLEXT) strap-1/SINT.$(FASLEXT)
+	strap-2/KOERCE.$(FASLEXT) strap-1/SINT.$(FASLEXT) \
+	strap-1/STRING.$(FASLEXT)
 strap-2/FINITE.$(FASLEXT): strap-2/SETCAT.$(FASLEXT)
 strap-2/ORDTYPE.$(FASLEXT): strap-2/BASTYPE.$(FASLEXT)
 strap-2/ORDSET.$(FASLEXT): strap-2/SETCAT.$(FASLEXT) \
@@ -2319,7 +2369,7 @@ strap-2/LOGIC.$(FASLEXT): strap-2/TYPE.$(FASLEXT)
 strap-2/BOOLE.$(FASLEXT): strap-2/LOGIC.$(FASLEXT)
 strap-2/PROPLOG.$(FASLEXT): strap-2/SETCAT.$(FASLEXT) \
 	strap-2/BOOLE.$(FASLEXT)
-strap-2/LLINSET.$(FASLEXT): strap-2/SETCAT.$(FASLEXT)
+strap-2/LLINSET.$(FASLEXT): strap-1/SETCAT.$(FASLEXT)
 strap-2/RLINSET.$(FASLEXT): strap-2/SETCAT.$(FASLEXT)
 strap-2/LINSET.$(FASLEXT): strap-2/LLINSET.$(FASLEXT) \
 	strap-2/RLINSET.$(FASLEXT)
@@ -2363,7 +2413,9 @@ strap-2/MODULE.$(FASLEXT): strap-2/COMRING.$(FASLEXT) \
 strap-2/INTDOM.$(FASLEXT): strap-2/COMRING.$(FASLEXT) \
 	strap-2/ALGEBRA.$(FASLEXT) strap-2/ENTIRER.$(FASLEXT) \
 	strap-1/FIELD.$(FASLEXT)
-strap-2/GCDDOM.$(FASLEXT): strap-2/INTDOM.$(FASLEXT)
+strap-2/GCDDOM.$(FASLEXT): strap-2/INTDOM.$(FASLEXT) \
+	strap-1/LIST.$(FASLEXT) strap-1/SUP.$(FASLEXT) \
+	strap-1/LSAGG.$(FASLEXT) strap-1/PFECAT.$(FASLEXT)
 strap-2/ENTIRER.$(FASLEXT): strap-2/RING.$(FASLEXT) \
 	strap-2/BMODULE.$(FASLEXT)
 strap-2/OINTDOM.$(FASLEXT): strap-2/INTDOM.$(FASLEXT) \
@@ -2406,7 +2458,11 @@ strap-2/INS.$(FASLEXT): strap-2/UFD.$(FASLEXT) strap-2/EUCDOM.$(FASLEXT) \
 	strap-2/KONVERT.$(FASLEXT) strap-2/RETRACT.$(FASLEXT) \
 	strap-2/LINEXP.$(FASLEXT) strap-2/CFCAT.$(FASLEXT) \
 	strap-2/REAL.$(FASLEXT) strap-2/CHARZ.$(FASLEXT) \
-	strap-2/STEP.$(FASLEXT) strap-2/PATMAB.$(FASLEXT)
+	strap-2/STEP.$(FASLEXT) strap-2/PATMAB.$(FASLEXT) \
+	strap-2/FEVALAB.$(FASLEXT) strap-1/FRAC.$(FASLEXT) \
+	strap-1/FLOAT.$(FASLEXT) strap-1/DFLOAT.$(FASLEXT) \
+	strap-1/INFORM.$(FASLEXT) strap-1/SEXCAT.$(FASLEXT) \
+	strap-1/PATTERN.$(FASLEXT)
 strap-2/FPS.$(FASLEXT): strap-2/RNS.$(FASLEXT)
 strap-2/RNS.$(FASLEXT): strap-2/FIELD.$(FASLEXT) strap-2/ORDRING.$(FASLEXT) \
 	strap-2/RETRACT.$(FASLEXT) strap-2/RADCAT.$(FASLEXT) \
@@ -2434,7 +2490,8 @@ strap-2/FPATMAB.$(FASLEXT): strap-2/PATMAB.$(FASLEXT)
 
 strap-2/PATAB.$(FASLEXT): strap-2/KONVERT.$(FASLEXT)
 
-strap-2/FLINEXP.$(FASLEXT): strap-2/LINEXP.$(FASLEXT)
+strap-2/FLINEXP.$(FASLEXT): strap-2/LINEXP.$(FASLEXT) \
+	strap-1/MATRIX.$(FASLEXT)
 
 strap-2/TRANFUN.$(FASLEXT): strap-2/TRIGCAT.$(FASLEXT) \
 	strap-2/ATRIG.$(FASLEXT) strap-2/HYPCAT.$(FASLEXT) \
@@ -2494,8 +2551,11 @@ strap-2/SETAGG.$(FASLEXT): strap-2/CLAGG.$(FASLEXT) strap-2/SETCAT.$(FASLEXT)
 strap-2/AGG.$(FASLEXT): strap-2/TYPE.$(FASLEXT) strap-1/INS.$(FASLEXT)
 strap-2/ELTAGG.$(FASLEXT): strap-2/AGG.$(FASLEXT) strap-2/ELTAB.$(FASLEXT)
 strap-2/ELTAB.$(FASLEXT): strap-2/TYPE.$(FASLEXT)
-strap-2/EVALAB.$(FASLEXT): strap-2/IEVALAB.$(FASLEXT)
-strap-2/IEVALAB.$(FASLEXT): strap-1/SETCAT.$(FASLEXT)
+strap-2/EVALAB.$(FASLEXT): strap-2/IEVALAB.$(FASLEXT) \
+	strap-1/EQ.$(FASLEXT) strap-1/LIST.$(FASLEXT) \
+	strap-1/GROUP.$(FASLEXT) strap-1/VSPACE.$(FASLEXT)
+strap-2/IEVALAB.$(FASLEXT): strap-1/SETCAT.$(FASLEXT) \
+	strap-1/LIST.$(FASLEXT)
 strap-2/SEXCAT.$(FASLEXT): strap-2/SETCAT.$(FASLEXT) \
 	strap-2/KVTFROM.$(FASLEXT) strap-2/ELTAB.$(FASLEXT)
 strap-2/MATCAT.$(FASLEXT): strap-2/ARR2CAT.$(FASLEXT) \
@@ -2564,7 +2624,14 @@ strap-2/ALIST.$(FASLEXT): strap-2/ALAGG.$(FASLEXT) strap-2/REF.$(FASLEXT)
 strap-2/REF.$(FASLEXT): strap-2/SETCAT.$(FASLEXT)
 strap-2/STRING.$(FASLEXT): strap-2/SRAGG.$(FASLEXT) \
 	strap-2/CHAR.$(FASLEXT)
-strap-2/FRAC.$(FASLEXT): strap-2/QFCAT.$(FASLEXT)
+
+strap-2/FRAC.$(FASLEXT): strap-2/QFCAT.$(FASLEXT) strap-1/GCDDOM.$(FASLEXT) \
+	strap-1/LA.$(FASLEXT) strap-1/EUCDOM.$(FASLEXT) \
+	strap-1/INS.$(FASLEXT) strap-1/SUP.$(FASLEXT) \
+	strap-1/PFECAT.$(FASLEXT) strap-1/FR.$(FASLEXT) \
+	strap-1/CHARNZ.$(FASLEXT) strap-1/SEGCAT.$(FASLEXT) \
+	strap-1/SEGXCAT.$(FASLEXT)
+
 strap-2/CHAR.$(FASLEXT): strap-2/ORDFIN.$(FASLEXT) strap-2/CCLASS.$(FASLEXT)
 strap-2/CCLASS.$(FASLEXT): strap-2/SETCAT.$(FASLEXT) \
 	strap-2/KOERCE.$(FASLEXT) \