Makefile: fix dependencies

All the run-style targets depend on a valid ISO file being created, so let's make that explicit. Signed-off-by: Bjoern Doebel <[email protected]> fixup! Makefile: fix dependencies
KernelTestFramework · Aug 12, 2020 · 50b809c · 50b809c
1 parent 902502a
commit 50b809c
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -90,29 +90,28 @@ QEMU_PARAMS_DEBUG := -s &
 
 ISO_FILE := boot.iso
 
-.PHONY: iso
-iso: all
+$(ISO_FILE): all
 	@echo "GEN ISO" $(ISO_FILE)
 	@ $(GRUB_FILE) --is-x86-multiboot $(TARGET) || { echo "Multiboot not supported"; exit 1; }
 	@ cp $(TARGET) grub/boot/
 	@ $(GRUB_MKIMAGE) --format i386-pc-eltorito -p /boot/grub -o grub/boot.img $(GRUB_MODULES)
 	@ $(XORRISO) -as mkisofs -U -b boot.img -no-emul-boot -boot-load-size 4 -boot-info-table -o $(ISO_FILE) grub 2>> /dev/null
 
 .PHONY: boot
-boot: all
+boot: $(ISO_FILE)
 	@echo "QEMU START"
 	@$(QEMU_BIN) -cdrom $(ISO_FILE) $(QEMU_PARAMS)
 
 .PHONY: boot_debug
-boot_debug: all iso
+boot_debug: $(ISO_FILE)
 	$(QEMU_BIN) -cdrom $(ISO_FILE) $(QEMU_PARAMS) $(QEMU_PARAMS_DEBUG)
 
 .PHONY: run
-run: all
+run: $(TARGET)
 	$(QEMU_BIN) -kernel $(TARGET) $(QEMU_PARAMS) $(QEMU_PARAMS_KERNEL)
 
 .PHONY: debug
-debug: all
+debug: $(TARGET)
 	$(QEMU_BIN) -kernel $(TARGET) $(QEMU_PARAMS) $(QEMU_PARAMS_KERNEL) $(QEMU_PARAMS_DEBUG)
 
 .PHONY: gdb