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, but at least the build now works. --- David, does the perf test still work for you with these changes? --- Makefile | 3 +-- performance-test/Makefile.local | 10 +++++----- 2 files changed, 6 insertions(+), 7 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..d9623d7 100644 --- a/performance-test/Makefile.local +++ b/performance-test/Makefile.local @@ -2,13 +2,13 @@ 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 +TIME_TEST_SCRIPT :=$ $(srcdir)/$(dir)/notmuch-time-test +MEMORY_TEST_SCRIPT := $(srcdir)/$(dir)/notmuch-memory-test CORPUS_NAME := notmuch-email-corpus-$(PERFTEST_VERSION).tar.xz -TXZFILE := ${dir}/download/${CORPUS_NAME} +TXZFILE := $(srcdir)/$(dir)/download/${CORPUS_NAME} SIGFILE := ${TXZFILE}.asc DEFAULT_URL := http://notmuchmail.org/releases/${CORPUS_NAME} @@ -39,4 +39,4 @@ $(TXZFILE): download-corpus: wget -O ${TXZFILE} ${DEFAULT_URL} -CLEAN := $(CLEAN) $(dir)/tmp.* $(dir)/log.* $(dir)/corpus $(dir)/notmuch.cache.* +CLEAN := $(CLEAN) $(srcdir)/$(dir)/tmp.* $(srcdir)/$(dir)/log.* $(srcdir)/$(dir)/corpus $(srcdir)/$(dir)/notmuch.cache.* -- 1.7.10.4