From: Ben Pfaff <blp@cs.stanford.edu>
Date: Tue, 21 Sep 2004 03:26:41 +0000 (+0000)
Subject: Add VM makefiles.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pintos-anon;a=commitdiff_plain;h=82b7512c230e93f7fe0c265a7161b59997f197f4

Add VM makefiles.
---

diff --git a/doc/vm.texi b/doc/vm.texi
index d9d5504..85605cc 100644
--- a/doc/vm.texi
+++ b/doc/vm.texi
@@ -12,11 +12,10 @@ You will be using the @file{vm} directory for this project.  There is
 no new code to get acquainted with for this assignment.  The @file{vm}
 directory contains only the @file{Makefile}s.  The only change from
 @file{userprog} is that this new @file{Makefile} turns on the setting
-@option{-DVM}, which you will need for this assignment.  All code you
-write will either be newly generated files (e.g.@: if you choose to
-implement your paging code in their own source files), or will be
-modifications to pre-existing code (e.g.@: you will change the
-behavior of @file{process.c} significantly).
+@option{-DVM}.  All code you write will either be newly generated
+files (e.g.@: if you choose to implement your paging code in their own
+source files), or will be modifications to pre-existing code (e.g.@:
+you will change the behavior of @file{process.c} significantly).
 
 You will be building this assignment on the last one.  It will benefit
 you to get your project 2 in good working order before this assignment
diff --git a/src/Makefile.build b/src/Makefile.build
index bd619f4..baf4d83 100644
--- a/src/Makefile.build
+++ b/src/Makefile.build
@@ -43,13 +43,6 @@ 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/process.c	# Process loading.
 userprog_SRC += userprog/pagedir.c	# Page directories.
@@ -58,6 +51,16 @@ 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))
diff --git a/src/vm/Make.vars b/src/vm/Make.vars
new file mode 100644
index 0000000..8becbf7
--- /dev/null
+++ b/src/vm/Make.vars
@@ -0,0 +1,2 @@
+DEFINES = -DUSERPROG -DFILESYS -DVM
+SUBDIRS = threads devices lib lib/kernel userprog filesys vm
diff --git a/src/vm/Makefile b/src/vm/Makefile
new file mode 100644
index 0000000..34c10aa
--- /dev/null
+++ b/src/vm/Makefile
@@ -0,0 +1 @@
+include ../Makefile.kernel