X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2FMakefile.kernel;h=162a4114256891794606019b106dc6d67353c323;hb=43dadfe13b843be54ac5fdc9e4496beb47af3b1f;hp=c1985c4537f791da77fe27e11228014baeec2c6e;hpb=6e90bdc33810948b6de5c70b4c7987740d67da3d;p=pintos-anon

diff --git a/src/Makefile.kernel b/src/Makefile.kernel
index c1985c4..162a411 100644
--- a/src/Makefile.kernel
+++ b/src/Makefile.kernel
@@ -1,17 +1,20 @@
-include Makefile.vars
-BUILD_SUBDIRS = $(addprefix build/, $(SUBDIRS))
-CP = cp
-MKDIR = mkdir
+# -*- makefile -*-
 
-all: build build/Makefile $(BUILD_SUBDIRS)
-	$(MAKE) -C build
+all:
 
-$(BUILD_SUBDIRS):
-	$(MKDIR) $@
-build:
-	$(MKDIR) $@
+include Make.vars
+
+DIRS = $(sort $(addprefix build/,$(KERNEL_SUBDIRS) $(TEST_SUBDIRS) lib/user))
+
+all grade check: $(DIRS) build/Makefile
+	cd build && $(MAKE) $@
+$(DIRS):
+	mkdir -p $@
 build/Makefile: ../Makefile.build
-	$(CP) $< $@
+	cp $< $@
+
+build/%: $(DIRS) build/Makefile
+	cd build && $(MAKE) $*
 
 clean:
 	rm -rf build