Change Makefile system

diff --git a/Makefile b/Makefile
new file mode 100644 (file)
index 0000000..f277092
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,17 @@
+.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
+
+vm: nothing.img
+    qemu-system-x86_64 -hda nothing.img
+
+clean:
+       rm -f nothing.img

diff --git a/stage1/Makefile b/stage1/Makefile
index 46c30d87eec63fd13eff1ea0b0d0e71d37b88f06..1cfbb19417ceba921091f0fca3020845eb5be864 100644 (file)
--- a/stage1/Makefile
+++ b/stage1/Makefile
@@ -1,21 +1,8 @@
-default_target: vm
-.PHONY: vm clean
+default_target: boot.bin
+.PHONY: clean
 
 boot.bin: boot.asm
        nasm -f bin -o boot.bin boot.asm
 
-nothing.img: 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
-
-vm: nothing.img
-       qemu-system-x86_64 -hda nothing.img
-
 clean:
-       rm -f boot.bin nothing.img
+       rm -f boot.bin