From 8cd4ad9e333169c2a9c222cb34a2199ccba56fa4 Mon Sep 17 00:00:00 2001
From: Matej Kosik
Date: Mon, 11 Jul 2016 16:20:42 +0200
Subject: expanding "make help" a little bit

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

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 93b89a4893..3b9d1e67c6 100644
--- a/Makefile
+++ b/Makefile
@@ -117,6 +117,8 @@ help:
 	@echo "or make archclean"
 	@echo
 	@echo "For make to be verbose, add VERBOSE=1"
+	@echo
+	@echo "If you want camlp{4,5} to generate human-readable files, add NO_RECOMPILE_ML4=1"
 
 UNSAVED_FILES:=$(shell find . -name '.\#*v' -o -name '.\#*.ml' -o -name '.\#*.ml?')
 ifdef UNSAVED_FILES
-- 
cgit v1.2.3


From 72d9bf028d0cf40cb6c727c69bfbcc15aafc4944 Mon Sep 17 00:00:00 2001
From: Pierre Letouzey
Date: Tue, 12 Jul 2016 16:28:10 +0200
Subject: Makefile: no more .ml4.d hence no more rule to clean them

---
 Makefile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 3b9d1e67c6..34ce67b7dc 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ Makefile $(wildcard Makefile.*) config/Makefile : ;
 # Cleaning
 ###########################################################################
 
-.PHONY: clean cleankeepvo objclean cruftclean indepclean docclean archclean optclean clean-ide ml4clean ml4depclean depclean cleanconfig distclean voclean devdocclean
+.PHONY: clean cleankeepvo objclean cruftclean indepclean docclean archclean optclean clean-ide ml4clean depclean cleanconfig distclean voclean devdocclean
 
 clean: objclean cruftclean depclean docclean devdocclean
 
@@ -220,9 +220,6 @@ clean-ide:
 ml4clean:
 	rm -f $(GENML4FILES)
 
-ml4depclean:
-	find . -name '*.ml4.d' | xargs rm -f
-
 depclean:
 	find . $(FIND_VCS_CLAUSE) '(' -name '*.d' ')' -print | xargs rm -f
 
-- 
cgit v1.2.3


From 605048905db9107a1d4b3c35ce59f5719474f875 Mon Sep 17 00:00:00 2001
From: Pierre Letouzey
Date: Tue, 12 Jul 2016 18:17:17 +0200
Subject: Makefile.build: follow-up of commits by Matej on VERBOSE and
 READABLE_ML4

 - With the ?= construction, we avoid warnings about undefined variables,
   while tolerating both 'make VERBOSE=1' and 'VERBOSE=1 make'

 - Some extra documentation and cleanup
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 34ce67b7dc..6649542c88 100644
--- a/Makefile
+++ b/Makefile
@@ -118,7 +118,7 @@ help:
 	@echo
 	@echo "For make to be verbose, add VERBOSE=1"
 	@echo
-	@echo "If you want camlp{4,5} to generate human-readable files, add NO_RECOMPILE_ML4=1"
+	@echo "If you want camlp{4,5} to generate human-readable files, add READABLE_ML4=1"
 
 UNSAVED_FILES:=$(shell find . -name '.\#*v' -o -name '.\#*.ml' -o -name '.\#*.ml?')
 ifdef UNSAVED_FILES
-- 
cgit v1.2.3