From 0da60299fa3abd4a84c7c673fa8f9ed202c84188 Mon Sep 17 00:00:00 2001
From: Guillaume Melquiond
Date: Fri, 27 Mar 2015 09:29:00 +0100
Subject: Properly handle extra "clean" targets with coq_makefile.

---
 tools/coq_makefile.ml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/coq_makefile.ml b/tools/coq_makefile.ml
index e2bca2acfb..72735e900f 100644
--- a/tools/coq_makefile.ml
+++ b/tools/coq_makefile.ml
@@ -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
-- 
cgit v1.2.3


From c8c545713fa1e248a62fbd9905be56a5449b96a0 Mon Sep 17 00:00:00 2001
From: Enrico Tassi
Date: Mon, 30 Mar 2015 10:41:32 +0200
Subject: coq_makefile: fix compilation with camlp4

---
 tools/coq_makefile.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/coq_makefile.ml b/tools/coq_makefile.ml
index 72735e900f..0931fd5506 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";
-- 
cgit v1.2.3