Improve Makefile, Use project name in GRUB menu entry

jonpas · Jan 17, 2018 · c4eea48 · c4eea48
1 parent f83e156
commit c4eea48
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -16,16 +16,16 @@ 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)
     @echo " GRUB $<"
     @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
@@ -1,5 +1,5 @@
 set timeout=0
 set default="0"
-menuentry "main" {
+menuentry "TyrOS" {
     multiboot /boot/main.elf
 }