From b17a416bc6d9c33948a55965d953f548029bbb5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juhani=20Krekel=C3=A4?= <juhani@krekelä.fi>
Date: Sun, 4 Jul 2021 19:34:31 +0300
Subject: [PATCH] Give nicer names to both source and binary files

---
 .gitignore               |  1 +
 Makefile                 | 12 ++++++++----
 bootsect.asm => boot.asm |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)
 rename bootsect.asm => boot.asm (99%)

diff --git a/.gitignore b/.gitignore
index c28b10e..e3c00d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.bin
 *.img
 *.d
+*.krn
diff --git a/Makefile b/Makefile
index 542177d..875d962 100644
--- a/Makefile
+++ b/Makefile
@@ -5,20 +5,24 @@ FLOPPY = 1440
 
 all: nor86.img
 
-nor86.img: bootsect.bin kernel.bin CC0 README.md
+nor86.img: boot.bin nor86.krn CC0 README.md
 	rm -f $@
 	mkdosfs -C $@ $(FLOPPY)
-	rw -i bootsect.bin -o $@
+	rw -i boot.bin -o $@
 	mcopy -i $@ CC0 ::
 	mcopy -i $@ README.md ::
-	mcopy -i $@ kernel.bin ::
+	mcopy -i $@ nor86.krn ::
+
+nor86.krn: kernel.asm
+	nasm -fbin -d F$(FLOPPY) -o $@ $<
+	nasm -MD $@.d -d F$(FLOPPY) -fbin -o $@ $<
 
 .asm.bin:
 	nasm -fbin -d F$(FLOPPY) -o $@ $<
 	nasm -MD $@.d -d F$(FLOPPY) -fbin -o $@ $<
 
 clean:
-	rm -f *.bin *.img *.bin.d
+	rm -f *.bin *.img *.bin.d *.krn
 
 run: nor86.img
 	qemu-system-i386 -fda $<
diff --git a/bootsect.asm b/boot.asm
similarity index 99%
rename from bootsect.asm
rename to boot.asm
index 45a5ea9..6c8dd0c 100644
--- a/bootsect.asm
+++ b/boot.asm
@@ -339,7 +339,7 @@ hang:
 	jmp hang
 
 
-kernel_name: db "KERNEL  BIN"
+kernel_name: db "NOR86   KRN"
 
 notfound_msg: db "Kernel not found", 0
 diskerror_msg: db "Disk error", 0