summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSébastien Hinderer <Sebastien.Hinderer@inria.fr>2021-02-15 11:25:03 +0100
committerSébastien Hinderer <Sebastien.Hinderer@inria.fr>2021-03-02 10:56:32 +0100
commit8aeb57fcf0a7e15b3d17db1f3307581ae5d9a3a9 (patch)
tree226dd9b3553535b63a64a5d89eb6d9b49d16c0dd
parent500d8dc8296d09305b5413f140c63ffee1de111d (diff)
downloadocaml-8aeb57fcf0a7e15b3d17db1f3307581ae5d9a3a9.tar.gz
Build system: rename the OCAMLLEX_FLAGS to OCAMLLEXFLAGS
-rw-r--r--Makefile2
-rw-r--r--Makefile.common2
-rw-r--r--debugger/Makefile2
-rw-r--r--lex/Makefile2
-rw-r--r--ocamldoc/Makefile10
-rw-r--r--ocamltest/Makefile2
-rw-r--r--tools/Makefile2
7 files changed, 11 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index c49327d3d2..0c35db518c 100644
--- a/Makefile
+++ b/Makefile
@@ -652,7 +652,7 @@ otherlibs/dynlink/dynlink.cmxa: otherlibs/dynlink/native/dynlink.ml
# The lexer
parsing/lexer.ml: parsing/lexer.mll
- $(CAMLLEX) $(OCAMLLEX_FLAGS) $<
+ $(CAMLLEX) $(OCAMLLEXFLAGS) $<
partialclean::
rm -f parsing/lexer.ml
diff --git a/Makefile.common b/Makefile.common
index f3e428a1ae..af979b789f 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -67,7 +67,7 @@ ifeq "$(FUNCTION_SECTIONS)" "true"
OPTCOMPFLAGS += -function-sections
endif
# By default, request ocamllex to be quiet
-OCAMLLEX_FLAGS ?= -q
+OCAMLLEXFLAGS ?= -q
# Escape special characters in the argument string.
# There are four characters that need escaping:
diff --git a/debugger/Makefile b/debugger/Makefile
index 4dda8fe6ba..5402b5d553 100644
--- a/debugger/Makefile
+++ b/debugger/Makefile
@@ -78,7 +78,7 @@ depend: beforedepend
| sed -e 's,$(UNIXDIR)/,$$(UNIXDIR)/,' > .depend
debugger_lexer.ml: debugger_lexer.mll
- $(CAMLLEX) $(OCAMLLEX_FLAGS) $<
+ $(CAMLLEX) $(OCAMLLEXFLAGS) $<
clean::
rm -f debugger_lexer.ml
beforedepend:: debugger_lexer.ml
diff --git a/lex/Makefile b/lex/Makefile
index 5f6b16557a..e0b07cd392 100644
--- a/lex/Makefile
+++ b/lex/Makefile
@@ -63,7 +63,7 @@ clean::
beforedepend:: parser.ml parser.mli
lexer.ml: lexer.mll
- $(CAMLLEX) $(OCAMLLEX_FLAGS) $<
+ $(CAMLLEX) $(OCAMLLEXFLAGS) $<
clean::
rm -f lexer.ml
diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile
index 8f8b92d416..90d1e3c5c4 100644
--- a/ocamldoc/Makefile
+++ b/ocamldoc/Makefile
@@ -229,7 +229,7 @@ odoc_see_lexer.ml: odoc_see_lexer.mll
$(OCAMLOPT_CMD) -shared -o $@ $(COMPFLAGS) $<
.mll.ml:
- $(OCAMLLEX) $(OCAMLLEX_FLAGS) $<
+ $(OCAMLLEX) $(OCAMLLEXFLAGS) $<
.mly.ml:
$(OCAMLYACC) --strict -v $<
@@ -409,10 +409,10 @@ clean:
depend:
$(OCAMLYACC) odoc_text_parser.mly
$(OCAMLYACC) odoc_parser.mly
- $(OCAMLLEX) $(OCAMLLEX_FLAGS) odoc_text_lexer.mll
- $(OCAMLLEX) $(OCAMLLEX_FLAGS) odoc_lexer.mll
- $(OCAMLLEX) $(OCAMLLEX_FLAGS) odoc_ocamlhtml.mll
- $(OCAMLLEX) $(OCAMLLEX_FLAGS) odoc_see_lexer.mll
+ $(OCAMLLEX) $(OCAMLLEXFLAGS) odoc_text_lexer.mll
+ $(OCAMLLEX) $(OCAMLLEXFLAGS) odoc_lexer.mll
+ $(OCAMLLEX) $(OCAMLLEXFLAGS) odoc_ocamlhtml.mll
+ $(OCAMLLEX) $(OCAMLLEXFLAGS) odoc_see_lexer.mll
$(OCAMLDEP) $(DEPFLAGS) $(DEPINCLUDES) *.mll *.mly *.ml *.mli > .depend
$(OCAMLDEP) $(DEPFLAGS) $(DEPINCLUDES) -shared generators/*.ml >> .depend
diff --git a/ocamltest/Makefile b/ocamltest/Makefile
index 6fa332400a..7f8d0e109f 100644
--- a/ocamltest/Makefile
+++ b/ocamltest/Makefile
@@ -242,7 +242,7 @@ ocamltest.opt$(EXE): $(deps_opt) $(native_modules)
$(ocamlyacc) $<
%.ml: %.mll
- $(ocamllex) $(OCAMLLEX_FLAGS) $<
+ $(ocamllex) $(OCAMLLEXFLAGS) $<
ocamltest_unix.ml: ocamltest_unix_$(ocamltest_unix).ml
echo '# 1 "$^"' > $@
diff --git a/tools/Makefile b/tools/Makefile
index e71104604c..98e5ae6b3e 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -332,7 +332,7 @@ clean::
# Common stuff
%.ml: %.mll
- $(CAMLLEX) $(OCAMLLEX_FLAGS) $<
+ $(CAMLLEX) $(OCAMLLEXFLAGS) $<
%.cmo: %.ml
$(CAMLC) -c $(COMPFLAGS) - $<