diff options
-rwxr-xr-x | configure | 18 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | configure.ac.pamphlet | 2 | ||||
-rw-r--r-- | src/ChangeLog | 25 | ||||
-rw-r--r-- | src/algebra/Makefile.in | 796 | ||||
-rw-r--r-- | src/algebra/Makefile.pamphlet | 820 | ||||
-rw-r--r-- | src/interp/Makefile.in | 3 | ||||
-rw-r--r-- | src/interp/Makefile.pamphlet | 3 | ||||
-rw-r--r-- | src/interp/debug.lisp | 2 | ||||
-rw-r--r-- | src/interp/g-util.boot | 1 | ||||
-rw-r--r-- | src/interp/i-coerce.boot | 5 | ||||
-rw-r--r-- | src/interp/i-output.boot | 7 | ||||
-rw-r--r-- | src/interp/i-spec1.boot | 4 | ||||
-rw-r--r-- | src/interp/lisplib.boot | 5 | ||||
-rw-r--r-- | src/interp/monitor.lisp | 4 | ||||
-rw-r--r-- | src/interp/msg.boot | 4 | ||||
-rw-r--r-- | src/interp/vmlisp.lisp | 7 | ||||
-rw-r--r-- | src/lisp/core.lisp.in | 15 |
18 files changed, 904 insertions, 819 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for OpenAxiom 1.2.0-2008-02-18. +# Generated by GNU Autoconf 2.60 for OpenAxiom 1.2.0-2008-02-20. # # Report bugs to <open-axiom-bugs@lists.sf.net>. # @@ -713,8 +713,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='OpenAxiom' PACKAGE_TARNAME='openaxiom' -PACKAGE_VERSION='1.2.0-2008-02-18' -PACKAGE_STRING='OpenAxiom 1.2.0-2008-02-18' +PACKAGE_VERSION='1.2.0-2008-02-20' +PACKAGE_STRING='OpenAxiom 1.2.0-2008-02-20' PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net' ac_unique_file="src/Makefile.pamphlet" @@ -1387,7 +1387,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenAxiom 1.2.0-2008-02-18 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.2.0-2008-02-20 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1457,7 +1457,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenAxiom 1.2.0-2008-02-18:";; + short | recursive ) echo "Configuration of OpenAxiom 1.2.0-2008-02-20:";; esac cat <<\_ACEOF @@ -1561,7 +1561,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenAxiom configure 1.2.0-2008-02-18 +OpenAxiom configure 1.2.0-2008-02-20 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1575,7 +1575,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenAxiom $as_me 1.2.0-2008-02-18, which was +It was created by OpenAxiom $as_me 1.2.0-2008-02-20, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -25230,7 +25230,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by OpenAxiom $as_me 1.2.0-2008-02-18, which was +This file was extended by OpenAxiom $as_me 1.2.0-2008-02-20, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25279,7 +25279,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenAxiom config.status 1.2.0-2008-02-18 +OpenAxiom config.status 1.2.0-2008-02-20 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 7c29d6cf..99f7c6f0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.2.0-2008-02-18], +AC_INIT([OpenAxiom], [1.2.0-2008-02-20], [open-axiom-bugs@lists.sf.net]) AC_CONFIG_AUX_DIR(config) diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index abacc25f..39d9ab3a 100644 --- a/configure.ac.pamphlet +++ b/configure.ac.pamphlet @@ -1022,7 +1022,7 @@ information: <<Autoconf init>>= sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.2.0-2008-02-18], +AC_INIT([OpenAxiom], [1.2.0-2008-02-20], [open-axiom-bugs@lists.sf.net]) @ diff --git a/src/ChangeLog b/src/ChangeLog index d088ec0c..6135f3b8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,28 @@ +2008-02-20 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * lisp/core.lisp.in [SBCL]: Require "sb-posix". + (|resetErrorCount|): New export function. + * interp/vmlisp.lisp (opOf): Remove macro definition. + * interp/msg.boot (setMsgCatlessAttr): Fix thinko. + * interp/monitor.lisp (monitor-add): Remove extra right parenthesis. + * interp/lisplib.boot: Import "debug". + (initializeLisplib): Don't use ERRORS variable. + * interp/i-spec1.boot (isDomainValuedVariable): Tidy. + * interp/i-output.boot (outputTran): Use SIZE instead of #. + (output): Remove misguided conversion from Tuple to List. + * interp/i-coerce.boot (coerceInteractive): Allow domain object + convesions. + * interp/g-util.boot (opOf): Declare. + * interp/Makefile.pamphlet (lisplib.$(FASLEXT)): Depend on + debug.$(FASLEXT). + * algebra/Makefile.pamphlet: Use .$(FASLEXT) instead of hardcoded + .o extension. + +2008-02-19 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * interp/vmlisp.lisp (|opOf|): Remove duplicate. + * lisp/core.lisp.in (|resetErrorCount|): New function. Export. + 2008-02-18 Gabriel Dos Reis <gdr@cs.tamu.edu> * algebra/variable.spad.pamphlet (AnonymousFunction): Add new diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in index a4dafd1f..7405a9d1 100644 --- a/src/algebra/Makefile.in +++ b/src/algebra/Makefile.in @@ -317,516 +317,544 @@ TESTS=${INPUT}/INTHEORY.input ${INPUT}/VIEW2D.input ${INPUT}/TESTFR.input subdir = src/algebra/ # The list of objects necessary to bootstrap the whole algebra library. +axiom_algebra_layer_strap = \ + strap/ABELGRP strap/ABELGRP- strap/ABELMON strap/ABELMON- \ + strap/ABELSG strap/ABELSG- strap/ALAGG strap/BOOLEAN \ + strap/CABMON strap/CHAR strap/CLAGG strap/CLAGG- \ + strap/COMRING strap/DFLOAT strap/DIFRING strap/DIFRING- \ + strap/DIVRING strap/DIVRING- strap/ENTIRER strap/ES \ + strap/ES- strap/EUCDOM strap/EUCDOM- strap/FFIELDC \ + strap/FFIELDC- strap/FPS strap/FPS- strap/GCDDOM \ + strap/GCDDOM- strap/HOAGG strap/HOAGG- strap/ILIST \ + strap/INS strap/INS- strap/INT strap/INTDOM \ + strap/INTDOM- strap/ISTRING strap/LIST strap/LNAGG \ + strap/LNAGG- strap/LSAGG strap/LSAGG- strap/MONOID \ + strap/MONOID- strap/MTSCAT strap/NNI strap/OINTDOM \ + strap/ORDRING strap/ORDRING- strap/OUTFORM strap/PI \ + strap/PRIMARR strap/POLYCAT strap/POLYCAT- strap/PSETCAT \ + strap/PSETCAT- strap/QFCAT strap/QFCAT- strap/RCAGG \ + strap/RCAGG- strap/REF strap/RING strap/RING- \ + strap/RNG strap/RNS strap/RNS- strap/SETAGG \ + strap/SETAGG- strap/SETCAT strap/SETCAT- strap/SINT \ + strap/STAGG strap/STAGG- strap/SYMBOL strap/TSETCAT \ + strap/TSETCAT- strap/UFD strap/UFD- strap/ULSCAT \ + strap/UPOLYC strap/UPOLYC- strap/URAGG strap/URAGG- \ + strap/VECTOR + axiom_algebra_layer_strap_objects = \ - strap/ABELGRP.o strap/ABELGRP-.o strap/ABELMON.o strap/ABELMON-.o \ - strap/ABELSG.o strap/ABELSG-.o strap/ALAGG.o strap/BOOLEAN.o \ - strap/CABMON.o strap/CHAR.o strap/CLAGG.o strap/CLAGG-.o \ - strap/COMRING.o strap/DFLOAT.o strap/DIFRING.o strap/DIFRING-.o \ - strap/DIVRING.o strap/DIVRING-.o strap/ENTIRER.o strap/ES.o \ - strap/ES-.o strap/EUCDOM.o strap/EUCDOM-.o strap/FFIELDC.o \ - strap/FFIELDC-.o strap/FPS.o strap/FPS-.o strap/GCDDOM.o \ - strap/GCDDOM-.o strap/HOAGG.o strap/HOAGG-.o strap/ILIST.o \ - strap/INS.o strap/INS-.o strap/INT.o strap/INTDOM.o \ - strap/INTDOM-.o strap/ISTRING.o strap/LIST.o strap/LNAGG.o \ - strap/LNAGG-.o strap/LSAGG.o strap/LSAGG-.o strap/MONOID.o \ - strap/MONOID-.o strap/MTSCAT.o strap/NNI.o strap/OINTDOM.o \ - strap/ORDRING.o strap/ORDRING-.o strap/OUTFORM.o strap/PI.o \ - strap/PRIMARR.o strap/POLYCAT.o strap/POLYCAT-.o strap/PSETCAT.o \ - strap/PSETCAT-.o strap/QFCAT.o strap/QFCAT-.o strap/RCAGG.o \ - strap/RCAGG-.o strap/REF.o strap/RING.o strap/RING-.o \ - strap/RNG.o strap/RNS.o strap/RNS-.o strap/SETAGG.o \ - strap/SETAGG-.o strap/SETCAT.o strap/SETCAT-.o strap/SINT.o \ - strap/STAGG.o strap/STAGG-.o strap/SYMBOL.o strap/TSETCAT.o \ - strap/TSETCAT-.o strap/UFD.o strap/UFD-.o strap/ULSCAT.o \ - strap/UPOLYC.o strap/UPOLYC-.o strap/URAGG.o strap/URAGG-.o \ - strap/VECTOR.o + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_strap)) axiom_algebra_bootstrap = \ - ABELGRP.o ABELGRP-.o ABELMON.o ABELMON-.o \ - ABELSG.o ABELSG-.o ALAGG.o BOOLEAN.o \ - CABMON.o CHAR.o CLAGG.o CLAGG-.o \ - COMRING.o DFLOAT.o DIFRING.o DIFRING-.o \ - DIVRING.o DIVRING-.o ENTIRER.o ES.o \ - ES-.o EUCDOM.o EUCDOM-.o FFIELDC.o \ - FFIELDC-.o FPS.o FPS-.o GCDDOM.o \ - GCDDOM-.o HOAGG.o HOAGG-.o ILIST.o \ - INS.o INS-.o INT.o INTDOM.o \ - INTDOM-.o ISTRING.o LIST.o LNAGG.o \ - LNAGG-.o LSAGG.o LSAGG-.o MONOID.o \ - MONOID-.o MTSCAT.o NNI.o OINTDOM.o \ - ORDRING.o ORDRING-.o OUTFORM.o PI.o \ - PRIMARR.o POLYCAT.o POLYCAT-.o PSETCAT.o \ - PSETCAT-.o QFCAT.o QFCAT-.o RCAGG.o \ - RCAGG-.o REF.o RING.o RING-.o \ - RNG.o RNS.o RNS-.o SETAGG.o \ - SETAGG-.o SETCAT.o SETCAT-.o SINT.o \ - STAGG.o STAGG-.o SYMBOL.o TSETCAT.o \ - TSETCAT-.o UFD.o UFD-.o ULSCAT.o \ - UPOLYC.o UPOLYC-.o URAGG.o URAGG-.o \ - VECTOR.o + ABELGRP ABELGRP- ABELMON ABELMON- \ + ABELSG ABELSG- ALAGG BOOLEAN \ + CABMON CHAR CLAGG CLAGG- \ + COMRING DFLOAT DIFRING DIFRING- \ + DIVRING DIVRING- ENTIRER ES \ + ES- EUCDOM EUCDOM- FFIELDC \ + FFIELDC- FPS FPS- GCDDOM \ + GCDDOM- HOAGG HOAGG- ILIST \ + INS INS- INT INTDOM \ + INTDOM- ISTRING LIST LNAGG \ + LNAGG- LSAGG LSAGG- MONOID \ + MONOID- MTSCAT NNI OINTDOM \ + ORDRING ORDRING- OUTFORM PI \ + PRIMARR POLYCAT POLYCAT- PSETCAT \ + PSETCAT- QFCAT QFCAT- RCAGG \ + RCAGG- REF RING RING- \ + RNG RNS RNS- SETAGG \ + SETAGG- SETCAT SETCAT- SINT \ + STAGG STAGG- SYMBOL TSETCAT \ + TSETCAT- UFD UFD- ULSCAT \ + UPOLYC UPOLYC- URAGG URAGG- \ + VECTOR axiom_algebra_bootstrap_nrlibs = \ - $(axiom_algebra_bootstrap:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_bootstrap)) axiom_algebra_bootstrap_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_bootstrap)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT), $(axiom_algebra_bootstrap))) axiom_algebra_layer_0 = \ - AHYP.o ATTREG.o CFCAT.o ELTAB.o \ - KOERCE.o KONVERT.o MSYSCMD.o ODEIFTBL.o \ - OM.o OMCONN.o OMDEV.o OUT.o \ - PRIMCAT.o PRINT.o PTRANFN.o SPFCAT.o \ - TYPE.o UTYPE.o PROPLOG.o PROPERTY.o \ - BASTYPE.o BASTYPE-.o CATEGORY.o + AHYP ATTREG CFCAT ELTAB \ + KOERCE KONVERT MSYSCMD ODEIFTBL \ + OM OMCONN OMDEV OUT \ + PRIMCAT PRINT PTRANFN SPFCAT \ + TYPE UTYPE PROPLOG PROPERTY \ + BASTYPE BASTYPE- CATEGORY axiom_algebra_layer_0_nrlibs = \ - $(axiom_algebra_layer_0:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_0)) axiom_algebra_layer_0_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_0)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_0))) axiom_algebra_layer_1 = \ - ANY1.o COMBOPC.o DROPT1.o EQ2.o \ - FORTCAT.o ITFUN2.o ITFUN3.o ITUPLE.o \ - MKBCFUNC.o MKRECORD.o MKUCFUNC.o NONE1.o \ - PATAB.o PLOT1.o PPCURVE.o PSCURVE.o \ - REAL.o RESLATC.o RETRACT.o RETRACT-.o \ - SEGBIND2.o SEGCAT.o STREAM1.o STREAM2.o \ - STREAM3.o BINDING.o SYNTAX.o + ANY1 COMBOPC DROPT1 EQ2 \ + FORTCAT ITFUN2 ITFUN3 ITUPLE \ + MKBCFUNC MKRECORD MKUCFUNC NONE1 \ + PATAB PLOT1 PPCURVE PSCURVE \ + REAL RESLATC RETRACT RETRACT- \ + SEGBIND2 SEGCAT STREAM1 STREAM2 \ + STREAM3 BINDING SYNTAX axiom_algebra_layer_1_nrlibs = \ - $(axiom_algebra_layer_1:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_1)) axiom_algebra_layer_1_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_1)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_1))) axiom_algebra_layer_2 = \ - FMC.o FMFUN.o FORTFN.o FVC.o CTORCALL.o \ - FVFUN.o INTRET.o SEGXCAT.o CONTOUR.o + FMC FMFUN FORTFN FVC CTORCALL \ + FVFUN INTRET SEGXCAT CONTOUR axiom_algebra_layer_2_nrlibs = \ - $(axiom_algebra_layer_2:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_2)) axiom_algebra_layer_2_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_2)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_2))) axiom_algebra_layer_3 = \ - AGG.o AGG-.o \ - GRDEF.o LIST3.o MKFUNC.o SCOPE.o + AGG AGG- GRDEF LIST3 MKFUNC SCOPE axiom_algebra_layer_3_nrlibs = \ - $(axiom_algebra_layer_3:.$(OBJEXT=./NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_3)) axiom_algebra_layer_3_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_3)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_3))) axiom_algebra_layer_4 = \ - ANON.o COLOR.o COMM.o COMPPROP.o \ - ELTAGG.o ELTAGG-.o ESCONT1.o EXIT.o \ - FAMONC.o FILECAT.o FINITE.o FNCAT.o \ - FORMULA1.o IDPC.o IEVALAB.o IEVALAB-.o \ - INTBIT.o LMODULE.o LOGIC.o LOGIC-.o \ - MAPHACK1.o MAPHACK2.o MAPHACK3.o MAPPKG1.o \ - MAPPKG2.o MAPPKG3.o MONAD.o MONAD-.o \ - NIPROB.o NONE.o NUMINT.o ODECAT.o \ - ODEPROB.o OMENC.o ONECOMP2.o OPTCAT.o \ - OPTPROB.o ORDSET.o ORDSET-.o PALETTE.o \ - PARPCURV.o PARPC2.o PARSCURV.o PARSC2.o \ - PARSURF.o PARSU2.o PATMAB.o PATRES2.o \ - PATTERN1.o PDECAT.o PDEPROB.o REPSQ.o \ - REPDB.o RFDIST.o RIDIST.o RMODULE.o \ - SEXCAT.o SGROUP.o SGROUP-.o SPACEC.o \ - SPLNODE.o STEP.o SUCH.o TEX1.o \ - UDVO.o YSTREAM.o PAIR.o ENV.o + ANON COLOR COMM COMPPROP \ + ELTAGG ELTAGG- ESCONT1 EXIT \ + FAMONC FILECAT FINITE FNCAT \ + FORMULA1 IDPC IEVALAB IEVALAB- \ + INTBIT LMODULE LOGIC LOGIC- \ + MAPHACK1 MAPHACK2 MAPHACK3 MAPPKG1 \ + MAPPKG2 MAPPKG3 MONAD MONAD- \ + NIPROB NONE NUMINT ODECAT \ + ODEPROB OMENC ONECOMP2 OPTCAT \ + OPTPROB ORDSET ORDSET- PALETTE \ + PARPCURV PARPC2 PARSCURV PARSC2 \ + PARSURF PARSU2 PATMAB PATRES2 \ + PATTERN1 PDECAT PDEPROB REPSQ \ + REPDB RFDIST RIDIST RMODULE \ + SEXCAT SGROUP SGROUP- SPACEC \ + SPLNODE STEP SUCH TEX1 \ + UDVO YSTREAM PAIR ENV axiom_algebra_layer_4_nrlibs = \ - $(axiom_algebra_layer_4:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_4)) axiom_algebra_layer_4_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_4)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_4))) axiom_algebra_layer_5 = \ - ATRIG.o ATRIG-.o BMODULE.o CACHSET.o \ - CHARNZ.o CHARZ.o DVARCAT.o DVARCAT-.o \ - ELEMFUN.o ELEMFUN-.o ESTOOLS2.o EVALAB.o \ - EVALAB-.o FCOMP.o FEVALAB.o FEVALAB-.o \ - FPATMAB.o GROUP.o GROUP-.o IDPAM.o \ - IDPO.o INCRMAPS.o IXAGG.o IXAGG-.o \ - KERNEL2.o LALG.o LALG-.o LINEXP.o \ - MODMONOM.o MONADWU.o MONADWU-.o MRF2.o \ - NARNG.o NARNG-.o NSUP2.o OASGP.o \ - ODVAR.o OPQUERY.o ORDFIN.o ORDMON.o \ - PATMATCH.o PERMCAT.o PDRING.o PDRING-.o \ - SDVAR.o SUP2.o TRIGCAT.o TRIGCAT-.o \ - ULS2.o UP2.o ELABEXPR.o + ATRIG ATRIG- BMODULE CACHSET \ + CHARNZ CHARZ DVARCAT DVARCAT- \ + ELEMFUN ELEMFUN- ESTOOLS2 EVALAB \ + EVALAB- FCOMP FEVALAB FEVALAB- \ + FPATMAB GROUP GROUP- IDPAM \ + IDPO INCRMAPS IXAGG IXAGG- \ + KERNEL2 LALG LALG- LINEXP \ + MODMONOM MONADWU MONADWU- MRF2 \ + NARNG NARNG- NSUP2 OASGP \ + ODVAR OPQUERY ORDFIN ORDMON \ + PATMATCH PERMCAT PDRING PDRING- \ + SDVAR SUP2 TRIGCAT TRIGCAT- \ + ULS2 UP2 ELABEXPR axiom_algebra_layer_5_nrlibs = \ - $(axiom_algebra_layer_5:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_5)) axiom_algebra_layer_5_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_5)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_5))) axiom_algebra_layer_6 = \ - AUTOMOR.o BGAGG.o BGAGG-.o BRAGG.o \ - BRAGG-.o CARTEN2.o CHARPOL.o COMPLEX2.o \ - DIFEXT.o DIFEXT-.o DLAGG.o ELAGG.o \ - ELAGG-.o ES1.o ES2.o GRMOD.o \ - GRMOD-.o HYPCAT.o HYPCAT-.o MKCHSET.o \ - MODRING.o MODULE.o MODULE-.o NASRING.o \ - NASRING-.o OAMON.o SORTPAK.o ZMOD.o + AUTOMOR BGAGG BGAGG- BRAGG \ + BRAGG- CARTEN2 CHARPOL COMPLEX2 \ + DIFEXT DIFEXT- DLAGG ELAGG \ + ELAGG- ES1 ES2 GRMOD \ + GRMOD- HYPCAT HYPCAT- MKCHSET \ + MODRING MODULE MODULE- NASRING \ + NASRING- OAMON SORTPAK ZMOD axiom_algebra_layer_6_nrlibs = \ - $(axiom_algebra_layer_6:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_6)) axiom_algebra_layer_6_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_6)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_6))) axiom_algebra_layer_7 = \ - ALGEBRA.o ALGEBRA-.o BTCAT.o BTCAT-.o \ - FMCAT.o IDPOAM.o IFAMON.o GRALG.o \ - GRALG-.o OCAMON.o PRQAGG.o QUAGG.o \ - SKAGG.o + ALGEBRA ALGEBRA- BTCAT BTCAT- \ + FMCAT IDPOAM IFAMON GRALG \ + GRALG- OCAMON PRQAGG QUAGG \ + SKAGG axiom_algebra_layer_7_nrlibs = \ - $(axiom_algebra_layer_7:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_7)) axiom_algebra_layer_7_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_7)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_7))) axiom_algebra_layer_8 = \ - BSTREE.o BTOURN.o CARD.o DRAWHACK.o \ - DQAGG.o FACTFUNC.o FMTC.o FR2.o \ - FRAC2.o FRUTIL.o ITAYLOR.o MLO.o \ - NAALG.o NAALG-.o OAGROUP.o OAMONS.o \ - OP.o ORDCOMP2.o PID.o RANDSRC.o \ - UNISEG2.o XALG.o + BSTREE BTOURN CARD DRAWHACK \ + DQAGG FACTFUNC FMTC FR2 \ + FRAC2 FRUTIL ITAYLOR MLO \ + NAALG NAALG- OAGROUP OAMONS \ + OP ORDCOMP2 PID RANDSRC \ + UNISEG2 XALG axiom_algebra_layer_8_nrlibs = \ - $(axiom_algebra_layer_8:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_8)) axiom_algebra_layer_8_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_8)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_8))) axiom_algebra_layer_9 = \ - AMR.o AMR-.o DEGRED.o DLP.o \ - EAB.o ESTOOLS1.o FAGROUP.o FAMONOID.o \ - FIELD.o FIELD-.o FLAGG.o FLAGG-.o \ - FLINEXP.o FLINEXP-.o FRETRCT.o FRETRCT-.o \ - FSERIES.o FT.o IDPAG.o IDPOAMS.o \ - INFINITY.o LA.o OMLO.o ORTHPOL.o \ - PRODUCT.o PADICCT.o PMPRED.o PMASS.o \ - PTFUNC2.o RADCAT.o RADCAT-.o RATRET.o \ - RADUTIL.o UPXS2.o XFALG.o ZLINDEP.o + AMR AMR- DEGRED DLP \ + EAB ESTOOLS1 FAGROUP FAMONOID \ + FIELD FIELD- FLAGG FLAGG- \ + FLINEXP FLINEXP- FRETRCT FRETRCT- \ + FSERIES FT IDPAG IDPOAMS \ + INFINITY LA OMLO ORTHPOL \ + PRODUCT PADICCT PMPRED PMASS \ + PTFUNC2 RADCAT RADCAT- RATRET \ + RADUTIL UPXS2 XFALG ZLINDEP axiom_algebra_layer_9_nrlibs = \ - $(axiom_algebra_layer_9:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_9)) axiom_algebra_layer_9_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_9)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_9))) axiom_algebra_layer_10 = \ - A1AGG.o A1AGG-.o ARR2CAT.o ARR2CAT-.o \ - ASP34.o BBTREE.o BFUNCT.o BPADIC.o \ - BTREE.o CRAPACK.o DEQUEUE.o DLIST.o \ - DRAWCX.o D01GBFA.o D02EJFA.o D03FAFA.o \ - DRAWPT.o FAMR.o FAMR-.o FLASORT.o \ - FLAGG2.o FGROUP.o FM.o FM1.o \ - FPC.o FPC-.o FMONOID.o INDE.o \ - IPADIC.o IROOT.o IR2.o LEXP.o \ - LIECAT.o LIECAT-.o LIST2.o LIST2MAP.o \ - LMOPS.o LZSTAGG.o LZSTAGG-.o MAGMA.o \ - MESH.o MOEBIUS.o MODFIELD.o MODOP.o \ - MRING.o MTHING.o NCNTFRAC.o NCODIV.o \ - NUMTUBE.o ODR.o OFMONOID.o ONECOMP.o \ - ORDCOMP.o OREPCAT.o OREPCAT-.o OWP.o \ - PADIC.o PATTERN2.o PATLRES.o PARTPERM.o \ - PBWLB.o PENDTREE.o PGE.o PGROEB.o \ - PINTERP.o PLOTTOOL.o PFR.o PMDOWN.o \ - PRTITION.o PMINS.o PMLSAGG.o PMTOOLS.o \ - PSCAT.o PSCAT-.o QFORM.o QUEUE.o \ - SCACHE.o SEG.o SEG2.o SEXOF.o \ - STACK.o STTAYLOR.o TABLBUMP.o TABLEAU.o \ - TOPSP.o TRANFUN.o TRANFUN-.o TUBE.o \ - UDPO.o UNISEG.o VIEW.o VSPACE.o \ - VSPACE-.o XPOLYC.o XPR.o + A1AGG A1AGG- ARR2CAT ARR2CAT- \ + ASP34 BBTREE BFUNCT BPADIC \ + BTREE CRAPACK DEQUEUE DLIST \ + DRAWCX D01GBFA D02EJFA D03FAFA \ + DRAWPT FAMR FAMR- FLASORT \ + FLAGG2 FGROUP FM FM1 \ + FPC FPC- FMONOID INDE \ + IPADIC IROOT IR2 LEXP \ + LIECAT LIECAT- LIST2 LIST2MAP \ + LMOPS LZSTAGG LZSTAGG- MAGMA \ + MESH MOEBIUS MODFIELD MODOP \ + MRING MTHING NCNTFRAC NCODIV \ + NUMTUBE ODR OFMONOID ONECOMP \ + ORDCOMP OREPCAT OREPCAT- OWP \ + PADIC PATTERN2 PATLRES PARTPERM \ + PBWLB PENDTREE PGE PGROEB \ + PINTERP PLOTTOOL PFR PMDOWN \ + PRTITION PMINS PMLSAGG PMTOOLS \ + PSCAT PSCAT- QFORM QUEUE \ + SCACHE SEG SEG2 SEXOF \ + STACK STTAYLOR TABLBUMP TABLEAU \ + TOPSP TRANFUN TRANFUN- TUBE \ + UDPO UNISEG VIEW VSPACE \ + VSPACE- XPOLYC XPR axiom_algebra_layer_10_nrlibs = \ - $(axiom_algebra_layer_10:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_10)) axiom_algebra_layer_10_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_10)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_10))) axiom_algebra_layer_11 = \ - APPLYORE.o ARRAY1.o ARRAY12.o ARRAY2.o \ - ASTACK.o BTAGG.o BTAGG-.o COMBINAT.o \ - CSTTOOLS.o D01FCFA.o E04MBFA.o FARRAY.o \ - FLALG.o GALUTIL.o HEAP.o IARRAY1.o \ - IARRAY2.o IFARRAY.o INTCAT.o INTHEORY.o \ - IRREDFFX.o LFCAT.o LODOCAT.o LODOCAT-.o \ - LWORD.o MATCAT.o MATCAT-.o MATSTOR.o \ - ORESUP.o OREPCTO.o OREUP.o PLOT3D.o \ - PR.o PREASSOC.o PRIMARR2.o REDORDER.o \ - SRAGG.o SRAGG-.o STREAM.o SYMPOLY.o \ - TS.o TUPLE.o UPSCAT.o UPSCAT-.o \ - VECTCAT.o VECTCAT-.o XDPOLY.o XEXPPKG.o \ - XF.o XF-.o XPBWPOLY.o XPOLY.o \ - XRPOLY.o + APPLYORE ARRAY1 ARRAY12 ARRAY2 \ + ASTACK BTAGG BTAGG- COMBINAT \ + CSTTOOLS D01FCFA E04MBFA FARRAY \ + FLALG GALUTIL HEAP IARRAY1 \ + IARRAY2 IFARRAY INTCAT INTHEORY \ + IRREDFFX LFCAT LODOCAT LODOCAT- \ + LWORD MATCAT MATCAT- MATSTOR \ + ORESUP OREPCTO OREUP PLOT3D \ + PR PREASSOC PRIMARR2 REDORDER \ + SRAGG SRAGG- STREAM SYMPOLY \ + TS TUPLE UPSCAT UPSCAT- \ + VECTCAT VECTCAT- XDPOLY XEXPPKG \ + XF XF- XPBWPOLY XPOLY \ + XRPOLY axiom_algebra_layer_11_nrlibs = \ - $(axiom_algebra_layer_11:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_11)) axiom_algebra_layer_11_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_11)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_11))) axiom_algebra_layer_12 = \ - BITS.o DIRPROD2.o IMATRIX.o IVECTOR.o \ - LPOLY.o LSMP.o LSMP1.o MATCAT2.o \ - PTCAT.o STRICAT.o TRIMAT.o + BITS DIRPROD2 IMATRIX IVECTOR \ + LPOLY LSMP LSMP1 MATCAT2 \ + PTCAT STRICAT TRIMAT axiom_algebra_layer_12_nrlibs = \ - $(axiom_algebra_layer_12:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_12)) axiom_algebra_layer_12_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_12)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_12))) axiom_algebra_layer_13 = \ - ASSOCEQ.o CARTEN.o CLIF.o CLIP.o \ - COORDSYS.o DBASE.o DHMATRIX.o DIOSP.o \ - DIRPCAT.o DIRPCAT-.o D02BBFA.o D02BHFA.o \ - D02CJFA.o FAXF.o FAXF-.o FFPOLY2.o \ - FNLA.o GRAY.o HB.o IRSN.o \ - MCALCFN.o MHROWRED.o NUMODE.o NUMQUAD.o \ - ODESYS.o ODETOOLS.o ORDFUNS.o PERMAN.o \ - PFECAT.o PFECAT-.o POINT.o PSEUDLIN.o \ - PTPACK.o REP2.o SETMN.o SEX.o \ - STRING.o SYMFUNC.o VECTOR2.o + ASSOCEQ CARTEN CLIF CLIP \ + COORDSYS DBASE DHMATRIX DIOSP \ + DIRPCAT DIRPCAT- D02BBFA D02BHFA \ + D02CJFA FAXF FAXF- FFPOLY2 \ + FNLA GRAY HB IRSN \ + MCALCFN MHROWRED NUMODE NUMQUAD \ + ODESYS ODETOOLS ORDFUNS PERMAN \ + PFECAT PFECAT- POINT PSEUDLIN \ + PTPACK REP2 SETMN SEX \ + STRING SYMFUNC VECTOR2 axiom_algebra_layer_13_nrlibs = \ - $(axiom_algebra_layer_13:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_13)) axiom_algebra_layer_13_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_13)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_13))) axiom_algebra_layer_14 = \ - ASP1.o ASP10.o ASP24.o ASP4.o \ - ASP50.o ASP6.o ASP73.o BALFACT.o \ - BEZOUT.o BINARY.o BINFILE.o BOUNDZRO.o \ - BPADICRT.o BRILL.o CDEN.o CHVAR.o \ - COMMUPC.o CONTFRAC.o CVMP.o CYCLOTOM.o \ - CYCLES.o DDFACT.o DECIMAL.o DIOPS.o \ - DIOPS-.o DIRPROD.o DISPLAY.o DMP.o \ - DPMO.o DPOLCAT.o DPOLCAT-.o D01AJFA.o \ - D01AKFA.o D01ALFA.o D01AMFA.o D01APFA.o \ - D01AQFA.o EMR.o EQ.o ERROR.o \ - EVALCYC.o E04DGFA.o E04FDFA.o E04GCFA.o \ - E04JAFA.o FACUTIL.o FF.o FFCG.o \ - FFCGX.o FFHOM.o FFNB.o FFNBX.o \ - FFPOLY.o FFX.o FFSLPE.o FGLMICPK.o \ - FILE.o FINAALG.o FINAALG-.o FINRALG.o \ - FINRALG-.o FFF.o FLOATRP.o FNAME.o \ - FOP.o FORMULA.o FORT.o FRAC.o \ - FTEM.o GENEEZ.o GENMFACT.o GENPGCD.o \ - GALFACTU.o GALPOLYU.o GB.o GBEUCLID.o \ - GBF.o GBINTERN.o GHENSEL.o GMODPOL.o \ - GOSPER.o GRIMAGE.o GROEBSOL.o HDMP.o \ - HDP.o HEXADEC.o HEUGCD.o IBPTOOLS.o \ - IFF.o IBITS.o ICARD.o ICDEN.o \ - IDECOMP.o IIARRAY2.o IMATLIN.o IMATQF.o \ - INMODGCD.o INNMFACT.o INPSIGN.o INTHERTR.o \ - INTRAT.o INTRF.o INTSLPE.o INTTR.o \ - ISUMP.o LAUPOL.o LEADCDET.o LGROBP.o \ - LIMITRF.o LINDEP.o LO.o LPEFRAC.o \ - LSPP.o MATLIN.o MCDEN.o MDDFACT.o \ - MFINFACT.o MFLOAT.o MINT.o MLIFT.o \ - MMAP.o MODMON.o MONOTOOL.o MPCPF.o \ - MPC2.o MPC3.o MPOLY.o MPRFF.o \ - MRATFAC.o MULTSQFR.o NORMRETR.o NPCOEF.o \ - NSUP.o NTPOLFN.o ODP.o ODEPRIM.o \ - ODEPRRIC.o OMPKG.o OMSERVER.o PADEPAC.o \ - PADICRAT.o PADICRC.o PCOMP.o PDECOMP.o \ - PF.o PFBR.o PFBRU.o PFOTOOLS.o \ - PFRPAC.o PGCD.o PINTERPA.o PLEQN.o \ - PMPLCAT.o PMQFCAT.o PNTHEORY.o POLUTIL.o \ - POLTOPOL.o POLYCATQ.o POLYLIFT.o POLYROOT.o \ - POLY2.o POLY2UP.o PRS.o PSQFR.o \ - PUSHVAR.o QALGSET.o QFCAT2.o RADIX.o \ - RATFACT.o RCFIELD.o RCFIELD-.o RDETR.o \ - RDETRS.o REAL0.o REAL0Q.o REALSOLV.o \ - RESRING.o RETSOL.o RF.o RFFACTOR.o \ - RMATCAT.o RMATCAT-.o RRCC.o RRCC-.o \ - SCPKG.o SHDP.o SHP.o SIGNRF.o \ - SMITH.o SMP.o SMTS.o SOLVEFOR.o \ - SPLTREE.o STINPROD.o STTFNC.o SUBRESP.o \ - SUMRF.o SUP.o SUPFRACF.o TANEXP.o \ - TEMUTL.o TEX.o TEXTFILE.o TREE.o \ - TWOFACT.o UNIFACT.o UP.o UPCDEN.o \ - UPDECOMP.o UPDIVP.o UPMP.o UPOLYC2.o \ - UPXSCAT.o UPSQFREE.o VIEWDEF.o VIEW2D.o \ - VOID.o WEIER.o WP.o + ASP1 ASP10 ASP24 ASP4 \ + ASP50 ASP6 ASP73 BALFACT \ + BEZOUT BINARY BINFILE BOUNDZRO \ + BPADICRT BRILL CDEN CHVAR \ + COMMUPC CONTFRAC CVMP CYCLOTOM \ + CYCLES DDFACT DECIMAL DIOPS \ + DIOPS- DIRPROD DISPLAY DMP \ + DPMO DPOLCAT DPOLCAT- D01AJFA \ + D01AKFA D01ALFA D01AMFA D01APFA \ + D01AQFA EMR EQ ERROR \ + EVALCYC E04DGFA E04FDFA E04GCFA \ + E04JAFA FACUTIL FF FFCG \ + FFCGX FFHOM FFNB FFNBX \ + FFPOLY FFX FFSLPE FGLMICPK \ + FILE FINAALG FINAALG- FINRALG \ + FINRALG- FFF FLOATRP FNAME \ + FOP FORMULA FORT FRAC \ + FTEM GENEEZ GENMFACT GENPGCD \ + GALFACTU GALPOLYU GB GBEUCLID \ + GBF GBINTERN GHENSEL GMODPOL \ + GOSPER GRIMAGE GROEBSOL HDMP \ + HDP HEXADEC HEUGCD IBPTOOLS \ + IFF IBITS ICARD ICDEN \ + IDECOMP IIARRAY2 IMATLIN IMATQF \ + INMODGCD INNMFACT INPSIGN INTHERTR \ + INTRAT INTRF INTSLPE INTTR \ + ISUMP LAUPOL LEADCDET LGROBP \ + LIMITRF LINDEP LO LPEFRAC \ + LSPP MATLIN MCDEN MDDFACT \ + MFINFACT MFLOAT MINT MLIFT \ + MMAP MODMON MONOTOOL MPCPF \ + MPC2 MPC3 MPOLY MPRFF \ + MRATFAC MULTSQFR NORMRETR NPCOEF \ + NSUP NTPOLFN ODP ODEPRIM \ + ODEPRRIC OMPKG OMSERVER PADEPAC \ + PADICRAT PADICRC PCOMP PDECOMP \ + PF PFBR PFBRU PFOTOOLS \ + PFRPAC PGCD PINTERPA PLEQN \ + PMPLCAT PMQFCAT PNTHEORY POLUTIL \ + POLTOPOL POLYCATQ POLYLIFT POLYROOT \ + POLY2 POLY2UP PRS PSQFR \ + PUSHVAR QALGSET QFCAT2 RADIX \ + RATFACT RCFIELD RCFIELD- RDETR \ + RDETRS REAL0 REAL0Q REALSOLV \ + RESRING RETSOL RF RFFACTOR \ + RMATCAT RMATCAT- RRCC RRCC- \ + SCPKG SHDP SHP SIGNRF \ + SMITH SMP SMTS SOLVEFOR \ + SPLTREE STINPROD STTFNC SUBRESP \ + SUMRF SUP SUPFRACF TANEXP \ + TEMUTL TEX TEXTFILE TREE \ + TWOFACT UNIFACT UP UPCDEN \ + UPDECOMP UPDIVP UPMP UPOLYC2 \ + UPXSCAT UPSQFREE VIEWDEF VIEW2D \ + VOID WEIER WP axiom_algebra_layer_14_nrlibs = \ - $(axiom_algebra_layer_14:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_14)) axiom_algebra_layer_14_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_14)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_14))) axiom_algebra_layer_15 = \ - DIAGG.o DIAGG-.o DSMP.o EXPUPXS.o \ - FRAMALG.o FRAMALG-.o MDAGG.o ODPOL.o \ - PLOT.o RMCAT2.o ROIRC.o SDPOL.o \ - SMATCAT.o SMATCAT-.o TUBETOOL.o UPXSCCA.o \ - UPXSCCA-.o + DIAGG DIAGG- DSMP EXPUPXS \ + FRAMALG FRAMALG- MDAGG ODPOL \ + PLOT RMCAT2 ROIRC SDPOL \ + SMATCAT SMATCAT- TUBETOOL UPXSCCA \ + UPXSCCA- -axiom_algebra_layer_15_nrlibis = \ - $(axiom_algebra_layer_15:.$(OBJEXT)=.NRLIBS/code.$(OBJEXT)) +axiom_algebra_layer_15_nrlibs = \ + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_15)) axiom_algebra_layer_15_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_15)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_15))) axiom_algebra_layer_16 = \ - DPMM.o EFUPXS.o FFINTBAS.o FRIDEAL.o \ - FRIDEAL2.o FRMOD.o FSAGG.o FSAGG-.o \ - IBATOOL.o INTFACT.o KDAGG.o KDAGG-.o \ - MSETAGG.o MONOGEN.o MONOGEN-.o NFINTBAS.o \ - SPACE3.o + DPMM EFUPXS FFINTBAS FRIDEAL \ + FRIDEAL2 FRMOD FSAGG FSAGG- \ + IBATOOL INTFACT KDAGG KDAGG- \ + MSETAGG MONOGEN MONOGEN- NFINTBAS \ + SPACE3 axiom_algebra_layer_16_nrlibs = \ - $(axiom_algebra_layer_16:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_16)) axiom_algebra_layer_16_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_16)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_16))) axiom_algebra_layer_17 = \ - CCLASS.o FSAGG2.o GALFACT.o IALGFACT.o \ - IBACHIN.o NORMMA.o ODERED.o OMSAGG.o \ - PERM.o PERMGRP.o PRIMES.o PWFFINTB.o \ - RDIST.o SAE.o SAEFACT.o SAERFFC.o \ - SGCF.o TBAGG.o TBAGG-.o VIEW3D.o + CCLASS FSAGG2 GALFACT IALGFACT \ + IBACHIN NORMMA ODERED OMSAGG \ + PERM PERMGRP PRIMES PWFFINTB \ + RDIST SAE SAEFACT SAERFFC \ + SGCF TBAGG TBAGG- VIEW3D axiom_algebra_layer_17_nrlibs = \ - $(axiom_algebra_layer_17:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_17)) axiom_algebra_layer_17_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_17)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_17))) axiom_algebra_layer_18 = \ - ALIST.o EQTBL.o GSTBL.o HASHTBL.o \ - INTABL.o INTFTBL.o INTPACK.o IPF.o \ - KAFILE.o PATRES.o STBL.o STRTBL.o \ - TABLE.o TBCMPPK.o + ALIST EQTBL GSTBL HASHTBL \ + INTABL INTFTBL INTPACK IPF \ + KAFILE PATRES STBL STRTBL \ + TABLE TBCMPPK axiom_algebra_layer_18_nrlibs = \ - $(axiom_algebra_layer_18:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_18)) axiom_algebra_layer_18_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_18)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_18))) axiom_algebra_layer_19 = \ - ACF.o ACF-.o ACPLOT.o ANTISYM.o \ - ANY.o ASP12.o ASP27.o ASP28.o \ - ASP33.o ASP49.o ASP55.o ASP7.o \ - ASP78.o ASP8.o ASP9.o ATTRBUT.o \ - BOP.o BOP1.o COMMONOP.o COMPCAT.o \ - COMPCAT-.o DRAW.o DRAWCFUN.o DROPT.o \ - DROPT0.o D01ANFA.o D01ASFA.o D03AGNT.o \ - EP.o E04AGNT.o FCPAK1.o FEXPR.o \ - FFCAT.o FFCAT-.o FFCGP.o FFNBP.o \ - FFP.o FLOAT.o FPARFRAC.o FR.o \ - FRNAALG.o FRNAALG-.o FS.o FS-.o \ - FST.o FUNCTION.o GDMP.o HACKPI.o \ - IDEAL.o INFORM.o INFORM1.o IPRNTPK.o \ - IR.o ISUPS.o KERNEL.o LIB.o \ - LMDICT.o LODOOPS.o MATRIX.o MKFLCFN.o \ - MSET.o M3D.o NAGC02.o NAGC05.o \ - NAGC06.o NAGD03.o NAGE01.o NAGE02.o \ - NAGE04.o NAGF07.o NAGS.o NAGSP.o \ - NREP.o NUMFMT.o OC.o OC-.o \ - ODEPACK.o ODERAT.o OMERR.o OMERRK.o \ - OPTPACK.o OSI.o PATTERN.o OVAR.o \ - PMKERNEL.o PMSYM.o POLY.o PRIMELT.o \ - QALGSET2.o QEQUAT.o RECLOS.o REP1.o \ - RESULT.o QUATCAT.o QUATCAT-.o RFFACT.o \ - RMATRIX.o ROMAN.o ROUTINE.o RPOLCAT.o \ - RPOLCAT-.o RULECOLD.o SAOS.o SEGBIND.o \ - SET.o SPECOUT.o SQMATRIX.o SWITCH.o \ - SYMS.o SYMTAB.o SYSSOLP.o UTSCAT.o \ - UTSCAT-.o VARIABLE.o WFFINTBS.o SPADPRSR.o \ - PARSER.o PROPFRML.o + ACF ACF- ACPLOT ANTISYM \ + ANY ASP12 ASP27 ASP28 \ + ASP33 ASP49 ASP55 ASP7 \ + ASP78 ASP8 ASP9 ATTRBUT \ + BOP BOP1 COMMONOP COMPCAT \ + COMPCAT- DRAW DRAWCFUN DROPT \ + DROPT0 D01ANFA D01ASFA D03AGNT \ + EP E04AGNT FCPAK1 FEXPR \ + FFCAT FFCAT- FFCGP FFNBP \ + FFP FLOAT FPARFRAC FR \ + FRNAALG FRNAALG- FS FS- \ + FST FUNCTION GDMP HACKPI \ + IDEAL INFORM INFORM1 IPRNTPK \ + IR ISUPS KERNEL LIB \ + LMDICT LODOOPS MATRIX MKFLCFN \ + MSET M3D NAGC02 NAGC05 \ + NAGC06 NAGD03 NAGE01 NAGE02 \ + NAGE04 NAGF07 NAGS NAGSP \ + NREP NUMFMT OC OC- \ + ODEPACK ODERAT OMERR OMERRK \ + OPTPACK OSI PATTERN OVAR \ + PMKERNEL PMSYM POLY PRIMELT \ + QALGSET2 QEQUAT RECLOS REP1 \ + RESULT QUATCAT QUATCAT- RFFACT \ + RMATRIX ROMAN ROUTINE RPOLCAT \ + RPOLCAT- RULECOLD SAOS SEGBIND \ + SET SPECOUT SQMATRIX SWITCH \ + SYMS SYMTAB SYSSOLP UTSCAT \ + UTSCAT- VARIABLE WFFINTBS SPADPRSR \ + PARSER PROPFRML axiom_algebra_layer_19_nrlibs = \ - $(axiom_algebra_layer_19:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_19)) axiom_algebra_layer_19_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_19)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_19))) axiom_algebra_layer_20 = \ - ACFS.o ACFS-.o AF.o ALGFACT.o \ - ALGFF.o ALGMANIP.o ALGMFACT.o ALGPKG.o \ - ALGSC.o AN.o APPRULE.o ASP19.o \ - ASP20.o ASP30.o ASP31.o ASP35.o \ - ASP41.o ASP42.o ASP74.o ASP77.o \ - ASP80.o CINTSLPE.o COMPFACT.o COMPLEX.o \ - COMPLPAT.o CMPLXRT.o CPMATCH.o CRFP.o \ - CTRIGMNP.o D01WGTS.o D02AGNT.o D03EEFA.o \ - DBLRESP.o DERHAM.o DFSFUN.o DRAWCURV.o \ - E04NAFA.o E04UCFA.o EF.o EFSTRUC.o \ - ELFUTS.o ESTOOLS.o EXPEXPAN.o EXPRODE.o \ - EXPRTUBE.o EXPR2.o FC.o FDIVCAT.o \ - FDIVCAT-.o FDIV2.o FFCAT2.o FLOATCP.o \ - FORDER.o FORTRAN.o FSRED.o FSUPFACT.o \ - FRNAAF2.o FSPECF.o FS2.o FS2UPS.o \ - GAUSSFAC.o GCNAALG.o GENUFACT.o GENUPS.o \ - GTSET.o GPOLSET.o IAN.o INEP.o \ - INFPROD0.o INFSP.o INPRODFF.o INPRODPF.o \ - INTAF.o INTALG.o INTEF.o INTG0.o \ - INTHERAL.o INTPAF.o INTPM.o INTTOOLS.o \ - ITRIGMNP.o JORDAN.o KOVACIC.o LF.o \ - LIE.o LODOF.o LSQM.o OMEXPR.o \ - MCMPLX.o MULTFACT.o NAGD01.o NAGD02.o \ - NAGF01.o NAGF02.o NAGF04.o NCEP.o \ - NLINSOL.o NSMP.o NUMERIC.o OCT.o \ - OCTCT2.o ODEPAL.o ODERTRIC.o PADE.o \ - PAN2EXPR.o PDEPACK.o PFO.o PFOQ.o \ - PICOERCE.o PMASSFS.o PMFS.o PMPREDFS.o \ - PSETPK.o QUAT.o QUATCT2.o RADFF.o \ - RDEEF.o RDEEFS.o RDIV.o RSETCAT.o \ - RSETCAT-.o RULE.o RULESET.o SIMPAN.o \ - SFORT.o SOLVESER.o SUMFS.o SUTS.o \ - TOOLSIGN.o TRIGMNIP.o TRMANIP.o ULSCCAT.o \ - ULSCCAT-.o UPXSSING.o UTSODE.o UTSODETL.o \ - UTS2.o WUTSET.o + ACFS ACFS- AF ALGFACT \ + ALGFF ALGMANIP ALGMFACT ALGPKG \ + ALGSC AN APPRULE ASP19 \ + ASP20 ASP30 ASP31 ASP35 \ + ASP41 ASP42 ASP74 ASP77 \ + ASP80 CINTSLPE COMPFACT COMPLEX \ + COMPLPAT CMPLXRT CPMATCH CRFP \ + CTRIGMNP D01WGTS D02AGNT D03EEFA \ + DBLRESP DERHAM DFSFUN DRAWCURV \ + E04NAFA E04UCFA EF EFSTRUC \ + ELFUTS ESTOOLS EXPEXPAN EXPRODE \ + EXPRTUBE EXPR2 FC FDIVCAT \ + FDIVCAT- FDIV2 FFCAT2 FLOATCP \ + FORDER FORTRAN FSRED FSUPFACT \ + FRNAAF2 FSPECF FS2 FS2UPS \ + GAUSSFAC GCNAALG GENUFACT GENUPS \ + GTSET GPOLSET IAN INEP \ + INFPROD0 INFSP INPRODFF INPRODPF \ + INTAF INTALG INTEF INTG0 \ + INTHERAL INTPAF INTPM INTTOOLS \ + ITRIGMNP JORDAN KOVACIC LF \ + LIE LODOF LSQM OMEXPR \ + MCMPLX MULTFACT NAGD01 NAGD02 \ + NAGF01 NAGF02 NAGF04 NCEP \ + NLINSOL NSMP NUMERIC OCT \ + OCTCT2 ODEPAL ODERTRIC PADE \ + PAN2EXPR PDEPACK PFO PFOQ \ + PICOERCE PMASSFS PMFS PMPREDFS \ + PSETPK QUAT QUATCT2 RADFF \ + RDEEF RDEEFS RDIV RSETCAT \ + RSETCAT- RULE RULESET SIMPAN \ + SFORT SOLVESER SUMFS SUTS \ + TOOLSIGN TRIGMNIP TRMANIP ULSCCAT \ + ULSCCAT- UPXSSING UTSODE UTSODETL \ + UTS2 WUTSET axiom_algebra_layer_20_nrlibs = \ - $(axiom_algebra_layer_20:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_20)) axiom_algebra_layer_20_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_20)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_20))) axiom_algebra_layer_21 = \ - DEFINTEF.o DFINTTLS.o DEFINTRF.o D01TRNS.o \ - EFULS.o ESCONT.o EXPR.o EXPR2UPS.o \ - FDIV.o FSCINT.o FSINT.o FS2EXPXP.o \ - GSERIES.o HELLFDIV.o INVLAPLA.o IR2F.o \ - IRRF2F.o LAPLACE.o LIMITPS.o LODEEF.o \ - NODE1.o ODECONST.o ODEINT.o REP.o \ - SOLVERAD.o SULS.o SUPXS.o ULS.o \ - ULSCONS.o UPXS.o UPXSCONS.o UTS.o + DEFINTEF DFINTTLS DEFINTRF D01TRNS \ + EFULS ESCONT EXPR EXPR2UPS \ + FDIV FSCINT FSINT FS2EXPXP \ + GSERIES HELLFDIV INVLAPLA IR2F \ + IRRF2F LAPLACE LIMITPS LODEEF \ + NODE1 ODECONST ODEINT REP \ + SOLVERAD SULS SUPXS ULS \ + ULSCONS UPXS UPXSCONS UTS axiom_algebra_layer_21_nrlibs = \ - $(axiom_algebra_layer_21:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_21)) axiom_algebra_layer_21_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_21)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_21))) axiom_algebra_layer_22 = \ - ASP29.o COMBF.o D01AGNT.o FSPRMELT.o \ - INBFF.o LODO.o LODO1.o LODO2.o \ - NTSCAT.o REGSET.o RGCHAIN.o RSETGCD.o \ - RSDCMPK.o SFRTCAT.o SIGNEF.o SNTSCAT.o \ - SOLVETRA.o SRDCMPK.o SREGSET.o STTF.o \ - SUBSPACE.o ZDSOLVE.o + ASP29 COMBF D01AGNT FSPRMELT \ + INBFF LODO LODO1 LODO2 \ + NTSCAT REGSET RGCHAIN RSETGCD \ + RSDCMPK SFRTCAT SIGNEF SNTSCAT \ + SOLVETRA SRDCMPK SREGSET STTF \ + SUBSPACE ZDSOLVE axiom_algebra_layer_22_nrlibs = \ - $(axiom_algebra_layer_22:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_22)) axiom_algebra_layer_22_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_22)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_22))) axiom_algebra_layer_23 = \ - CPIMA.o IRURPK.o LAZM3PK.o LEXTRIPK.o \ - NORMPK.o QCMPACK.o RURPK.o SFRGCD.o \ - SFQCMPK.o INTRVL.o ODEEF.o DOMAIN.o + CPIMA IRURPK LAZM3PK LEXTRIPK \ + NORMPK QCMPACK RURPK SFRGCD \ + SFQCMPK INTRVL ODEEF DOMAIN axiom_algebra_layer_23_nrlibs = \ - $(axiom_algebra_layer_23:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_23)) axiom_algebra_layer_23_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_23)) -axiom_algebra_layer_user = RINTERP.o + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_23))) +axiom_algebra_layer_user = RINTERP axiom_algebra_layer_user_nrlibs = \ - $(axiom_algebra_layer_user:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_user)) axiom_algebra_layer_user_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_user)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_user))) # The algebra build is not yet ready for parallel build. .NOTPARALLEL: @@ -856,17 +884,17 @@ check: -${OUT}/%.o: %.NRLIB/code.o - cp $*.NRLIB/code.o ${OUT}/$*.o +${OUT}/%.$(FASLEXT): %.NRLIB/code.$(FASLEXT) + cp $*.NRLIB/code.$(FASLEXT) ${OUT}/$*.$(FASLEXT) -.PRECIOUS: %.NRLIB/code.o -%.NRLIB/code.o: %.spad +.PRECIOUS: %.NRLIB/code.$(FASLEXT) +%.NRLIB/code.$(FASLEXT): %.spad @ rm -rf $*.NRLIB echo ")co $*.spad" | ${INTERPSYS} # Compile bootstrap file to machine object code, and the result # immediately available for AXIOMsys consumption. -strap/%.o: %.lsp +strap/%.$(FASLEXT): %.lsp $(COMPILE_LISP) && $(INSTALL) $@ $(OUT) $(OUTSRC)/%.spad: mk-target-src-algabra-dir @@ -1145,7 +1173,7 @@ bootstrap-stamp: $(axiom_algebra_bootstrap_objects) @ echo ================================== mostlyclean-local: - @ -rm -f $(OUT)/*.$(OBJEXT) + @ -rm -f $(OUT)/*.$(FASLEXT) @ -rm -rf *.NRLIB rm -rf strap rm -f *stamp diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet index 6845c125..4e791a38 100644 --- a/src/algebra/Makefile.pamphlet +++ b/src/algebra/Makefile.pamphlet @@ -49,7 +49,7 @@ You do this by \end{enumerate} \item insert the documentation into the next layer (e.g. 15) -\item insert the [[\${OUT}/BAR.o]] file into the layer's file list +\item insert the [[\${OUT}/BAR.$(FASLEXT)]] file into the layer's file list \end{enumerate} \section{Rebuilding the algebra from scratch} @@ -114,75 +114,79 @@ these targets to be out of date. The rest of the loop is left up to the student. The bootstrap process works because first we ask for the compiled -lisp code stanzas (the \File{strap/BAR.o} files), THEN we ask for -the final algebra code stanzas (the [[\${OUT}/BAR.o]] files). This +lisp code stanzas (the \File{strap/BAR.$(FASLEXT)} files), THEN we ask for +the final algebra code stanzas (the [[\${OUT}/BAR.$(FASLEXT)]] files). This is a very subtle point so think it through carefully. Notice that this is the only layer calling for \File{strap/} files. All other layers call for [[\${OUT}]] files. If you break this the world will no longer compile so don't change it if you don't understand it. \begin{verbatim} -LAYER0BOOTSTRAP=${OUT}/XPR.o +LAYER0BOOTSTRAP=${OUT}/XPR.$(FASLEXT) \end{verbatim} <<layer0 bootstrap>>= # The list of objects necessary to bootstrap the whole algebra library. +axiom_algebra_layer_strap = \ + strap/ABELGRP strap/ABELGRP- strap/ABELMON strap/ABELMON- \ + strap/ABELSG strap/ABELSG- strap/ALAGG strap/BOOLEAN \ + strap/CABMON strap/CHAR strap/CLAGG strap/CLAGG- \ + strap/COMRING strap/DFLOAT strap/DIFRING strap/DIFRING- \ + strap/DIVRING strap/DIVRING- strap/ENTIRER strap/ES \ + strap/ES- strap/EUCDOM strap/EUCDOM- strap/FFIELDC \ + strap/FFIELDC- strap/FPS strap/FPS- strap/GCDDOM \ + strap/GCDDOM- strap/HOAGG strap/HOAGG- strap/ILIST \ + strap/INS strap/INS- strap/INT strap/INTDOM \ + strap/INTDOM- strap/ISTRING strap/LIST strap/LNAGG \ + strap/LNAGG- strap/LSAGG strap/LSAGG- strap/MONOID \ + strap/MONOID- strap/MTSCAT strap/NNI strap/OINTDOM \ + strap/ORDRING strap/ORDRING- strap/OUTFORM strap/PI \ + strap/PRIMARR strap/POLYCAT strap/POLYCAT- strap/PSETCAT \ + strap/PSETCAT- strap/QFCAT strap/QFCAT- strap/RCAGG \ + strap/RCAGG- strap/REF strap/RING strap/RING- \ + strap/RNG strap/RNS strap/RNS- strap/SETAGG \ + strap/SETAGG- strap/SETCAT strap/SETCAT- strap/SINT \ + strap/STAGG strap/STAGG- strap/SYMBOL strap/TSETCAT \ + strap/TSETCAT- strap/UFD strap/UFD- strap/ULSCAT \ + strap/UPOLYC strap/UPOLYC- strap/URAGG strap/URAGG- \ + strap/VECTOR + axiom_algebra_layer_strap_objects = \ - strap/ABELGRP.o strap/ABELGRP-.o strap/ABELMON.o strap/ABELMON-.o \ - strap/ABELSG.o strap/ABELSG-.o strap/ALAGG.o strap/BOOLEAN.o \ - strap/CABMON.o strap/CHAR.o strap/CLAGG.o strap/CLAGG-.o \ - strap/COMRING.o strap/DFLOAT.o strap/DIFRING.o strap/DIFRING-.o \ - strap/DIVRING.o strap/DIVRING-.o strap/ENTIRER.o strap/ES.o \ - strap/ES-.o strap/EUCDOM.o strap/EUCDOM-.o strap/FFIELDC.o \ - strap/FFIELDC-.o strap/FPS.o strap/FPS-.o strap/GCDDOM.o \ - strap/GCDDOM-.o strap/HOAGG.o strap/HOAGG-.o strap/ILIST.o \ - strap/INS.o strap/INS-.o strap/INT.o strap/INTDOM.o \ - strap/INTDOM-.o strap/ISTRING.o strap/LIST.o strap/LNAGG.o \ - strap/LNAGG-.o strap/LSAGG.o strap/LSAGG-.o strap/MONOID.o \ - strap/MONOID-.o strap/MTSCAT.o strap/NNI.o strap/OINTDOM.o \ - strap/ORDRING.o strap/ORDRING-.o strap/OUTFORM.o strap/PI.o \ - strap/PRIMARR.o strap/POLYCAT.o strap/POLYCAT-.o strap/PSETCAT.o \ - strap/PSETCAT-.o strap/QFCAT.o strap/QFCAT-.o strap/RCAGG.o \ - strap/RCAGG-.o strap/REF.o strap/RING.o strap/RING-.o \ - strap/RNG.o strap/RNS.o strap/RNS-.o strap/SETAGG.o \ - strap/SETAGG-.o strap/SETCAT.o strap/SETCAT-.o strap/SINT.o \ - strap/STAGG.o strap/STAGG-.o strap/SYMBOL.o strap/TSETCAT.o \ - strap/TSETCAT-.o strap/UFD.o strap/UFD-.o strap/ULSCAT.o \ - strap/UPOLYC.o strap/UPOLYC-.o strap/URAGG.o strap/URAGG-.o \ - strap/VECTOR.o + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_strap)) @ <<layer0 copy>>= axiom_algebra_bootstrap = \ - ABELGRP.o ABELGRP-.o ABELMON.o ABELMON-.o \ - ABELSG.o ABELSG-.o ALAGG.o BOOLEAN.o \ - CABMON.o CHAR.o CLAGG.o CLAGG-.o \ - COMRING.o DFLOAT.o DIFRING.o DIFRING-.o \ - DIVRING.o DIVRING-.o ENTIRER.o ES.o \ - ES-.o EUCDOM.o EUCDOM-.o FFIELDC.o \ - FFIELDC-.o FPS.o FPS-.o GCDDOM.o \ - GCDDOM-.o HOAGG.o HOAGG-.o ILIST.o \ - INS.o INS-.o INT.o INTDOM.o \ - INTDOM-.o ISTRING.o LIST.o LNAGG.o \ - LNAGG-.o LSAGG.o LSAGG-.o MONOID.o \ - MONOID-.o MTSCAT.o NNI.o OINTDOM.o \ - ORDRING.o ORDRING-.o OUTFORM.o PI.o \ - PRIMARR.o POLYCAT.o POLYCAT-.o PSETCAT.o \ - PSETCAT-.o QFCAT.o QFCAT-.o RCAGG.o \ - RCAGG-.o REF.o RING.o RING-.o \ - RNG.o RNS.o RNS-.o SETAGG.o \ - SETAGG-.o SETCAT.o SETCAT-.o SINT.o \ - STAGG.o STAGG-.o SYMBOL.o TSETCAT.o \ - TSETCAT-.o UFD.o UFD-.o ULSCAT.o \ - UPOLYC.o UPOLYC-.o URAGG.o URAGG-.o \ - VECTOR.o + ABELGRP ABELGRP- ABELMON ABELMON- \ + ABELSG ABELSG- ALAGG BOOLEAN \ + CABMON CHAR CLAGG CLAGG- \ + COMRING DFLOAT DIFRING DIFRING- \ + DIVRING DIVRING- ENTIRER ES \ + ES- EUCDOM EUCDOM- FFIELDC \ + FFIELDC- FPS FPS- GCDDOM \ + GCDDOM- HOAGG HOAGG- ILIST \ + INS INS- INT INTDOM \ + INTDOM- ISTRING LIST LNAGG \ + LNAGG- LSAGG LSAGG- MONOID \ + MONOID- MTSCAT NNI OINTDOM \ + ORDRING ORDRING- OUTFORM PI \ + PRIMARR POLYCAT POLYCAT- PSETCAT \ + PSETCAT- QFCAT QFCAT- RCAGG \ + RCAGG- REF RING RING- \ + RNG RNS RNS- SETAGG \ + SETAGG- SETCAT SETCAT- SINT \ + STAGG STAGG- SYMBOL TSETCAT \ + TSETCAT- UFD UFD- ULSCAT \ + UPOLYC UPOLYC- URAGG URAGG- \ + VECTOR axiom_algebra_bootstrap_nrlibs = \ - $(axiom_algebra_bootstrap:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_bootstrap)) axiom_algebra_bootstrap_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_bootstrap)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT), $(axiom_algebra_bootstrap))) @ \subsection{Layer 0} @@ -201,18 +205,19 @@ system.spad.pamphlet (MSYSCMD) <<layer0>>= axiom_algebra_layer_0 = \ - AHYP.o ATTREG.o CFCAT.o ELTAB.o \ - KOERCE.o KONVERT.o MSYSCMD.o ODEIFTBL.o \ - OM.o OMCONN.o OMDEV.o OUT.o \ - PRIMCAT.o PRINT.o PTRANFN.o SPFCAT.o \ - TYPE.o UTYPE.o PROPLOG.o PROPERTY.o \ - BASTYPE.o BASTYPE-.o CATEGORY.o + AHYP ATTREG CFCAT ELTAB \ + KOERCE KONVERT MSYSCMD ODEIFTBL \ + OM OMCONN OMDEV OUT \ + PRIMCAT PRINT PTRANFN SPFCAT \ + TYPE UTYPE PROPLOG PROPERTY \ + BASTYPE BASTYPE- CATEGORY axiom_algebra_layer_0_nrlibs = \ - $(axiom_algebra_layer_0:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_0)) axiom_algebra_layer_0_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_0)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_0))) @ \subsection{Layer 1} @@ -228,19 +233,20 @@ coerce.spad.pamphlet (TYPE KOERCE KONVERT RETRACT) <<layer1>>= axiom_algebra_layer_1 = \ - ANY1.o COMBOPC.o DROPT1.o EQ2.o \ - FORTCAT.o ITFUN2.o ITFUN3.o ITUPLE.o \ - MKBCFUNC.o MKRECORD.o MKUCFUNC.o NONE1.o \ - PATAB.o PLOT1.o PPCURVE.o PSCURVE.o \ - REAL.o RESLATC.o RETRACT.o RETRACT-.o \ - SEGBIND2.o SEGCAT.o STREAM1.o STREAM2.o \ - STREAM3.o BINDING.o SYNTAX.o + ANY1 COMBOPC DROPT1 EQ2 \ + FORTCAT ITFUN2 ITFUN3 ITUPLE \ + MKBCFUNC MKRECORD MKUCFUNC NONE1 \ + PATAB PLOT1 PPCURVE PSCURVE \ + REAL RESLATC RETRACT RETRACT- \ + SEGBIND2 SEGCAT STREAM1 STREAM2 \ + STREAM3 BINDING SYNTAX axiom_algebra_layer_1_nrlibs = \ - $(axiom_algebra_layer_1:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_1)) axiom_algebra_layer_1_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_1)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_1))) @ \subsection{Layer 2} @@ -249,14 +255,15 @@ axiom_algebra_layer_1_objects = \ <<layer2>>= axiom_algebra_layer_2 = \ - FMC.o FMFUN.o FORTFN.o FVC.o CTORCALL.o \ - FVFUN.o INTRET.o SEGXCAT.o CONTOUR.o + FMC FMFUN FORTFN FVC CTORCALL \ + FVFUN INTRET SEGXCAT CONTOUR axiom_algebra_layer_2_nrlibs = \ - $(axiom_algebra_layer_2:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_2)) axiom_algebra_layer_2_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_2)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_2))) @ \subsection{Layer 3} @@ -269,14 +276,14 @@ grdef.spad.pamphlet (GRDEF) <<layer3>>= axiom_algebra_layer_3 = \ - AGG.o AGG-.o \ - GRDEF.o LIST3.o MKFUNC.o SCOPE.o + AGG AGG- GRDEF LIST3 MKFUNC SCOPE axiom_algebra_layer_3_nrlibs = \ - $(axiom_algebra_layer_3:.$(OBJEXT=./NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_3)) axiom_algebra_layer_3_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_3)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_3))) @ \subsubsection{Completed spad files} @@ -293,29 +300,30 @@ ystream.spad.pamphlet (YSTREAM) <<layer4>>= axiom_algebra_layer_4 = \ - ANON.o COLOR.o COMM.o COMPPROP.o \ - ELTAGG.o ELTAGG-.o ESCONT1.o EXIT.o \ - FAMONC.o FILECAT.o FINITE.o FNCAT.o \ - FORMULA1.o IDPC.o IEVALAB.o IEVALAB-.o \ - INTBIT.o LMODULE.o LOGIC.o LOGIC-.o \ - MAPHACK1.o MAPHACK2.o MAPHACK3.o MAPPKG1.o \ - MAPPKG2.o MAPPKG3.o MONAD.o MONAD-.o \ - NIPROB.o NONE.o NUMINT.o ODECAT.o \ - ODEPROB.o OMENC.o ONECOMP2.o OPTCAT.o \ - OPTPROB.o ORDSET.o ORDSET-.o PALETTE.o \ - PARPCURV.o PARPC2.o PARSCURV.o PARSC2.o \ - PARSURF.o PARSU2.o PATMAB.o PATRES2.o \ - PATTERN1.o PDECAT.o PDEPROB.o REPSQ.o \ - REPDB.o RFDIST.o RIDIST.o RMODULE.o \ - SEXCAT.o SGROUP.o SGROUP-.o SPACEC.o \ - SPLNODE.o STEP.o SUCH.o TEX1.o \ - UDVO.o YSTREAM.o PAIR.o ENV.o + ANON COLOR COMM COMPPROP \ + ELTAGG ELTAGG- ESCONT1 EXIT \ + FAMONC FILECAT FINITE FNCAT \ + FORMULA1 IDPC IEVALAB IEVALAB- \ + INTBIT LMODULE LOGIC LOGIC- \ + MAPHACK1 MAPHACK2 MAPHACK3 MAPPKG1 \ + MAPPKG2 MAPPKG3 MONAD MONAD- \ + NIPROB NONE NUMINT ODECAT \ + ODEPROB OMENC ONECOMP2 OPTCAT \ + OPTPROB ORDSET ORDSET- PALETTE \ + PARPCURV PARPC2 PARSCURV PARSC2 \ + PARSURF PARSU2 PATMAB PATRES2 \ + PATTERN1 PDECAT PDEPROB REPSQ \ + REPDB RFDIST RIDIST RMODULE \ + SEXCAT SGROUP SGROUP- SPACEC \ + SPLNODE STEP SUCH TEX1 \ + UDVO YSTREAM PAIR ENV axiom_algebra_layer_4_nrlibs = \ - $(axiom_algebra_layer_4:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_4)) axiom_algebra_layer_4_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_4)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_4))) @ \subsection{Layer 5} @@ -328,25 +336,26 @@ equation1.spad.pamphlet (EVALAB IEVALAB) <<layer5>>= axiom_algebra_layer_5 = \ - ATRIG.o ATRIG-.o BMODULE.o CACHSET.o \ - CHARNZ.o CHARZ.o DVARCAT.o DVARCAT-.o \ - ELEMFUN.o ELEMFUN-.o ESTOOLS2.o EVALAB.o \ - EVALAB-.o FCOMP.o FEVALAB.o FEVALAB-.o \ - FPATMAB.o GROUP.o GROUP-.o IDPAM.o \ - IDPO.o INCRMAPS.o IXAGG.o IXAGG-.o \ - KERNEL2.o LALG.o LALG-.o LINEXP.o \ - MODMONOM.o MONADWU.o MONADWU-.o MRF2.o \ - NARNG.o NARNG-.o NSUP2.o OASGP.o \ - ODVAR.o OPQUERY.o ORDFIN.o ORDMON.o \ - PATMATCH.o PERMCAT.o PDRING.o PDRING-.o \ - SDVAR.o SUP2.o TRIGCAT.o TRIGCAT-.o \ - ULS2.o UP2.o ELABEXPR.o + ATRIG ATRIG- BMODULE CACHSET \ + CHARNZ CHARZ DVARCAT DVARCAT- \ + ELEMFUN ELEMFUN- ESTOOLS2 EVALAB \ + EVALAB- FCOMP FEVALAB FEVALAB- \ + FPATMAB GROUP GROUP- IDPAM \ + IDPO INCRMAPS IXAGG IXAGG- \ + KERNEL2 LALG LALG- LINEXP \ + MODMONOM MONADWU MONADWU- MRF2 \ + NARNG NARNG- NSUP2 OASGP \ + ODVAR OPQUERY ORDFIN ORDMON \ + PATMATCH PERMCAT PDRING PDRING- \ + SDVAR SUP2 TRIGCAT TRIGCAT- \ + ULS2 UP2 ELABEXPR axiom_algebra_layer_5_nrlibs = \ - $(axiom_algebra_layer_5:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_5)) axiom_algebra_layer_5_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_5)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_5))) @ \subsection{Layer6} @@ -360,19 +369,20 @@ sortpak.spad.pamphlet (SORTPAK) <<layer6>>= axiom_algebra_layer_6 = \ - AUTOMOR.o BGAGG.o BGAGG-.o BRAGG.o \ - BRAGG-.o CARTEN2.o CHARPOL.o COMPLEX2.o \ - DIFEXT.o DIFEXT-.o DLAGG.o ELAGG.o \ - ELAGG-.o ES1.o ES2.o GRMOD.o \ - GRMOD-.o HYPCAT.o HYPCAT-.o MKCHSET.o \ - MODRING.o MODULE.o MODULE-.o NASRING.o \ - NASRING-.o OAMON.o SORTPAK.o ZMOD.o + AUTOMOR BGAGG BGAGG- BRAGG \ + BRAGG- CARTEN2 CHARPOL COMPLEX2 \ + DIFEXT DIFEXT- DLAGG ELAGG \ + ELAGG- ES1 ES2 GRMOD \ + GRMOD- HYPCAT HYPCAT- MKCHSET \ + MODRING MODULE MODULE- NASRING \ + NASRING- OAMON SORTPAK ZMOD axiom_algebra_layer_6_nrlibs = \ - $(axiom_algebra_layer_6:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_6)) axiom_algebra_layer_6_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_6)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_6))) @ \subsection{Layer7} @@ -384,16 +394,17 @@ axiom_algebra_layer_6_objects = \ <<layer7>>= axiom_algebra_layer_7 = \ - ALGEBRA.o ALGEBRA-.o BTCAT.o BTCAT-.o \ - FMCAT.o IDPOAM.o IFAMON.o GRALG.o \ - GRALG-.o OCAMON.o PRQAGG.o QUAGG.o \ - SKAGG.o + ALGEBRA ALGEBRA- BTCAT BTCAT- \ + FMCAT IDPOAM IFAMON GRALG \ + GRALG- OCAMON PRQAGG QUAGG \ + SKAGG axiom_algebra_layer_7_nrlibs = \ - $(axiom_algebra_layer_7:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_7)) axiom_algebra_layer_7_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_7)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_7))) @ \subsection{Layer8} @@ -407,18 +418,19 @@ fortcat.spad.pamphlet (FORTFN FMC FORTCAT FVC FMTC FMFUN FVFUN) <<layer8>>= axiom_algebra_layer_8 = \ - BSTREE.o BTOURN.o CARD.o DRAWHACK.o \ - DQAGG.o FACTFUNC.o FMTC.o FR2.o \ - FRAC2.o FRUTIL.o ITAYLOR.o MLO.o \ - NAALG.o NAALG-.o OAGROUP.o OAMONS.o \ - OP.o ORDCOMP2.o PID.o RANDSRC.o \ - UNISEG2.o XALG.o + BSTREE BTOURN CARD DRAWHACK \ + DQAGG FACTFUNC FMTC FR2 \ + FRAC2 FRUTIL ITAYLOR MLO \ + NAALG NAALG- OAGROUP OAMONS \ + OP ORDCOMP2 PID RANDSRC \ + UNISEG2 XALG axiom_algebra_layer_8_nrlibs = \ - $(axiom_algebra_layer_8:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_8)) axiom_algebra_layer_8_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_8)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_8))) @ \subsection{Layer9} @@ -435,21 +447,22 @@ sf.spad.pamphlet (REAL RADCAT RNS FPS DFLOAT) <<layer9>>= axiom_algebra_layer_9 = \ - AMR.o AMR-.o DEGRED.o DLP.o \ - EAB.o ESTOOLS1.o FAGROUP.o FAMONOID.o \ - FIELD.o FIELD-.o FLAGG.o FLAGG-.o \ - FLINEXP.o FLINEXP-.o FRETRCT.o FRETRCT-.o \ - FSERIES.o FT.o IDPAG.o IDPOAMS.o \ - INFINITY.o LA.o OMLO.o ORTHPOL.o \ - PRODUCT.o PADICCT.o PMPRED.o PMASS.o \ - PTFUNC2.o RADCAT.o RADCAT-.o RATRET.o \ - RADUTIL.o UPXS2.o XFALG.o ZLINDEP.o + AMR AMR- DEGRED DLP \ + EAB ESTOOLS1 FAGROUP FAMONOID \ + FIELD FIELD- FLAGG FLAGG- \ + FLINEXP FLINEXP- FRETRCT FRETRCT- \ + FSERIES FT IDPAG IDPOAMS \ + INFINITY LA OMLO ORTHPOL \ + PRODUCT PADICCT PMPRED PMASS \ + PTFUNC2 RADCAT RADCAT- RATRET \ + RADUTIL UPXS2 XFALG ZLINDEP axiom_algebra_layer_9_nrlibs = \ - $(axiom_algebra_layer_9:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_9)) axiom_algebra_layer_9_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_9)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_9))) @ \subsection{Layer10} @@ -479,36 +492,37 @@ viewpack.spad.pamphlet (VIEW) <<layer10>>= axiom_algebra_layer_10 = \ - A1AGG.o A1AGG-.o ARR2CAT.o ARR2CAT-.o \ - ASP34.o BBTREE.o BFUNCT.o BPADIC.o \ - BTREE.o CRAPACK.o DEQUEUE.o DLIST.o \ - DRAWCX.o D01GBFA.o D02EJFA.o D03FAFA.o \ - DRAWPT.o FAMR.o FAMR-.o FLASORT.o \ - FLAGG2.o FGROUP.o FM.o FM1.o \ - FPC.o FPC-.o FMONOID.o INDE.o \ - IPADIC.o IROOT.o IR2.o LEXP.o \ - LIECAT.o LIECAT-.o LIST2.o LIST2MAP.o \ - LMOPS.o LZSTAGG.o LZSTAGG-.o MAGMA.o \ - MESH.o MOEBIUS.o MODFIELD.o MODOP.o \ - MRING.o MTHING.o NCNTFRAC.o NCODIV.o \ - NUMTUBE.o ODR.o OFMONOID.o ONECOMP.o \ - ORDCOMP.o OREPCAT.o OREPCAT-.o OWP.o \ - PADIC.o PATTERN2.o PATLRES.o PARTPERM.o \ - PBWLB.o PENDTREE.o PGE.o PGROEB.o \ - PINTERP.o PLOTTOOL.o PFR.o PMDOWN.o \ - PRTITION.o PMINS.o PMLSAGG.o PMTOOLS.o \ - PSCAT.o PSCAT-.o QFORM.o QUEUE.o \ - SCACHE.o SEG.o SEG2.o SEXOF.o \ - STACK.o STTAYLOR.o TABLBUMP.o TABLEAU.o \ - TOPSP.o TRANFUN.o TRANFUN-.o TUBE.o \ - UDPO.o UNISEG.o VIEW.o VSPACE.o \ - VSPACE-.o XPOLYC.o XPR.o + A1AGG A1AGG- ARR2CAT ARR2CAT- \ + ASP34 BBTREE BFUNCT BPADIC \ + BTREE CRAPACK DEQUEUE DLIST \ + DRAWCX D01GBFA D02EJFA D03FAFA \ + DRAWPT FAMR FAMR- FLASORT \ + FLAGG2 FGROUP FM FM1 \ + FPC FPC- FMONOID INDE \ + IPADIC IROOT IR2 LEXP \ + LIECAT LIECAT- LIST2 LIST2MAP \ + LMOPS LZSTAGG LZSTAGG- MAGMA \ + MESH MOEBIUS MODFIELD MODOP \ + MRING MTHING NCNTFRAC NCODIV \ + NUMTUBE ODR OFMONOID ONECOMP \ + ORDCOMP OREPCAT OREPCAT- OWP \ + PADIC PATTERN2 PATLRES PARTPERM \ + PBWLB PENDTREE PGE PGROEB \ + PINTERP PLOTTOOL PFR PMDOWN \ + PRTITION PMINS PMLSAGG PMTOOLS \ + PSCAT PSCAT- QFORM QUEUE \ + SCACHE SEG SEG2 SEXOF \ + STACK STTAYLOR TABLBUMP TABLEAU \ + TOPSP TRANFUN TRANFUN- TUBE \ + UDPO UNISEG VIEW VSPACE \ + VSPACE- XPOLYC XPR axiom_algebra_layer_10_nrlibs = \ - $(axiom_algebra_layer_10:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_10)) axiom_algebra_layer_10_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_10)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_10))) @ \subsection{Layer11} @@ -537,26 +551,27 @@ xpoly.spad.pamphlet (OFMONOID FMCAT FM1 XALG XFALG XPOLYC XPR XDPOLY XRPOLY <<layer11>>= axiom_algebra_layer_11 = \ - APPLYORE.o ARRAY1.o ARRAY12.o ARRAY2.o \ - ASTACK.o BTAGG.o BTAGG-.o COMBINAT.o \ - CSTTOOLS.o D01FCFA.o E04MBFA.o FARRAY.o \ - FLALG.o GALUTIL.o HEAP.o IARRAY1.o \ - IARRAY2.o IFARRAY.o INTCAT.o INTHEORY.o \ - IRREDFFX.o LFCAT.o LODOCAT.o LODOCAT-.o \ - LWORD.o MATCAT.o MATCAT-.o MATSTOR.o \ - ORESUP.o OREPCTO.o OREUP.o PLOT3D.o \ - PR.o PREASSOC.o PRIMARR2.o REDORDER.o \ - SRAGG.o SRAGG-.o STREAM.o SYMPOLY.o \ - TS.o TUPLE.o UPSCAT.o UPSCAT-.o \ - VECTCAT.o VECTCAT-.o XDPOLY.o XEXPPKG.o \ - XF.o XF-.o XPBWPOLY.o XPOLY.o \ - XRPOLY.o + APPLYORE ARRAY1 ARRAY12 ARRAY2 \ + ASTACK BTAGG BTAGG- COMBINAT \ + CSTTOOLS D01FCFA E04MBFA FARRAY \ + FLALG GALUTIL HEAP IARRAY1 \ + IARRAY2 IFARRAY INTCAT INTHEORY \ + IRREDFFX LFCAT LODOCAT LODOCAT- \ + LWORD MATCAT MATCAT- MATSTOR \ + ORESUP OREPCTO OREUP PLOT3D \ + PR PREASSOC PRIMARR2 REDORDER \ + SRAGG SRAGG- STREAM SYMPOLY \ + TS TUPLE UPSCAT UPSCAT- \ + VECTCAT VECTCAT- XDPOLY XEXPPKG \ + XF XF- XPBWPOLY XPOLY \ + XRPOLY axiom_algebra_layer_11_nrlibs = \ - $(axiom_algebra_layer_11:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_11)) axiom_algebra_layer_11_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_11)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_11))) @ \subsection{Layer12} @@ -568,15 +583,16 @@ axiom_algebra_layer_11_objects = \ <<layer12>>= axiom_algebra_layer_12 = \ - BITS.o DIRPROD2.o IMATRIX.o IVECTOR.o \ - LPOLY.o LSMP.o LSMP1.o MATCAT2.o \ - PTCAT.o STRICAT.o TRIMAT.o + BITS DIRPROD2 IMATRIX IVECTOR \ + LPOLY LSMP LSMP1 MATCAT2 \ + PTCAT STRICAT TRIMAT axiom_algebra_layer_12_nrlibs = \ - $(axiom_algebra_layer_12:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_12)) axiom_algebra_layer_12_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_12)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_12))) @ \subsection{Layer13} @@ -609,22 +625,23 @@ solvedio.spad.pamphlet (DIOSP) <<layer13>>= axiom_algebra_layer_13 = \ - ASSOCEQ.o CARTEN.o CLIF.o CLIP.o \ - COORDSYS.o DBASE.o DHMATRIX.o DIOSP.o \ - DIRPCAT.o DIRPCAT-.o D02BBFA.o D02BHFA.o \ - D02CJFA.o FAXF.o FAXF-.o FFPOLY2.o \ - FNLA.o GRAY.o HB.o IRSN.o \ - MCALCFN.o MHROWRED.o NUMODE.o NUMQUAD.o \ - ODESYS.o ODETOOLS.o ORDFUNS.o PERMAN.o \ - PFECAT.o PFECAT-.o POINT.o PSEUDLIN.o \ - PTPACK.o REP2.o SETMN.o SEX.o \ - STRING.o SYMFUNC.o VECTOR2.o + ASSOCEQ CARTEN CLIF CLIP \ + COORDSYS DBASE DHMATRIX DIOSP \ + DIRPCAT DIRPCAT- D02BBFA D02BHFA \ + D02CJFA FAXF FAXF- FFPOLY2 \ + FNLA GRAY HB IRSN \ + MCALCFN MHROWRED NUMODE NUMQUAD \ + ODESYS ODETOOLS ORDFUNS PERMAN \ + PFECAT PFECAT- POINT PSEUDLIN \ + PTPACK REP2 SETMN SEX \ + STRING SYMFUNC VECTOR2 axiom_algebra_layer_13_nrlibs = \ - $(axiom_algebra_layer_13:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_13)) axiom_algebra_layer_13_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_13)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_13))) @ \subsection{Layer14} @@ -723,67 +740,68 @@ wtpol.spad.pamphlet (WP OWP) <<layer14>>= axiom_algebra_layer_14 = \ - ASP1.o ASP10.o ASP24.o ASP4.o \ - ASP50.o ASP6.o ASP73.o BALFACT.o \ - BEZOUT.o BINARY.o BINFILE.o BOUNDZRO.o \ - BPADICRT.o BRILL.o CDEN.o CHVAR.o \ - COMMUPC.o CONTFRAC.o CVMP.o CYCLOTOM.o \ - CYCLES.o DDFACT.o DECIMAL.o DIOPS.o \ - DIOPS-.o DIRPROD.o DISPLAY.o DMP.o \ - DPMO.o DPOLCAT.o DPOLCAT-.o D01AJFA.o \ - D01AKFA.o D01ALFA.o D01AMFA.o D01APFA.o \ - D01AQFA.o EMR.o EQ.o ERROR.o \ - EVALCYC.o E04DGFA.o E04FDFA.o E04GCFA.o \ - E04JAFA.o FACUTIL.o FF.o FFCG.o \ - FFCGX.o FFHOM.o FFNB.o FFNBX.o \ - FFPOLY.o FFX.o FFSLPE.o FGLMICPK.o \ - FILE.o FINAALG.o FINAALG-.o FINRALG.o \ - FINRALG-.o FFF.o FLOATRP.o FNAME.o \ - FOP.o FORMULA.o FORT.o FRAC.o \ - FTEM.o GENEEZ.o GENMFACT.o GENPGCD.o \ - GALFACTU.o GALPOLYU.o GB.o GBEUCLID.o \ - GBF.o GBINTERN.o GHENSEL.o GMODPOL.o \ - GOSPER.o GRIMAGE.o GROEBSOL.o HDMP.o \ - HDP.o HEXADEC.o HEUGCD.o IBPTOOLS.o \ - IFF.o IBITS.o ICARD.o ICDEN.o \ - IDECOMP.o IIARRAY2.o IMATLIN.o IMATQF.o \ - INMODGCD.o INNMFACT.o INPSIGN.o INTHERTR.o \ - INTRAT.o INTRF.o INTSLPE.o INTTR.o \ - ISUMP.o LAUPOL.o LEADCDET.o LGROBP.o \ - LIMITRF.o LINDEP.o LO.o LPEFRAC.o \ - LSPP.o MATLIN.o MCDEN.o MDDFACT.o \ - MFINFACT.o MFLOAT.o MINT.o MLIFT.o \ - MMAP.o MODMON.o MONOTOOL.o MPCPF.o \ - MPC2.o MPC3.o MPOLY.o MPRFF.o \ - MRATFAC.o MULTSQFR.o NORMRETR.o NPCOEF.o \ - NSUP.o NTPOLFN.o ODP.o ODEPRIM.o \ - ODEPRRIC.o OMPKG.o OMSERVER.o PADEPAC.o \ - PADICRAT.o PADICRC.o PCOMP.o PDECOMP.o \ - PF.o PFBR.o PFBRU.o PFOTOOLS.o \ - PFRPAC.o PGCD.o PINTERPA.o PLEQN.o \ - PMPLCAT.o PMQFCAT.o PNTHEORY.o POLUTIL.o \ - POLTOPOL.o POLYCATQ.o POLYLIFT.o POLYROOT.o \ - POLY2.o POLY2UP.o PRS.o PSQFR.o \ - PUSHVAR.o QALGSET.o QFCAT2.o RADIX.o \ - RATFACT.o RCFIELD.o RCFIELD-.o RDETR.o \ - RDETRS.o REAL0.o REAL0Q.o REALSOLV.o \ - RESRING.o RETSOL.o RF.o RFFACTOR.o \ - RMATCAT.o RMATCAT-.o RRCC.o RRCC-.o \ - SCPKG.o SHDP.o SHP.o SIGNRF.o \ - SMITH.o SMP.o SMTS.o SOLVEFOR.o \ - SPLTREE.o STINPROD.o STTFNC.o SUBRESP.o \ - SUMRF.o SUP.o SUPFRACF.o TANEXP.o \ - TEMUTL.o TEX.o TEXTFILE.o TREE.o \ - TWOFACT.o UNIFACT.o UP.o UPCDEN.o \ - UPDECOMP.o UPDIVP.o UPMP.o UPOLYC2.o \ - UPXSCAT.o UPSQFREE.o VIEWDEF.o VIEW2D.o \ - VOID.o WEIER.o WP.o + ASP1 ASP10 ASP24 ASP4 \ + ASP50 ASP6 ASP73 BALFACT \ + BEZOUT BINARY BINFILE BOUNDZRO \ + BPADICRT BRILL CDEN CHVAR \ + COMMUPC CONTFRAC CVMP CYCLOTOM \ + CYCLES DDFACT DECIMAL DIOPS \ + DIOPS- DIRPROD DISPLAY DMP \ + DPMO DPOLCAT DPOLCAT- D01AJFA \ + D01AKFA D01ALFA D01AMFA D01APFA \ + D01AQFA EMR EQ ERROR \ + EVALCYC E04DGFA E04FDFA E04GCFA \ + E04JAFA FACUTIL FF FFCG \ + FFCGX FFHOM FFNB FFNBX \ + FFPOLY FFX FFSLPE FGLMICPK \ + FILE FINAALG FINAALG- FINRALG \ + FINRALG- FFF FLOATRP FNAME \ + FOP FORMULA FORT FRAC \ + FTEM GENEEZ GENMFACT GENPGCD \ + GALFACTU GALPOLYU GB GBEUCLID \ + GBF GBINTERN GHENSEL GMODPOL \ + GOSPER GRIMAGE GROEBSOL HDMP \ + HDP HEXADEC HEUGCD IBPTOOLS \ + IFF IBITS ICARD ICDEN \ + IDECOMP IIARRAY2 IMATLIN IMATQF \ + INMODGCD INNMFACT INPSIGN INTHERTR \ + INTRAT INTRF INTSLPE INTTR \ + ISUMP LAUPOL LEADCDET LGROBP \ + LIMITRF LINDEP LO LPEFRAC \ + LSPP MATLIN MCDEN MDDFACT \ + MFINFACT MFLOAT MINT MLIFT \ + MMAP MODMON MONOTOOL MPCPF \ + MPC2 MPC3 MPOLY MPRFF \ + MRATFAC MULTSQFR NORMRETR NPCOEF \ + NSUP NTPOLFN ODP ODEPRIM \ + ODEPRRIC OMPKG OMSERVER PADEPAC \ + PADICRAT PADICRC PCOMP PDECOMP \ + PF PFBR PFBRU PFOTOOLS \ + PFRPAC PGCD PINTERPA PLEQN \ + PMPLCAT PMQFCAT PNTHEORY POLUTIL \ + POLTOPOL POLYCATQ POLYLIFT POLYROOT \ + POLY2 POLY2UP PRS PSQFR \ + PUSHVAR QALGSET QFCAT2 RADIX \ + RATFACT RCFIELD RCFIELD- RDETR \ + RDETRS REAL0 REAL0Q REALSOLV \ + RESRING RETSOL RF RFFACTOR \ + RMATCAT RMATCAT- RRCC RRCC- \ + SCPKG SHDP SHP SIGNRF \ + SMITH SMP SMTS SOLVEFOR \ + SPLTREE STINPROD STTFNC SUBRESP \ + SUMRF SUP SUPFRACF TANEXP \ + TEMUTL TEX TEXTFILE TREE \ + TWOFACT UNIFACT UP UPCDEN \ + UPDECOMP UPDIVP UPMP UPOLYC2 \ + UPXSCAT UPSQFREE VIEWDEF VIEW2D \ + VOID WEIER WP axiom_algebra_layer_14_nrlibs = \ - $(axiom_algebra_layer_14:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_14)) axiom_algebra_layer_14_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_14)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_14))) @ \subsection{Layer15} @@ -798,17 +816,18 @@ plot.spad.pamphlet (PLOT PLOT1) <<layer15>>= axiom_algebra_layer_15 = \ - DIAGG.o DIAGG-.o DSMP.o EXPUPXS.o \ - FRAMALG.o FRAMALG-.o MDAGG.o ODPOL.o \ - PLOT.o RMCAT2.o ROIRC.o SDPOL.o \ - SMATCAT.o SMATCAT-.o TUBETOOL.o UPXSCCA.o \ - UPXSCCA-.o + DIAGG DIAGG- DSMP EXPUPXS \ + FRAMALG FRAMALG- MDAGG ODPOL \ + PLOT RMCAT2 ROIRC SDPOL \ + SMATCAT SMATCAT- TUBETOOL UPXSCCA \ + UPXSCCA- -axiom_algebra_layer_15_nrlibis = \ - $(axiom_algebra_layer_15:.$(OBJEXT)=.NRLIBS/code.$(OBJEXT)) +axiom_algebra_layer_15_nrlibs = \ + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_15)) axiom_algebra_layer_15_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_15)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_15))) @ \subsection{Layer16} @@ -823,17 +842,18 @@ space.spad.pamphlet (SPACEC SPACE3 TOPSP) <<layer16>>= axiom_algebra_layer_16 = \ - DPMM.o EFUPXS.o FFINTBAS.o FRIDEAL.o \ - FRIDEAL2.o FRMOD.o FSAGG.o FSAGG-.o \ - IBATOOL.o INTFACT.o KDAGG.o KDAGG-.o \ - MSETAGG.o MONOGEN.o MONOGEN-.o NFINTBAS.o \ - SPACE3.o + DPMM EFUPXS FFINTBAS FRIDEAL \ + FRIDEAL2 FRMOD FSAGG FSAGG- \ + IBATOOL INTFACT KDAGG KDAGG- \ + MSETAGG MONOGEN MONOGEN- NFINTBAS \ + SPACE3 axiom_algebra_layer_16_nrlibs = \ - $(axiom_algebra_layer_16:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_16)) axiom_algebra_layer_16_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_16)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_16))) @ \subsection{Layer17} @@ -860,17 +880,18 @@ view3D.spad.pamphlet (VIEW3D) <<layer17>>= axiom_algebra_layer_17 = \ - CCLASS.o FSAGG2.o GALFACT.o IALGFACT.o \ - IBACHIN.o NORMMA.o ODERED.o OMSAGG.o \ - PERM.o PERMGRP.o PRIMES.o PWFFINTB.o \ - RDIST.o SAE.o SAEFACT.o SAERFFC.o \ - SGCF.o TBAGG.o TBAGG-.o VIEW3D.o + CCLASS FSAGG2 GALFACT IALGFACT \ + IBACHIN NORMMA ODERED OMSAGG \ + PERM PERMGRP PRIMES PWFFINTB \ + RDIST SAE SAEFACT SAERFFC \ + SGCF TBAGG TBAGG- VIEW3D axiom_algebra_layer_17_nrlibs = \ - $(axiom_algebra_layer_17:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_17)) axiom_algebra_layer_17_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_17)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_17))) @ \subsection{Layer18} @@ -886,16 +907,17 @@ table.spad.pamphlet (HASHTBL INTABL TABLE EQTBL STRTBL GSTBL STBL) <<layer18>>= axiom_algebra_layer_18 = \ - ALIST.o EQTBL.o GSTBL.o HASHTBL.o \ - INTABL.o INTFTBL.o INTPACK.o IPF.o \ - KAFILE.o PATRES.o STBL.o STRTBL.o \ - TABLE.o TBCMPPK.o + ALIST EQTBL GSTBL HASHTBL \ + INTABL INTFTBL INTPACK IPF \ + KAFILE PATRES STBL STRTBL \ + TABLE TBCMPPK axiom_algebra_layer_18_nrlibs = \ - $(axiom_algebra_layer_18:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_18)) axiom_algebra_layer_18_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_18)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_18))) @ \subsection{Layer19} @@ -969,42 +991,43 @@ variable.spad.pamphlet (OVAR VARIABLE RULECOLD FUNCTION ANON) <<layer19>>= axiom_algebra_layer_19 = \ - ACF.o ACF-.o ACPLOT.o ANTISYM.o \ - ANY.o ASP12.o ASP27.o ASP28.o \ - ASP33.o ASP49.o ASP55.o ASP7.o \ - ASP78.o ASP8.o ASP9.o ATTRBUT.o \ - BOP.o BOP1.o COMMONOP.o COMPCAT.o \ - COMPCAT-.o DRAW.o DRAWCFUN.o DROPT.o \ - DROPT0.o D01ANFA.o D01ASFA.o D03AGNT.o \ - EP.o E04AGNT.o FCPAK1.o FEXPR.o \ - FFCAT.o FFCAT-.o FFCGP.o FFNBP.o \ - FFP.o FLOAT.o FPARFRAC.o FR.o \ - FRNAALG.o FRNAALG-.o FS.o FS-.o \ - FST.o FUNCTION.o GDMP.o HACKPI.o \ - IDEAL.o INFORM.o INFORM1.o IPRNTPK.o \ - IR.o ISUPS.o KERNEL.o LIB.o \ - LMDICT.o LODOOPS.o MATRIX.o MKFLCFN.o \ - MSET.o M3D.o NAGC02.o NAGC05.o \ - NAGC06.o NAGD03.o NAGE01.o NAGE02.o \ - NAGE04.o NAGF07.o NAGS.o NAGSP.o \ - NREP.o NUMFMT.o OC.o OC-.o \ - ODEPACK.o ODERAT.o OMERR.o OMERRK.o \ - OPTPACK.o OSI.o PATTERN.o OVAR.o \ - PMKERNEL.o PMSYM.o POLY.o PRIMELT.o \ - QALGSET2.o QEQUAT.o RECLOS.o REP1.o \ - RESULT.o QUATCAT.o QUATCAT-.o RFFACT.o \ - RMATRIX.o ROMAN.o ROUTINE.o RPOLCAT.o \ - RPOLCAT-.o RULECOLD.o SAOS.o SEGBIND.o \ - SET.o SPECOUT.o SQMATRIX.o SWITCH.o \ - SYMS.o SYMTAB.o SYSSOLP.o UTSCAT.o \ - UTSCAT-.o VARIABLE.o WFFINTBS.o SPADPRSR.o \ - PARSER.o PROPFRML.o + ACF ACF- ACPLOT ANTISYM \ + ANY ASP12 ASP27 ASP28 \ + ASP33 ASP49 ASP55 ASP7 \ + ASP78 ASP8 ASP9 ATTRBUT \ + BOP BOP1 COMMONOP COMPCAT \ + COMPCAT- DRAW DRAWCFUN DROPT \ + DROPT0 D01ANFA D01ASFA D03AGNT \ + EP E04AGNT FCPAK1 FEXPR \ + FFCAT FFCAT- FFCGP FFNBP \ + FFP FLOAT FPARFRAC FR \ + FRNAALG FRNAALG- FS FS- \ + FST FUNCTION GDMP HACKPI \ + IDEAL INFORM INFORM1 IPRNTPK \ + IR ISUPS KERNEL LIB \ + LMDICT LODOOPS MATRIX MKFLCFN \ + MSET M3D NAGC02 NAGC05 \ + NAGC06 NAGD03 NAGE01 NAGE02 \ + NAGE04 NAGF07 NAGS NAGSP \ + NREP NUMFMT OC OC- \ + ODEPACK ODERAT OMERR OMERRK \ + OPTPACK OSI PATTERN OVAR \ + PMKERNEL PMSYM POLY PRIMELT \ + QALGSET2 QEQUAT RECLOS REP1 \ + RESULT QUATCAT QUATCAT- RFFACT \ + RMATRIX ROMAN ROUTINE RPOLCAT \ + RPOLCAT- RULECOLD SAOS SEGBIND \ + SET SPECOUT SQMATRIX SWITCH \ + SYMS SYMTAB SYSSOLP UTSCAT \ + UTSCAT- VARIABLE WFFINTBS SPADPRSR \ + PARSER PROPFRML axiom_algebra_layer_19_nrlibs = \ - $(axiom_algebra_layer_19:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_19)) axiom_algebra_layer_19_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_19)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_19))) @ \subsection{Layer20} @@ -1086,47 +1109,48 @@ utsode.spad.pamphlet (UTSODE) <<layer20>>= axiom_algebra_layer_20 = \ - ACFS.o ACFS-.o AF.o ALGFACT.o \ - ALGFF.o ALGMANIP.o ALGMFACT.o ALGPKG.o \ - ALGSC.o AN.o APPRULE.o ASP19.o \ - ASP20.o ASP30.o ASP31.o ASP35.o \ - ASP41.o ASP42.o ASP74.o ASP77.o \ - ASP80.o CINTSLPE.o COMPFACT.o COMPLEX.o \ - COMPLPAT.o CMPLXRT.o CPMATCH.o CRFP.o \ - CTRIGMNP.o D01WGTS.o D02AGNT.o D03EEFA.o \ - DBLRESP.o DERHAM.o DFSFUN.o DRAWCURV.o \ - E04NAFA.o E04UCFA.o EF.o EFSTRUC.o \ - ELFUTS.o ESTOOLS.o EXPEXPAN.o EXPRODE.o \ - EXPRTUBE.o EXPR2.o FC.o FDIVCAT.o \ - FDIVCAT-.o FDIV2.o FFCAT2.o FLOATCP.o \ - FORDER.o FORTRAN.o FSRED.o FSUPFACT.o \ - FRNAAF2.o FSPECF.o FS2.o FS2UPS.o \ - GAUSSFAC.o GCNAALG.o GENUFACT.o GENUPS.o \ - GTSET.o GPOLSET.o IAN.o INEP.o \ - INFPROD0.o INFSP.o INPRODFF.o INPRODPF.o \ - INTAF.o INTALG.o INTEF.o INTG0.o \ - INTHERAL.o INTPAF.o INTPM.o INTTOOLS.o \ - ITRIGMNP.o JORDAN.o KOVACIC.o LF.o \ - LIE.o LODOF.o LSQM.o OMEXPR.o \ - MCMPLX.o MULTFACT.o NAGD01.o NAGD02.o \ - NAGF01.o NAGF02.o NAGF04.o NCEP.o \ - NLINSOL.o NSMP.o NUMERIC.o OCT.o \ - OCTCT2.o ODEPAL.o ODERTRIC.o PADE.o \ - PAN2EXPR.o PDEPACK.o PFO.o PFOQ.o \ - PICOERCE.o PMASSFS.o PMFS.o PMPREDFS.o \ - PSETPK.o QUAT.o QUATCT2.o RADFF.o \ - RDEEF.o RDEEFS.o RDIV.o RSETCAT.o \ - RSETCAT-.o RULE.o RULESET.o SIMPAN.o \ - SFORT.o SOLVESER.o SUMFS.o SUTS.o \ - TOOLSIGN.o TRIGMNIP.o TRMANIP.o ULSCCAT.o \ - ULSCCAT-.o UPXSSING.o UTSODE.o UTSODETL.o \ - UTS2.o WUTSET.o + ACFS ACFS- AF ALGFACT \ + ALGFF ALGMANIP ALGMFACT ALGPKG \ + ALGSC AN APPRULE ASP19 \ + ASP20 ASP30 ASP31 ASP35 \ + ASP41 ASP42 ASP74 ASP77 \ + ASP80 CINTSLPE COMPFACT COMPLEX \ + COMPLPAT CMPLXRT CPMATCH CRFP \ + CTRIGMNP D01WGTS D02AGNT D03EEFA \ + DBLRESP DERHAM DFSFUN DRAWCURV \ + E04NAFA E04UCFA EF EFSTRUC \ + ELFUTS ESTOOLS EXPEXPAN EXPRODE \ + EXPRTUBE EXPR2 FC FDIVCAT \ + FDIVCAT- FDIV2 FFCAT2 FLOATCP \ + FORDER FORTRAN FSRED FSUPFACT \ + FRNAAF2 FSPECF FS2 FS2UPS \ + GAUSSFAC GCNAALG GENUFACT GENUPS \ + GTSET GPOLSET IAN INEP \ + INFPROD0 INFSP INPRODFF INPRODPF \ + INTAF INTALG INTEF INTG0 \ + INTHERAL INTPAF INTPM INTTOOLS \ + ITRIGMNP JORDAN KOVACIC LF \ + LIE LODOF LSQM OMEXPR \ + MCMPLX MULTFACT NAGD01 NAGD02 \ + NAGF01 NAGF02 NAGF04 NCEP \ + NLINSOL NSMP NUMERIC OCT \ + OCTCT2 ODEPAL ODERTRIC PADE \ + PAN2EXPR PDEPACK PFO PFOQ \ + PICOERCE PMASSFS PMFS PMPREDFS \ + PSETPK QUAT QUATCT2 RADFF \ + RDEEF RDEEFS RDIV RSETCAT \ + RSETCAT- RULE RULESET SIMPAN \ + SFORT SOLVESER SUMFS SUTS \ + TOOLSIGN TRIGMNIP TRMANIP ULSCCAT \ + ULSCCAT- UPXSSING UTSODE UTSODETL \ + UTS2 WUTSET axiom_algebra_layer_20_nrlibs = \ - $(axiom_algebra_layer_20:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_20)) axiom_algebra_layer_20_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_20)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_20))) @ \subsection{Layer21} @@ -1164,20 +1188,21 @@ taylor.spad.pamphlet (ITAYLOR UTS UTS2) <<layer21>>= axiom_algebra_layer_21 = \ - DEFINTEF.o DFINTTLS.o DEFINTRF.o D01TRNS.o \ - EFULS.o ESCONT.o EXPR.o EXPR2UPS.o \ - FDIV.o FSCINT.o FSINT.o FS2EXPXP.o \ - GSERIES.o HELLFDIV.o INVLAPLA.o IR2F.o \ - IRRF2F.o LAPLACE.o LIMITPS.o LODEEF.o \ - NODE1.o ODECONST.o ODEINT.o REP.o \ - SOLVERAD.o SULS.o SUPXS.o ULS.o \ - ULSCONS.o UPXS.o UPXSCONS.o UTS.o + DEFINTEF DFINTTLS DEFINTRF D01TRNS \ + EFULS ESCONT EXPR EXPR2UPS \ + FDIV FSCINT FSINT FS2EXPXP \ + GSERIES HELLFDIV INVLAPLA IR2F \ + IRRF2F LAPLACE LIMITPS LODEEF \ + NODE1 ODECONST ODEINT REP \ + SOLVERAD SULS SUPXS ULS \ + ULSCONS UPXS UPXSCONS UTS axiom_algebra_layer_21_nrlibs = \ - $(axiom_algebra_layer_21:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_21)) axiom_algebra_layer_21_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_21)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_21))) @ \subsection{Layer22} @@ -1203,18 +1228,19 @@ zerodim.spad.pamphlet (RGCHAIN ZDSOLVE) \subsection{Layer21} <<layer22>>= axiom_algebra_layer_22 = \ - ASP29.o COMBF.o D01AGNT.o FSPRMELT.o \ - INBFF.o LODO.o LODO1.o LODO2.o \ - NTSCAT.o REGSET.o RGCHAIN.o RSETGCD.o \ - RSDCMPK.o SFRTCAT.o SIGNEF.o SNTSCAT.o \ - SOLVETRA.o SRDCMPK.o SREGSET.o STTF.o \ - SUBSPACE.o ZDSOLVE.o + ASP29 COMBF D01AGNT FSPRMELT \ + INBFF LODO LODO1 LODO2 \ + NTSCAT REGSET RGCHAIN RSETGCD \ + RSDCMPK SFRTCAT SIGNEF SNTSCAT \ + SOLVETRA SRDCMPK SREGSET STTF \ + SUBSPACE ZDSOLVE axiom_algebra_layer_22_nrlibs = \ - $(axiom_algebra_layer_22:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_22)) axiom_algebra_layer_22_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_22)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_22))) @ \subsection{Final layer spad files} @@ -1235,15 +1261,16 @@ zerodim.spad.pamphlet (LEXTRIPK IRURPK RURPK) <<layer23>>= axiom_algebra_layer_23 = \ - CPIMA.o IRURPK.o LAZM3PK.o LEXTRIPK.o \ - NORMPK.o QCMPACK.o RURPK.o SFRGCD.o \ - SFQCMPK.o INTRVL.o ODEEF.o DOMAIN.o + CPIMA IRURPK LAZM3PK LEXTRIPK \ + NORMPK QCMPACK RURPK SFRGCD \ + SFQCMPK INTRVL ODEEF DOMAIN axiom_algebra_layer_23_nrlibs = \ - $(axiom_algebra_layer_23:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_23)) axiom_algebra_layer_23_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_23)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_23))) @ \subsection{User Layer for newly added algebra} @@ -1251,13 +1278,14 @@ axiom_algebra_layer_23_objects = \ Rather than classify newly created algebra into the existing type lattice we add it here. <<USERLAYER>>= -axiom_algebra_layer_user = RINTERP.o +axiom_algebra_layer_user = RINTERP axiom_algebra_layer_user_nrlibs = \ - $(axiom_algebra_layer_user:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) + $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_user)) axiom_algebra_layer_user_objects = \ - $(addprefix $(OUT)/, $(axiom_algebra_layer_user)) + $(addprefix $(OUT)/, \ + $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_user))) @ \section{Broken Files} @@ -1709,15 +1737,15 @@ A 5 stanza group for this case performs the following functions: The subtle point here occurs in the first item. The bootstrap code group (in the [[layer0 bootstrap]] code chunk above) asks for the -compiled [[.o]] files in the \File{strap/} directory. Essentially this +compiled [[.$(FASLEXT)]] files in the \File{strap/} directory. Essentially this code group calls for intermediate compiled files. This triggers the bootstrap stanzas (items 1 and 2 above). All of the other layer chunks ask for compiled code in the [[\${OUT}]] directory which is the final algebra directory. The bootstrap process works because first we ask for the compiled -lisp code stanzas (the \File{strap/BAR.o} files), THEN we ask for -the final algebra code stanzas (the [[\${OUT}/BAR.o]] files). This +lisp code stanzas (the \File{strap/BAR.$(FASLEXT)} files), THEN we ask for +the final algebra code stanzas (the [[\${OUT}/BAR.$(FASLEXT)]] files). This is a very subtle point so think it through carefully. The layer0 bootstrap list is the only file list that calls for \File{strap/} files. All other layers ask for [[\${OUT}]] files. Make sure you @@ -1739,10 +1767,10 @@ A 9 stanza group for this case performs the following functions: \item compile the bootstrap \File{BAR-.lsp} to the \File{strap/} directory \item extract the spad \File{BAR.spad} from the pamphlet \File{foo.spad.pamphlet} -\item compile the extracted \File{BAR.spad} domain (to get [[BAR.o]]) -\item copy the \File{BAR.o} to the final algebra directory -\item compile the extracted \File{BAR-.spad} domain (to get [[BAR-.o]]) -\item copy the [[BAR-.o]] to the final algebra directory +\item compile the extracted \File{BAR.spad} domain (to get [[BAR.$(FASLEXT)]]) +\item copy the \File{BAR.$(FASLEXT)} to the final algebra directory +\item compile the extracted \File{BAR-.spad} domain (to get [[BAR-.$(FASLEXT)]]) +\item copy the [[BAR-.$(FASLEXT)]] to the final algebra directory \end{enumerate} As you can see this is just the combination of the two possible 5 @@ -1785,20 +1813,20 @@ implicit rules so they would normally be deleted. To prevent the removal the NRLIB directory and its contents, the files are marked as .PRECIOUS. The output of the compile step is saved in a file of the same name -and extension .out in the \${MID} directory. These files are useful for +and extension .$(FASLEXT)ut in the \${MID} directory. These files are useful for deriving the dependencies by scanning the ``Loading ...'' messages. <<genericDotOfiles>>= -${OUT}/%.o: %.NRLIB/code.o - cp $*.NRLIB/code.o ${OUT}/$*.o +${OUT}/%.$(FASLEXT): %.NRLIB/code.$(FASLEXT) + cp $*.NRLIB/code.$(FASLEXT) ${OUT}/$*.$(FASLEXT) @ <<genericNRLIBfiles>>= -.PRECIOUS: %.NRLIB/code.o -%.NRLIB/code.o: %.spad +.PRECIOUS: %.NRLIB/code.$(FASLEXT) +%.NRLIB/code.$(FASLEXT): %.spad @ rm -rf $*.NRLIB echo ")co $*.spad" | ${INTERPSYS} @ @@ -1806,7 +1834,7 @@ ${OUT}/%.o: %.NRLIB/code.o <<genericBOOTSTRAPfiles>>= # Compile bootstrap file to machine object code, and the result # immediately available for AXIOMsys consumption. -strap/%.o: %.lsp +strap/%.$(FASLEXT): %.lsp $(COMPILE_LISP) && $(INSTALL) $@ $(OUT) @ @@ -2288,7 +2316,7 @@ check: <<stages>> mostlyclean-local: - @ -rm -f $(OUT)/*.$(OBJEXT) + @ -rm -f $(OUT)/*.$(FASLEXT) @ -rm -rf *.NRLIB rm -rf strap rm -f *stamp diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in index cabc92d7..008453ac 100644 --- a/src/interp/Makefile.in +++ b/src/interp/Makefile.in @@ -471,7 +471,8 @@ simpbool.$(FASLEXT): simpbool.boot macros.$(FASLEXT) newfort.$(FASLEXT): newfort.boot macros.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< -lisplib.$(FASLEXT): lisplib.boot nlib.$(FASLEXT) c-util.$(FASLEXT) +lisplib.$(FASLEXT): lisplib.boot nlib.$(FASLEXT) c-util.$(FASLEXT) \ + debug.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< interop.$(FASLEXT): interop.boot c-util.$(FASLEXT) diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet index 6e4ff654..bea38292 100644 --- a/src/interp/Makefile.pamphlet +++ b/src/interp/Makefile.pamphlet @@ -785,7 +785,8 @@ simpbool.$(FASLEXT): simpbool.boot macros.$(FASLEXT) newfort.$(FASLEXT): newfort.boot macros.$(FASLEXT) $(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $< -lisplib.$(FASLEXT): lisplib.boot nlib.$(FASLEXT) c-util.$(FASLEXT) +lisplib.$(FASLEXT): lisplib.boot nlib.$(FASLEXT) c-util.$(FASLEXT) \ + debug.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< interop.$(FASLEXT): interop.boot c-util.$(FASLEXT) diff --git a/src/interp/debug.lisp b/src/interp/debug.lisp index 8eeef9b1..125f352e 100644 --- a/src/interp/debug.lisp +++ b/src/interp/debug.lisp @@ -1,6 +1,6 @@ ;; Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. ;; All rights reserved. -;; Copyright (C) 2007, Gabriel Dos Reis. +;; Copyright (C) 2007-2008, Gabriel Dos Reis. ;; All rights reserved. ;; ;; Redistribution and use in source and binary forms, with or without diff --git a/src/interp/g-util.boot b/src/interp/g-util.boot index ca50a4e5..272ad517 100644 --- a/src/interp/g-util.boot +++ b/src/interp/g-util.boot @@ -514,6 +514,7 @@ str2Tex s == val := objValUnwrap val CAR val.1 +opOf: %Thing -> %Thing opOf x == atom x => x first x diff --git a/src/interp/i-coerce.boot b/src/interp/i-coerce.boot index 273dcb15..c5794562 100644 --- a/src/interp/i-coerce.boot +++ b/src/interp/i-coerce.boot @@ -753,7 +753,10 @@ coerceInteractive(triple,t2) == -- JHD added category Aug 1996 for BasicMath t1 in $LangSupportTypes => t2 = $OutputForm => objNew(val,t2) - NIL + t1 = $Domain and conceptualType t2 = $Category + and ofCategory(val,t2)=> objNew(val,t2) + conceptualType t1 = t2 => objNew(val,t2) + nil t1 = '$NoValueMode => if $compilingMap then clearDependentMaps($mapName,nil) throwKeyedMsg("S2IC0009",[t2,$mapName]) diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot index ce11e725..c3d46723 100644 --- a/src/interp/i-output.boot +++ b/src/interp/i-output.boot @@ -383,11 +383,11 @@ outputTran x == op is ["$elt",targ,fun] or not $InteractiveMode and op is ["elt",targ,fun] => -- l has the args targ' := obj2String prefix2String targ - if 2 = #targ then targ' := ['PAREN,targ'] + if 2 = SIZE targ then targ' := ['PAREN,targ'] ['CONCAT,outputTran [fun,:l],'"$",targ'] x is ["$elt",targ,c] or not $InteractiveMode and x is ["elt",targ,c] => targ' := obj2String prefix2String targ - if 2 = #targ then targ' := ['PAREN,targ'] + if 2 = SIZE targ then targ' := ['PAREN,targ'] ['CONCAT,outputTran c,'"$",targ'] x is ["-",a,b] => a := outputTran a @@ -1405,9 +1405,6 @@ output(expr,domain) == SPADCALL(SPADCALL textwrit, expr, printfun) sayMSGNT '%l - -- big hack for tuples for new compiler - domain is ['Tuple, S] => output(asTupleAsList expr, ['List, S]) - sayALGEBRA [:bright '"LISP",'"output:",'%l,expr or '"NIL"] outputNumber(start,linelength,num) == diff --git a/src/interp/i-spec1.boot b/src/interp/i-spec1.boot index 2cbd7722..f8408fa9 100644 --- a/src/interp/i-spec1.boot +++ b/src/interp/i-spec1.boot @@ -1212,8 +1212,8 @@ isDomainValuedVariable form == get(form,'value,$InteractiveFrame) or _ (PAIRP($env) and get(form,'value,$env)) or _ (PAIRP($e) and get(form,'value,$e)))) and - objMode(val) in '((Domain) (Category) (Type)) => - -- ??? shall we accept all of $LangSupportTypes? + ((m := objMode(val)) in '((Domain) (Category)) + or conceptualType m = $Category) => objValUnwrap(val) nil diff --git a/src/interp/lisplib.boot b/src/interp/lisplib.boot index 5c75ede6..f111df8f 100644 --- a/src/interp/lisplib.boot +++ b/src/interp/lisplib.boot @@ -34,6 +34,7 @@ import '"nlib" import '"c-util" +import '"debug" )package "BOOT" ++ @@ -384,7 +385,7 @@ getLisplibVersion libName == initializeLisplib libName == _$ERASE(libName,'ERRORLIB,$libraryDirectory) - SETQ(ERRORS,0) -- ERRORS is a fluid variable for the compiler + resetErrorCount() $libFile:= writeLib1(libName,'ERRORLIB,$libraryDirectory) ADDOPTIONS('FILE,$libFile) $lisplibForm := nil --defining form for lisplib @@ -436,7 +437,7 @@ finalizeLisplib libName == if $profileCompiler then profileWrite() if $lisplibForm and null CDR $lisplibForm then MAKEPROP(CAR $lisplibForm,'NILADIC,'T) - ERRORS ^=0 => -- ERRORS is a fluid variable for the compiler + errorCount() ^=0 => sayMSG ['" Errors in processing ",kind,'" ",:bright libName,'":"] sayMSG ['" not replacing ",$spadLibFT,'" for",:bright libName] diff --git a/src/interp/monitor.lisp b/src/interp/monitor.lisp index 6fa26c98..c6f5c35b 100644 --- a/src/interp/monitor.lisp +++ b/src/interp/monitor.lisp @@ -1,6 +1,6 @@ ;; Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. ;; All rights reserved. -;; Copyright (C) 2007, Gabriel Dos Reis. +;; Copyright (C) 2007-2008, Gabriel Dos Reis. ;; All rights reserved. ;; ;; Redistribution and use in source and binary forms, with or without @@ -186,7 +186,7 @@ (eval `(trace (,name :cond (progn (monitor-incr ',name) nil)))) (setf (gethash name *monitor-table*) (make-monitor-data - :name name :count 0 :monitorp t :sourcefile sourcefile))))) + :name name :count 0 :monitorp t :sourcefile sourcefile))) (defun monitor-delete (fn) "delete a function from the monitor table" diff --git a/src/interp/msg.boot b/src/interp/msg.boot index dbfb81b0..0befa79c 100644 --- a/src/interp/msg.boot +++ b/src/interp/msg.boot @@ -1,6 +1,6 @@ -- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. -- All rights reserved. --- Copyright (C) 2007, Gabriel Dos Reis. +-- Copyright (C) 2007-2008, Gabriel Dos Reis. -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without @@ -494,7 +494,7 @@ setMsgUnforcedAttr(msg,cat,attr) == not QASSQ(cat, ncAlist msg) => ncPutQ(msg,cat,attr) setMsgCatlessAttr(msg,attr) == - ncPutQ(msg,'catless,CONS (attr, IFCDR QASSQ(catless, ncAlist msg))) + ncPutQ(msg,'catless,CONS (attr, IFCDR QASSQ("catless", ncAlist msg))) whichCat attr == found := 'catless diff --git a/src/interp/vmlisp.lisp b/src/interp/vmlisp.lisp index 4be165ea..889b3c58 100644 --- a/src/interp/vmlisp.lisp +++ b/src/interp/vmlisp.lisp @@ -265,13 +265,6 @@ (defmacro nump (n) `(numberp ,n)) -(defmacro |opOf| (x) ;(if (atom x) x (qcar x)) - (if (atom x) - `(if (consp ,x) (qcar ,x) ,x) - (let ((xx (gensym))) - `(let ((,xx ,x)) - (if (consp ,xx) (qcar ,xx) ,xx))))) - (defmacro oraddtempdefs (filearg) `(eval-when #+:common-lisp (:compile-toplevel) diff --git a/src/lisp/core.lisp.in b/src/lisp/core.lisp.in index 53175aca..ab21a70c 100644 --- a/src/lisp/core.lisp.in +++ b/src/lisp/core.lisp.in @@ -1,9 +1,9 @@ ;; Ô Emacs, this is a -*- Lisp -*- file, despite apperance ;; -;; Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. +;; Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd. ;; All rights reserved. ;; -;; Copyright (C) 2007, Gabriel Dos Reis. +;; Copyright (C) 2007-2008, Gabriel Dos Reis. ;; All rights reserved. ;; ;; Redistribution and use in source and binary forms, with or without @@ -18,7 +18,7 @@ ;; the documentation and/or other materials provided with the ;; distribution. ;; -;; - Neither the name of The Numerical ALgorithms Group Ltd. nor the +;; - Neither the name of The Numerical Algorithms Group Ltd. nor the ;; names of its contributors may be used to endorse or promote products ;; derived from this software without specific prior written permission. ;; @@ -59,6 +59,7 @@ "coreError" "errorCount" "countError" + "resetErrorCount" "warn" "%hasFeature" @@ -331,6 +332,9 @@ (defun |countError| nil (setq |$errorCount| (1+ |$errorCount|))) +(defun |resetErrorCount| nil + (setq |$errorCount| 0)) + (defun |fatalError| (msg) (|countError|) (|diagnosticMessage| "fatal error" msg) @@ -756,7 +760,10 @@ (defun |%hasFeature| (f) (member f *features* :test #'eq)) -;; -*- Lisp Implementatiom-dependen Supports -*- +;; -*- Lisp Implementatiom-dependent Supports -*- + +#+ :sbcl +(require "sb-posix") #+ :sbcl (defun shoe-provide-module(name) |