summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorrtm <rtm>2006-06-13 15:50:06 +0000
committerrtm <rtm>2006-06-13 15:50:06 +0000
commit0a70d042d04e084da4226e7d0d684dedcae06d78 (patch)
tree3dfa629b4e4b44b399fb13b384ed9b50dd03f997 /Makefile
parent70a895f63c504f255a28f63efdcfc6b39b2572c5 (diff)
downloadxv6-labs-0a70d042d04e084da4226e7d0d684dedcae06d78.tar.gz
xv6-labs-0a70d042d04e084da4226e7d0d684dedcae06d78.tar.bz2
xv6-labs-0a70d042d04e084da4226e7d0d684dedcae06d78.zip
more or less take traps/interrupts
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 8d67fed..22636ea 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-OBJS = main.o console.o string.o kalloc.o proc.o trapasm.o
+OBJS = main.o console.o string.o kalloc.o proc.o trapasm.o trap.o vectors.o
CC = i386-jos-elf-gcc
LD = i386-jos-elf-ld
@@ -23,5 +23,8 @@ kernel : $(OBJS)
$(LD) -Ttext 0x100000 -e main -o kernel $(OBJS)
$(OBJDUMP) -S kernel > kernel.asm
+vectors.S : vectors.pl
+ perl vectors.pl > vectors.S
+
clean :
rm -f *.o bootblock kernel kernel.asm xv6.img