2 files changed, 24 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index b93941f..0a174e2 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,9 @@ compiled_programs=${cc_files} ${cpp_files}
 CC=gcc -std=gnu99
 CFLAGS=-Os
 
-all: samizdat-paths.sh ${compiled_programs}
+SUBMODULES = fsmgr kiki openssh
+
+all: samizdat-paths.sh ${compiled_programs} ${SUBMODULES}
 
 dynmenu: src/dynmenu.cpp
         $(CXX) $(CFLAGS) $< -o $@ -lcurses
@@ -50,15 +52,18 @@ endif
 
 include user.mk
 
-SUBMODULES = fsmgr kiki openssh
-.PHONY: rootfs submodule $(SUBMODULES)
-
+.PHONY: submodule $(SUBMODULES)
 $(SUBMODULES):
         [ -e $@/Makefile ] || git submodule update --init
-        $(MAKE) -C $@
-        $(MAKE) -C $@ install
+        $(MAKE) -C $@ $(cmd)
 
-rootfs: $(SUBMODULES)
+install-submodules: cmd=install
+install-submodules: $(SUBMODULES)
+
+.PHONY: rootfs
+rootfs:
+        [ -e install-submodules-stamp ] || make install-submodules-stamp
+        [ -e install-stamp ] || sudo make install-stamp
         $(MAKE) -C rootfs
         sudo mkdir -p /srv/nbd
         sudo ln -sf "$$PWD"/rootfs/samizdat.btrfs /srv/nbd/samizdat.btrfs
@@ -78,8 +83,18 @@ isotest-nonet: install
         xorriso-usb.sh $(reuse_child) --out samizdat-nonet.iso
         USE_ISO=y SLOW_BOOT=y NO_NET=y qemu.sh samizdat-nonet.iso
 
-install: ${bin_programs} samizdat-paths.sh ${compiled_programs}
+.PHONY: install
+install:
+        [ -e install-submodules-stamp ] || make install-submodules-stamp
+        sudo make install-stamp
+
+install-submodules-stamp: install-submodules
+        touch $@
+
+install-bin-programs: ${bin_programs}
         install -p ${bin_programs} ${instdir}${samizdat_bindir}
+
+install-stamp: install-bin-programs samizdat-paths.sh ${compiled_programs}
         mkdir -p ${instdir}${samizdat_initrd_files_dir}
         mkdir -p ${instdir}${samizdat_child_dir}
         mkdir -p ${instdir}${samizdat_grub_efi_dir}
@@ -89,3 +104,4 @@ install: ${bin_programs} samizdat-paths.sh ${compiled_programs}
         cp -r ${initrd_files} ${instdir}${samizdat_initrd_files_dir}
         cp -r ${initramfs_conf_files} ${instdir}${samizdat_initramfs_conf_dir}
         cp -r ${isolinux_files} ${instdir}${samizdat_isolinux_dir}
+        touch $@
diff --git a/openssh b/openssh
-Subproject 8a34eb2de148e1e504043d4bbf98fd45b36bbc9
+Subproject 3734a550eba796593f32e5b201127ecc359f07a