diff options
| author | dos-reis <gdr@axiomatics.org> | 2007-09-24 10:45:31 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2007-09-24 10:45:31 +0000 |
| commit | a3a5203b3605c9ed8c4f89dc97704415d0557359 (patch) | |
| tree | 3b2ebd07f31bdb6b80b5108ab184934cd7cd4c8d /src/algebra | |
| parent | 9c14e01323f5076804740aa25d0d1384d25efb28 (diff) | |
| download | open-axiom-a3a5203b3605c9ed8c4f89dc97704415d0557359.tar.gz | |
* config/setup-dep.mk ($(top_builddir)/libtool): Regenerate when
out of date.
src/algebra/
* Makefile.pamphlet (DEPSYS): Remove.
(COMPILE_LISP): New.
(strap/%.o): Use it to compile cached Lisp files.
src/interp/
* bookvol5.pamphlet (restart): Simplify. Handle command line
arguments.
src/lisp/
* core.lisp.in (|handleCommandLine|): Return truthvalue on success.
Don't call $originalLispTopLevel.
(|compileLispHandler|): Rename file to in-file.
(|topLevel|): Exit only whne handleCommandLine indicates so.
Diffstat (limited to 'src/algebra')
| -rw-r--r-- | src/algebra/ChangeLog | 6 | ||||
| -rw-r--r-- | src/algebra/Makefile.in | 8 | ||||
| -rw-r--r-- | src/algebra/Makefile.pamphlet | 13 |
3 files changed, 14 insertions, 13 deletions
diff --git a/src/algebra/ChangeLog b/src/algebra/ChangeLog index af89aa97..9b180d13 100644 --- a/src/algebra/ChangeLog +++ b/src/algebra/ChangeLog @@ -1,3 +1,9 @@ +2007-09-24 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * Makefile.pamphlet (DEPSYS): Remove. + (COMPILE_LISP): New. + (strap/%.o): Use it to compile cached Lisp files. + 2007-09-16 Alfredo Portes <alfredo.portes@gmail.com> Alasdair McAndrew <amca01@gmail.com> diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in index ff37dad4..9fdcb0ea 100644 --- a/src/algebra/Makefile.in +++ b/src/algebra/Makefile.in @@ -8,8 +8,9 @@ INPUT=../input EXTRACT_BOOTSTRAP_FILE = \ $(axiom_build_document) --output=$@ --tangle="$@ BOOTSTRAP" $< - -DEPSYS= ../interp/depsys$(EXEEXT) +## We use interpsys, built from previous stage, to bootstrap the algebra +## files. In fact, we use interpsys to build everything. +COMPILE_LISP = ../interp/interpsys$(EXEEXT) -- --compile --output=$@ $< INTERPSYS = \ @@ -866,8 +867,7 @@ ${OUT}/%.o: %.NRLIB/code.o # Compile bootstrap file to machine object code, and the result # immediately available for AXIOMsys consumption. strap/%.o: %.lsp - $(DEPSYS) -- --compile --output=$@ $< - cp $@ ${OUT} + $(COMPILE_LISP) && $(INSTALL) $@ $(OUT) $(OUTSRC)/%.spad: mk-target-src-algabra-dir diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet index 7e36a81e..4eb64bb1 100644 --- a/src/algebra/Makefile.pamphlet +++ b/src/algebra/Makefile.pamphlet @@ -1313,14 +1313,10 @@ EXTRACT_BOOTSTRAP_FILE = \ @ -\subsection{The depsys variable} - -The {\bf depsys} image is the compile-time environment for boot and lisp -files. - <<environment>>= - -DEPSYS= ../interp/depsys$(EXEEXT) +## We use interpsys, built from previous stage, to bootstrap the algebra +## files. In fact, we use interpsys to build everything. +COMPILE_LISP = ../interp/interpsys$(EXEEXT) -- --compile --output=$@ $< @ @@ -1811,8 +1807,7 @@ ${OUT}/%.o: %.NRLIB/code.o # Compile bootstrap file to machine object code, and the result # immediately available for AXIOMsys consumption. strap/%.o: %.lsp - $(DEPSYS) -- --compile --output=$@ $< - cp $@ ${OUT} + $(COMPILE_LISP) && $(INSTALL) $@ $(OUT) @ <<genericSPADfiles>>= |