tools/distclean: use git-clean when possible

git-clean is much faster and more reliable...

Also add confdefs.h in gitignore, although this file is normally removed
at the end of the configure script.

diff --git a/.gitignore b/.gitignore
index da856290a25f84d27e60dd29e2f2bb7beb2c678e..7def6f8071eabbd763ba1e319534d153f1e34ab9 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ NP-VERSION-FILE
 /Cache.pm
 /command.cfg
 /compile
+/confdefs.h
 /config.*
 /configure
 /debian

diff --git a/tools/distclean b/tools/distclean
index f5e0ecef373c439c83928e22ab1fcb86c0b17bd7..f4ec20bd1d11a7ae06cdc51ab551adf7253bf6e8 100755 (executable)
--- a/tools/distclean
+++ b/tools/distclean
@@ -10,6 +10,18 @@ if [ ! -f tools/distclean ]; then
   exit 1
 fi
 
+# First try git-clean, removing all ignored files will be perfect...
+if [ -d ".git" ]; then
+  echo "$0: Running 'git clean -fdX', this will remove all files ignored by git..."
+       git clean -fdX
+       if [ "$?" -eq "0" ]; then
+               echo "$0: Cleanup complete! Have a nice day..."
+               exit 0
+       fi
+       echo "$0: git-clean error, failing back to legacy cleanup!"
+fi
+
+# If we get here, then git-clean did not run or failed. Using the legacy method...
 if [ -f Makefile ]; then
   echo "$0: Makefile present. Cleaning up with 'make distclean'..."
   make -i distclean