From 6a51b4a98cd9fb326f16152328b1af764d3ac6c4 Mon Sep 17 00:00:00 2001
From: Amelia Coutard <eliottulio.coutard@gmail.com>
Date: Wed, 1 Mar 2023 02:12:19 +0100
Subject: [PATCH] Fixed naming (amycros still present in some places). Also
 fixed .gitignore for naming and test_module (special case no longer needed)

---
 .gitignore | 4 +---
 Makefile   | 8 ++++----
 grub.cfg   | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index bf37ece..7d7afd0 100644
--- 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 4a6c42b..6aaa220 100644
--- 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 a3e0f58..d008406 100644
--- 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
 }
-- 
2.47.0