-DEFINES = -DUSERPROG -DFILESYS -DVM
-SUBDIRS = threads devices lib lib/kernel userprog filesys vm
+# -*- makefile -*-
+
+os.dsk: DEFINES = -DUSERPROG -DFILESYS -DVM
+KERNEL_SUBDIRS = threads devices lib lib/kernel userprog filesys vm
+TEST_SUBDIRS = tests/userprog tests/vm tests/filesys/base
+GRADING_FILE = $(SRCDIR)/tests/vm/Grading
+SIMULATOR = --qemu