debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 10:58:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: fix out-of-tree builds

Browse source 
Support for out-of-tree builds was added in
commit 3e4a9d60a9
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 7beeb8c88a
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.
This commit is contained in:
Jani Nikula 2013-05-25 14:18:58 +03:00 committed by David Bremner
parent 8a164516ee
commit 2cbd68de92
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -2,9 +2,10 @@
# given explicitly on the command line) so mention it first. # given explicitly on the command line) so mention it first.
all: all:
# List all subdirectories here. Each contains its own Makefile.local # List all subdirectories here. Each contains its own Makefile.local.
subdirs := compat completion emacs lib man parse-time-string # Use of '=', without '+=', seems to be required for out-of-tree
subdirs += performance-test util test # 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. # We make all targets depend on the Makefiles themselves.
global_deps = Makefile Makefile.config Makefile.local \ global_deps = Makefile Makefile.config Makefile.local \

2
performance-test/Makefile.local
View file

@ -2,7 +2,7 @@
dir := performance-test dir := performance-test
include $(dir)/version.sh include $(srcdir)/$(dir)/version.sh
TIME_TEST_SCRIPT := ${dir}/notmuch-time-test TIME_TEST_SCRIPT := ${dir}/notmuch-time-test
MEMORY_TEST_SCRIPT := ${dir}/notmuch-memory-test MEMORY_TEST_SCRIPT := ${dir}/notmuch-memory-test