aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Boutillier2015-03-14 14:32:22 +0100
committerPierre Boutillier2015-03-14 14:40:51 +0100
commit1710356cdac3e968d678b75abb52d78a58b63e07 (patch)
treeea8d3dfbb4618289d26a2694c5aad91d784136fb
parenta023acc4c1a1cea2ef7751c1a65bba1cafaaeadf (diff)
End of Bug 3986 - make cleanall removes .*.aux files
-rw-r--r--tools/coq_makefile.ml40
1 files changed, 22 insertions, 18 deletions
diff --git a/tools/coq_makefile.ml b/tools/coq_makefile.ml
index 4034aa2bdf..e2bca2acfb 100644
--- a/tools/coq_makefile.ml
+++ b/tools/coq_makefile.ml
@@ -344,6 +344,10 @@ let clean sds sps =
(fun x -> print "\t+cd "; print x; print " && $(MAKE) clean\n")
sds;
print "\n";
+ let () =
+ if !some_vfile then
+ let () = print "cleanall:: clean\n" in
+ print "\trm -f $(patsubst %.v,.%.aux,$(VFILES))\n\n" in
print "archclean::\n";
print "\trm -f *.cmx *.o\n";
List.iter
@@ -702,25 +706,25 @@ let main_targets vfiles (mlifiles,ml4files,mlfiles,mllibfiles,mlpackfiles) other
end
let all_target (vfiles, (_,_,_,_,mlpackfiles as mlfiles), sps, sds) inc =
- let other_targets = CList.map_filter
- (fun (n,_,is_phony,_) -> if not (is_phony || is_genrule n) then Some n else None)
- sps @ sds in
+ let other_targets =
+ CList.map_filter
+ (fun (n,_,is_phony,_) -> if not (is_phony || is_genrule n) then Some n else None)
+ sps @ sds in
main_targets vfiles mlfiles other_targets inc;
- print ".PHONY: ";
- print_list " "
- ("all" :: "archclean" :: "beautify" :: "byte" :: "clean" ::
- "gallina" :: "gallinahtml" :: "html" ::
- "install" :: "install-doc" :: "install-natdynlink" :: "install-toploop" ::
- "opt" :: "printenv" :: "quick" ::
- "uninstall" :: "userinstall" ::
- "validate" :: "vio2vo" ::
- (sds@(CList.map_filter
- (fun (n,_,is_phony,_) ->
- if is_phony then Some n else None) sps)));
- print "\n\n";
- custom sps;
- subdirs sds;
- forpacks mlpackfiles
+ print ".PHONY: ";
+ print_list
+ " "
+ ("all" :: "archclean" :: "beautify" :: "byte" :: "clean" :: "cleanall"
+ :: "gallina" :: "gallinahtml" :: "html" :: "install" :: "install-doc"
+ :: "install-natdynlink" :: "install-toploop" :: "opt" :: "printenv"
+ :: "quick" :: "uninstall" :: "userinstall" :: "validate" :: "vio2vo"
+ :: (sds@(CList.map_filter
+ (fun (n,_,is_phony,_) ->
+ if is_phony then Some n else None) sps)));
+ print "\n\n";
+ custom sps;
+ subdirs sds;
+ forpacks mlpackfiles
let banner () =
print (Printf.sprintf