From 1ee7a0030053e2447302d8157b9d3356a54e9b3a Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Mon, 17 Sep 2007 22:50:50 +0000
Subject: 	Fix SF/1792002 	* util.lisp.pamphlet (build-interpsys): Lose
 parse-files, 	comp-files and browse-files parameters.  Don't set AutoLoad 
 properties for those files anymore. 	(parse-functions): Remove definition. 
 (comp-functions): Likewise. 	(browse-functions): Likewise. 	(|tr|): Don't
 call |oldCompilerAutoloadOnceTrigger| and 	|browserAutloadOnceTrigger|
 anymore. 	* daase.lisp.pamphlet (make-databases): Don't call 
 |oldCompilerAutoloadOnceTrigger| anymore. 	* compiler.boot.pamphlet
 (compileSpad2Cmd): Don't call 	oldParserAutoloadOnceTrigger anymore. 	*
 bootlex.lisp (|oldParserAutoloadOnceTrigger|): Remove. 	*
 Makefile.pamphlet (OBJS): Include $(OPOBJS), $(OCOBJS) and 	$(BROBJS). 
 (OPOBJS): Objects are not in autoload directory anymore. 	(OCOBJS):
 Likewise. 	(BROBJS): Likewise. 	(makeint.lisp): Remove explicit
 dependency on $(OCOBJS), $(OPOBJS) 	and $(BROBJS).  Don't call
 build-interpsys with those arguments 	anymore. 	* Makefile.in:
 Regenerate.

---
 src/interp/Makefile.in | 57 ++++++++++++++++++++++++++------------------------
 1 file changed, 30 insertions(+), 27 deletions(-)

(limited to 'src/interp/Makefile.in')

diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in
index 84eb57ba..2e94d9af 100644
--- a/src/interp/Makefile.in
+++ b/src/interp/Makefile.in
@@ -104,7 +104,10 @@ OBJS=	vmlisp.$(FASLEXT)	hash.$(FASLEXT)	\
 	template.$(FASLEXT)	termrw.$(FASLEXT)	\
 	trace.$(FASLEXT)	\
 	union.$(FASLEXT)       daase.$(FASLEXT)  	\
-	fortcall.$(FASLEXT)
+	fortcall.$(FASLEXT) \
+	$(OPOBJS) \
+	$(OCOBJS) \
+	$(BROBJS)
 
 interpsys_modules = $(patsubst %.$(FASLEXT), "%", $(OBJS))
 
@@ -145,35 +148,35 @@ INOBJS=	varini.$(FASLEXT)	\
 IN_modules = $(patsubst %.$(FASLEXT), "%", $(INOBJS))
 
 # These are autloaded old parser files
-OPOBJS=	${AUTO}/parsing.$(FASLEXT)	${AUTO}/bootlex.$(FASLEXT)	\
-        ${AUTO}/def.$(FASLEXT)	\
-	${AUTO}/fnewmeta.$(FASLEXT)	${AUTO}/metalex.$(FASLEXT)	\
-	${AUTO}/parse.$(FASLEXT)	${AUTO}/postpar.$(FASLEXT)	\
-	${AUTO}/postprop.$(FASLEXT)	${AUTO}/preparse.$(FASLEXT)
+OPOBJS=	parsing.$(FASLEXT)	bootlex.$(FASLEXT)	\
+        def.$(FASLEXT)	\
+	fnewmeta.$(FASLEXT)	metalex.$(FASLEXT)	\
+	parse.$(FASLEXT)	postpar.$(FASLEXT)	\
+	postprop.$(FASLEXT)	preparse.$(FASLEXT)
 
 autoload_objects += $(OPBJS)
-OCOBJS=	${AUTO}/apply.$(FASLEXT)	${AUTO}/c-doc.$(FASLEXT)	\
-	${AUTO}/c-util.$(FASLEXT)	${AUTO}/profile.$(FASLEXT)	\
-	${AUTO}/category.$(FASLEXT)	${AUTO}/compiler.$(FASLEXT)	\
-	${AUTO}/define.$(FASLEXT)	${AUTO}/functor.$(FASLEXT)	\
-	${AUTO}/info.$(FASLEXT)	${AUTO}/iterator.$(FASLEXT)	\
-	${AUTO}/modemap.$(FASLEXT)	${AUTO}/nruncomp.$(FASLEXT)	\
-	${AUTO}/package.$(FASLEXT)	${AUTO}/htcheck.$(FASLEXT)	\
-        ${AUTO}/xruncomp.$(FASLEXT)   
+OCOBJS=	apply.$(FASLEXT)	c-doc.$(FASLEXT)	\
+	c-util.$(FASLEXT)	profile.$(FASLEXT)	\
+	category.$(FASLEXT)	compiler.$(FASLEXT)	\
+	define.$(FASLEXT)	functor.$(FASLEXT)	\
+	info.$(FASLEXT)	iterator.$(FASLEXT)	\
+	modemap.$(FASLEXT)	nruncomp.$(FASLEXT)	\
+	package.$(FASLEXT)	htcheck.$(FASLEXT)	\
+        xruncomp.$(FASLEXT)   
 
 autoload_objects += $(OCOBJS)
 
-BROBJS=	${AUTO}/bc-matrix.$(FASLEXT)				\
-	${AUTO}/bc-misc.$(FASLEXT)	${AUTO}/bc-solve.$(FASLEXT)	\
-	${AUTO}/bc-util.$(FASLEXT)				\
-	${AUTO}/ht-util.$(FASLEXT)	${AUTO}/htsetvar.$(FASLEXT)	\
-	${AUTO}/ht-root.$(FASLEXT)	\
-	${AUTO}/br-con.$(FASLEXT)	\
-	${AUTO}/br-data.$(FASLEXT)	${AUTO}/showimp.$(FASLEXT)    \
-	${AUTO}/br-op1.$(FASLEXT)	${AUTO}/br-op2.$(FASLEXT)	\
-	${AUTO}/br-search.$(FASLEXT)	${AUTO}/br-util.$(FASLEXT)	\
-	${AUTO}/topics.$(FASLEXT)     ${AUTO}/br-prof.$(FASLEXT)    \
-	${AUTO}/br-saturn.$(FASLEXT)
+BROBJS=	bc-matrix.$(FASLEXT)				\
+	bc-misc.$(FASLEXT)	bc-solve.$(FASLEXT)	\
+	bc-util.$(FASLEXT)				\
+	ht-util.$(FASLEXT)	htsetvar.$(FASLEXT)	\
+	ht-root.$(FASLEXT)	\
+	br-con.$(FASLEXT)	\
+	br-data.$(FASLEXT)	showimp.$(FASLEXT)    \
+	br-op1.$(FASLEXT)	br-op2.$(FASLEXT)	\
+	br-search.$(FASLEXT)	br-util.$(FASLEXT)	\
+	topics.$(FASLEXT)     br-prof.$(FASLEXT)    \
+	br-saturn.$(FASLEXT)
 
 autoload_objects += $(BFOBJS)
 
@@ -275,7 +278,7 @@ distclean-local: clean-local
 
 makeint.lisp:	${DEPSYS} ${OBJS} bookvol5.$(FASLEXT) util.$(FASLEXT) \
                 nocompil.lisp \
-	        ${OUTINTERP} ${OCOBJS} ${OPOBJS} ${BROBJS} obey.$(FASLEXT) \
+	        ${OUTINTERP} obey.$(FASLEXT) \
 		database.date ${INOBJS} ${ASCOMP} ${ASAUTO} \
 		${NAGBROBJS} ${TRANOBJS} \
 	        ${LOADSYS} \
@@ -296,7 +299,7 @@ makeint.lisp:	${DEPSYS} ${OBJS} bookvol5.$(FASLEXT) util.$(FASLEXT) \
 	@ echo '(in-package "BOOT")' >> makeint.lisp
 	@ touch ${TIMESTAMP}
 	@ echo '${YEARWEEK}' >> makeint.lisp
-	@ echo '(boot::build-interpsys (append (quote ($(interpsys_modules))) (quote ($(AS_modules))) (quote ($(IN_modules)))) (quote ($(patsubst %, "%", ${OPOBJS}))) (quote ($(patsubst %, "%", ${OCOBJS}))) (quote ($(patsubst %, "%", ${BROBJS}))) (quote ($(patsubst %, "%", ${TRANOBJS}))) (quote ($(patsubst %, "%", ${NAGBROBJS}))) (quote ($(patsubst %, "%", ${ASAUTO})))  "${AXIOM}")' >> makeint.lisp
+	@ echo '(boot::build-interpsys (append (quote ($(interpsys_modules))) (quote ($(AS_modules))) (quote ($(IN_modules))))  (quote ($(patsubst %, "%", ${TRANOBJS}))) (quote ($(patsubst %, "%", ${NAGBROBJS}))) (quote ($(patsubst %, "%", ${ASAUTO})))  "${AXIOM}")' >> makeint.lisp
 	@ echo '(boot::set-restart-hook)' >> makeint.lisp
 	@ echo '(in-package "BOOT")' >> makeint.lisp
 	@ echo '(load "../algebra/warm.data")' >> makeint.lisp
-- 
cgit v1.2.3