Fix the remaining 12 shift/reduce conflicts

[tiger.ml.git] / tiger / Makefile

diff --git a/tiger/Makefile b/tiger/Makefile
index 20eedaa..6f23ab3 100644 (file)
--- a/tiger/Makefile
+++ b/tiger/Makefile
@@ -1,9 +1,11 @@
 MAKEFLAGS := --no-builtin-rules
 
-EXE_TYPE         := byte  # byte | native
-EXECUTABLES      := tigerc tiger_tests
-OCAMLBUILD_FLAGS := -I src/exe -I src/lib/tiger
-OCAMLBUILD       := ocamlbuild $(OCAMLBUILD_FLAGS)
+EXE_TYPE              := byte  # byte | native
+EXECUTABLES           := tigerc tiger_tests
+OCAMLBUILD_FLAGS_DIRS := -I src/exe -I src/lib/tiger
+OCAMLBUILD_FLAGS_COMP := -cflags '-w A'
+OCAMLBUILD_FLAGS      :=  -classic-display $(OCAMLBUILD_FLAGS_COMP) $(OCAMLBUILD_FLAGS_DIRS)
+OCAMLBUILD            := ocamlbuild $(OCAMLBUILD_FLAGS)
 
 .PHONY: \
  all \
@@ -11,9 +13,7 @@ OCAMLBUILD       := ocamlbuild $(OCAMLBUILD_FLAGS)
  clean \
  test
 
-all:
-       @$(MAKE) -s clean
-       @$(MAKE) -s build
+all: clean
        @$(MAKE) -s test
 
 build:
@@ -26,5 +26,5 @@ clean:
        @$(OCAMLBUILD) -clean
        @rm -rf ./bin
 
-test: bin/exe/tiger_tests
-       @./$<
+test: build
+       @./bin/exe/tiger_tests