X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;ds=sidebyside;f=tiger%2FMakefile;h=20eedaaa46bb0d79c83bd9b6c22a65c5778f0092;hb=78c9eca51ebc5150d79f84e255a57bb9df9f82fc;hp=99173662dee5d282f36592e904e95ece30bf933b;hpb=1c975d0844f1b642646212180f34216af1ca8328;p=tiger.ml.git diff --git a/tiger/Makefile b/tiger/Makefile index 9917366..20eedaa 100644 --- a/tiger/Makefile +++ b/tiger/Makefile @@ -1,9 +1,9 @@ MAKEFLAGS := --no-builtin-rules -EXE_TYPE := byte # byte | native -EXECUTABLES := tiger +EXE_TYPE := byte # byte | native +EXECUTABLES := tigerc tiger_tests OCAMLBUILD_FLAGS := -I src/exe -I src/lib/tiger -OCAMLBUILD := ocamlbuild $(OCAMLBUILD_FLAGS) +OCAMLBUILD := ocamlbuild $(OCAMLBUILD_FLAGS) .PHONY: \ all \ @@ -12,19 +12,19 @@ OCAMLBUILD := ocamlbuild $(OCAMLBUILD_FLAGS) test all: - $(MAKE) clean - $(MAKE) build - $(MAKE) test + @$(MAKE) -s clean + @$(MAKE) -s build + @$(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: bin/exe/tiger_tests + @./$<