diff options
| author | dos-reis <gdr@axiomatics.org> | 2007-10-10 07:22:10 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2007-10-10 07:22:10 +0000 |
| commit | 371a162e7759102786eca794c46ac28c3dc68789 (patch) | |
| tree | 1b74574099c7481abf1e59fa54e4a02212d51ace /src/interp/Makefile.pamphlet | |
| parent | ec3275dadba53ec37908b049d11833f20f5dc857 (diff) | |
| download | open-axiom-371a162e7759102786eca794c46ac28c3dc68789.tar.gz | |
2007-10-10 Gabriel Dos Reis <gdr@cs.tamu.edu>
* configure.ac.pamphlet: Tidy. Don't instantiate src/lisp/core.lisp.
* configure.ac: Regenerate.
* configure: Likewise.
* config/var-def.mk (open_axiom_installdir): New.
(AXIOM): Support versioning.
* Makefile.pamphlet (install): Tidy.
Remove sections on SPAD and SYS variables.
* Makefile.in: Regenerate.
src/algebra/
2007-10-10 Gabriel Dos Reis <gdr@cs.tamu.edu>
* Makefile.pamphlet (INTERPSYS): Now take system root directory
and algebra directory as arguments.
* Makefile.in: Regenerate.
src/etc/
2007-10-10 Gabriel Dos Reis <gdr@cs.tamu.edu>
* Makefile.pamphlet (INTERPSYS): Take system root directory and
algebra directory as arguments.
* Makefile.in: Regenerate.
src/interp/
2007-10-10 Gabriel Dos Reis <gdr@cs.tamu.edu>
* bookvol5.pamphlet (initroot): Use |systemRootDirectory| instead
of environment variable AXIOM.
(|loadExposureGroupData|): Likewise.
* br-data.boot.pamphlet (dbHasExamplePage): Likewise.
(dbRead): Likewise.
(dbReadComments): Likewise.
(buildGloss): Likewise.
* br-saturn.boot.pamphlet (getSaturnExampleList): Likewise.
* br-search.boot.pamphlet (grepSplit): Likewise.
* daase.lisp.pamphlet (asharp): Likewise.
(initial-getdatabase): Likewise.
(DaaseName): Likewise.
(create-initializers): Likewise.
* ht-root.boot.pamphlet (htGlossPage): Likewise.
* htcheck.boot.pamphlet (buildHtMacroTable): Likewise.
* i-syscmd.boot.pamphlet (summary): Likewise.
(copyright): Likewise.
* patches.lisp.pamphlet (restart0): Likewise.
* util.lisp.pamphlet (sourcepath): Likewise.
* Makefile.pamphlet (OBJS): Include sys-driver.$(FASLEXT).
(${SAVESYS}): Tidy.
(${AXIOMSYS}): Likewise.
(${DEPSYS}): Depend on sys-driver.$(FASLEXT). Load it.
(sys-driver.$(FASLEXT)): New rule.
* Makefile.in: Regenerate.
* sys-driver.boot: New.
src/lisp/
2007-10-10 Gabriel Dos Reis <gdr@cs.tamu.edu>
* core.lisp.in (|%systemOptions|): New.
(|%systemArguments|): Likewise.
(|$systemInstallationDirectory|): Likewise.
(|$sysOpts|): Likewise.
(|$sysArgs|): Likewise.
(|handleCommandLine|): Tidy.
(|printUsage|): Update.
* Makefile.pamphlet (core.lisp): Instantiate here.
src/script/
2007-10-10 Gabriel Dos Reis <gdr@cs.tamu.edu>
* axiom.in (AXIOM): Use value substituted by Autoconf.
Remove dead code.
Diffstat (limited to 'src/interp/Makefile.pamphlet')
| -rw-r--r-- | src/interp/Makefile.pamphlet | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet index c10dc169..23651987 100644 --- a/src/interp/Makefile.pamphlet +++ b/src/interp/Makefile.pamphlet @@ -322,7 +322,7 @@ interpreted) in [[depsys]]. <<environment>>= OBJS= vmlisp.$(FASLEXT) hash.$(FASLEXT) \ - diagnostics.$(FASLEXT) \ + diagnostics.$(FASLEXT) sys-driver.$(FASLEXT) \ macros.$(FASLEXT) \ unlisp.$(FASLEXT) setq.$(FASLEXT) \ astr.$(FASLEXT) bits.$(FASLEXT) \ @@ -972,6 +972,7 @@ ${DEPSYS}: vmlisp.$(FASLEXT) \ boot-pkg.$(FASLEXT) \ sys-constants.$(FASLEXT) \ sys-globals.$(FASLEXT) \ + sys-driver.$(FASLEXT) \ diagnostics.$(FASLEXT) \ sys-macros.$(FASLEXT) \ macros.$(FASLEXT) \ @@ -999,6 +1000,7 @@ ${DEPSYS}: vmlisp.$(FASLEXT) \ @ echo 3 making ${DEPSYS} @ rm -f makedep.lisp @ $(mkinstalldirs) $(axiom_build_bindir) + @ echo '(|importModule| "sys-driver")' >> makedep.lisp @ echo '(|importModule| "vmlisp")' >> makedep.lisp @ echo '(|importModule| "bits")' >> makedep.lisp @ echo '(|importModule| "hash")' >> makedep.lisp @@ -1099,9 +1101,10 @@ makeint.lisp: ${DEPSYS} ${OBJS} bookvol5.$(FASLEXT) util.$(FASLEXT) \ @ echo '(gbc t)' >> makeint.lisp ${SAVESYS}: makeint.lisp - AXIOM="$(AXIOM)" DAASE="$(axiom_src_datadir)" \ - $(LOADSYS) -- --make --output=$@ --main="BOOT::RESTART" \ - --load-directory=. makeint.lisp + $(LOADSYS) -- --system="$(AXIOM)/" \ + --sysalg="$(axiom_src_datadir)/algebra/" \ + --make --output=$@ --main="BOOT::RESTART" \ + --load-directory=. makeint.lisp @ echo 6 ${SAVESYS} created $(mkinstalldirs) $(axiom_target_bindir) @ @@ -1119,9 +1122,11 @@ are re-generated after leaving \File{interp/} directory. all-axiomsys: ${AXIOMSYS} ${AXIOMSYS}: makeint.lisp - AXIOM="$(AXIOM)" DAASE="$(axiom_targetdir)" \ - $(LOADSYS) -- --make --output=$@ --main="BOOT::RESTART" \ - --load-directory=. makeint.lisp + $(LOADSYS) -- \ + --system="$(AXIOM)/" \ + --sysalg="$(axiom_targetdir)/algebra/" \ + --make --output=$@ --main="BOOT::RESTART" \ + --load-directory=. makeint.lisp @ echo 6a ${AXIOMSYS} created @ @@ -2024,6 +2029,9 @@ diagnostics.$(FASLEXT): diagnostics.boot sys-constants.$(FASLEXT) \ sys-globals.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< +sys-driver.$(FASLEXT): sys-driver.boot boot-pkg.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + sys-globals.$(FASLEXT): sys-globals.boot sys-constants.$(FASLEXT) \ hash.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< |