diff --git a/Makefile.pamphlet b/Makefile.pamphlet index 319b866..fad55c8 100644 --- a/Makefile.pamphlet +++ b/Makefile.pamphlet @@ -709,7 +709,10 @@ lspdir: rootdirs ${MNT}/${SYS}/bin/document ${LSP}/Makefile @echo 19 making ${LSP} @mkdir -p ${OBJ}/${SYS}/bin @mkdir -p ${OBJ}/${SYS}/lsp - @(cd lsp ; ${ENV} ${MAKE} gcldir ) + @echo ===================================== + @echo lsp BUILDING GCL COMMON LISP + @echo ===================================== + @(cd lsp ; ${ENV} ${MAKE} gcldir ) 1>/dev/null 2>/dev/null # @(cd lsp ; ${ENV} ${MAKE} ccldir ) <> diff --git a/changelog b/changelog index b312204..e59e5d6 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,7 @@ +20130630 tpd src/axiom-website/patches.html 20130630.01.tpd.patch +20130630 tpd src/interp/Makefile make cleanup +20130630 tpd src/algebra/Makefile make cleanup +20130630 tpd Makefile make cleanup 20130625 tpd src/axiom-website/patches.html 20130625.02.tpd.patch 20130625 tpd src/interp/br-con.lisp move code to bookvol5 20130625 tpd books/bookvol5 move code from br-con.lisp diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet index 2e12f8f..f5d42e0 100644 --- a/src/algebra/Makefile.pamphlet +++ b/src/algebra/Makefile.pamphlet @@ -17425,12 +17425,13 @@ ${OUT}/%.o: ${MID}/%.nrlib/code.o .PRECIOUS: ${MID}/%.nrlib/code.o ${MID}/%.nrlib/code.o: ${MID}/%.spad @ echo sa07 compiling $*.spad to $*.nrlib - @ (cd ${MID} ; \ - if [ -z "${NOISE}" ] ; then \ - echo ")co $*.spad" | ${INTERPSYS} ; \ + @ if [ -z "${NOISE}" ] ; then \ + (cd ${MID} ; \ + echo ")co $*.spad" | ${INTERPSYS} ) ; \ else \ - echo ")co $*.spad" | ${INTERPSYS} 1>/dev/null 2>/dev/null ; \ - fi ) + (cd ${MID} ; \ + echo ")co $*.spad" | ${INTERPSYS} ) 1>/dev/null 2>/dev/null ; \ + fi @ <>= diff --git a/src/axiom-website/patches.html b/src/axiom-website/patches.html index dd04a8d..95f1861 100644 --- a/src/axiom-website/patches.html +++ b/src/axiom-website/patches.html @@ -4222,6 +4222,8 @@ books/bookvol5 move code from br-con.lisp Makefiles cleanup 20130625.02.tpd.patch books/bookvol5 move code from br-con.lisp +20130630.01.tpd.patch +src/interp/Makefile make cleanup diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet index bf22ba7..cd079ae 100644 --- a/src/interp/Makefile.pamphlet +++ b/src/interp/Makefile.pamphlet @@ -2933,223 +2933,70 @@ clean: <> <> -<> -<> - -<> - -<> - -<> - -<> - -<> -<> - -<> - -<> - -<> -<> - <> -<> - -<> - -<> - -<> -<> - -<> - -<> - -<> - -<> -<> - -<> -<> - -<> - -<> - -<> - -<> - -<> - -<> - -<> - -<> - -<> - -<> <> <> -<> <> <> -<> <> <> -<> - -<> - -<> - -<> - -<> - -<> - -<> - -<> - -<> - -<> - -<> - -<> - -<> - -<> -<> - -<> -<> - -<> -<> - -<> -<> - -<> -<> - -<> -<> - -<> -<> - -<> -<> - -<> -<> - -<> -<> - -<> -<> - -<> -<> - -<> -<> - -<> -<> - -<> - -<> - -<> - -<> - -<> - -<> - -<> -<> -<> - -<> - -<> - -<> - -<> - -<> - -<> - -<> - -<> - -<> - -<> - -<> -<> - -<> - -<> - -<> - -<> +<> -<> -<> +${MID}/http.lisp: ${IN}/http.lisp + @ echo si110 making ${MID}/http.lisp from ${IN}/http.lisp + @( cp ${IN}/http.lisp ${MID}/http.lisp ) -<> -<> +${OUT}/%.${LISP}: ${MID}/%.lisp + @ echo siOUTfromMID making ${OUT}/$*.lisp from ${MID}/$*.lisp + @cp ${MID}/$*.lisp ${OUT}/$*.${LISP} -<> +${OUT}/%.lisp: ${IN}/%.lisp.pamphlet + @ echo siOUTfromIN making ${OUT}/$*.lisp from ${IN}/$*.lisp.pamphlet + @ rm -f ${OUT}/$*.${O} + @( cd ${OUT} ; \ + echo '(tangle "${IN}/$*.lisp.pamphlet" "*" "$*.lisp")' \ + | ${OBJ}/${SYS}/bin/lisp ) 1>/dev/null -<> +${OUT}/%.o: ${MID}/%.lisp + @ echo siOUTfromMID making ${OUT}/$*.o from ${MID}/$*.lisp + @ if [ -z "${NOISE}" ] ; then \ + (cd ${MID} ; \ + echo '(progn (compile-file "$*.lisp"' \ + ':output-file "${OUT}/$*.o") (${BYE}))' | ${DEPSYS} ) ; \ + else \ + (cd ${MID} ; \ + echo '(progn (compile-file "$*.lisp"' \ + ':output-file "${OUT}/$I.o") (${BYE}))' | ${DEPSYS} ) \ + 1>/dev/null 2>/dev/null ; \ + fi -#${OUT}/%.o: ${MID}/%.lisp -# @ echo generic making ${OUT}/$*.o from ${MID}/$*.lisp -# @ ( cd ${MID} ; \ -# if [ -z "${NOISE}" ] ; then \ -# echo '(progn (compile-file "vmlisp.lisp"' \ -# ':output-file "${OUT}/$*.o") (${BYE}))' | ${DEPSYS} ; \ -# else \ -# echo '(progn (compile-file "vmlisp.lisp"' \ -# ':output-file "${OUT}/$I.o") (${BYE}))' | ${DEPSYS} \ -# 1>/dev/null 2>/dev/null ; \ -# fi ) -# ${MID}/%.lisp: ${IN}/%.lisp.pamphlet @ echo siMIDfromIN making ${MID}/$*.lisp from ${IN}/$*.lisp.pamphlet @ (cd ${MID} ; \ ( echo '(tangle "${IN}/$*.lisp.pamphlet" "*" "$*.lisp")' \ | ${OBJ}/${SYS}/bin/lisp 1>/dev/null ) ) +${AUTO}/%.${O}: ${OUT}/%.${O} + @ echo siAUTOfromOUT making ${AUTO}/$*.${O} from ${OUT}/$*.${O} + @ cp ${OUT}/$*.${O} ${AUTO} + +${OUT}/%.${O}: ${MID}/%.${LISP} + @ echo si123 making ${OUT}/$*.${O} from ${MID}/$*.${LISP} + @ if [ -z "${NOISE}" ] ; then \ + (cd ${MID} ; \ + echo '(progn (compile-file "${MID}/$*.${LISP}"' \ + ':output-file "${OUT}/$*.${O}") (${BYE}))' | ${DEPSYS} ) ; \ + else \ + (cd ${MID} ; \ + echo '(progn (compile-file "${MID}/$*.${LISP}"' \ + ':output-file "${OUT}/$*.${O}") (${BYE}))' | ${DEPSYS} ) \ + 1>/dev/null 2>/dev/null ; \ + fi + @ \eject \begin{thebibliography}{99}