From 151508e04e56e1d090b22101b277803ec5d45815 Mon Sep 17 00:00:00 2001
From: Pierre Boutillier
Date: Sat, 18 Jan 2014 11:34:10 +0100
Subject: Fixup make clean and .merlin

---
 .merlin  | 3 +++
 Makefile | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.merlin b/.merlin
index ce5bff525f..f0f0c31c9e 100644
--- a/.merlin
+++ b/.merlin
@@ -1,5 +1,7 @@
 FLG -rectypes
 
+S config
+B config
 S lib
 B lib
 S intf
@@ -27,6 +29,7 @@ B toplevel
 S plugins
 B plugins
 
+PKG lablgtk2.sourceview2
 S ide
 B ide
 S ide/utils
diff --git a/Makefile b/Makefile
index 8aa76d6a1e..10fb51f625 100644
--- a/Makefile
+++ b/Makefile
@@ -166,7 +166,7 @@ cruftclean: ml4clean
 indepclean:
 	rm -f $(GENFILES)
 	rm -f $(COQTOPBYTE) $(CHICKENBYTE) bin/fake_ide
-	find . -name '*~' -o -name '*.cm[ioa]' | xargs rm -f
+	find . \( -name '*~' -o -name '*.cm[ioat]' -o -name '*.cmti' \) -delete
 	rm -f */*.pp[iox] plugins/*/*.pp[iox]
 	rm -rf $(SOURCEDOCDIR)
 	rm -f toplevel/mltop.byteml toplevel/mltop.optml
@@ -222,7 +222,7 @@ cleanconfig:
 distclean: clean cleanconfig
 
 voclean:
-	find theories plugins test-suite -name '*.vo' -o -name '*.glob' -o -name "*.cmxs" -o -name "*.native" -o -name "*.cmx" -o -name "*.cmi" -o -name "*.o" | xargs rm -f
+	find theories plugins test-suite \( -name '*.vo' -o -name '*.glob' -o -name "*.cmxs" -o -name "*.native" -o -name "*.cmx" -o -name "*.cmi" -o -name "*.o" -o -name '.*.aux' \) -delete
 
 devdocclean:
 	find . -name '*.dep.ps' -o -name '*.dot' | xargs rm -f
-- 
cgit v1.2.3