X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=tiger%2FMakefile;h=a858a5799bc1d9379e41f276070d9a6e166347c4;hb=68a223c2efdfda40c0995b34a7b3af200ad4d29b;hp=99173662dee5d282f36592e904e95ece30bf933b;hpb=1c975d0844f1b642646212180f34216af1ca8328;p=tiger.ml.git

diff --git a/tiger/Makefile b/tiger/Makefile
index 9917366..a858a57 100644
--- a/tiger/Makefile
+++ b/tiger/Makefile
@@ -1,9 +1,11 @@
 MAKEFLAGS := --no-builtin-rules
 
-EXE_TYPE := byte # byte | native
-EXECUTABLES := tiger
-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      := $(OCAMLBUILD_FLAGS_COMP) $(OCAMLBUILD_FLAGS_DIRS)
+OCAMLBUILD            := ocamlbuild $(OCAMLBUILD_FLAGS)
 
 .PHONY: \
  all \
@@ -11,20 +13,18 @@ OCAMLBUILD := ocamlbuild $(OCAMLBUILD_FLAGS)
  clean \
  test
 
-all:
-	$(MAKE) clean
-	$(MAKE) build
-	$(MAKE) test
+all: clean
+	@$(MAKE) -s test
 
 build:
-	$(OCAMLBUILD) $(addsuffix _main.$(EXE_TYPE),$(EXECUTABLES))
-	mkdir -p bin/exe
-	$(foreach exe,$(EXECUTABLES),cp _build/src/exe/$(exe)_main.$(EXE_TYPE) bin/exe/$(exe))
-	rm $(addsuffix _main.$(EXE_TYPE),$(EXECUTABLES))
+	@$(OCAMLBUILD) $(addsuffix .$(EXE_TYPE),$(EXECUTABLES))
+	@mkdir -p bin/exe
+	$(foreach exe,$(EXECUTABLES),cp _build/src/exe/$(exe).$(EXE_TYPE) bin/exe/$(exe); )
+	@rm $(addsuffix .$(EXE_TYPE),$(EXECUTABLES))
 
 clean:
-	$(OCAMLBUILD) -clean
-	rm -rf ./bin
+	@$(OCAMLBUILD) -clean
+	@rm -rf ./bin
 
-test: bin/exe/tiger
-	./$<
+test: build
+	@./bin/exe/tiger_tests