the cleaner i make it, the cleaner it gets

1 files changed, 11 insertions, 20 deletions

diff --git a/rootfs/Makefile b/rootfs/Makefile
index c85132f..017b379 100644
--- a/rootfs/Makefile
+++ b/rootfs/Makefile
@@ -1,32 +1,23 @@
-fsmgr := $(shell command -v fsmgr)
-
+fsmgr != command -v fsmgr
 ifeq ($(fsmgr),)
 $(error "no fsmgr")
 endif
-
-sudo := $(shell [ "$$(id -u)" = 0 ] || echo sudo)
+UID != id -u
+SUDO != [ 0 = "$(UID)" ] || echo sudo
 
 .DEFAULT_GOAL = all
 
 .PHONY: all clean cleaner
 all: $(addprefix _filesystem/samizdat., seed.btrfs patch.btrfs)
 
-_build/%: _build
-_filesystem/%: _filesystem
-
-_build _filesystem:
-        $(sudo) btrfs subvolume create $@
+subvolumes = _build _filesystem
+$(subvolumes):
+        $(SUDO) btrfs subvolume create $@
 
 clean:
-        btrfs subvolume delete _build
-cleaner: clean
-        -$(sudo) btrfs subvolume delete _filesystem
-
-_build/%.patch.btrfs: %.seed.btrfs
-
-_build/%.seed.btrfs: %.btrfs
-
-_filesystem/%.btrfs: _build/%.btrfs
+        -$(SUDO) btrfs subvolume delete _build
+destroy: clean
+        -$(SUDO) btrfs subvolume delete _filesystem
 
-%.btrfs:
-        $(sudo) $(fsmgr) build $@
+%.btrfs: | $(subvolumes)
+        $(SUDO) $(fsmgr) build $@