diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-11-13 15:49:18 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-11-13 15:49:18 +0000 |
| commit | 4d0c8ae73e443bbfae3793a1313e0e5c5cf0c6a7 (patch) | |
| tree | 61036dbbde4d9173acb1f5b5ba7acacc943a17dc /src/algebra | |
| parent | 6c1c0bcb2816b92639a2a1e55f66504ae712d9d1 (diff) | |
| download | open-axiom-4d0c8ae73e443bbfae3793a1313e0e5c5cf0c6a7.tar.gz | |
* interp/sys-driver.boot (initializeDatabases): Honor --initial-db.
(initializeGlobalState): Don't bind $compileDefaultsOnly.
* interp/sys-globals.boot ($compileDefaultsOnly): Remove.
* interp/define.boot (compDefineCategory): Adjust.
(compDefineCategory1): Likewise.
(compDefineFunctor1): Clear dbCapsuleDefinitions.
* interp/lisplib.boot (compDefineLisplib): Tidy.
* interp/daase.lisp (BROWSEOPEN): Use dbSourceFile.
(GETDATABASE): Likewise.
(LOCALNRLIB): Likewise.
(WRITE-BROWSEDB): Likewise.
* algebra/Makefile.in (COMPILE_SPAD): Specifiy initial DB.
(BOOTSTRAP): Likewise.
Diffstat (limited to 'src/algebra')
| -rw-r--r-- | src/algebra/Makefile.in | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in index 49f8eb56..73b5800a 100644 --- a/src/algebra/Makefile.in +++ b/src/algebra/Makefile.in @@ -83,13 +83,13 @@ DRIVER = ../driver/open-axiom$(EXEEXT) INTERPSYS = ../interp/interpsys$(EXEEXT) COMPILE_SPAD = $(DRIVER) --execpath=$(INTERPSYS) \ - --system="$(AXIOM)" \ + --system="$(AXIOM)" --initial-db=initdb.daase \ --sysdb="$(axiom_src_datadir)/algebra/" \ --strap=strap-2 --optimize=3 \ --system-algebra --compile $< BOOTSTRAP = $(DRIVER) --execpath=$(INTERPSYS) \ - --system="$(AXIOM)" \ + --system="$(AXIOM)" --initial-db=initdb.daase \ --sysdb="$(axiom_src_datadir)/algebra/" \ --system-algebra --compile @@ -100,7 +100,6 @@ BOOTSTRAP = $(DRIVER) --execpath=$(INTERPSYS) \ ## They are needed only for their being known as constructors. ## Consequently, the dependencies listed here are at the categories ## inheritance level; not necessarily at the use level. -strap-0/TYPE.$(FASLEXT): initdb.daase strap-0/UTYPE.$(FASLEXT): strap-0/TYPE.$(FASLEXT) strap-0/BASTYPE.$(FASLEXT): strap-0/TYPE.$(FASLEXT) strap-0/KOERCE.$(FASLEXT): strap-0/TYPE.$(FASLEXT) @@ -1103,6 +1102,7 @@ strap-2/BOOLEAN.$(FASLEXT): strap-2/PROPLOG.$(FASLEXT) \ strap-0 strap-1 strap-2: $(mkdir_p) $@ +.PRECIOUS: strap-0/%.$(FASLEXT) strap-0/%.$(FASLEXT): %.spad | strap-0 $(BOOTSTRAP) --sysalg=strap-0 --bootstrap $< \ && cp $*.NRLIB/code.$(FASLEXT) $@ && \ @@ -1110,6 +1110,7 @@ strap-0/%.$(FASLEXT): %.spad | strap-0 cp $*.NRLIB/code.lsp strap-0/$*.lsp; fi && \ rm -rf $*.NRLIB +.PRECIOUS: strap-1/%.$(FASLEXT) strap-1/%.$(FASLEXT): %.spad | strap-1 $(BOOTSTRAP) --strap=strap-0 --sysalg=strap-1 --optimize=3 $< && \ cp $*.NRLIB/code.$(FASLEXT) $@ && \ @@ -1119,7 +1120,8 @@ strap-1/%.$(FASLEXT): %.spad | strap-1 cp $*.NRLIB/code.lsp strap-1/$*.lsp; fi && \ rm -rf $*.NRLIB $*-.NRLIB -strap-2/%.$(FASLEXT): %.spad | strap-2 +.PRECIOUS: strap-2/%.$(FASLEXT) +strap-2/%.$(FASLEXT): %.spad initdb.daase | strap-2 $(BOOTSTRAP) --strap=strap-1 --sysalg=strap-2 --optimize=3 $< && \ cp $*.NRLIB/code.$(FASLEXT) $@ && \ if test -d $*-.NRLIB; then cp $*-.NRLIB/code.$(FASLEXT) \ @@ -2427,7 +2429,7 @@ initdb.daase: $(SPADFILES) mostlyclean-local: @rm -f $(OUT)/*.$(FASLEXT) $(OUT)/*.daase @rm -rf *.NRLIB - @rm -rf *.DAASE *.daase libdb.text initdb.* + @rm -rf *.DAASE *.daase libdb.text @rm -rf strap* @rm -f *stamp |