From c4eea482d6d26b96c6134d23a5031c9e86cf7856 Mon Sep 17 00:00:00 2001
From: jonpas <jonpas33@gmail.com>
Date: Wed, 17 Jan 2018 23:28:30 +0100
Subject: [PATCH] Improve Makefile, Use project name in GRUB menu entry

---
 Makefile               | 6 +++---
 iso/boot/grub/grub.cfg | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 98e1d00..b681a7b 100644
--- a/Makefile
+++ b/Makefile
@@ -16,8 +16,6 @@ BOOT = iso/boot
 ELF = $(BIN)/main.elf
 IMG = $(BIN)/main.img
 
-OBJS := $(foreach IN_EXT, .c .asm, $(patsubst %$(IN_EXT), %.o, $(wildcard $(SRC)/*$(IN_EXT)))) $(SRC)/boot.o
-
 all: $(IMG)
 
 $(IMG): $(ELF)
@@ -25,7 +23,9 @@ $(IMG): $(ELF)
     @cp '$<' '$(BOOT)'
     @$(GRUB) -o '$@' $(GRUBFLAGS)
 
-$(ELF): $(OBJS)
+$(ELF): \
+        $(patsubst %.c, %.o, $(wildcard $(SRC)/*.c)) \
+        $(patsubst %.asm, %.o, $(wildcard $(SRC)/*.asm))
     @echo " LINK $<"
     @$(LINK) -o '$(ELF)' $(LINKFLAGS) $^
 
diff --git a/iso/boot/grub/grub.cfg b/iso/boot/grub/grub.cfg
index a8cc94c..a3e3e60 100644
--- a/iso/boot/grub/grub.cfg
+++ b/iso/boot/grub/grub.cfg
@@ -1,5 +1,5 @@
 set timeout=0
 set default="0"
-menuentry "main" {
+menuentry "TyrOS" {
     multiboot /boot/main.elf
 }