Fix cleaning rules to eliminate stuff generated by C back end.

diff --git a/v7/src/compiler/Clean.sh b/v7/src/compiler/Clean.sh
index ce64bb81b9b26db3983bd3ec6a445a20c82ae7cc..102a54f8aa52bef91ffb09226856b01c35c24058 100755 (executable)
--- a/v7/src/compiler/Clean.sh
+++ b/v7/src/compiler/Clean.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-# $Id: Clean.sh,v 1.8 2003/02/14 18:48:11 cph Exp $
+# $Id: Clean.sh,v 1.9 2006/09/29 19:28:54 cph Exp $
 #
-# Copyright 2000,2001,2003 Massachusetts Institute of Technology
+# Copyright 2000,2001,2003,2006 Massachusetts Institute of Technology
 #
 # This file is part of MIT/GNU Scheme.
 #
@@ -25,16 +25,19 @@
 # The working directory must be the compiler directory.
 
 if [ $# -ne 1 ]; then
-    echo "usage: $0 <command>"
+    echo "usage: ${0} <command>"
     exit 1
 fi
 
-../etc/Clean.sh "${1}" rm-pkg
+TOPDIR="${TOPDIR:-$(pwd)/..}"
+export TOPDIR
+CLEANSH="${TOPDIR}/etc/Clean.sh"
+"${CLEANSH}" "${1}" rm-pkg
 
 for SUBDIR in back base fggen fgopt machine rtlbase rtlgen rtlopt; do
-    if [ -d ${SUBDIR} ]; then
+    if [ -d "${SUBDIR}" ]; then
        echo "making ${1} in ${SUBDIR}"
-       (cd ${SUBDIR} && rm -f *.bin *.ext *.com *.bci)
+       (cd "${SUBDIR}" && "${CLEANSH}" "${1}" rm-bin rm-com)
     fi
 done
 

diff --git a/v7/src/etc/Clean.sh b/v7/src/etc/Clean.sh
index 11a6eef37bcdcac9d4bb83156955bd5b57fa2633..cd39bf3823a26c1fd587d80b371bf6829d954b36 100755 (executable)
--- a/v7/src/etc/Clean.sh
+++ b/v7/src/etc/Clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: Clean.sh,v 1.13 2006/09/28 23:48:27 cph Exp $
+# $Id: Clean.sh,v 1.14 2006/09/29 19:28:56 cph Exp $
 #
 # Copyright 2000,2001,2002,2006 Massachusetts Institute of Technology
 #
@@ -60,7 +60,8 @@ maintainer-clean)
     ;;
 esac
 
-. ../etc/functions.sh
+TOPDIR="${TOPDIR:-..}"
+. "${TOPDIR}/etc/functions.sh"
 
 if [ "${DIST}" = "yes" ]; then
     if [ -f Makefile.in ] && [ -f Makefile ]; then
@@ -70,10 +71,10 @@ if [ "${DIST}" = "yes" ]; then
 fi
 
 if [ "${MAINTAINER}" = "yes" ]; then
-    maybe_unlink Makefile ../Makefile.std
+    maybe_unlink Makefile "${TOPDIR}/Makefile.std"
     maybe_unlink .edwin-ffi ed-ffi.scm
     for FN in Clean.sh Setup.sh Stage.sh Tags.sh; do
-       maybe_unlink "${FN}" "../etc/${FN}"
+       maybe_unlink "${FN}" "${TOPDIR}/etc/${FN}"
     done
 fi
 
@@ -92,8 +93,8 @@ for KEYWORD in ${KEYWORDS}; do
        rm -f *.bco *.bld *.glo *.con *.ldr
        ;;
     rm-pkg)
-       echo "rm -f *.crf *.fre *.pkd"
-       rm -f *.crf *.fre *.pkd
+       echo "rm -f *-unx.* *-w32.* *-os2.*"
+       rm -f *-unx.* *-w32.* *-os2.*
        ;;
     esac
 done

diff --git a/v7/src/microcode/makegen/Makefile.in.in b/v7/src/microcode/makegen/Makefile.in.in
index 05754feb308dfeed8d218f3abbbd522d42f3f402..dd76d924b428a3522e1833bc5fff82b0ad1387ea 100644 (file)
--- a/v7/src/microcode/makegen/Makefile.in.in
+++ b/v7/src/microcode/makegen/Makefile.in.in
@@ -1,6 +1,6 @@
 # -*- Makefile -*-
 #
-# $Id: Makefile.in.in,v 1.30 2006/09/16 11:19:09 gjr Exp $
+# $Id: Makefile.in.in,v 1.31 2006/09/29 19:28:58 cph Exp $
 #
 # Copyright 2000,2001,2002,2003,2005,2006 Massachusetts Institute of Technology
 #
@@ -191,7 +191,8 @@ ALL_PROGRAMS = $(bin_PROGRAMS) $(aux_PROGRAMS)
 ALL_LIBS = $(aux_LIBS)
 ALL_DATA = $(aux_DATA)
 
-MOSTLYCLEAN_FILES = *.o cmpauxmd.s usrdef.c bchdef.c
+MOSTLYCLEAN_FILES = *.o cmpauxmd.s usrdef.c bchdef.c \
+       compinit.h utabmd.c utabmd.bci *.tch
 
 CLEAN_FILES = $(ALL_PROGRAMS) $(ALL_LIBS) $(ALL_DATA) $(EXTRA_PROGRAMS)