1 files changed, 9 insertions, 20 deletions

diff --git a/rootfs/Makefile b/rootfs/Makefile
index ef2921e..c85132f 100644
--- a/rootfs/Makefile
+++ b/rootfs/Makefile
@@ -6,38 +6,27 @@ endif
 
 sudo := $(shell [ "$$(id -u)" = 0 ] || echo sudo)
 
-rootfs ?= samizdat.seed.btrfs
-patchfs ?= samizdat.patch.btrfs
-
 .DEFAULT_GOAL = all
 
-.PHONY: all rootfs patchfs clean cleaner
-all: $(rootfs) $(patchfs)
+.PHONY: all clean cleaner
+all: $(addprefix _filesystem/samizdat., seed.btrfs patch.btrfs)
+
+_build/%: _build
+_filesystem/%: _filesystem
 
 _build _filesystem:
         $(sudo) btrfs subvolume create $@
 
-clean = $(patchfs) $(rootfs) $(rootfs:%.seed.btrfs=%.btrfs)
-clean := $(clean) $(clean:%=%.tmp)
-
 clean:
-        rm -f $(clean)
+        btrfs subvolume delete _build
 cleaner: clean
         -$(sudo) btrfs subvolume delete _filesystem
 
-rootfs: $(rootfs)
-patchfs: $(patchfs)
+_build/%.patch.btrfs: %.seed.btrfs
 
-%.patch.btrfs: %.seed.btrfs
-        $(sudo) $(fsmgr) build $@
+_build/%.seed.btrfs: %.btrfs
 
-%.seed.btrfs: %.btrfs
-        $(sudo) $(fsmgr) build $@
+_filesystem/%.btrfs: _build/%.btrfs
 
 %.btrfs:
         $(sudo) $(fsmgr) build $@
-
-$(patchfs): $(rootfs)
-
-$(patchfs) $(rootfs):
-        $(sudo) REWRITE_SOURCES_LIST=y $(fsmgr) build $@