summaryrefslogtreecommitdiffstats
path: root/vm
diff options
context:
space:
mode:
authormanuel <manuel@mausz.at>2012-03-27 11:51:08 +0200
committermanuel <manuel@mausz.at>2012-03-27 11:51:08 +0200
commit4f670845ff9ab6c48bcb5f7bf4d4ef6dc3c3064b (patch)
tree868c52e06f207b5ec8a3cc141f4b8b2bdfcc165c /vm
parenteae0bd57f0a26314a94785061888d193d186944a (diff)
downloadprogos-4f670845ff9ab6c48bcb5f7bf4d4ef6dc3c3064b.tar.gz
progos-4f670845ff9ab6c48bcb5f7bf4d4ef6dc3c3064b.tar.bz2
progos-4f670845ff9ab6c48bcb5f7bf4d4ef6dc3c3064b.zip
reorganize file structure to match the upstream requirements
Diffstat (limited to 'vm')
-rw-r--r--vm/.gitignore3
-rw-r--r--vm/Make.vars7
-rw-r--r--vm/Makefile1
3 files changed, 11 insertions, 0 deletions
diff --git a/vm/.gitignore b/vm/.gitignore
new file mode 100644
index 0000000..6d5357c
--- /dev/null
+++ b/vm/.gitignore
@@ -0,0 +1,3 @@
1build
2bochsrc.txt
3bochsout.txt
diff --git a/vm/Make.vars b/vm/Make.vars
new file mode 100644
index 0000000..e3c33a7
--- /dev/null
+++ b/vm/Make.vars
@@ -0,0 +1,7 @@
1# -*- makefile -*-
2
3kernel.bin: DEFINES = -DUSERPROG -DFILESYS -DVM
4KERNEL_SUBDIRS = threads devices lib lib/kernel userprog filesys vm
5TEST_SUBDIRS = tests/userprog tests/vm tests/filesys/base
6GRADING_FILE = $(SRCDIR)/tests/vm/Grading
7SIMULATOR = --qemu
diff --git a/vm/Makefile b/vm/Makefile
new file mode 100644
index 0000000..34c10aa
--- /dev/null
+++ b/vm/Makefile
@@ -0,0 +1 @@
include ../Makefile.kernel