diff options
| author | Enrico Tassi | 2015-03-30 11:30:53 +0200 |
|---|---|---|
| committer | Enrico Tassi | 2015-03-30 11:30:53 +0200 |
| commit | aeec29a177e8f1c89996c0449e4cd81ca3ca4377 (patch) | |
| tree | cc39f942a75fd621633b1ac0999bbe4b3918fcfd /tools | |
| parent | 224d3b0e8be9b6af8194389141c9508504cf887c (diff) | |
| parent | 41e4725805588b3fffdfdc0cd5ee6859de1612b5 (diff) | |
Merge branch 'v8.5' into trunk
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/coq_makefile.ml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/coq_makefile.ml b/tools/coq_makefile.ml index cf9b8a087d..b5d0d22819 100644 --- a/tools/coq_makefile.ml +++ b/tools/coq_makefile.ml @@ -463,7 +463,7 @@ let variables is_install opt (args,defs) = print "ifeq ($(CAMLP4),camlp5) CAMLP4EXTEND=pa_extend.cmo q_MLast.cmo pa_macro.cmo unix.cma threads.cma else -CAMLP4EXTEND= +CAMLP4EXTEND=threads.cma endif\n"; print "PP?=-pp '$(CAMLP4O) -I $(CAMLLIB) -I $(CAMLLIB)threads/ $(COQSRCLIBS) compat5.cmo \\ $(CAMLP4EXTEND) $(GRAMMARS) $(CAMLP4OPTIONS) -impl'\n\n"; @@ -536,9 +536,13 @@ let include_dirs (inc_ml,inc_i,inc_r) = List.iter (fun x -> print "\\\n "; print x) str_r; print "\n\n"; end +let double_colon = ["clean"; "cleanall"; "archclean"] + let custom sps = let pr_path (file,dependencies,is_phony,com) = - print file; print ": "; print dependencies; print "\n"; + print file; + print (if List.mem file double_colon then ":: " else ": "); + print dependencies; print "\n"; if com <> "" then (print "\t"; print com; print "\n"); print "\n" in |