X-Git-Url: http://akaros.cs.berkeley.edu/gitweb/?p=akaros.git;a=blobdiff_plain;f=Makefile;h=5f7681f3dde6e074dd872bef8b875834a5aa1df2;hp=f1df43483c5c156bcd6355c5e08379bab11fc655;hb=f195b3f1e068302e5ce7459fd1a5aba68503f0bf;hpb=6d8c14aaeb577e902e831244cb2e8c7489dc2ca0

diff --git a/Makefile b/Makefile
index f1df434..5f7681f 100644
--- a/Makefile
+++ b/Makefile
@@ -541,6 +541,7 @@ endif #ifeq ($(mixed-targets),1)
 # such as how pthread depends on parlib.
 
 user-dirs = parlib pthread benchutil iplib ndblib bsd
+benchutil: parlib
 pthread: parlib benchutil
 iplib: parlib
 ndblib: iplib
@@ -555,7 +556,7 @@ $(user-dirs):
 
 PHONY += userclean $(clean-user-dirs)
 clean-user-dirs := $(addprefix _clean_user_,$(user-dirs))
-userclean: $(clean-user-dirs) testclean
+userclean: $(clean-user-dirs) testclean utestclean
 
 $(clean-user-dirs):
 	@cd user/$(patsubst _clean_user_%,%,$@) && $(MAKE) clean
@@ -564,9 +565,16 @@ tests/: tests
 tests: install-libs
 	@$(MAKE) -f tests/Makefile
 
+PHONY += utest
+utest: $(user-dirs)
+	@cd user/$@ && $(MAKE) 
+
 testclean:
 	@$(MAKE) -f tests/Makefile clean
 
+utestclean:
+	@cd user/utest && $(MAKE) clean
+
 # KFS related stuff
 PHONY += fill-kfs unfill-kfs
 XCC_SO_FILES = $(addprefix $(XCC_TARGET_ROOT)/lib/, *.so*)
@@ -574,14 +582,20 @@ XCC_SO_FILES = $(addprefix $(XCC_TARGET_ROOT)/lib/, *.so*)
 $(OBJDIR)/.dont-force-fill-kfs:
 	$(Q)rm -rf $(addprefix $(FIRST_KFS_PATH)/lib/, $(notdir $(XCC_SO_FILES)))
 	@echo "Cross Compiler 'so' files removed from KFS"
-	@$(MAKE) -f tests/Makefile unfill-kfs
+	@$(MAKE) -f tests/Makefile uninstall
+	@echo "Apps from /test removed from KFS"
+	@cd user/utest && $(MAKE) uninstall
+	@echo "User space tests removed from KFS"
 	@touch $(OBJDIR)/.dont-force-fill-kfs
 
 fill-kfs: $(OBJDIR)/.dont-force-fill-kfs install-libs
 	@mkdir -p $(FIRST_KFS_PATH)/lib
 	$(Q)cp -uP $(XCC_SO_FILES) $(FIRST_KFS_PATH)/lib
 	@echo "Cross Compiler 'so' files installed to KFS"
-	@$(MAKE) -f tests/Makefile fill-kfs
+	@$(MAKE) -f tests/Makefile install
+	@echo "Apps from /test installed to KFS"
+	@cd user/utest && $(MAKE) install
+	@echo "User space tests installed to KFS"
 
 # Use doxygen to make documentation for ROS (Untested since 2010 or so)
 doxygen-dir := $(CUR_DIR)/Documentation/doxygen