From df9d60f3151b90d0f8718ae82746d59dea931216 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hinderer?= Date: Tue, 28 Jul 2020 17:48:32 +0200 Subject: [PATCH] Get rid of the YACCFLAGS build variable It was not used, except in lex/Makefile where this commit replaces its unique occurrence by its definition in the same file. --- Makefile | 1 - debugger/Makefile | 1 - lex/Makefile | 3 +-- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 54d8e9df6..4455a6fd1 100644 --- a/Makefile +++ b/Makefile @@ -53,7 +53,6 @@ else OCAML_NATDYNLINKOPTS = -ccopt "$(NATDYNLINKOPTS)" endif -YACCFLAGS=-v --strict CAMLLEX=$(CAMLRUN) boot/ocamllex CAMLDEP=$(CAMLRUN) boot/ocamlc -depend DEPFLAGS=-slash diff --git a/debugger/Makefile b/debugger/Makefile index 1f94e74af..3620fa88a 100644 --- a/debugger/Makefile +++ b/debugger/Makefile @@ -27,7 +27,6 @@ CAMLC=$(BEST_OCAMLC) -g -nostdlib -I $(ROOTDIR)/stdlib COMPFLAGS=$(INCLUDES) -absname -w +a-4-9-41-42-44-45-48 -warn-error A \ -safe-string -strict-sequence -strict-formats LINKFLAGS=-linkall -I $(UNIXDIR) -I $(DYNLINKDIR) -YACCFLAGS= CAMLLEX=$(BEST_OCAMLLEX) CAMLDEP=$(BEST_OCAMLDEP) DEPFLAGS=-slash diff --git a/lex/Makefile b/lex/Makefile index c928d737d..5f6b16557 100644 --- a/lex/Makefile +++ b/lex/Makefile @@ -27,7 +27,6 @@ CAMLOPT = $(CAMLRUN) $(ROOTDIR)/ocamlopt$(EXE) -nostdlib -I $(ROOTDIR)/stdlib COMPFLAGS = -absname -w +a-4-9-41-42-44-45-48 -warn-error A \ -safe-string -strict-sequence -strict-formats -bin-annot LINKFLAGS = -YACCFLAGS = -v CAMLLEX = $(CAMLRUN) $(ROOTDIR)/boot/ocamllex CAMLDEP = $(BOOT_OCAMLC) -depend DEPFLAGS = -slash @@ -56,7 +55,7 @@ clean:: rm -f *.cmo *.cmi *.cmx *.cmt *.cmti *.o *.obj parser.ml parser.mli: parser.mly - $(CAMLYACC) $(YACCFLAGS) parser.mly + $(CAMLYACC) -v parser.mly clean:: rm -f parser.ml parser.mli parser.output