Improve makefile recipes

diff --git a/nixops/Makefile b/nixops/Makefile
index e52e973e3d5399852b016aadbc2c44a21b44a93a..c5216829862c4c27bca76605bb4052611428c494 100644 (file)
--- a/nixops/Makefile
+++ b/nixops/Makefile
@@ -27,11 +27,16 @@ setup:
 .PHONY: setup
 
 ###### Nixops regular tasks
+TARGET ?=
 NIXOPS_ARGS ?=
+ifdef TARGET
+  override NIXOPS_ARGS +=--include=$(TARGET)
+endif
+SSH_ARGS ?=
+
 nixops:
        $(NIXOPS_PRIV) $(NIXOPS_ARGS)
 
-SSH_ARGS ?=
 ssh-eldiron:
        $(NIXOPS_PRIV) ssh eldiron -- $(SSH_ARGS)
 
@@ -49,25 +54,25 @@ info:
        $(NIXOPS_PRIV) info
 
 debug:
-       $(NIXOPS_PRIV) deploy --build-only --show-trace
+       $(NIXOPS_PRIV) deploy --build-only --show-trace $(NIXOPS_ARGS)
 
 dry-run:
-       $(NIXOPS_PRIV) deploy --dry-run
+       $(NIXOPS_PRIV) deploy --dry-run $(NIXOPS_ARGS)
 
 build:
-       $(NIXOPS_PRIV) deploy --build-only --max-jobs 1
+       $(NIXOPS_PRIV) deploy --build-only $(NIXOPS_ARGS)
 
 upload:
-       $(NIXOPS_PRIV) deploy --copy-only
+       $(NIXOPS_PRIV) deploy --copy-only $(NIXOPS_ARGS)
 
 deploy:
-       $(NIXOPS_PRIV) deploy
+       $(NIXOPS_PRIV) deploy $(NIXOPS_ARGS)
 
 deploy-reboot:
-       $(NIXOPS_PRIV) deploy --force-reboot
+       $(NIXOPS_PRIV) deploy --force-reboot $(NIXOPS_ARGS)
 
 reboot:
-       $(NIXOPS_PRIV) reboot --include=eldiron
+       $(NIXOPS_PRIV) reboot --include=$(TARGET)
 .PHONY: nixops ssh-eldiron info debug dry-run build upload deploy deploy-reboot reboot
 
 ###### Cleanup generations and garbage collection