X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=clean.sh;h=4b84302272f8fe3096b126ab64a39324eeb75350;hb=3c5c2c265637357e88cb5bb36bcfdc5569bdea4c;hp=72ad69d213ad3d9fe1e1dca5cd0ab7351b20d990;hpb=d7f6139a91d7d9b0667a597584ae306d958bb2f4;p=sbcl.git

diff --git a/clean.sh b/clean.sh
index 72ad69d..4b84302 100755
--- a/clean.sh
+++ b/clean.sh
@@ -22,18 +22,27 @@ 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.
-pwd=`pwd`
+original_pwd=`pwd`
 for d in tools-for-build; do
-    cd $d
-    make clean
-    cd $pwd
+    cd $d > /dev/null
+    # I hope the -s option is standard. At least GNU make and BSD make
+    # support it. It silences make, since otherwise the output from
+    # this script is just the operations done by these make's, which
+    # is misleading when this script does lotso other operations too.
+    # -- WHN
+    $GNUMAKE -I ../src/runtime -s clean
+    cd $original_pwd  > /dev/null
 done
 
 # Within all directories, remove things which don't look like source
 # files. Some explanations:
 #   (symlinks)
-#     are never in the sources; they must've been created
+#     are never in the sources, so must've been created
 #   sbcl
 #     the runtime environment, created by compiling C code
 #   sbcl.h 
@@ -45,42 +54,58 @@ 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
 #     certainly not source
-#   *~, #*#, TAGS
+#   *~, #*#
 #     common names for editor temporary files
+#   TAGS, tags
+#     files created by GNU etags and ctags
+#   .#*, *.orig, .*.orig, *.rej
+#     rubbish left behind by CVS updates
 #   *.htm, *.html
-#     The system doc sources are SGML, any HTML is automatically 
-#     generated output.
+#     The system doc sources are SGML, any HTML is
+#     automatically-generated output.
 #   depend
 #     made by "make depend" (or "gmake depend" or some such thing)
-#   *.x86f, *.axpf, *.lbytef, *.fasl
-#     typical extensions for fasl files
+#   *.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 -or \
-	-name '*~' -or \
-	-name '#*#' -or \
-	-name '?*.x86f' -or \
-	-name '?*.axpf' -or \
-	-name '?*.lbytef' -or \
-	-name '?*.fasl' -or \
-	-name 'core' -or \
-	-name '?*.core' -or \
-	-name '*.map' -or \
-	-name '*.nm' -or \
-	-name '*.host-obj' -or \
-	-name '*.lisp-obj' -or \
-	-name '*.target-obj' -or \
-	-name '*.lib' -or \
-	-name '*.tmp' -or \
-	-name '*.o' -or \
-	-name 'sbcl' -or \
-	-name 'sbcl.h' -or \
-	-name 'depend' -or \
-	-name '*.htm' -or \
-	-name '*.html' -or \
-	-name 'TAGS' -or \
+	-type l -o \
+	-name '*~' -o \
+	-name '#*#' -o \
+	-name '.#*' -o \
+	-name '*.orig' -o \
+	-name '.*.orig' -o \
+        -name '*.rej' -o \
+	-name '?*.x86f' -o \
+	-name '?*.axpf' -o \
+	-name '?*.lbytef' -o \
+	-name '?*.fasl' -o \
+	-name 'core' -o \
+	-name '?*.core' -o \
+	-name '*.map' -o \
+	-name '*.nm' -o \
+	-name '*.host-obj' -o \
+	-name '*.lisp-obj' -o \
+	-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 'TAGS' -o \
+	-name 'tags' -o \
+	-name 'test-passed' -o \
 	-name 'local-target-features.lisp-expr' \) -print | xargs rm -f
+
+cd doc && sh ./clean.sh