-DEFINES = -DUSERPROG -DFILESYS
-SUBDIRS = threads devices lib lib/kernel userprog filesys
+# -*- makefile -*-
-# Comment out the two lines below to disable VM.
-DEFINES += -DVM
-SUBDIRS += vm
+os.dsk: DEFINES = -DUSERPROG -DFILESYS
+
+KERNEL_SUBDIRS = threads devices lib lib/kernel userprog filesys
+TEST_SUBDIRS = tests/userprog tests/filesys/base tests/filesys/extended
+
+# Uncomment the lines below to enable VM.
+#os.dsk: DEFINES += -DVM
+#KERNEL_SUBDIRS += vm
+#TEST_SUBDIRS += tests/vm