aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/boot/ChangeLog14
-rw-r--r--src/boot/Makefile.in37
-rw-r--r--src/boot/Makefile.pamphlet37
3 files changed, 46 insertions, 42 deletions
diff --git a/src/boot/ChangeLog b/src/boot/ChangeLog
index 9525085c..317f6434 100644
--- a/src/boot/ChangeLog
+++ b/src/boot/ChangeLog
@@ -1,3 +1,17 @@
+2007-09-10 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * Makefile.pamphlet (stage0/%.$(FASLEXT)): Remove.
+ (stage1/%.$(FASLEXT)): Likewise.
+ (stage2/%.$(FASLEXT)): Likewise.
+ (%/tokens.$(FASLEXT)): Tidy.
+ (%/includer.$(FASLEXT)): Likewise.
+ (%/scanner.$(FASLEXT)): Likewise.
+ (%/pile.$(FASLEXT)): Likewise.
+ (%/ast.$(FASLEXT)): Likewise.
+ (%/parser.$(FASLEXT)): Likewise.
+ (mostlyclean-local): Don't remove $(AXIOM_LOCAL_LISP).
+ * Makefile.in: Regenerate.
+
2007-08-21 Gabriel Dos Reis <gdr@cs.tamu.edu>
* translator.boot.pamphlet (bpOutItem): Don't delay variable
diff --git a/src/boot/Makefile.in b/src/boot/Makefile.in
index e97b22aa..262d6d8f 100644
--- a/src/boot/Makefile.in
+++ b/src/boot/Makefile.in
@@ -63,10 +63,6 @@ stage0/bootsys$(EXEEXT): $(stage0_boot_objects)
$(stage0_boot_objects): $(AXIOM_LOCAL_LISP)
-stage0/%.$(FASLEXT): stage0/%.clisp
- $(AXIOM_LOCAL_LISP) -- --compile \
- --load-directory=stage0 --output=$@ $<
-
stage0/%.clisp: $(srcdir)/%.boot.pamphlet stage0/.started
$(axiom_build_document) --tangle=$*.clisp --output=$@ $<
@@ -85,10 +81,6 @@ stage1/bootsys$(EXEEXT): $(addprefix stage1/, $(boot_objects))
--output=$@ --load-directory=stage1 \
$(addprefix stage1/, $(boot_objects))
-stage1/%.$(FASLEXT): stage1/%.clisp
- $(AXIOM_LOCAL_LISP) -- --compile \
- --load-directory=stage1 $<
-
stage1/%.clisp: %.boot stage0/stamp stage1/.started
stage0/bootsys -- --translate --output=$@ $<
@@ -104,10 +96,6 @@ stage2/bootsys$(EXEEXT): $(addprefix stage2/, $(boot_objects))
--output=$@ --load-directory=stage2 \
$(addprefix stage2/, $(boot_objects))
-stage2/%.$(FASLEXT): stage2/%.clisp
- $(AXIOM_LOCAL_LISP) -- --compile \
- --load-directory=stage2 $<
-
stage2/%.clisp: %.boot stage1/stamp stage2/.started
stage1/bootsys -- --translate --output=$@ $<
@@ -115,21 +103,29 @@ stage2/%.clisp: %.boot stage1/stamp stage2/.started
## FIXME: This should be automatically extracted from the
## Boot source file at packaging time.
-%/tokens.($FASLEXT): %/initial-env.$(FASLEXT)
+%/tokens.$(FASLEXT): %/tokens.clisp %/initial-env.$(FASLEXT)
+ $(AXIOM_LOCAL_LISP) -- --compile --load-directory=$* $<
-%/includer.$(FASLEXT): %/tokens.$(FASLEXT)
+%/includer.$(FASLEXT): %/includer.clisp %/tokens.$(FASLEXT)
+ $(AXIOM_LOCAL_LISP) -- --compile --load-directory=$* $<
-%/scanner.$(FASLEXT): %/tokens.$(FASLEXT) %/includer.$(FASLEXT)
+%/scanner.$(FASLEXT): %/scanner.clisp %/tokens.$(FASLEXT) %/includer.$(FASLEXT)
+ $(AXIOM_LOCAL_LISP) -- --compile --load-directory=$* $<
-%/pile.$(FASLEXT): %/scanner.$(FASLEXT) %/includer.$(FASLEXT)
+%/pile.$(FASLEXT): %/pile.clisp %/scanner.$(FASLEXT) %/includer.$(FASLEXT)
+ $(AXIOM_LOCAL_LISP) -- --compile --load-directory=$* $<
-%/ast.$(FASLEXT): %/includer.$(FASLEXT)
+%/ast.$(FASLEXT): %/ast.clisp %/includer.$(FASLEXT)
+ $(AXIOM_LOCAL_LISP) -- --compile --load-directory=$* $<
-%/parser.$(FASLEXT): %/ast.$(FASLEXT) %/scanner.$(FASLEXT) %/includer.$(FASLEXT)
+%/parser.$(FASLEXT): %/parser.clisp %/ast.$(FASLEXT) %/scanner.$(FASLEXT) \
+ %/includer.$(FASLEXT)
+ $(AXIOM_LOCAL_LISP) -- --compile --load-directory=$* $<
-%/translator.$(FASLEXT): %/parser.$(FASLEXT) %/ast.$(FASLEXT) \
- %/pile.$(FASLEXT) %/scanner.$(FASLEXT) \
+%/translator.$(FASLEXT): %/translator.clisp %/parser.$(FASLEXT) \
+ %/ast.$(FASLEXT) %/pile.$(FASLEXT) %/scanner.$(FASLEXT) \
%/includer.$(FASLEXT)
+ $(AXIOM_LOCAL_LISP) -- --compile --load-directory=$* $<
.PRECIOUS: %.boot
%.boot: $(srcdir)/%.boot.pamphlet
@@ -144,7 +140,6 @@ initial-env.lisp: initial-env.lisp.pamphlet
$(axiom_build_document) --tangle $<
mostlyclean-local:
- @rm -f $(AXIOM_LOCAL_LISP)
@rm -f $(axiom_build_bindir)/bootsys$(EXEEXT)
@rm -rf prev-stage
@rm -rf stage0 stage1 stage2
diff --git a/src/boot/Makefile.pamphlet b/src/boot/Makefile.pamphlet
index 531a4e6f..d4e26ccc 100644
--- a/src/boot/Makefile.pamphlet
+++ b/src/boot/Makefile.pamphlet
@@ -1310,21 +1310,29 @@ compilation of these files proceeds in two steps:
## FIXME: This should be automatically extracted from the
## Boot source file at packaging time.
-%/tokens.($FASLEXT): %/initial-env.$(FASLEXT)
+%/tokens.$(FASLEXT): %/tokens.clisp %/initial-env.$(FASLEXT)
+ $(AXIOM_LOCAL_LISP) -- --compile --load-directory=$* $<
-%/includer.$(FASLEXT): %/tokens.$(FASLEXT)
+%/includer.$(FASLEXT): %/includer.clisp %/tokens.$(FASLEXT)
+ $(AXIOM_LOCAL_LISP) -- --compile --load-directory=$* $<
-%/scanner.$(FASLEXT): %/tokens.$(FASLEXT) %/includer.$(FASLEXT)
+%/scanner.$(FASLEXT): %/scanner.clisp %/tokens.$(FASLEXT) %/includer.$(FASLEXT)
+ $(AXIOM_LOCAL_LISP) -- --compile --load-directory=$* $<
-%/pile.$(FASLEXT): %/scanner.$(FASLEXT) %/includer.$(FASLEXT)
+%/pile.$(FASLEXT): %/pile.clisp %/scanner.$(FASLEXT) %/includer.$(FASLEXT)
+ $(AXIOM_LOCAL_LISP) -- --compile --load-directory=$* $<
-%/ast.$(FASLEXT): %/includer.$(FASLEXT)
+%/ast.$(FASLEXT): %/ast.clisp %/includer.$(FASLEXT)
+ $(AXIOM_LOCAL_LISP) -- --compile --load-directory=$* $<
-%/parser.$(FASLEXT): %/ast.$(FASLEXT) %/scanner.$(FASLEXT) %/includer.$(FASLEXT)
+%/parser.$(FASLEXT): %/parser.clisp %/ast.$(FASLEXT) %/scanner.$(FASLEXT) \
+ %/includer.$(FASLEXT)
+ $(AXIOM_LOCAL_LISP) -- --compile --load-directory=$* $<
-%/translator.$(FASLEXT): %/parser.$(FASLEXT) %/ast.$(FASLEXT) \
- %/pile.$(FASLEXT) %/scanner.$(FASLEXT) \
+%/translator.$(FASLEXT): %/translator.clisp %/parser.$(FASLEXT) \
+ %/ast.$(FASLEXT) %/pile.$(FASLEXT) %/scanner.$(FASLEXT) \
%/includer.$(FASLEXT)
+ $(AXIOM_LOCAL_LISP) -- --compile --load-directory=$* $<
<<boot from pamphlet>>
@
@@ -1402,10 +1410,6 @@ stage0/bootsys$(EXEEXT): $(stage0_boot_objects)
$(stage0_boot_objects): $(AXIOM_LOCAL_LISP)
-stage0/%.$(FASLEXT): stage0/%.clisp
- $(AXIOM_LOCAL_LISP) -- --compile \
- --load-directory=stage0 --output=$@ $<
-
stage0/%.clisp: $(srcdir)/%.boot.pamphlet stage0/.started
$(axiom_build_document) --tangle=$*.clisp --output=$@ $<
@@ -1429,10 +1433,6 @@ stage1/bootsys$(EXEEXT): $(addprefix stage1/, $(boot_objects))
--output=$@ --load-directory=stage1 \
$(addprefix stage1/, $(boot_objects))
-stage1/%.$(FASLEXT): stage1/%.clisp
- $(AXIOM_LOCAL_LISP) -- --compile \
- --load-directory=stage1 $<
-
stage1/%.clisp: %.boot stage0/stamp stage1/.started
stage0/bootsys -- --translate --output=$@ $<
@
@@ -1453,10 +1453,6 @@ stage2/bootsys$(EXEEXT): $(addprefix stage2/, $(boot_objects))
--output=$@ --load-directory=stage2 \
$(addprefix stage2/, $(boot_objects))
-stage2/%.$(FASLEXT): stage2/%.clisp
- $(AXIOM_LOCAL_LISP) -- --compile \
- --load-directory=stage2 $<
-
stage2/%.clisp: %.boot stage1/stamp stage2/.started
stage1/bootsys -- --translate --output=$@ $<
@
@@ -1504,7 +1500,6 @@ BOOT_TO_LISP = \
\section{Cleanup}
<<cleanup>>=
mostlyclean-local:
- @rm -f $(AXIOM_LOCAL_LISP)
@rm -f $(axiom_build_bindir)/bootsys$(EXEEXT)
@rm -rf prev-stage
@rm -rf stage0 stage1 stage2
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-04 04:03:50 +0000