X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2FMakefile.build;h=d4c6d659d0afc5af2da03dbe67751d10beff0324;hb=601d95be13aa18bfdea51930f86cccdde1c01f5e;hp=1c92b77d2783b36e757626687b9fe06d5ca4c4b1;hpb=d46fd132092304422193b717d9a60641604cc1b5;p=pintos-anon

diff --git a/src/Makefile.build b/src/Makefile.build
index 1c92b77..d4c6d65 100644
--- a/src/Makefile.build
+++ b/src/Makefile.build
@@ -43,31 +43,31 @@ lib_kernel_SRC += lib/kernel/bitmap.c	# Bitmaps.
 lib_kernel_SRC += lib/kernel/hash.c	# Hash tables.
 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/inode.c		# File headers.
-filesys_SRC += filesys/fsutil.c		# Utilities.
-
 # User process code.
-userprog_SRC  = userprog/addrspace.c	# Address spaces.
+userprog_SRC  = userprog/process.c	# Process loading.
 userprog_SRC += userprog/pagedir.c	# Page directories.
 userprog_SRC += userprog/exception.c	# User exception handler.
 userprog_SRC += userprog/syscall.c	# System call handler.
 userprog_SRC += userprog/gdt.c		# GDT initialization.
 userprog_SRC += userprog/tss.c		# TSS management.
 
+# No virtual memory code yet.
+#vm_SRC = vm/filename.c			# Some file.
+
+# Filesystem code.
+filesys_SRC  = filesys/filesys.c	# Filesystem core.
+filesys_SRC += filesys/file.c		# Files.
+filesys_SRC += filesys/directory.c	# Directories.
+filesys_SRC += filesys/inode.c		# File headers.
+filesys_SRC += filesys/fsutil.c		# Utilities.
+
 SOURCES = $(foreach dir,$(SUBDIRS),$($(subst /,_,$(dir))_SRC))
 OBJECTS = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(SOURCES)))
 DEPENDS = $(patsubst %.o,%.d,$(OBJECTS))
 
 all: os.dsk
 
-threads/intr-stubs.S: threads/intr-stubs.pl threads/loader.h
-	$< > $@
-
-threads/kernel.lds.s: CPPFLAGS += -P -C
+threads/kernel.lds.s: CPPFLAGS += -P
 threads/kernel.lds.s: threads/kernel.lds.S threads/loader.h
 
 kernel.o: threads/kernel.lds.s $(OBJECTS) 
@@ -89,7 +89,7 @@ os.dsk: loader.bin kernel.bin
 
 clean:
 	$(RM) -f $(OBJECTS) $(DEPENDS) 
-	$(RM) -f threads/intr-stubs.S threads/loader.o
+	$(RM) -f threads/loader.o
 	$(RM) -f kernel.o kernel.lds.s
 	$(RM) -f kernel.bin loader.bin