Rewrite filesystem to support Unix "delete" semantics.

[pintos-anon] / src / Makefile.build

diff --git a/src/Makefile.build b/src/Makefile.build
index 8fe960a4684204a80711d8e3fcd7e1c259dbb2c9..017267f688b14a356d5c8556ecae12956efd29c6 100644 (file)
--- a/src/Makefile.build
+++ b/src/Makefile.build
@@ -25,6 +25,7 @@ threads_SRC += threads/paging.c               # Page tables.
 threads_SRC += threads/palloc.c                # Page allocator.
 threads_SRC += threads/malloc.c                # Subpage allocator.
 threads_SRC += threads/start.S         # Startup code.
+threads_SRC += threads/test.c          # Test code.
 
 # Device driver code.
 devices_SRC  = devices/timer.c         # Timer device.
@@ -32,6 +33,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/intq.c          # Interrupt queue.
 
 # Library code shared between kernel and user programs.
 lib_SRC  = lib/debug.c         # Debug helpers.
@@ -44,13 +46,13 @@ lib_SRC += lib/string.c             # String functions.
 lib_kernel_SRC += lib/kernel/list.c    # Doubly-linked lists.
 lib_kernel_SRC += lib/kernel/bitmap.c  # Bitmaps.
 lib_kernel_SRC += lib/kernel/hash.c    # Hash tables.
-lib_kernel_SRC += lib/kernel/printf.c  # Kernel printf().
+lib_kernel_SRC += lib/kernel/console.c # printf(), putchar().
 
 # Filesystem code.
 filesys_SRC  = filesys/filesys.c       # Filesystem core.
 filesys_SRC += filesys/file.c          # Files.
 filesys_SRC += filesys/directory.c     # Directories.
-filesys_SRC += filesys/filehdr.c       # File headers (inodes).
+filesys_SRC += filesys/inode.c         # File headers.
 filesys_SRC += filesys/fsutil.c                # Utilities.
 
 # User process code.
@@ -80,8 +82,8 @@ kernel.bin: kernel.o
        ../../pad 4096 < $@.tmp > $@
        rm $@.tmp
 
-threads/loader.o: kernel.bin
-threads/loader.o: DEFINES += -DKERNEL_LOAD_PAGES=`perl -e 'print +(-s "kernel.bin") / 4096;'`
+threads/loader.o: threads/loader.S kernel.bin
+       $(CC) -c $< -o $@ $(ASFLAGS) -DKERNEL_LOAD_PAGES=`perl -e 'print +(-s "kernel.bin") / 4096;'`
 
 loader.bin: threads/loader.o
        ld -N -e start -Ttext 0x7c00 --oformat binary -o $@ $<