Reorganise cleaning targets

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@10012 85f007b7-540e-0410-9357-904b9bb8a0f7

2 files changed, 38 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index 7c94fb6548..c8af1e62e6 100644
--- a/Makefile
+++ b/Makefile
@@ -80,21 +80,28 @@ stage3 $(STAGE3_TARGETS): stage2
 # Cleaning
 ###########################################################################
 
-.PHONY: clean archclean ml4clean clean-ide depclean distclean cleanconfig cleantheories doclean
+.PHONY: clean objclean cruftclean indepclean archclean ml4clean clean-ide depclean distclean cleanconfig cleantheories docclean
 
-clean: archclean ml4clean depclean
+clean: objclean cruftclean depclean
+
+objclean: archclean indepclean
+
+cruftclean: ml4clean
+	find . -name '*~' -or -name '*.annot' | xargs rm -f
+	rm -f gmon.out core
+
+indepclean:
 	rm -f $(GENFILES)
 	rm -f $(COQTOPBYTE) $(COQCBYTE) bin/coq-interface$(EXE) bin/parser$(EXE)
-	find . -name '*~' -or -name '*.cm[ioa]' -or -name '*.annot' | xargs rm -f
+	find . -name '*~' -or -name '*.cm[ioa]' | xargs rm -f
 	find contrib -name '*.vo' -or -name '*.glob' | xargs rm -f
-	rm -f gmon.out core
 	rm -f */*.pp[iox] contrib/*/*.pp[iox]
 	rm -rf $(SOURCEDOCDIR)
 	rm -f toplevel/mltop.byteml toplevel/mltop.optml
 	rm -f glob.dump
 	rm -f revision
 
-doclean:
+docclean:
 	$(MAKE) -C doc clean
 
 archclean: clean-ide cleantheories
@@ -105,7 +112,7 @@ archclean: clean-ide cleantheories
 	rm -f $(TOOLS)
 	rm -f $(MINICOQ)
 
-clean-ide: 
+clean-ide:
 	rm -f $(COQIDEVO) $(COQIDEVO:.vo=.glob) $(COQIDECMO) $(COQIDECMX) $(COQIDECMO:.cmo=.cmi) $(COQIDEBYTE) $(COQIDEOPT) $(COQIDE)
 	rm -f ide/extract_index.ml ide/find_phrase.ml ide/highlight.ml
 	rm -f ide/config_lexer.ml ide/config_parser.mli ide/config_parser.ml
@@ -120,7 +127,7 @@ depclean:
 cleanconfig:
 	rm -f config/Makefile config/coq_config.ml dev/ocamldebug-v7 ide/undo.mli
 
-distclean: clean cleanconfig
+distclean: clean cleanconfig docclean
 
 cleantheories:
 	rm -f states/*.coq
diff --git a/dev/doc/build-system.txt b/dev/doc/build-system.txt
index 87d5df707d..c79a561542 100644
--- a/dev/doc/build-system.txt
+++ b/dev/doc/build-system.txt
@@ -38,6 +38,8 @@ The handling of globals is now: the globals of FOO.v are in FOO.glob
 and the global glob.dump is created by concatenation of all .glob
 files. In particular, .glob files are now always created.
 
+See also section "cleaning targets"
+
 Dependencies
 ------------
 
@@ -49,6 +51,28 @@ of changed files are recomputed).
 If you add a dependency to a Coq camlp4 extension (grammar.cma or
 q_constr.cmo), then see sections ".ml4 files" and "new files".
 
+Cleaning Targets
+----------------
+
+Targets for cleaning various parts:
+
+ - distclean: clean everything; must leave only what should end up in
+   distribution tarball and/or is in a svn checkout.
+
+ - clean: clean everything except effect of "./configure" and documentation.
+
+ - cleanconfig: clean effect of "./configure" only
+
+ - archclean:  remove all architecture-dependent   generated files
+ - indepclean: remove all architecture-independent generated files
+   (not documentation)
+
+ - objclean: clean all generated files, but not Makefile meta-data
+   (e.g. dependencies), nor debugging/development information nor
+   other cruft (e.g. editor backup files), nor documentation
+
+ - docclean: clean documentation
+
 .ml4 files
 ----------