From d43a2429e10b454066a0ce150e86ed3140cec000 Mon Sep 17 00:00:00 2001 From: rhiannon morris Date: Fri, 6 May 2022 21:35:19 +0200 Subject: [PATCH] makefile fixes --- Makefile | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 309c9b9..45d47ce 100644 --- a/Makefile +++ b/Makefile @@ -1,24 +1,29 @@ all: quox +# these two are real files, but always ask nix if they need remaking +.PHONY: quox quox: - nix build '.#quox-exe' - ln -sfL $$(realpath result/bin/quox) quox + nix build --no-link '.#quox' + ln -sfL $$(nix path-info '.#quox')/bin/quox quox +.PHONY: quox-tests quox-tests: - nix build '.#quox-tests' - ln -sfL $$(realpath result/bin/quox-tests) quox-tests + nix build --no-link '.#quox-tests' + ln -sfL $$(nix path-info '.#quox-tests')/bin/quox-tests quox-tests + .PHONY: lib lib: - nix build '.#quox' + nix build '.#quox-lib' .PHONY: test test: nix run -- '.#quox-tests' -V 14 .PHONY: prove -prove: quox-tests - prove ./quox-tests +prove: + nix build '.#quox-tests' + prove $$(nix path-info '.#quox-tests')/bin/quox-tests .PHONY: clean clean: