Fixed naming (amycros still present in some places). Also fixed .gitignore for naming...

diff --git a/.gitignore b/.gitignore
index bf37ecea6f4cf2b726d906b340857e00c1a46bce..7d7afd0c54ff890cb43800aeb5fdf0b6d0d572e3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,4 @@
 out
 dep
 isodir
-amycros.iso
-test_module/test.S.o
-test_module/test.elf64
+isos.iso

diff --git a/Makefile b/Makefile
index 4a6c42bebf9bd46aab80abed3c2668fcb0298ebf..6aaa2204f25db14f5bc3d287957e5dfe9be47e12 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -20,17 +20,17 @@ LDFLAGS ?= -O2
 LDFLAGS := $(LDFLAGS) -Wall -Wextra -Werror -std=c++20 -ffreestanding
 
 TO_ISO := isodir/boot/grub/grub.cfg
-TO_CLEAN := isodir amycros.iso
+TO_CLEAN := isodir isos.iso
 
 include **/module.mk
 
-build: amycros.iso
+build: isos.iso
 qemu: build
-       qemu-system-x86_64 -cdrom amycros.iso -serial stdio -cpu qemu64,pdpe1gb -no-reboot $(QEMUFLAGS)
+       qemu-system-x86_64 -cdrom isos.iso -serial stdio -cpu qemu64,pdpe1gb -no-reboot $(QEMUFLAGS)
 clean:
        -rm -rf $(TO_CLEAN)
 
-amycros.iso: $(TO_ISO)
+isos.iso: $(TO_ISO)
        grub-mkrescue -o "$@" isodir
 
 isodir/boot/grub/grub.cfg: grub.cfg

diff --git a/grub.cfg b/grub.cfg
index a3e0f580af09b27bf6facf03bd5a52cee476ceb1..d008406a6f770228426aedd535c9f004149bbd29 100644 (file)
--- a/grub.cfg
+++ b/grub.cfg
@@ -8,7 +8,7 @@
 # So, about the license. I don't think I have a copyright on this file's code, but,
 # since I gave it the CC0 license in case I do, that doesn't matter either way.
 
-menuentry "Amycros" {
+menuentry "isos" {
        multiboot2 /boot/kernel.elf64
        module2 /boot/test-module.elf64 test-module
 }