From 800b8b768c2d4c63a7ae037d9619ea911b92ea5d Mon Sep 17 00:00:00 2001 From: Freya Murphy Date: Sun, 20 Apr 2025 23:50:31 -0400 Subject: fix makefile target --- Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 7e2f8fa..b87410f 100644 --- a/Makefile +++ b/Makefile @@ -52,22 +52,22 @@ QEMU = qemu-system-x86_64-uefi GRUB = grub-mkrescue-uefi endif -qemu: $(BIN)/$(ISO) img +qemu: $(BIN)/$(ISO) $(BIN)/$(IMAGE) $(QEMU) $(QEMUOPTS) -qemu-kvm: $(BIN)/$(ISO) img +qemu-kvm: $(BIN)/$(ISO) $(BIN)/$(IMAGE) $(QEMU) $(QEMUOPTS) -cpu host --enable-kvm -qemu-kvm-nox: $(BIN)/$(ISO) img +qemu-kvm-nox: $(BIN)/$(ISO) $(BIN)/$(IMAGE) $(QEMU) $(QEMUOPTS) -cpu host --enable-kvm -nographic -qemu-nox: $(BIN)/$(ISO) img +qemu-nox: $(BIN)/$(ISO) $(BIN)/$(IMAGE) $(QEMU) $(QEMUOPTS) -nographic -qemu-gdb: $(BIN)/$(ISO) img +qemu-gdb: $(BIN)/$(ISO) $(BIN)/$(IMAGE) $(QEMU) $(QEMUOPTS) -S -gdb tcp::1337 -qemu-gdb-nox: $(BIN)/$(ISO) img +qemu-gdb-nox: $(BIN)/$(ISO) $(BIN)/$(IMAGE) $(QEMU) $(QEMUOPTS) -nographic -S -gdb tcp::1337 gdb: @@ -76,9 +76,6 @@ gdb: clean: rm -fr $(BIN) -img: - qemu-img create $(BIN)/$(IMAGE) $(IMAGE_SIZE) - build: $(BIN)/$(ISO) $(A_OBJ): $(BIN)/%.S.o : %.S @@ -103,6 +100,9 @@ $(BIN)/$(ISO): $(BIN)/$(KERNEL) cp $(BIN)/$(KERNEL) $(BIN)/iso/boot $(GRUB) -o $(BIN)/$(ISO) bin/iso 2>/dev/null +$(BIN)/$(IMAGE): + qemu-img create $(BIN)/$(IMAGE) $(IMAGE_SIZE) + fmt: clang-format -i $(shell find -type f -name "*.[ch]" -and -not -path "./kernel/old/*") sed -i 's/[ \t]*$$//' $(shell find -type f -name "*.[chS]" -and -not -path "./kernel/old/*") -- cgit v1.2.3-freya