diff --git a/tools/distclean b/tools/distclean
index 5b3388cd024f442666c337edde5fd4afeb1f1370..f4ec20bd1d11a7ae06cdc51ab551adf7253bf6e8 100755 (executable)
--- a/tools/distclean
+++ b/tools/distclean
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 distclean
+ make -i distclean
if [ $? -ne 0 ]; then
echo "Uh-oh! Make distclean failed."
- echo "Please run './config.status' and try again."
exit 1
fi
fi
echo "$0: Removing auto* files..."
rm -rf autom4te.cache
-find . -type f -name Makefile.in -print0| xargs -0 rm -f
+find . -type f -name Makefile.in -print| xargs rm -f
rm -f aclocal.m4 compile config.guess config.h.in config.sub configure depcomp
rm -f m4/Makefile.am
echo "$0: Removing miscelanious files..."
rm -f po/*.gmo po/stamp-po
+rm -f lib/tests/*.Po
rm -f doc/developer-guidelines.html
rm -f INSTALL install-sh missing
rm -f plugins/t/check_nagios.nagios?.status.???.tmp