1 files changed, 35 insertions, 19 deletions

diff --git a/build/clean.sh b/build/clean.sh
index 5b4c5624a60d..e4465f8a786c 100644
--- a/build/clean.sh
+++ b/build/clean.sh
@@ -1,17 +1,16 @@
 #!/bin/sh
 
+#
+# Attempt to remove as many generated files as we can.
+# Ideally, a well-used development sandbox would look like
+# a pristine checkout after running this script.
+#
+
 if [ \! -f build/version ]; then
     echo 'Must run the clean script from the top-level dir of the libarchive distribution' 1>&2
     exit 1
 fi
 
-#
-# The automake-generated 'maintainer-clean' target does clean up a
-# lot.  If that fails, try plain 'clean' in case we're using the cmake
-# or other makefile.  But don't worry if we can't...
-#
-make maintainer-clean || make clean || true
-
 # If we're on BSD, blow away the build dir under /usr/obj
 rm -rf /usr/obj`pwd`
 
@@ -19,22 +18,32 @@ rm -rf /usr/obj`pwd`
 # Try to clean up a bit more...
 #
 
-find . -name '*.So' | xargs rm
-find . -name '*.a' | xargs rm
-find . -name '*.la' | xargs rm
-find . -name '*.lo' | xargs rm
-find . -name '*.o' | xargs rm
-find . -name '*.orig' | xargs rm
-find . -name '*.po' | xargs rm
-find . -name '*.rej' | xargs rm
-find . -name '*~' | xargs rm
-find . -name '.depend' | xargs rm
+find . -name '*.So' | xargs rm -f
+find . -name '*.a' | xargs rm -f
+find . -name '*.la' | xargs rm -f
+find . -name '*.lo' | xargs rm -f
+find . -name '*.o' | xargs rm -f
+find . -name '*.orig' | xargs rm -f
+find . -name '*.po' | xargs rm -f
+find . -name '*.rej' | xargs rm -f
+find . -name '*~' | xargs rm -f
+find . -name '.depend' | xargs rm -f
 find . -name '.deps' | xargs rm -rf
-find . -name '.dirstamp' | xargs rm
+find . -name '.dirstamp' | xargs rm -f
 find . -name '.libs' | xargs rm -rf
+find . -name 'CMakeFiles' | xargs rm -rf
+find . -name 'cmake_install.cmake' | xargs rm -f
+find . -name 'CTestTestfile.cmake' | xargs rm -f
 
+rm -rf Testing
 rm -rf autom4te.cache
+rm -rf bin
+rm -rf cmake.tmp
+rm -rf libarchive/Testing
 
+rm -f CMakeCache.txt
+rm -f DartConfiguration.tcl
+rm -f Makefile
 rm -f Makefile.in
 rm -f aclocal.m4
 rm -f bsdcpio
@@ -42,7 +51,8 @@ rm -f bsdcpio_test
 rm -f bsdtar
 rm -f bsdtar_test
 rm -f build/autoconf/compile
-rm -f build/autoconf/config.*
+rm -f build/autoconf/config.guess
+rm -f build/autoconf/config.sub
 rm -f build/autoconf/depcomp
 rm -f build/autoconf/install-sh
 rm -f build/autoconf/libtool.m4
@@ -60,7 +70,9 @@ rm -f config.log
 rm -f config.status
 rm -f configure
 rm -f cpio/*.1.gz
+rm -f cpio/Makefile
 rm -f cpio/bsdcpio
+rm -f cpio/test/Makefile
 rm -f cpio/test/bsdcpio_test
 rm -f cpio/test/list.h
 rm -f doc/html/*
@@ -69,13 +81,17 @@ rm -f doc/pdf/*
 rm -f doc/text/*
 rm -f doc/wiki/*
 rm -f libarchive/*.[35].gz
+rm -f libarchive/Makefile
 rm -f libarchive/libarchive.so*
+rm -f libarchive/test/Makefile
 rm -f libarchive/test/libarchive_test
 rm -f libarchive/test/list.h
 rm -f libarchive_test
 rm -f libtool
 rm -f stamp-h1
 rm -f tar/*.1.gz
+rm -f tar/Makefile
 rm -f tar/bsdtar
+rm -f tar/test/Makefile
 rm -f tar/test/bsdtar_test
 rm -f tar/test/list.h