aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2011-08-30 08:41:47 +0000
committerdos-reis <gdr@axiomatics.org>2011-08-30 08:41:47 +0000
commit7073e471a7b732854ad3cbc972615c8c3deefa61 (patch)
tree06c8adaf4f86e7be27995ba22aa9feb0c225edcb /src
parent57dff7bf047f7364a8ffe27453d7f66de0b159f5 (diff)
downloadopen-axiom-7073e471a7b732854ad3cbc972615c8c3deefa61.tar.gz
* algebra/Makefile.in: Simplify bootstrap rules. Build
initdb.daase before bootstrap.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/algebra/Makefile.in70
2 files changed, 31 insertions, 44 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index b75e7032..683ae4c1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-30 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * algebra/Makefile.in: Simplify bootstrap rules. Build
+ initdb.daase before bootstrap.
+
2011-08-29 Gabriel Dos Reis <gdr@cs.tamu.edu>
* interp/lisplib.boot (laodIfNecessaryAndExists): Remove as unused.
diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in
index 4db09a9c..8597b27f 100644
--- a/src/algebra/Makefile.in
+++ b/src/algebra/Makefile.in
@@ -486,39 +486,39 @@ strap-2/DIAGG.$(FASLEXT): strap-2/DIOPS.$(FASLEXT)
strap-2/FSAGG.$(FASLEXT): strap-2/DIAGG.$(FASLEXT)
-strap-0/.started:
- $(mkdir_p) strap-0 && $(TOUCH) $@
+strap-%:
+ $(mkdir_p) $@
-strap-0/.finished: $(oa_strap_0_fasls)
+strap-0: initdb.daase
+strap-0-stamp: $(oa_strap_0_fasls)
rm -f $@
rm -rf $(addsuffix .NRLIB,$(oa_strap_0_sources))
$(TOUCH) $@
-strap-1/.started: strap-0/.finished
- $(mkdir_p) strap-1 && $(TOUCH) $@
+strap-1: strap-0-stamp
-strap-1/.finished: $(oa_strap_1_fasls)
+
+strap-1-stamp: $(oa_strap_1_fasls)
rm -f $@
rm -rf $(addsuffix .NRLIB,$(oa_strap_1_sources)) \
$(addsuffix -.NRLIB,$(oa_strap_1_sources))
$(TOUCH) $@
-strap-2/.started: $(oa_strap_1_fasls)
- $(mkdir_p) strap-2 && $(TOUCH) $@
+strap-2: $(oa_strap_1_fasls)
-strap-2/.finished: $(oa_strap_2_fasls)
+strap-2-stamp: $(oa_strap_2_fasls)
rm -f $@
rm -rf $(addsuffix .NRLIB,$(oa_strap_2_sources)) \
$(addsuffix -.NRLIB,$(oa_strap_2_sources))
$(TOUCH) $@
-strap-0/%.$(FASLEXT): %.spad strap-0/.started
+strap-0/%.$(FASLEXT): %.spad | strap-0
$(BOOTSTRAP) --sysalg=strap-0 --bootstrap $< \
&& cp $*.NRLIB/code.$(FASLEXT) $@ && \
if test x@oa_keep_files@ = xyes; then \
cp $*.NRLIB/code.lsp strap-0/$*.lsp; fi
-strap-1/%.$(FASLEXT): %.spad strap-1/.started
+strap-1/%.$(FASLEXT): %.spad | strap-1
$(BOOTSTRAP) --strap=strap-0 --sysalg=strap-1 --optimize=3 $< && \
cp $*.NRLIB/code.$(FASLEXT) $@ && \
if test -d $*-.NRLIB; then cp $*-.NRLIB/code.$(FASLEXT) \
@@ -526,7 +526,7 @@ strap-1/%.$(FASLEXT): %.spad strap-1/.started
if test x@oa_keep_files@ = xyes; then \
cp $*.NRLIB/code.lsp strap-1/$*.lsp; fi
-strap-2/%.$(FASLEXT): %.spad strap-2/.started
+strap-2/%.$(FASLEXT): %.spad | strap-2
$(BOOTSTRAP) --strap=strap-1 --sysalg=strap-2 --optimize=3 $< && \
cp $*.NRLIB/code.$(FASLEXT) $@ && \
if test -d $*-.NRLIB; then cp $*-.NRLIB/code.$(FASLEXT) \
@@ -1566,29 +1566,16 @@ $(OUT)/JVMFDACC.$(FASLEXT): $(OUT)/LOGIC.$(FASLEXT)
$(OUT)/JVMMDACC.$(FASLEXT): $(OUT)/LOGIC.$(FASLEXT)
-.PHONY: all all-algebra mkdir-output-directory
+.PHONY: all all-algebra
all: all-ax
all-ax all-algebra: stamp
@ echo finished $(builddir)
-stamp: mkdir-output-directory ${SPADFILES} user-stamp ${TESTS}
+stamp: ${SPADFILES} user-stamp ${TESTS}
-rm -f stamp
$(STAMP) stamp
-mkdir-output-directory:
- $(mkdir_p) $(OUTSRC)
-
-everything: check lib db cmd gloss
- @ echo 4303 invoking make in `pwd` with parms:
-
-check:
- @ echo 4305 Checking that INTERP.EXPOSED and NRLIBs are consistent
- @ echo 4306 libcheck needs to use exposed.lsp, not INTERP.EXPOSED
-
-
-
-
.PRECIOUS: $(OUT)/%.$(FASLEXT)
${OUT}/%.$(FASLEXT): %.NRLIB/code.$(FASLEXT)
cp $< $@
@@ -1604,11 +1591,10 @@ ${OUTSRC}/%.spad: $(srcdir)/%.spad.pamphlet
.PRECIOUS: $(builddir)/%.tex
.PRECIOUS: $(builddir)/%.dvi
-$(DOC)/%.dvi: mk-target-doc-dir
+$(DOC)/%.dvi: | $(DOC)
-.PHONY: mk-target-doc-dir
-mk-target-doc-dir:
- @ [ -d $(DOC) ] || $(mkdir_p) $(DOC)
+$(DOC):
+ @ $(mkdir_p) $(DOC)
$(DOC)/%.dvi: $(builddir)/%.dvi
@cp -p $< $@
@@ -1674,14 +1660,17 @@ $(axiom_algebra_layer_user_objects): bootstrap-stamp
.PHONY: all-algstrap
all-algstrap: strap-stamp
-strap-stamp: strap-2/.finished
- @ $(mkdir_p) $(OUT)
+strap-stamp: strap-2-stamp
@ rm -f strap-stamp
@ $(STAMP) strap-stamp
@ echo =====================================
@ echo === algebra bootstrap complete ======
@ echo =====================================
+$(axiom_algebra_layer_0_objects): | $(OUT)
+$(OUT):
+ $(mkdir_p) $@
+
0-stamp: strap-stamp $(axiom_algebra_layer_0_objects)
@ rm -f 0-stamp
@ $(STAMP) 0-stamp
@@ -1863,20 +1852,13 @@ user-stamp: $(axiom_algebra_layer_user_objects)
.PRECIOUS: $(SPADFILES)
-.PHONY: spad-files-stamp
-spad-files-stamp: $(SPADFILES)
- @ rm -f spad-files-stamp
- @ $(STAMP) spad-files-stamp
+$(SPADFILES): | $(OUTSRC)
.PHONY: all-initdb
-all-initdb: initdb-stamp
-
-.PHONY: initdb-stamp
-initdb-stamp: initdb.daase
- @ rm -f initdb-stamp
- @ $(STAMP) initdb-stamp
+all-initdb: initdb.daase
-initdb.daase: spad-files-stamp
+.PRECIOUS: initdb.daase
+initdb.daase: $(SPADFILES)
$(DRIVER) --execpath=$(INTERPSYS) --system="$(AXIOM)" \
--spad-srcdir=$(OUTSRC) \
--output=initdb.$$$$ --build-initdb && \