From f41ace6b51dc580d94e28897a08cc1aebf1bdcc2 Mon Sep 17 00:00:00 2001
From: Jason Gross <jagro@google.com>
Date: Thu, 21 Jul 2016 08:40:56 -0700
Subject: Fix clean target

This is the problem with copy-paste solutions.  (Thanks @jadephilipoom)
---
 Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 03e0ccfcf..4a716e3f1 100644
--- a/Makefile
+++ b/Makefile
@@ -64,7 +64,10 @@ install-coqprime:
 
 Makefile.coq: Makefile _CoqProject
 	$(SHOW)'COQ_MAKEFILE -f _CoqProject > $@'
-	$(HIDE)$(COQBIN)coq_makefile -f _CoqProject | sed s'|^\(-include.*\)$$|ifneq ($$(filter-out $(FAST_TARGETS),$$(MAKECMDGOALS)),)~\1~else~ifeq ($$(MAKECMDGOALS),)~\1~endif~endif|g' | tr '~' '\n' | sed s'/^clean:$$/clean-old::/g' | sed s'/^clean::$$/clean-old::/g' | sed s'/^Makefile: /Makefile-old: /g' > $@
+	$(HIDE)$(COQBIN)coq_makefile -f _CoqProject | sed s'|^\(-include.*\)$$|ifneq ($$(filter-out $(FAST_TARGETS),$$(MAKECMDGOALS)),)~\1~else~ifeq ($$(MAKECMDGOALS),)~\1~endif~endif|g' | tr '~' '\n' | sed s'/^clean:$$/clean::/g' | sed s'/^Makefile: /Makefile-old: /g' > $@
+
+clean::
+	rm -f Makefile.coq
 
 cleanall:: clean clean-coqprime
 	rm -f .dir-locals.el
-- 
cgit v1.2.3


From d22b177d86e0544668b0a7e36063936376f1996d Mon Sep 17 00:00:00 2001
From: Jason Gross <jagro@google.com>
Date: Thu, 21 Jul 2016 08:43:38 -0700
Subject: Faster update-_CoqProject target

---
 Makefile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Makefile b/Makefile
index 4a716e3f1..b518c702d 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,13 @@ ifneq ($(filter 8.4%,$(COQ_VERSION)),) # 8.4
 COQC?=$(TIMER) "$(COQBIN)coqc"
 endif
 
+ifneq ($(filter-out $(SUPER_FAST_TARGETS),$(MAKECMDGOALS)),)
 -include Makefile.coq
+else
+ifeq ($(MAKECMDGOALS),)
+-include Makefile.coq
+endif
+endif
 
 .DEFAULT_GOAL := coq
 
-- 
cgit v1.2.3