From 813272cd88cc6c0a1dfbb121d2130fc849042c8a Mon Sep 17 00:00:00 2001
From: Michal Idziorek <m.i@gmx.at>
Date: Mon, 20 Oct 2014 18:54:18 +0200
Subject: 1st userspace programm and partial newlib support!

---
 Makefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index fc7dec2..9dac9b0 100644
--- a/Makefile
+++ b/Makefile
@@ -105,9 +105,10 @@ FoolOS.img: $(MBR) $(STAGE2) kernel.bin $(FILLUP) FoolData.img
 binfont.img:  binfont.bin
 	cat $^ > $@
 
-FoolData.img: binfont.bin $(MP_BIN)
+FoolData.img: binfont.bin $(MP_BIN) userspace/userprog
 	dd if=$(MP_BIN) of=$@ bs=512 seek=0 conv=notrunc
 	dd if=binfont.bin of=$@ bs=512 seek=1 conv=notrunc
+	dd if=userspace/userprog of=$@ bs=512 seek=4 conv=notrunc
 
 ############ vm stuff ############
 
@@ -121,10 +122,15 @@ run: all
 
 clean:
 	-rm *.bin *.img bochs.log $(KERNEL_ENTRY) $(ASMOBJECTS) $(OBJECTS) $(FILLUP) $(MBR) $(MP_BIN) bochs.out ne2k-tx.log ne2k-txdump.txt $(STAGE2)
+	make -C userspace clean
+
 
 release: all
 	-rm *.bin FoolData.img binfont.img bochs.log $(KERNEL_ENTRY) $(ASMOBJECTS) $(OBJECTS) $(FILLUP) $(MBR) $(MP_BIN) bochs.out ne2k-tx.log ne2k-txdump.txt $(STAGE2)
 
+userspace/userprog:
+	make -C userspace
+
 
 ############ test stuff ############
 stick:  FoolOS.img
-- 
cgit v1.2.3