From 5ee637cf4d01ff9ae77aa2cba79aded50e8796f3 Mon Sep 17 00:00:00 2001 From: rhiannon morris Date: Wed, 4 May 2022 18:49:00 +0200 Subject: [PATCH] update makefile --- Makefile | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index f3461a9..309c9b9 100644 --- a/Makefile +++ b/Makefile @@ -1,20 +1,20 @@ all: quox quox: - (cd exe; sirdi build) - ln -sf exe/build/exec/main $@ + nix build '.#quox-exe' + ln -sfL $$(realpath result/bin/quox) quox quox-tests: - (cd tests; sirdi build) - ln -sf tests/build/exec/main $@ + nix build '.#quox-tests' + ln -sfL $$(realpath result/bin/quox-tests) quox-tests .PHONY: lib lib: - sirdi build + nix build '.#quox' .PHONY: test -test: quox-tests - ./quox-tests -V 14 +test: + nix run -- '.#quox-tests' -V 14 .PHONY: prove prove: quox-tests @@ -22,7 +22,4 @@ prove: quox-tests .PHONY: clean clean: - $(RM) quox quox-tests - sirdi clean - (cd exe; sirdi clean) - (cd tests; sirdi clean) + rm -f quox quox-tests result