src/

2007-08-17  Gabriel Dos Reis  <gdr@cs.tamu.edu>

	* Makefile.pamphlet (all-lisp): Don't make $(axiom_build_bindir)
	here. Pass target tp $(MAKE).
	(all-boot): Likewise.
	(all-lib): Don't make $(OUT) here.  Pass target to $(MAKE).
	* Makefile.in: Regenerate.

src/boot/
2007-08-17  Gabriel Dos Reis  <gdr@cs.tamu.edu>

	* Makefile.pamphlet (BOOTSYS_FOR_TARGET): Remove.
	(stamp): Update prerequisite.
	($(axiom_build_bindir)/bootsys$(EXEEXT)): Rename from
	$(BOOTSYS_FOR_TARGET). 
	(%/.started): Rename from mk-statge0-dir.  Tidy.
	(stage0/%.clisp): Update prerequisite.
	(%/initial-env.$(FASLEXT)): Likewise.
	(mk-stage1-dir): Remove.
	(mk-stage2-dir): Likewise.
	(mostlyclean-local): Update.
	* Makefile.in: Regenerate.

src/lib/
2007-08-17  Gabriel Dos Reis  <gdr@cs.tamu.edu>

	* Makefile.pamphlet ($(axiom_target_libdir)/libspad.la): Remove
	prerequisite mk-target-libdir.
	(mk-target-libdir): Remove.
	* Makefile.in: Regenerate.

src/lisp/
2007-08-17  Gabriel Dos Reis  <gdr@cs.tamu.edu>

	* Makefile.pamphlet ($(OUT)/lisp$(EXEEXT)): Create $(OUT)
	directory before installing lisp executable.
	* Makefile.in: Regenerate.

12 files changed, 69 insertions, 71 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1de04f6a..959bbaa9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2007-08-17  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* Makefile.pamphlet (all-lisp): Don't make $(axiom_build_bindir)
+	here. Pass target tp $(MAKE).
+	(all-boot): Likewise.
+	(all-lib): Don't make $(OUT) here.  Pass target to $(MAKE).
+	* Makefile.in: Regenerate.
+
 2007-08-05  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* Makefile.pamphlet (all-lisp): Don't make all-boot a prereqsite.
diff --git a/src/Makefile.in b/src/Makefile.in
index 6cc27274..c01dfcc7 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -35,14 +35,11 @@ all-doc:
 all-book:
 	cd booklets && ${MAKE}
 all-lib:
-	$(mkinstalldirs) $(OUT)
-	@cd lib && ${MAKE}
+	@cd lib && $(MAKE) $@
 all-lisp: all-lib
-	$(mkinstalldirs) $(axiom_build_bindir)
 	cd lisp && $(MAKE) all-lisp
 all-boot: all-lisp
-	$(mkinstalldirs) $(axiom_build_bindir)
-	@cd boot && ${MAKE}
+	@cd boot && $(MAKE) $@
 all-depsys: all-boot
 	cd interp && $(MAKE) all-depsys
 
diff --git a/src/Makefile.pamphlet b/src/Makefile.pamphlet
index 1476f831..e3e78734 100644
--- a/src/Makefile.pamphlet
+++ b/src/Makefile.pamphlet
@@ -113,8 +113,7 @@ need to make {\bf libspad.a} before we make Lisp image we use.
 
 <<libdir>>=
 all-lib:
-	$(mkinstalldirs) $(OUT)
-	@cd lib && ${MAKE}
+	@cd lib && $(MAKE) $@
 @
 
 \subsection{The \File{boot/} directory}
@@ -129,8 +128,7 @@ common lisp form. This directory contains those files.
 
 <<bootdir>>=
 all-boot: all-lisp
-	$(mkinstalldirs) $(axiom_build_bindir)
-	@cd boot && ${MAKE}
+	@cd boot && $(MAKE) $@
 @
 
 \subsection{The \File{interp/} directory}
@@ -173,7 +171,6 @@ comes from the local Lisp image used to initiate \Tool{bootsys}.
 
 <<lispdir>>=
 all-lisp: all-lib
-	$(mkinstalldirs) $(axiom_build_bindir)
 	cd lisp && $(MAKE) all-lisp
 @
 
diff --git a/src/boot/ChangeLog b/src/boot/ChangeLog
index 94a882d5..9b2571be 100644
--- a/src/boot/ChangeLog
+++ b/src/boot/ChangeLog
@@ -1,3 +1,17 @@
+2007-08-17  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* Makefile.pamphlet (BOOTSYS_FOR_TARGET): Remove.
+	(stamp): Update prerequisite.
+	($(axiom_build_bindir)/bootsys$(EXEEXT)): Rename from
+	$(BOOTSYS_FOR_TARGET). 
+	(%/.started): Rename from mk-statge0-dir.  Tidy.
+	(stage0/%.clisp): Update prerequisite.
+	(%/initial-env.$(FASLEXT)): Likewise.
+	(mk-stage1-dir): Remove.
+	(mk-stage2-dir): Likewise.
+	(mostlyclean-local): Update.
+	* Makefile.in: Regenerate.
+
 2007-08-07  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* ast.boot.pamphlet (bfColonColon): Use SYMBOL-NAME, not
diff --git a/src/boot/Makefile.in b/src/boot/Makefile.in
index 444748bf..e97b22aa 100644
--- a/src/boot/Makefile.in
+++ b/src/boot/Makefile.in
@@ -1,6 +1,5 @@
 AXIOM_LOCAL_LISP_sources = initial-env.lisp
 AXIOM_LOCAL_LISP = ../lisp/base-lisp$(EXEEXT)
-BOOTSYS_FOR_TARGET = $(axiom_target_bindir)/bootsys$(EXEEXT)
 PROCLAIMS=(load "$(srcdir)/boot-proclaims.lisp")
 
 boot_objects = initial-env.$(FASLEXT) $(boot_sources:.boot=.$(FASLEXT))
@@ -32,11 +31,12 @@ all: all-ax all-boot
 
 all-ax all-boot: stamp
 
-stamp: $(BOOTSYS_FOR_TARGET)
+stamp: $(axiom_build_bindir)/bootsys$(EXEEXT)
 	@rm -f stamp
 	$(STAMP) $@
 
-$(BOOTSYS_FOR_TARGET): stage2/bootsys$(EXEEXT)
+$(axiom_build_bindir)/bootsys$(EXEEXT): stage2/bootsys$(EXEEXT)
+	$(mkinstalldirs) $(axiom_build_bindir)
 	$(INSTALL_PROGRAM) stage2/bootsys$(EXEEXT) $(axiom_build_bindir)
 
 .PRECIOUS: stage0/%.clisp
@@ -56,9 +56,10 @@ stage0/bootsys$(EXEEXT): $(stage0_boot_objects)
 		$(stage0_boot_objects)
 
 
-.PHONY: mk-stage0-dir
-mk-stage0-dir:
-	@[ -d stage0 ] || $(mkinstalldirs) stage0
+.PRECIOUS: %/.started
+%/.started:
+	$(mkinstalldirs) $*
+	$(STAMP) $@
 
 $(stage0_boot_objects): $(AXIOM_LOCAL_LISP)
 
@@ -66,11 +67,10 @@ stage0/%.$(FASLEXT): stage0/%.clisp
 	$(AXIOM_LOCAL_LISP) -- --compile \
 		--load-directory=stage0 --output=$@ $<
 
-
-stage0/%.clisp: $(srcdir)/%.boot.pamphlet mk-stage0-dir
+stage0/%.clisp: $(srcdir)/%.boot.pamphlet stage0/.started
 	$(axiom_build_document) --tangle=$*.clisp --output=$@ $<
 
-%/initial-env.$(FASLEXT): initial-env.lisp mk-%-dir
+%/initial-env.$(FASLEXT): initial-env.lisp %/.started
 	$(AXIOM_LOCAL_LISP) -- --compile --output=$@ $<
 
 .PRECIOUS: stage1/%.$(FASLEXT)
@@ -89,13 +89,9 @@ stage1/%.$(FASLEXT): stage1/%.clisp
 	$(AXIOM_LOCAL_LISP) -- --compile \
 		--load-directory=stage1 $<
 
-stage1/%.clisp: %.boot stage0/stamp mk-stage1-dir
+stage1/%.clisp: %.boot stage0/stamp stage1/.started
 	stage0/bootsys -- --translate --output=$@ $<
 
-.PHONY: mk-stage1-dir
-mk-stage1-dir:
-	@[ -d stage1 ] || $(mkinstalldirs) stage1
-
 .PRECIOUS: stage2/%.$(FASLEXT)
 .PRECIOUS: stage2/%.clisp
 
@@ -112,13 +108,9 @@ stage2/%.$(FASLEXT): stage2/%.clisp
 	$(AXIOM_LOCAL_LISP) -- --compile \
 		--load-directory=stage2 $<
 
-stage2/%.clisp: %.boot stage1/stamp mk-stage2-dir
+stage2/%.clisp: %.boot stage1/stamp stage2/.started
 	stage1/bootsys -- --translate --output=$@ $<
 
-.PHONY: mk-stage2-dir
-mk-stage2-dir:
-	@[ -d stage2 ] || $(mkinstalldirs) stage2
-
 ## Dependency for various modules.  
 ## FIXME: This should be automatically extracted from the
 ## Boot source file at packaging time.
@@ -153,7 +145,7 @@ initial-env.lisp: initial-env.lisp.pamphlet
 
 mostlyclean-local:
 	@rm -f $(AXIOM_LOCAL_LISP)
-	@rm -f $(BOOTSYS_FOR_TARGET)
+	@rm -f $(axiom_build_bindir)/bootsys$(EXEEXT)
 	@rm -rf prev-stage
 	@rm -rf stage0 stage1 stage2
 	@rm -f *.data *.fn
diff --git a/src/boot/Makefile.pamphlet b/src/boot/Makefile.pamphlet
index f53ee379..531a4e6f 100644
--- a/src/boot/Makefile.pamphlet
+++ b/src/boot/Makefile.pamphlet
@@ -1138,14 +1138,6 @@ AXIOM_LOCAL_LISP_sources = initial-env.lisp
 AXIOM_LOCAL_LISP = ../lisp/base-lisp$(EXEEXT)
 @
 
-\paragraph{[[BOOTSYS_FOR_TARGET]].}
-The [[$(BOOTSYS_FOR_TARGET)]] image is the final Boot translator image,
-produced after several bootstrap stages.  That is the result of
-running the \Tool{Make} target [[all-boot]].
-<<environment>>=
-BOOTSYS_FOR_TARGET = $(axiom_target_bindir)/bootsys$(EXEEXT)
-@ 
-
 
 \section{Proclaim optimization}
 \label{sec:proclaim}
@@ -1403,9 +1395,10 @@ stage0/bootsys$(EXEEXT): $(stage0_boot_objects)
 		$(stage0_boot_objects)
 
 
-.PHONY: mk-stage0-dir
-mk-stage0-dir:
-	@[ -d stage0 ] || $(mkinstalldirs) stage0
+.PRECIOUS: %/.started
+%/.started:
+	$(mkinstalldirs) $*
+	$(STAMP) $@
 
 $(stage0_boot_objects): $(AXIOM_LOCAL_LISP)
 
@@ -1413,11 +1406,10 @@ stage0/%.$(FASLEXT): stage0/%.clisp
 	$(AXIOM_LOCAL_LISP) -- --compile \
 		--load-directory=stage0 --output=$@ $<
 
-
-stage0/%.clisp: $(srcdir)/%.boot.pamphlet mk-stage0-dir
+stage0/%.clisp: $(srcdir)/%.boot.pamphlet stage0/.started
 	$(axiom_build_document) --tangle=$*.clisp --output=$@ $<
 
-%/initial-env.$(FASLEXT): initial-env.lisp mk-%-dir
+%/initial-env.$(FASLEXT): initial-env.lisp %/.started
 	$(AXIOM_LOCAL_LISP) -- --compile --output=$@ $<
 @
 
@@ -1441,12 +1433,8 @@ stage1/%.$(FASLEXT): stage1/%.clisp
 	$(AXIOM_LOCAL_LISP) -- --compile \
 		--load-directory=stage1 $<
 
-stage1/%.clisp: %.boot stage0/stamp mk-stage1-dir
+stage1/%.clisp: %.boot stage0/stamp stage1/.started
 	stage0/bootsys -- --translate --output=$@ $<
-
-.PHONY: mk-stage1-dir
-mk-stage1-dir:
-	@[ -d stage1 ] || $(mkinstalldirs) stage1
 @
 
 \subsubsection{Stage 2}
@@ -1469,12 +1457,8 @@ stage2/%.$(FASLEXT): stage2/%.clisp
 	$(AXIOM_LOCAL_LISP) -- --compile \
 		--load-directory=stage2 $<
 
-stage2/%.clisp: %.boot stage1/stamp mk-stage2-dir
+stage2/%.clisp: %.boot stage1/stamp stage2/.started
 	stage1/bootsys -- --translate --output=$@ $<
-
-.PHONY: mk-stage2-dir
-mk-stage2-dir:
-	@[ -d stage2 ] || $(mkinstalldirs) stage2
 @
 
 <<bootstrap>>=
@@ -1521,7 +1505,7 @@ BOOT_TO_LISP = \
 <<cleanup>>=
 mostlyclean-local:
 	@rm -f $(AXIOM_LOCAL_LISP)
-	@rm -f $(BOOTSYS_FOR_TARGET)
+	@rm -f $(axiom_build_bindir)/bootsys$(EXEEXT)
 	@rm -rf prev-stage
 	@rm -rf stage0 stage1 stage2
 	@rm -f *.data *.fn
@@ -1614,11 +1598,12 @@ all: all-ax all-boot
 
 all-ax all-boot: stamp
 
-stamp: $(BOOTSYS_FOR_TARGET)
+stamp: $(axiom_build_bindir)/bootsys$(EXEEXT)
 	@rm -f stamp
 	$(STAMP) $@
 
-$(BOOTSYS_FOR_TARGET): stage2/bootsys$(EXEEXT)
+$(axiom_build_bindir)/bootsys$(EXEEXT): stage2/bootsys$(EXEEXT)
+	$(mkinstalldirs) $(axiom_build_bindir)
 	$(INSTALL_PROGRAM) stage2/bootsys$(EXEEXT) $(axiom_build_bindir)
 
 <<bootstrap>>
diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog
index cb5b0396..8bcace53 100644
--- a/src/lib/ChangeLog
+++ b/src/lib/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-17  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* Makefile.pamphlet ($(axiom_target_libdir)/libspad.la): Remove
+	prerequisite mk-target-libdir.
+	(mk-target-libdir): Remove.
+	* Makefile.in: Regenerate.
+
 2007-07-27  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* Makefile.pamphlet: Partially rework, taking advantage of libtool.
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index 8a22fe97..09d7ea2b 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -41,13 +41,8 @@ stamp: $(axiom_target_libdir)/libspad.la
 	rm -f stamp
 	$(STAMP) stamp
 
-.PHONY: mk-target-libdir
-mk-target-libdir:
-	[ -d $(axiom_target_libdir) ] \
-		|| $(mkinstalldirs) $(axiom_target_libdir)
-
-
-$(axiom_target_libdir)/libspad.la: $(libspad_la_objects) mk-target-libdir
+$(axiom_target_libdir)/libspad.la: $(libspad_la_objects)
+	$(mkinstalldirs) $(axiom_target_libdir)
 	$(LIBTOOL) --mode=link $(CC) -o $@ $(libspad_la_objects) \
 		-rpath $(libdir)/axiom/target/$(target)/lib
 
diff --git a/src/lib/Makefile.pamphlet b/src/lib/Makefile.pamphlet
index 3f2f37ac..6b0b0433 100644
--- a/src/lib/Makefile.pamphlet
+++ b/src/lib/Makefile.pamphlet
@@ -173,13 +173,8 @@ stamp: $(axiom_target_libdir)/libspad.la
 	rm -f stamp
 	$(STAMP) stamp
 
-.PHONY: mk-target-libdir
-mk-target-libdir:
-	[ -d $(axiom_target_libdir) ] \
-		|| $(mkinstalldirs) $(axiom_target_libdir)
-
-
-$(axiom_target_libdir)/libspad.la: $(libspad_la_objects) mk-target-libdir
+$(axiom_target_libdir)/libspad.la: $(libspad_la_objects)
+	$(mkinstalldirs) $(axiom_target_libdir)
 	$(LIBTOOL) --mode=link $(CC) -o $@ $(libspad_la_objects) \
 		-rpath $(libdir)/axiom/target/$(target)/lib
 
diff --git a/src/lisp/ChangeLog b/src/lisp/ChangeLog
index 7d5aa312..0e5ccf84 100644
--- a/src/lisp/ChangeLog
+++ b/src/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-17  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* Makefile.pamphlet ($(OUT)/lisp$(EXEEXT)): Create $(OUT)
+	directory before installing lisp executable.
+	* Makefile.in: Regenerate.
+
 2007-08-07  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* core.lisp.pamphlet (|topLevel|): Push into system's preferred
diff --git a/src/lisp/Makefile.in b/src/lisp/Makefile.in
index 67f1d51a..a190b452 100644
--- a/src/lisp/Makefile.in
+++ b/src/lisp/Makefile.in
@@ -44,6 +44,7 @@ ifeq (@axiom_lisp_flavor@,gcl)
                       ' si::*system-directory* (quote (list ".lsp")))' \
                '  "$(lisp_c_objects) @axiom_c_runtime_extra@"))' \
             | ./base-lisp$(EXEEXT)
+	$(mkinstalldirs) $(OUT)
 	$(INSTALL_PROGRAM) lisp$(EXEEXT) $(OUT)
 endif
 
diff --git a/src/lisp/Makefile.pamphlet b/src/lisp/Makefile.pamphlet
index b252d4cd..4d4e240d 100644
--- a/src/lisp/Makefile.pamphlet
+++ b/src/lisp/Makefile.pamphlet
@@ -50,6 +50,7 @@ ifeq (@axiom_lisp_flavor@,gcl)
                       ' si::*system-directory* (quote (list ".lsp")))' \
                '  "$(lisp_c_objects) @axiom_c_runtime_extra@"))' \
             | ./base-lisp$(EXEEXT)
+	$(mkinstalldirs) $(OUT)
 	$(INSTALL_PROGRAM) lisp$(EXEEXT) $(OUT)
 endif