diff options
author | Jani Nikula <jani@nikula.org> | 2013-05-25 14:18:58 +0300 |
---|---|---|
committer | David Bremner <bremner@debian.org> | 2013-05-26 18:49:04 -0300 |
commit | 2cbd68de92e032302a8fc65a6620adb1fc5ba1ae (patch) | |
tree | 6b7fe6df8920dfbb01ba862402e063029462e6dd | |
parent | 8a164516ee3a8ad000cf10cdcb4e84eb8bf7674d (diff) |
build: fix out-of-tree builds
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.
-rw-r--r-- | Makefile | 7 | ||||
-rw-r--r-- | performance-test/Makefile.local | 2 |
2 files changed, 5 insertions, 4 deletions
@@ -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 |