X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2FMakefile.build;h=277373effe4910e6818671581ba51b9223599cfc;hb=ed04361f6ec91e4f0db1550c2cc487a461b2d17b;hp=8fa804b0cb669d318e4ad82cbbc095061ef1e707;hpb=c0206643b024b6f0e6cde1cbb5e7d37abbc84c69;p=pintos-anon

diff --git a/src/Makefile.build b/src/Makefile.build
index 8fa804b..277373e 100644
--- a/src/Makefile.build
+++ b/src/Makefile.build
@@ -28,6 +28,7 @@ devices_SRC += devices/kbd.c		# Keyboard device.
 devices_SRC += devices/vga.c		# Video device.
 devices_SRC += devices/serial.c		# Serial port device.
 devices_SRC += devices/disk.c		# IDE disk device.
+devices_SRC += devices/input.c		# Serial and keyboard input.
 devices_SRC += devices/intq.c		# Interrupt queue.
 
 # Library code shared between kernel and user programs.
@@ -36,6 +37,7 @@ lib_SRC += lib/random.c			# Pseudo-random numbers.
 lib_SRC += lib/stdio.c			# I/O library.
 lib_SRC += lib/stdlib.c			# Utility functions.
 lib_SRC += lib/string.c			# String functions.
+lib_SRC += lib/arithmetic.c
 
 # Kernel-specific library code.
 lib/kernel_SRC  = lib/kernel/debug.c	# Debug helpers.
@@ -71,7 +73,7 @@ threads/kernel.lds.s: CPPFLAGS += -P
 threads/kernel.lds.s: threads/kernel.lds.S threads/loader.h
 
 kernel.o: threads/kernel.lds.s $(OBJECTS) 
-	$(LD) -T $< -o $@ $(OBJECTS) `$(CC) -print-libgcc-file-name`
+	$(LD) -T $< -o $@ $(OBJECTS)
 
 kernel.bin: kernel.o
 	$(OBJCOPY) -O binary -R .note -R .comment -S $< $@.tmp
@@ -92,6 +94,8 @@ clean::
 	rm -f threads/loader.o threads/kernel.lds.s threads/loader.d
 	rm -f kernel.o kernel.lds.s
 	rm -f kernel.bin loader.bin os.dsk
+	rm -f bochsout.txt bochsrc.txt
+	rm -f results grade
 
 Makefile: $(SRCDIR)/Makefile.build
 	cp $< $@