X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=clean.sh;h=92d814476270cdbb69cb324440d2fde8dec89dff;hb=cd13034f9415f64cdaa05893a4ac5ff1e95c97bd;hp=351150b20be60486827f7d94a40c13cab52237fb;hpb=bb7c5beef3a2c45f0ff99f8038409dc4787aa295;p=sbcl.git

diff --git a/clean.sh b/clean.sh
index 351150b..92d8144 100755
--- a/clean.sh
+++ b/clean.sh
@@ -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,8 @@ 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)
+#   test-passed
+#     generated by automatic directory-test-thyself procedure
 find . \( \
 	-type l -o \
 	-name '*~' -o \
@@ -76,6 +82,7 @@ find . \( \
 	-name '.#*' -o \
 	-name '*.orig' -o \
 	-name '.*.orig' -o \
+        -name '*.rej' -o \
 	-name '?*.x86f' -o \
 	-name '?*.axpf' -o \
 	-name '?*.lbytef' -o \
@@ -89,13 +96,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