Make Makefile work

diff --git a/Makefile b/Makefile
index f27709220e4632a1941e4350ecdd27ccd4b83a9f..23abe4432e12a3a3370d7ede70b54230ca0aab1b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,24 @@
+default_target: vm
 .PHONY: vm clean
 
-nothing.img: stage1/boot.bin
-    dd if=/dev/zero of=nothing.img bs=2M count=1
-    parted -s nothing.img mklabel msdos
-    parted -s -a optimal nothing.img mkpart primary fat32 1M 100%
-    doas losetup /dev/loop1 nothing.img
-    doas mkfs.fat /dev/loop1p1
-    doas losetup -d /dev/loop1
-    dd if=boot.bin of=nothing.img bs=1 count=446 conv=notrunc
-    dd if=magic.bin of=nothing.img bs=1 seek=510 count=2 conv=notrunc
+magic.bin:
+       echo -en "\x55\xAA" > magic.bin
 
-vm: nothing.img
-    qemu-system-x86_64 -hda nothing.img
+stage1/boot.bin: stage1/boot.asm
+       nasm -f bin -o stage1/boot.bin stage1/boot.asm
+
+nothing.img: magic.bin stage1/boot.bin
+       dd if=/dev/zero of=nothing.img bs=2M count=1
+       parted -s nothing.img mklabel msdos
+       parted -s -a optimal nothing.img mkpart primary fat32 1M 100%
+       doas losetup /dev/loop1 nothing.img
+       doas mkfs.fat /dev/loop1p1
+       doas losetup -d /dev/loop1
+       dd if=stage1/boot.bin of=nothing.img bs=1 count=446 conv=notrunc
+       dd if=magic.bin of=nothing.img bs=1 seek=510 count=2 conv=notrunc
+
+vm: clean nothing.img
+       qemu-system-x86_64 -hda nothing.img
 
 clean:
-       rm -f nothing.img
+       rm -f magic.bin stage1/boot.bin nothing.img

diff --git a/stage1/Makefile b/stage1/Makefile
deleted file mode 100644 (file)
index 1cfbb19..0000000
--- a/stage1/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-default_target: boot.bin
-.PHONY: clean
-
-boot.bin: boot.asm
-       nasm -f bin -o boot.bin boot.asm
-
-clean:
-       rm -f boot.bin