From df5cc91659b0a2190072e6fc305060c8de95ed82 Mon Sep 17 00:00:00 2001
From: rtm <rtm>
Date: Thu, 22 Jun 2006 20:47:23 +0000
Subject: compile "user programs" curproc array

---
 Makefile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index c3495c0..870ea70 100644
--- a/Makefile
+++ b/Makefile
@@ -20,18 +20,22 @@ bootblock : bootasm.S bootmain.c
 	$(OBJCOPY) -S -O binary bootblock.o bootblock
 	./sign.pl bootblock
 
-kernel : $(OBJS) bootother.S
+kernel : $(OBJS) bootother.S user1
 	$(CC) -nostdinc -I. -c bootother.S
 	$(LD) -N -e start -Ttext 0x7000 -o bootother.out bootother.o
 	$(OBJCOPY) -S -O binary bootother.out bootother
 	$(OBJDUMP) -S bootother.o > bootother.asm
-	$(LD) -Ttext 0x100000 -e main -o kernel $(OBJS) -b binary bootother
+	$(LD) -Ttext 0x100000 -e main -o kernel $(OBJS) -b binary bootother user1
 	$(OBJDUMP) -S kernel > kernel.asm
 
 vectors.S : vectors.pl
 	perl vectors.pl > vectors.S
 
+user1 : user1.c
+	$(CC) -nostdinc -I. -c user1.c
+	$(LD) -N -e main -Ttext 0 -o user1 user1.o
+
 -include *.d
 
 clean : 
-	rm -f *.o bootblock kernel kernel.asm xv6.img *.d
+	rm -f *.o bootblock kernel kernel.asm xv6.img *.d user1
-- 
cgit v1.2.3