diff --git a/make/lo.mk b/make/lo.mk
index 05ed9af5..018ec5c8 100644
--- a/make/lo.mk
+++ b/make/lo.mk
@@ -8,6 +8,7 @@ LOADABLE_OBJ_HOOK            ?= LOADABLE_OBJECT_HOOK
 # === change this <
 
 include $(MODDIR)/make/defs.mk
+include $(MODDIR)/make/profiler.mk
 
 .PRECIOUS: %.cpp %.o
 LOADABLE_OBJS_HEADER         ?= $(wildcard $(TOOLS_INCLUDE_DIR)/$(CPP_PREFIX)*$(CPP_SUFFIX).h)
diff --git a/make/run.mk b/make/run.mk
index 4d4b4127..7c42523e 100644
--- a/make/run.mk
+++ b/make/run.mk
@@ -30,6 +30,7 @@ LOCAL_CFLAGS   += -DEXE_NAME=\"$(EXE)\"
 LOCAL_CPPFLAGS += -DEXE_NAME=\"$(EXE)\"
 
 include $(MODDIR)/make/defs.mk
+include $(MODDIR)/make/profiler.mk
 BUILD_HDR =
 include $(MODDIR)/make/rules.mk
 include $(MODDIR)/make/ldlibpath.mk
@@ -67,6 +68,9 @@ start: run-prereq
 	$(RM) -f core.*
 	$(EXE_PATH) $(EXE_ARGS) &
 
+which:
+	/usr/bin/which $(EXE_PATH)
+
 $(SHORTCUT_SCRIPT):
 ifeq ($(TARGET),mingw)
 	echo "set PATH=%PATH;$(DLL_PATH)" > $@.tmp
diff --git a/make/test-java.mk b/make/test-java.mk
index ee7eb010..bd7faafa 100644
--- a/make/test-java.mk
+++ b/make/test-java.mk
@@ -10,4 +10,4 @@ JAVA_SRC                  += $(JAVA_TEST_MAIN_JAVA)
 #include $(MODDIR)/make/java.mk
 
 run test: $(JAVA_CLASSFILES)
-	CLASSPATH=$(shell echo $(CLASSPATH) | sed 's/  */:/g') java $(JAVA_TEST_MAIN_CLASS) $(EXE_ARGS)
+	CLASSPATH=$(shell echo $(CLASSPATH) | sed 's/  */:/g') time -p java $(JAVA_JVM_OPTS) $(JAVA_TEST_MAIN_CLASS) $(EXE_ARGS)
diff --git a/make/tools.mk b/make/tools.mk
index e341e7b3..80746982 100644
--- a/make/tools.mk
+++ b/make/tools.mk
@@ -8,6 +8,7 @@ include $(MODDIR)/make/targets-tools.mk
 include $(MODDIR)/make/cpp-extra-targets.mk
 include $(MODDIR)/make/depend.mk
 include $(MODDIR)/make/backup.mk
+include $(MODDIR)/make/profiler.mk
 
 LOCAL_CFLAGS     += -D_USRDLL -DALL_EXPORTS
 LOCAL_CPPFLAGS   += -D_USRDLL -DALL_EXPORTS