Makefile: improve core command-line interface targets

1 files changed, 23 insertions, 23 deletions

diff --git a/Makefile b/Makefile
index 5c18e27..30e621d 100644
--- a/Makefile
+++ b/Makefile
@@ -167,11 +167,6 @@ FORCE:
 $(btrfs_images): FORCE
         $(MAKE) -C rootfs $(notdir $@)
 
-.PHONY: usb key emu
-usb emu: rootfs
-usb key emu:
-        make -C partitions $@
-
 boot: rootfs
         sudo ./src/mkinitramfs-samizdat
         sudo ROOTFS=rootfs/$(rootfs) ./src/parted-usb.sh
@@ -350,26 +345,31 @@ install-stamp: install-bin-programs samizdat-paths.sh ${compiled_programs}
 bootclean:
         rm -f samizdat.disk.img boot-disk.template.img boot-disk.img
 
-upgrade:
-        make install-submodules
-        make install
-        ./src/mkinitramfs-samizdat
-        make -C partitions key
+.PHONY: update upgrade up upgrade-key initrd
 
-testinitrdkey:
-        make install
+initrd: install
         ./src/mkinitramfs-samizdat
-        make -C partitions clean keymu
 
-testinitrd:
-        make install
-        ./src/mkinitramfs-samizdat
-        make -C partitions clean emu
+update: apt-get-update-stamp
+        git pull --ff-only --recurse-submodules
 
-total-destroy:
-        make -C partitions total-destroy
+upgrade: install-submodules install initrd
 
-testinitrd:
-        make install
-        ./src/mkinitramfs-samizdat
-        make -C partitions clean emu
+upgrade-key: upgrade key
+
+up: update upgrade
+
+.PHONY: usb key emu testinitrdkey testinitrd total-destroy persist
+
+persist: | partitions/persist.img
+partitions/persist.img:
+        make -C partitions $(notdir $@)
+
+usb emu: initrd rootfs
+key keymu emu-key: initrd
+
+usb emu key keymu emu-key total-destroy:
+        make -C partitions clean $@
+
+testinitrdkey: keymu
+testinitrd: emu