From 2cbd68de92e032302a8fc65a6620adb1fc5ba1ae Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Sat, 25 May 2013 14:18:58 +0300 Subject: [PATCH] build: fix out-of-tree builds Support for out-of-tree builds was added in commit 3e4a9d60a9419621b08c647a306843d76c47c2cb Author: Carl Worth 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 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. --- Makefile | 7 ++++--- performance-test/Makefile.local | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 73a85546..0428160b 100644 --- a/Makefile +++ b/Makefile @@ -2,9 +2,10 @@ # given explicitly on the command line) so mention it first. 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 +# List all subdirectories here. Each contains its own Makefile.local. +# Use of '=', without '+=', seems to be required for out-of-tree +# builds to work. +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 73aa963b..e47219ad 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