From 154daf2e85eaa209486de6d41e8a1b067590bb8e Mon Sep 17 00:00:00 2001 From: dos-reis Date: Fri, 12 Oct 2007 04:33:34 +0000 Subject: * Makefile.pamphlet (${DEPSYS}): Depend on g-util.$(FASLEXT). Load explicitly. (<>): Remove. (<>): Likewise. (<>): Likewise. (<>): Likewise. (<>): Likewise. (<>): Likewise. (<>): Likewise. (<>): Likewise. (<>): Likewise. (<>): Likewise. (ht-root.$(FASLEXT)): New rule. (htcheck.$(FASLEXT)): Likewise. (ht-util.$(FASLEXT)): Likewise. (htsetvar.$(FASLEXT)): Likewise. (hypertex.$(FASLEXT)): Likewise. (profile.$(FASLEXT)): Likewise. (rulesets.$(FASLEXT)): Likewise. (g-opt.$(FASLEXT)): Likewise. (g-timer.$(FASLEXT)): Likewise. (g-util.$(FASLEXT)): Likewise. (g-cndata.$(FASLEXT)): Likewise. * daase.lisp.pamphlet (*attributes*): Move definition to sys-constants.boot. * g-cndata.boot.pamphlet: Push into package "BOOT". Fix syntax. * g-opt.boot.pamphlet: Likewise. (EqualBarGensym): Fix thinko. * g-timer.boot.pamphlet: Push into package "BOOT". * g-util.boot.pamphlet: Likewise. * ht-root.boot.pamphlet: Likewise. Fix syntax. * ht-util.boot.pamphlet: Push into package "BOOT". * htcheck.boot.pamphlet: Likewise. * htsetvar.boot.pamphlet: Likewise. * hypertex.boot.pamphlet: Likewise. Fix syntax. * profile.boot.pamphlet: Likewise. * rulesets.boot.pamphlet: Likewise. * setq.lisp.pamphlet (/VERSION): Move definition to sys-globals.boot. * spad.lisp.pamphlet (/WSNAME): Likewise. (|rplac|): Move to sys-macros.boot. --- src/interp/Makefile.pamphlet | 146 ++++++++++++------------------------------- 1 file changed, 41 insertions(+), 105 deletions(-) (limited to 'src/interp/Makefile.pamphlet') diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet index ebec650c..54889009 100644 --- a/src/interp/Makefile.pamphlet +++ b/src/interp/Makefile.pamphlet @@ -994,7 +994,7 @@ ${DEPSYS}: vmlisp.$(FASLEXT) \ fnewmeta.$(FASLEXT) \ g-error.clisp \ g-boot.clisp c-util.${LISP} \ - g-util.clisp \ + g-util.$(FASLEXT) \ clam.clisp \ slam.clisp @ echo 3 making ${DEPSYS} @@ -1035,11 +1035,10 @@ ${DEPSYS}: vmlisp.$(FASLEXT) \ @ 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 '(unless (probe-file "g-util.$(FASLEXT)") (|compileLispFile| "g-util.clisp" "g-util.$(FASLEXT)"))' >> makedep.lisp - @ echo '(load "g-util")' >> makedep.lisp + @ echo '(|importModule| "g-util")' >> makedep.lisp <> @rm $(addsuffix .$(FASLEXT), \ - clam slam g-error g-boot c-util g-util) + clam slam g-error g-boot c-util) @ echo 4 ${DEPSYS} created @@ -1225,14 +1224,6 @@ compiler.clisp: compiler.boot @ echo '(old-boot::boot "compiler.boot")' | ${DEPSYS} @ -\subsection{profile.boot \cite{65}} - -<>= -profile.clisp: profile.boot - @ echo 237 making $@ from $< - @ echo '(old-boot::boot "profile.boot")' | ${DEPSYS} -@ - \subsection{database.boot \cite{67}} <>= @@ -1265,39 +1256,6 @@ functor.clisp: functor.boot @ echo '(old-boot::boot "functor.boot")' | ${DEPSYS} @ -\subsection{g-cndata.boot} - -<>= -g-cndata.clisp: g-cndata.boot - @ echo 261 making $@ from $< - @ echo '(old-boot::boot "g-cndata.boot")' | ${DEPSYS} -@ - -\subsection{g-opt.boot} - -<>= -g-opt.clisp: g-opt.boot - @ echo 267 making $@ from $< - @ echo '(old-boot::boot "g-opt.boot")' | ${DEPSYS} -@ - -\subsection{g-timer.boot} - -<>= -g-timer.clisp: g-timer.boot - @ echo 270 making $@ from $< - @ echo '(old-boot::boot "g-timer.boot")' | ${DEPSYS} -@ - - -\subsection{hypertex.boot} - -<>= -hypertex.clisp: hypertex.boot - @ echo 277 making $@ from $< - @ echo '(old-boot::boot "hypertex.boot")' | ${DEPSYS} -@ - \subsection{i-analy.boot} <>= @@ -1536,14 +1494,6 @@ if these two things are done then a DEPSYS image can be bootstrapped to a new platform. \end{verbatim} -\subsection{rulesets.boot} - -<>= -rulesets.clisp: rulesets.boot - @ echo 388 making $@ from $< - @ echo '(old-boot::boot "rulesets.boot")' | ${DEPSYS} -@ - \subsection{server.boot} <>= @@ -1585,22 +1535,6 @@ bc-solve.clisp: bc-solve.boot @ echo '(old-boot::boot "bc-solve.boot")' | ${DEPSYS} @ -\subsection{ht-util.boot} - -<>= -ht-util.clisp: ht-util.boot - @ echo 440 making $@ from $< - @ echo '(old-boot::boot "ht-util.boot")' | ${DEPSYS} -@ - -\subsection{htsetvar.boot} - -<>= -htsetvar.clisp: htsetvar.boot - @ echo 444 making $@ from $< - @ echo '(old-boot::boot "htsetvar.boot")' | ${DEPSYS} -@ - \subsection{record.boot} <>= @@ -1609,22 +1543,6 @@ record.clisp: record.boot @ echo '(old-boot::boot "record.boot")' | ${DEPSYS} @ -\subsection{ht-root.boot} - -<>= -ht-root.clisp: ht-root.boot - @ echo 451 making $@ from $< - @ echo '(old-boot::boot "ht-root.boot")' | ${DEPSYS} -@ - -\subsection{htcheck.boot} - -<>= -htcheck.clisp: htcheck.boot - @ echo 455 making $@ from $< - @ echo '(old-boot::boot "htcheck.boot")' | ${DEPSYS} -@ - \subsection{ax.boot} <>= @@ -1788,6 +1706,31 @@ distclean-local: clean-local $(AUTO)/%.$(FASLEXT): %.$(FASLEXT) $(INSTALL) $< $@ +## HyperDoc +ht-root.$(FASLEXT): ht-root.boot ht-util.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + +htcheck.$(FASLEXT): htcheck.boot sys-driver.$(FASLEXT) macros.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + +ht-util.$(FASLEXT): ht-util.boot macros.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + +htsetvar.$(FASLEXT): htsetvar.boot macros.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + +hypertex.$(FASLEXT): hypertex.boot boot-pkg.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + +## OpenAxiom's interpreter. + +profile.$(FASLEXT): profile.boot macros.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + +rulesets.$(FASLEXT): rulesets.boot vmlisp.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + + ## ## OpenAxiom's front-end consists of two parts: ## (a) the interprerter's parser -- also referred to as new parser @@ -1890,6 +1833,19 @@ dq.$(FASLEXT): dq.boot boot-pkg.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< ## General support and utilities. + +g-opt.$(FASLEXT): g-opt.boot def.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + +g-timer.$(FASLEXT): g-timer.boot macros.$(FASLEXT) g-util.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + +g-util.$(FASLEXT): g-util.boot macros.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + +g-cndata.$(FASLEXT): g-cndata.boot sys-macros.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + sys-macros.$(FASLEXT): sys-macros.lisp diagnostics.$(FASLEXT) \ union.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< @@ -1970,22 +1926,6 @@ boot-pkg.$(FASLEXT): boot-pkg.lisp <> -<> - -<> - -<> - -<> - -<> - -<> - -<> - -<> - <> <> @@ -2038,12 +1978,8 @@ boot-pkg.$(FASLEXT): boot-pkg.lisp <> -<> - <> -<> - <> <> -- cgit v1.2.3