From 390bcdb00838e045b643912e32a9d159b40f3b70 Mon Sep 17 00:00:00 2001
From: Pierre Letouzey
Date: Wed, 1 Jun 2016 11:35:53 +0200
Subject: Makefile.build : update the otags rule

 There were a forgotten CAMLP4DEPS macro.
 We also avoid otags failure with camlp5 (in this case, it only
 builds the tags of regular .ml files, not .ml4).
---
 Makefile.build | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Makefile.build b/Makefile.build
index 18b1e4fb46..c0b39dce9b 100644
--- a/Makefile.build
+++ b/Makefile.build
@@ -1160,9 +1160,13 @@ dev/%.mllib.d: $(D_DEPEND_BEFORE_SRC) dev/%.mllib $(D_DEPEND_AFTER_SRC) $(OCAMLL
 .PHONY: devel otags
 devel: $(DEBUGPRINTERS)
 
+# NOTA : otags only accepts camlp4 as preprocessor, so the following rule
+# won't build tags of .ml4 when compiling with camlp5
 otags:
-	otags $(MLIFILES) $(MLSTATICFILES) \
-	$(foreach i,$(ML4FILES),-pc -pa tools/compat5.cmo -pa op -pa g -pa m -pa rq $(patsubst %,-pa %,$(call CAMLP4DEPS,$i)) -impl $i)
+	otags $(MLIFILES) $(filter-out configure.ml, $(MLSTATICFILES)) \
+	$(if $(filter camlp5,$(CAMLP4)), , \
+          -pa op -pa g -pa m -pa rq $(addprefix -pa , $(CAMLP4DEPS)) \
+          $(addprefix -impl , $(ML4FILES)))
 
 
 ###########################################################################
-- 
cgit v1.2.3