Support for out-of-tree builds was added in commit 3e4a9d60a9419621b08c647a306843d76c47c2cb Author: Carl Worth <cworth@cworth.org> Date: Wed Mar 9 15:02:42 2011 -0800 build: Add support for non-source-directory builds. and broken in commit 7beeb8c88a014ecbc53d8241f10683b3c4c16228 Author: David Bremner <bremner@debian.org> Date: Sat Nov 17 12:28:15 2012 -0400 test: initial performance testing infrastructure Fix the build breakage. Out-of-tree 'make test' has been broken since earlier than the above, and remains broken, as does out-of-tree perf test, but at least the build now works. --- I didn't have the time to dig into the test and perf test breakage. --- Makefile | 3 +-- performance-test/Makefile.local | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 73a8554..3301d30 100644 --- a/Makefile +++ b/Makefile @@ -3,8 +3,7 @@ all: # List all subdirectories here. Each contains its own Makefile.local -subdirs := compat completion emacs lib man parse-time-string -subdirs += performance-test util test +subdirs = compat completion emacs lib man parse-time-string performance-test util test # We make all targets depend on the Makefiles themselves. global_deps = Makefile Makefile.config Makefile.local \ diff --git a/performance-test/Makefile.local b/performance-test/Makefile.local index 73aa963..e47219a 100644 --- a/performance-test/Makefile.local +++ b/performance-test/Makefile.local @@ -2,7 +2,7 @@ dir := performance-test -include $(dir)/version.sh +include $(srcdir)/$(dir)/version.sh TIME_TEST_SCRIPT := ${dir}/notmuch-time-test MEMORY_TEST_SCRIPT := ${dir}/notmuch-memory-test -- 1.7.2.5