* Makefile.pamphlet (${DEPSYS}): Depend on g-error.$(FASLEXT),

	g-boot.$(FASLEXT), c-util.$(FASLEXT), clam.$(FASLEXT),
	slam.$(FASLEXT).  
	(slam.$(FASLEXT)): New rule.
	(clam.$(FASLEXT)): Likewise.
	(g-boot.$(FASLEXT)): Likewise.
	(g-error.$(FASLEXT)): Likewise.
	(c-util.$(FASLEXT)): Likewise.
	(<<c-util.lisp (OUT from IN)>>): Remove.
	(<<c-util.clisp>>): Likewise.
	* c-util.boot.pamphlet: Remove cached Lisp translation.
	Push into package "BOOT". Fix syntax. Remove unused functions.
	* clam.boot.pamphlet: Push into package "BOOT". Fix syntax.
	* g-error.boot.package: Likewise.
	* g-boot.boot.pamphlet: Push into package "BOOT".
	* slam.boot.pamphlet: Likewise.
	* sys-global.boot (CHR): Define.
	(TOK): Likewise.

1 files changed, 25 insertions, 26 deletions

diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in
index 2bc50802..fb5347da 100644
--- a/src/interp/Makefile.in
+++ b/src/interp/Makefile.in
@@ -314,11 +314,12 @@ ${DEPSYS}:	vmlisp.$(FASLEXT) \
 	        postprop.$(FASLEXT)\
 		def.$(FASLEXT) \
 	        fnewmeta.$(FASLEXT) \
-		g-error.clisp \
-	        g-boot.clisp c-util.${LISP} \
+		g-error.$(FASLEXT) \
+	        g-boot.$(FASLEXT) \
+		c-util.$(FASLEXT) \
 	        g-util.$(FASLEXT) \
-	        clam.clisp \
-	        slam.clisp
+	        clam.$(FASLEXT) \
+	        slam.$(FASLEXT)
 	@ echo 3 making ${DEPSYS} 
 	@ rm -f makedep.lisp
 	@ $(mkinstalldirs) $(axiom_build_bindir)
@@ -347,21 +348,14 @@ ${DEPSYS}:	vmlisp.$(FASLEXT) \
 	@ echo '(|importModule| "bootlex")' >> makedep.lisp
 	@ echo '(|importModule| "postprop")' >> makedep.lisp
 	@ echo '(|importModule| "postpar")' >> makedep.lisp
-	@ echo '(unless (probe-file "clam.$(FASLEXT)") (|compileLispFile| "clam.clisp" "clam.$(FASLEXT)"))' >> makedep.lisp
-	@ echo '(load "clam")' >> makedep.lisp
-	@ echo '(unless (probe-file "slam.$(FASLEXT)") (|compileLispFile| "slam.clisp" "slam.$(FASLEXT)"))' >> makedep.lisp
-	@ echo '(load "slam")' >> makedep.lisp
-	@ echo '(unless (probe-file "g-error.$(FASLEXT)") (|compileLispFile| "g-error.clisp" "g-error.$(FASLEXT)"))' >> makedep.lisp
-	@ echo '(load "g-error")' >> makedep.lisp
-	@ echo '(unless (probe-file "g-boot.$(FASLEXT)") (|compileLispFile| "g-boot.clisp" "g-boot.$(FASLEXT)"))' >> makedep.lisp
-	@ echo '(load "g-boot")' >> makedep.lisp
-	@ echo '(unless (probe-file "c-util.$(FASLEXT)") (|compileLispFile| "c-util.${LISP}" "c-util.$(FASLEXT)"))' >> makedep.lisp
-	@ echo '(load "c-util")' >> makedep.lisp
+	@ echo '(|importModule| "clam")' >> makedep.lisp
+	@ echo '(|importModule| "slam")' >> makedep.lisp
+	@ echo '(|importModule| "g-error")' >> makedep.lisp
+	@ echo '(|importModule| "g-boot")' >> makedep.lisp
+	@ echo '(|importModule| "c-util")' >> makedep.lisp
 	@ echo '(|importModule| "g-util")' >> makedep.lisp
 	../lisp/base-lisp$(EXEEXT) -- --make --output=$@ \
 		--load-directory=. makedep.lisp
-	@rm $(addsuffix .$(FASLEXT), \
-		clam slam g-error g-boot c-util)
 	@ echo 4 ${DEPSYS} created
 
 
@@ -555,12 +549,27 @@ dq.$(FASLEXT): dq.boot boot-pkg.$(FASLEXT)
 
 ## General support and utilities.
 
+slam.$(FASLEXT): slam.boot g-timer.$(FASLEXT)
+	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
+clam.$(FASLEXT): clam.boot g-timer.$(FASLEXT)
+	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
 g-opt.$(FASLEXT): g-opt.boot def.$(FASLEXT)
 	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
 
 g-timer.$(FASLEXT): g-timer.boot macros.$(FASLEXT) g-util.$(FASLEXT)
 	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
 
+g-boot.$(FASLEXT): g-boot.boot def.$(FASLEXT) g-util.$(FASLEXT)
+	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
+g-error.$(FASLEXT): g-error.boot diagnostics.$(FASLEXT) g-util.$(FASLEXT)
+	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
+c-util.$(FASLEXT): c-util.boot g-util.$(FASLEXT)
+	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
+
 g-util.$(FASLEXT): g-util.boot macros.$(FASLEXT)
 	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
 
@@ -652,16 +661,6 @@ compiler.clisp: compiler.boot
 	@ echo 233 making $@ from $<
 	@ echo '(old-boot::boot "compiler.boot")' | ${DEPSYS}
 
-c-util.${LISP}: $(srcdir)/c-util.boot.pamphlet
-	@ echo 146 making c-util.${LISP} from $(srcdir)/c-util.boot.pamphlet
-	@ rm -f c-util.$(FASLEXT)
-	$(axiom_build_document) --tangle=c-util.clisp --output=$@ $<
-
-c-util.clisp: c-util.boot
-	@ echo 148 making $@ from $<
-	@ echo '(progn (old-boot::boot "c-util.boot"))' | ${DEPSYS}
-
-
 database.clisp: database.boot
 	@ echo 243 making $@ from $<
 	@ echo '(old-boot::boot "database.boot")' | ${DEPSYS}