* Makefile.pamphlet (cfuns.$(FASLEXT)): New rule.

	(obey.$(FASLEXT)): Likewise.
	(setq.$(FASLEXT)): Likewise.
	(spaderror.$(FASLEXT)): Likewise.
	(debug.$(FASLEXT)): Likewise.
	(property.$(FASLEXT)): Likewise.
	(nspadaux.$(FASLEXT)): Likewise.
	(sockio.$(FASLEXT)): Likewise.
	(sfsfun-l.$(FASLEXT)): Likewise.
	(varini.$(FASLEXT)): Likewise.
	(trace.$(FASLEXT)): Likewise.
	(termrw.$(FASLEXT)): Likewise.
	(showimp.$(FASLEXT)): Likewise.
	(sfsfun.$(FASLEXT)): Likewise.

17 files changed, 114 insertions, 5 deletions

diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog
index f04b700b..ff4d153d 100644
--- a/src/interp/ChangeLog
+++ b/src/interp/ChangeLog
@@ -1,5 +1,22 @@
 2007-11-23  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
+	* Makefile.pamphlet (cfuns.$(FASLEXT)): New rule.
+	(obey.$(FASLEXT)): Likewise.
+	(setq.$(FASLEXT)): Likewise.
+	(spaderror.$(FASLEXT)): Likewise.
+	(debug.$(FASLEXT)): Likewise.
+	(property.$(FASLEXT)): Likewise.
+	(nspadaux.$(FASLEXT)): Likewise.
+	(sockio.$(FASLEXT)): Likewise.
+	(sfsfun-l.$(FASLEXT)): Likewise.
+	(varini.$(FASLEXT)): Likewise.
+	(trace.$(FASLEXT)): Likewise.
+	(termrw.$(FASLEXT)): Likewise.
+	(showimp.$(FASLEXT)): Likewise.
+	(sfsfun.$(FASLEXT)): Likewise.
+
+2007-11-23  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
 	* Makefile.pamphlet (topics.$(FASLEXT)): New rule.
 	(alql.$(FASLEXT)): Likewise.
 	(br-prof.$(FASLEXT)): Likewise.
diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in
index 76baa8e9..9bdc9ce1 100644
--- a/src/interp/Makefile.in
+++ b/src/interp/Makefile.in
@@ -739,6 +739,47 @@ dq.$(FASLEXT): dq.boot boot-pkg.$(FASLEXT)
 	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
 
 ## General support and utilities.
+cfuns.$(FASLEXT): cfuns.lisp boot-pkg.$(FASLEXT)
+	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+
+obey.$(FASLEXT): obey.lisp macros.$(FASLEXT)
+	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+
+setq.$(FASLEXT): setq.lisp macros.$(FASLEXT)
+	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+
+spaderror.$(FASLEXT): spaderror.lisp macros.$(FASLEXT)
+	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+
+debug.$(FASLEXT): debug.lisp macros.$(FASLEXT)
+	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+
+property.$(FASLEXT): property.lisp sys-macros.$(FASLEXT)
+	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+
+nspadaux.$(FASLEXT): nspadaux.lisp sys-macros.$(FASLEXT)
+	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+
+sockio.$(FASLEXT): sockio.lisp sys-macros.$(FASLEXT)
+	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+
+sfsfun-l.$(FASLEXT): sfsfun-l.lisp sys-macros.$(FASLEXT)
+	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+
+varini.$(FASLEXT): varini.boot sys-macros.$(FASLEXT)
+	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+
+trace.$(FASLEXT): trace.boot debug.$(FASLEXT)
+	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+
+termrw.$(FASLEXT): termrw.boot macros.$(FASLEXT)
+	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+
+showimp.$(FASLEXT): showimp.boot macros.$(FASLEXT)
+	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+
+sfsfun.$(FASLEXT): sfsfun.boot macros.$(FASLEXT)
+	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
 
 modemap.$(FASLEXT): modemap.boot c-util.$(FASLEXT) info.$(FASLEXT)
 	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet
index 2cbc36c4..d3b3fb31 100644
--- a/src/interp/Makefile.pamphlet
+++ b/src/interp/Makefile.pamphlet
@@ -1300,6 +1300,47 @@ dq.$(FASLEXT): dq.boot boot-pkg.$(FASLEXT)
 	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
 
 ## General support and utilities.
+cfuns.$(FASLEXT): cfuns.lisp boot-pkg.$(FASLEXT)
+	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+
+obey.$(FASLEXT): obey.lisp macros.$(FASLEXT)
+	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+
+setq.$(FASLEXT): setq.lisp macros.$(FASLEXT)
+	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+
+spaderror.$(FASLEXT): spaderror.lisp macros.$(FASLEXT)
+	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+
+debug.$(FASLEXT): debug.lisp macros.$(FASLEXT)
+	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+
+property.$(FASLEXT): property.lisp sys-macros.$(FASLEXT)
+	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+
+nspadaux.$(FASLEXT): nspadaux.lisp sys-macros.$(FASLEXT)
+	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+
+sockio.$(FASLEXT): sockio.lisp sys-macros.$(FASLEXT)
+	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+
+sfsfun-l.$(FASLEXT): sfsfun-l.lisp sys-macros.$(FASLEXT)
+	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+
+varini.$(FASLEXT): varini.boot sys-macros.$(FASLEXT)
+	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+
+trace.$(FASLEXT): trace.boot debug.$(FASLEXT)
+	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+
+termrw.$(FASLEXT): termrw.boot macros.$(FASLEXT)
+	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+
+showimp.$(FASLEXT): showimp.boot macros.$(FASLEXT)
+	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
+
+sfsfun.$(FASLEXT): sfsfun.boot macros.$(FASLEXT)
+	$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
 
 modemap.$(FASLEXT): modemap.boot c-util.$(FASLEXT) info.$(FASLEXT)
 	$(BOOTSYS) -- --compile --boot="old" --output=$@ --load-directory=. $<
diff --git a/src/interp/cfuns.lisp b/src/interp/cfuns.lisp
index 5e0ab54d..c9e33696 100644
--- a/src/interp/cfuns.lisp
+++ b/src/interp/cfuns.lisp
@@ -32,6 +32,7 @@
 ;; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+(import-module "boot-pkg")
 (in-package "BOOT")
 
 #+(and :Lucid (not :ibm/370))
diff --git a/src/interp/debug.lisp b/src/interp/debug.lisp
index 88896531..64c68f0c 100644
--- a/src/interp/debug.lisp
+++ b/src/interp/debug.lisp
@@ -42,9 +42,9 @@
  
 ; NAME:    Debugging Package
 ; PURPOSE: Debugging hooks for Boot code
- 
+
+(import-module "macros") 
 (in-package "BOOT")
-(use-package '("LISP" ))
  
 (DEFPARAMETER /COUNTLIST NIL)
 (DEFPARAMETER /TIMERLIST NIL)
diff --git a/src/interp/nspadaux.lisp b/src/interp/nspadaux.lisp
index cc31a68a..26c431ca 100644
--- a/src/interp/nspadaux.lisp
+++ b/src/interp/nspadaux.lisp
@@ -32,6 +32,7 @@
 ;; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+(import-module "sys-macros")
 (in-package "BOOT")
 
 (defvar |$DEFdepth| 0)
diff --git a/src/interp/obey.lisp b/src/interp/obey.lisp
index 9d19fa1f..1cc2b720 100644
--- a/src/interp/obey.lisp
+++ b/src/interp/obey.lisp
@@ -32,6 +32,7 @@
 ;; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+(import-module "macros")
 (in-package "BOOT")
 
 #+ (and :lucid :unix)
diff --git a/src/interp/property.lisp b/src/interp/property.lisp
index 08cd1b57..d3be6d36 100644
--- a/src/interp/property.lisp
+++ b/src/interp/property.lisp
@@ -46,7 +46,7 @@
 ;;    properties on some special handlers.
 
 
-
+(import-module "sys-macros")
 (in-package "BOOT")
 
 ;; following was in NEWSPAD LISP
diff --git a/src/interp/setq.lisp b/src/interp/setq.lisp
index b1872dfc..992ad396 100644
--- a/src/interp/setq.lisp
+++ b/src/interp/setq.lisp
@@ -39,6 +39,7 @@
  "Portions (c) Copyright Taiichi Yuasa and Masami Hagiya, 1984."
  "All rights reserved"))
 
+(import-module "macros")
 (in-package "BOOT")
 
 (SETQ |/MAJOR-VERSION| 7)
diff --git a/src/interp/sfsfun-l.lisp b/src/interp/sfsfun-l.lisp
index b969fb53..89242508 100644
--- a/src/interp/sfsfun-l.lisp
+++ b/src/interp/sfsfun-l.lisp
@@ -32,6 +32,7 @@
 ;; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+(import-module "sys-macros")
 (in-package "BOOT")
 
 ;;
diff --git a/src/interp/sfsfun.boot b/src/interp/sfsfun.boot
index c6c28253..2496d99c 100644
--- a/src/interp/sfsfun.boot
+++ b/src/interp/sfsfun.boot
@@ -67,7 +67,7 @@
 
 
 
--- Used to be SPECFNSF
+import '"macros"
 )package "BOOT" 
 
 FloatError(formatstring,arg) ==
diff --git a/src/interp/showimp.boot b/src/interp/showimp.boot
index 829aa5e5..a3ff694e 100644
--- a/src/interp/showimp.boot
+++ b/src/interp/showimp.boot
@@ -32,6 +32,7 @@
 -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+import '"macros"
 )package "BOOT"
 
 $returnNowhereFromGoGet := false
diff --git a/src/interp/sockio.lisp b/src/interp/sockio.lisp
index 66b8aebc..de5b8274 100644
--- a/src/interp/sockio.lisp
+++ b/src/interp/sockio.lisp
@@ -32,8 +32,8 @@
 ;; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-;; load C socket functions
 
+(import-module "sys-macros")
 (in-package "BOOT")
 
 #+(and :Lucid (not :ibm/370))
diff --git a/src/interp/spaderror.lisp b/src/interp/spaderror.lisp
index 9d0ec3d3..0653b75e 100644
--- a/src/interp/spaderror.lisp
+++ b/src/interp/spaderror.lisp
@@ -33,6 +33,7 @@
 
 
 ;; this files contains basic routines for error handling
+(import-module "macros")
 (in-package "BOOT")
 
 (defun error-format (message args)
diff --git a/src/interp/termrw.boot b/src/interp/termrw.boot
index 5b876b84..6723b9d1 100644
--- a/src/interp/termrw.boot
+++ b/src/interp/termrw.boot
@@ -31,6 +31,7 @@
 -- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import '"macros"
 )package "BOOT"
  
 termRW(t,R) ==
diff --git a/src/interp/trace.boot b/src/interp/trace.boot
index cb78d843..93999d4f 100644
--- a/src/interp/trace.boot
+++ b/src/interp/trace.boot
@@ -32,6 +32,7 @@
 -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+import '"debug"
 )package "BOOT"
 
 --% Code for tracing functions
diff --git a/src/interp/varini.boot b/src/interp/varini.boot
index 5b755d32..b728fe5e 100644
--- a/src/interp/varini.boot
+++ b/src/interp/varini.boot
@@ -32,6 +32,7 @@
 -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+import '"sys-macros"
 )package "BOOT"
 
 -- Variables to control whether old software calls the new compiler.