@@ -79,19 +79,25 @@
 	rm -rf xvfs-test-coverage
 	mkdir xvfs-test-coverage
 	genhtml xvfs-test-coverage.info --output-directory xvfs-test-coverage
 	rm -f xvfs-test-coverage.info
 
-profile: profile.c Makefile
-	rm -f example-client$(LIB_SUFFIX) xvfs$(LIB_SUFFIX)
-	$(MAKE) xvfs$(LIB_SUFFIX) example-client$(LIB_SUFFIX) XVFS_ADD_CPPFLAGS="-UXVFS_DEBUG"
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -UUSE_TCL_STUBS ./xvfs$(LIB_SUFFIX) ./example-client$(LIB_SUFFIX) -o profile profile.c -ltcl
-
-do-profile: profile Makefile
-	rm -rf oprofile_data
-	LD_LIBRARY_PATH='$(shell pwd):$(LD_LIBRARY_PATH)' operf ./profile
-	opreport
+profile-bare: profile.c example.c xvfs-core.h xvfs-core.c Makefile
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -UUSE_TCL_STUBS -o profile-bare profile.c -ltcl
+
+profile-gperf: profile.c example.c xvfs-core.h xvfs-core.c Makefile
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -pg -UUSE_TCL_STUBS -o profile-gperf profile.c -ltcl
+
+do-profile: profile-bare profile-gperf Makefile
+	rm -rf oprofile_data
+	rm -f gmon.out callgrind.out
+	operf ./profile-bare
+	opreport
+	./profile-gperf
+	gprof ./profile-gperf
+	valgrind --tool=callgrind --callgrind-out-file=callgrind.out ./profile-bare 10 2
+	callgrind_annotate callgrind.out
 
 clean:
 	rm -f xvfs-create-standalone.new xvfs-create-standalone
 	rm -f example.c example.c.new
 	rm -f example-standalone$(LIB_SUFFIX) example-standalone.o
@@ -102,13 +108,15 @@
 	rm -f example-client.gcda example-client.gcno
 	rm -f example-flexible.gcda example-flexible.gcno
 	rm -f xvfs_random$(LIB_SUFFIX) xvfs_synthetic$(LIB_SUFFIX)
 	rm -f xvfs.gcda xvfs.gcno
 	rm -f __test__.tcl
-	rm -f profile
+	rm -f profile-bare profile-gperf
+	rm -f gmon.out
+	rm -f callgrind.out
 	rm -rf oprofile_data
 	rm -f xvfs-test-coverage.info
 	rm -rf xvfs-test-coverage
 
 distclean: clean
 
 .PHONY: all clean distclean test do-test do-coverage do-benchmark do-profile