From 77b9f2d066ae78a2f347b4a4a213329d3a18713f Mon Sep 17 00:00:00 2001
From: Adrien Bourmault <neox@os-k.eu>
Date: Sat, 16 Mar 2019 22:33:09 +0100
Subject: [PATCH] Makefile stuff

---
 Makefile                  | 21 +++++++++------------
 boot/grub/grub-install.sh |  2 +-
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 00e3ce4..5537649 100644
--- a/Makefile
+++ b/Makefile
@@ -63,17 +63,12 @@ CL3='\033[0m'
 NC='\033[1;37m'
 
 kernel:
-	cpp ./Makefile.in > build/Makefile.out
-	python build/idttool.py
-	make kernel -f build/Makefile.out.2
-	rm build/Makefile.out build/Makefile.out.2
-
-kernel-asm:
-	cpp -D_TO_ASM ./Makefile.in > build/Makefile.out
-	python build/idttool.py
-	make kernel -f build/Makefile.out.2
-	rm build/Makefile.out build/Makefile.out.2
-
+	@echo ${CL2}[[kernel]]${NC} Making kernel...${CL3}
+	@cpp ./Makefile.in > build/Makefile.out
+	@python build/idttool.py
+	@make kernel -f build/Makefile.out.2
+	@rm build/Makefile.out build/Makefile.out.2
+	@echo ${CL2}[[kernel]]${CL} Terminated without error.${CL3}
 tests:
 	cpp -D_TESTS ./Makefile.in > build/Makefile.out
 	python build/idttool.py
@@ -84,8 +79,9 @@ boot.mbr: $(BINDIR)/disk.img $(MBRDIR)/grub.cfg
 	@mkdir -p $(BINDIR)/disk
 	@echo ${CL2}[boot.mbr]${NC} Installing MBR on image...${CL3}
 	@$(MBRDIR)/grub-install.sh $(BINDIR)/disk.img $(BINDIR)/disk $(MBRDIR)/grub.cfg
-	@echo ${CL2}[boot.mbr]${CL} OK${CL3}
+	@tail -1 grub.log | head -1 | grep "Installation terminée, sans erreur."
 	@rmdir $(BINDIR)/disk
+	@echo ${CL2}[boot.mbr]${CL} Terminated without error.${CL3}
 
 boot.loader.asm: $(LOADERDIR)/loader.asm
 	@echo ${CL2}[boot.loader.asm]${NC} Making loader...${CL3}
@@ -106,6 +102,7 @@ copykernel:
 make_disk:
 	@echo ${CL2}[make_disk]${NC} Constructing disk image...${CL3}
 	@$(MBRDIR)/create_disk.sh $(BINDIR)/disk.img
+
 	@echo ${CL2}[make_disk]${CL} OK${CL3}
 
 
diff --git a/boot/grub/grub-install.sh b/boot/grub/grub-install.sh
index cd76028..d89d6eb 100755
--- a/boot/grub/grub-install.sh
+++ b/boot/grub/grub-install.sh
@@ -61,4 +61,4 @@ sudo umount /dev/loop1 > /dev/null
 echo ${CL2}[grub-install.sh]${NC} Unmounting image... 		\(losetup\)${CL3}
 sudo losetup -D > /dev/null
 
-echo ${CL2}[grub-install.sh]${CL} Terminated without error. See grub.log for more informations.${CL3}
+echo ${CL2}[grub-install.sh]${CL} See grub.log for more informations.${CL3}