1 Return-Path: <jani@nikula.org>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 16431431FC0
\r
6 for <notmuch@notmuchmail.org>; Sat, 25 May 2013 04:19:13 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id 0lUIcN9bQV5u for <notmuch@notmuchmail.org>;
\r
16 Sat, 25 May 2013 04:19:05 -0700 (PDT)
\r
17 Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com
\r
18 [209.85.217.178]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 917D8431FAF
\r
21 for <notmuch@notmuchmail.org>; Sat, 25 May 2013 04:19:05 -0700 (PDT)
\r
22 Received: by mail-lb0-f178.google.com with SMTP id w10so5486840lbi.37
\r
23 for <notmuch@notmuchmail.org>; Sat, 25 May 2013 04:19:04 -0700 (PDT)
\r
24 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
\r
25 d=google.com; s=20120113;
\r
26 h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references
\r
27 :x-gm-message-state;
\r
28 bh=HWZ2hz8RF4Y3jNGITcOBkNepgkttxmAMy8oyp1lFIWQ=;
\r
29 b=YvVa6/dA77Y/C5HdNfUBWG526EiEY2lnuktGwxCocyalv15mox94nQ15k4ivxBzn+q
\r
30 TORib5Oxh84V242/09/Dlz98/FxAA5wloR6LNaX+bPSEo4YNZDN5PGE+3x90qo1BLNGU
\r
31 0RVKDweckHgeiDYA7WC86RHK/cB7TVY02Av6JlSRNMy6dRhOtVFtDDejTl09m7G+Snn7
\r
32 Pdamgicr4kxt3Jx041A4YvL+xr77dN2rs13meCwiSkmeedM+C2GVHZmwpxZ60bNeaouh
\r
33 6R4j/tUSoF2fDAZigGVVpzm6kxxl210JIyGxC00WROIdoY0Gw3ZMkFCeoiIv05/OS4sD
\r
35 X-Received: by 10.112.60.8 with SMTP id d8mr3504005lbr.39.1369480744050;
\r
36 Sat, 25 May 2013 04:19:04 -0700 (PDT)
\r
37 Received: from localhost (dsl-hkibrasgw2-58c376-211.dhcp.inet.fi.
\r
39 by mx.google.com with ESMTPSA id f9sm8088210lbf.4.2013.05.25.04.19.02
\r
40 for <multiple recipients>
\r
41 (version=TLSv1.2 cipher=RC4-SHA bits=128/128);
\r
42 Sat, 25 May 2013 04:19:03 -0700 (PDT)
\r
43 From: Jani Nikula <jani@nikula.org>
\r
44 To: notmuch@notmuchmail.org
\r
45 Subject: [PATCH v2] build: fix out-of-tree builds
\r
46 Date: Sat, 25 May 2013 14:18:58 +0300
\r
47 Message-Id: <1369480738-16551-1-git-send-email-jani@nikula.org>
\r
48 X-Mailer: git-send-email 1.7.10.4
\r
49 In-Reply-To: <1368615519-25977-1-git-send-email-jani@nikula.org>
\r
50 References: <1368615519-25977-1-git-send-email-jani@nikula.org>
\r
52 ALoCoQlA08hiJD25b8pCM2j6CP4sKZ6tfw+LvAQxWKh6B3z9fvnf/dS35oal1cEmRerZggDlqxSq
\r
53 X-BeenThere: notmuch@notmuchmail.org
\r
54 X-Mailman-Version: 2.1.13
\r
56 List-Id: "Use and development of the notmuch mail system."
\r
57 <notmuch.notmuchmail.org>
\r
58 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
59 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
60 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
61 List-Post: <mailto:notmuch@notmuchmail.org>
\r
62 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
63 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
64 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
65 X-List-Received-Date: Sat, 25 May 2013 11:19:13 -0000
\r
67 Support for out-of-tree builds was added in
\r
68 commit 3e4a9d60a9419621b08c647a306843d76c47c2cb
\r
69 Author: Carl Worth <cworth@cworth.org>
\r
70 Date: Wed Mar 9 15:02:42 2011 -0800
\r
72 build: Add support for non-source-directory builds.
\r
75 commit 7beeb8c88a014ecbc53d8241f10683b3c4c16228
\r
76 Author: David Bremner <bremner@debian.org>
\r
77 Date: Sat Nov 17 12:28:15 2012 -0400
\r
79 test: initial performance testing infrastructure
\r
81 Fix the build breakage.
\r
83 Out-of-tree 'make test' has been broken since earlier than the above,
\r
84 and remains broken, as does out-of-tree perf test, but at least the
\r
89 I didn't have the time to dig into the test and perf test breakage.
\r
91 Makefile | 7 ++++---
\r
92 performance-test/Makefile.local | 2 +-
\r
93 2 files changed, 5 insertions(+), 4 deletions(-)
\r
95 diff --git a/Makefile b/Makefile
\r
96 index 73a8554..0428160 100644
\r
100 # given explicitly on the command line) so mention it first.
\r
103 -# List all subdirectories here. Each contains its own Makefile.local
\r
104 -subdirs := compat completion emacs lib man parse-time-string
\r
105 -subdirs += performance-test util test
\r
106 +# List all subdirectories here. Each contains its own Makefile.local.
\r
107 +# Use of '=', without '+=', seems to be required for out-of-tree
\r
109 +subdirs = compat completion emacs lib man parse-time-string performance-test util test
\r
111 # We make all targets depend on the Makefiles themselves.
\r
112 global_deps = Makefile Makefile.config Makefile.local \
\r
113 diff --git a/performance-test/Makefile.local b/performance-test/Makefile.local
\r
114 index 73aa963..e47219a 100644
\r
115 --- a/performance-test/Makefile.local
\r
116 +++ b/performance-test/Makefile.local
\r
119 dir := performance-test
\r
121 -include $(dir)/version.sh
\r
122 +include $(srcdir)/$(dir)/version.sh
\r
124 TIME_TEST_SCRIPT := ${dir}/notmuch-time-test
\r
125 MEMORY_TEST_SCRIPT := ${dir}/notmuch-memory-test
\r