From eb7e7e5e7b3078ae01ba7a491aef70910c5fbdff Mon Sep 17 00:00:00 2001
From: Christian Dietrich <stettberger@dokucode.de>
Date: Wed, 22 Oct 2014 11:49:48 +0000
Subject: [PATCH] Undo deletion

---
 Makefile | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index ed25bc6..b247525 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,21 @@
 all: main/system.iso
 
 %/system.elf: %/system.o startup.o
+	gcc -Wl,-T linker.ld $^ -m32 -static -nostdlib  -Wl,--build-id=none -o $@
 
 %/system.o: %.c 
+	mkdir -p $(shell dirname $@)
+	gcc $< -o $@ -O2 -std=c11 -m32 -c -ffunction-sections
 
 startup.o: startup.s
 	gcc startup.s -m32  -c -o startup.o -ffunction-sections
 
 %/system.iso: %/system.elf
+	rm -rf $(shell dirname $<)/grub
+	mkdir -p $(shell dirname $<)/grub/boot/grub
+	cp grub.cfg $(shell dirname $<)/grub/boot/grub
+	cp $< $(shell dirname $<)/grub/boot/system.elf
+	grub-mkrescue -o $@ $(shell dirname $<)/grub
 
 
 trace-%: %/system.elf %/system.iso
@@ -24,7 +32,7 @@ import-%: %/trace.pb
 	import-trace -t $<  -i mem  -e $(shell dirname $<)/system.elf -v $(shell dirname $<) -b mem
 	import-trace -t $<  -i regs  -e $(shell dirname $<)/system.elf -v $(shell dirname $<) -b regs --flags
 	import-trace -t $<  -i regs  -e $(shell dirname $<)/system.elf -v $(shell dirname $<) -b ip --no-gp --ip
-	prune-trace -v $(shell dirname $<) -b %%
+	import-trace -v $(shell dirname $<) -b %%
 
 
 # Do never remove implicitly generated stuff