X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=clean.sh;h=50feec1f11c14ff88cc75104b11eaea1365d069d;hb=8cd3b7fd2eabd8e7d2f8efa9cd5dd91b428f8a53;hp=46ccee3e88329872dd46fd7ac67dd8f27d3cc2ec;hpb=722703e7cbd3a4b279a4c1baab5d95df2c23cce9;p=sbcl.git

diff --git a/clean.sh b/clean.sh
index 46ccee3..50feec1 100755
--- a/clean.sh
+++ b/clean.sh
@@ -13,7 +13,7 @@
 # this script (including "gmake clean" in the src/runtime directory)
 # several times in a row without failure.. so we leave the output/
 # directory in place.)
-rm -rf obj/* output/* doc/user-manual \
+rm -rf obj/* output/* src/runtime/genesis/ doc/user-manual \
   doc/user-manual.junk doc/DBTOHTML_OUTPUT_DIR*
 # (The doc/user-manual.junk and doc/DBTOHTML_OUTPUT_DIR* directories
 # are created by the Cygnus db2html script when it formats the the
@@ -22,6 +22,10 @@ rm -rf obj/* output/* doc/user-manual \
 # distribution, we automatically clean up after it here in the 
 # standard clean.sh file.)
 
+# Ensure we know GNUMAKE
+. ./find-gnumake.sh
+find_gnumake
+
 # Ask some other directories to clean themselves up.
 original_pwd=`pwd`
 for d in tools-for-build; do
@@ -31,7 +35,7 @@ for d in tools-for-build; do
     # this script is just the operations done by these make's, which
     # is misleading when this script does lotso other operations too.
     # -- WHN
-    make -s clean
+    $GNUMAKE -I ../src/runtime -s clean
     cd $original_pwd  > /dev/null
 done
 
@@ -50,7 +54,7 @@ done
 #     probably machine-generated translation of DocBook (*.sgml) files
 #   core
 #     probably a Unix core dump -- not part of the sources anyway
-#   *.o, *.lib, *.nm
+#   *.o, *.so, *.lib, *.nm, a.out
 #     results of C-style linking, assembling, etc.
 #   *.core, *.map
 #     looks like SBCL SAVE-LISP-AND-DIE or GENESIS output, and
@@ -59,7 +63,7 @@ done
 #     common names for editor temporary files
 #   TAGS, tags
 #     files created by GNU etags and ctags
-#   .#*, *.orig, .*.orig
+#   .#*, *.orig, .*.orig, *.rej
 #     rubbish left behind by CVS updates
 #   *.htm, *.html
 #     The system doc sources are SGML, any HTML is
@@ -69,6 +73,11 @@ done
 #   *.lisp-obj, *.fasl, *.x86f, *.axpf, *.lbytef, *.lib
 #     typical extensions for fasl files (not just from SBCL, but
 #     from other Lisp systems which might be used as xc hosts)
+#   *.tmp, *.lisp-temp
+#     conventional names for temporary files autogenerated in
+#     building or testing
+#   test-passed
+#     generated by automatic directory-test-thyself procedure
 find . \( \
 	-type l -o \
 	-name '*~' -o \
@@ -76,6 +85,7 @@ find . \( \
 	-name '.#*' -o \
 	-name '*.orig' -o \
 	-name '.*.orig' -o \
+        -name '*.rej' -o \
 	-name '?*.x86f' -o \
 	-name '?*.axpf' -o \
 	-name '?*.lbytef' -o \
@@ -89,12 +99,16 @@ find . \( \
 	-name '*.target-obj' -o \
 	-name '*.lib' -o \
 	-name '*.tmp' -o \
+	-name '*.lisp-temp' -o \
 	-name '*.o' -o \
+	-name '*.so' -o \
+	-name 'a.out' -o \
 	-name 'sbcl' -o \
 	-name 'sbcl.h' -o \
 	-name 'depend' -o \
-	-name '*.htm' -o \
-	-name '*.html' -o \
 	-name 'TAGS' -o \
 	-name 'tags' -o \
+	-name 'test-passed' -o \
 	-name 'local-target-features.lisp-expr' \) -print | xargs rm -f
+
+cd doc && sh ./clean.sh