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 DB6F9431FAF
\r
6 for <notmuch@notmuchmail.org>; Thu, 7 Mar 2013 13:34:34 -0800 (PST)
\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 y6nHeAwIC1Sh for <notmuch@notmuchmail.org>;
\r
16 Thu, 7 Mar 2013 13:34:34 -0800 (PST)
\r
17 Received: from mail-la0-f45.google.com (mail-la0-f45.google.com
\r
18 [209.85.215.45]) (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 1EBDE431FAE
\r
21 for <notmuch@notmuchmail.org>; Thu, 7 Mar 2013 13:34:33 -0800 (PST)
\r
22 Received: by mail-la0-f45.google.com with SMTP id er20so1029656lab.18
\r
23 for <notmuch@notmuchmail.org>; Thu, 07 Mar 2013 13:34:32 -0800 (PST)
\r
24 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
\r
25 d=google.com; s=20120113;
\r
26 h=x-received:from:to:subject:date:message-id:x-mailer
\r
27 :x-gm-message-state;
\r
28 bh=OjPKV7+n2tslCxTOiOx6xfJFCD/cGIO66onu0UtwJY4=;
\r
29 b=VJWlgG7UIahEfARnL4Sei1CqvNggpZKu4YHzsn+po3DRKKIX+bq3bCY9P3uiO+TfZx
\r
30 EV1Peom8qfMny5Y3TzG3b+hit2XTbWnahxLpk07oS6ZDvHCUOp9ZrtJrDbXTVksIdY5P
\r
31 k0rzIGZxirL4XzCe/xTyjHZygjAflN6zNvWEq+kD0/knMqPiOHbSdpOKjl+z7UEqkfBq
\r
32 xM/7+GIcZpv9pn5IxY1Ba+JcD5MCAqa0X00O5IfI2hLG/DpkGY6jnGQ2RFIrhGP5gWRl
\r
33 vVCWefSWUjXHGdPEC+HslB/ZdZK4YeByvFPMGxVm0gTEqkKRiZRF+f7LMQxWZwW9b/Hs
\r
35 X-Received: by 10.152.45.140 with SMTP id n12mr30103229lam.36.1362692071151;
\r
36 Thu, 07 Mar 2013 13:34:31 -0800 (PST)
\r
37 Received: from localhost (dsl-hkibrasgw4-50df51-27.dhcp.inet.fi.
\r
39 by mx.google.com with ESMTPS id k15sm998685lbd.6.2013.03.07.13.34.29
\r
40 (version=TLSv1.2 cipher=RC4-SHA bits=128/128);
\r
41 Thu, 07 Mar 2013 13:34:30 -0800 (PST)
\r
42 From: Jani Nikula <jani@nikula.org>
\r
43 To: notmuch@notmuchmail.org,
\r
45 Subject: [PATCH] build: fix out-of-tree builds
\r
46 Date: Thu, 7 Mar 2013 23:34:28 +0200
\r
47 Message-Id: <1362692068-30142-1-git-send-email-jani@nikula.org>
\r
48 X-Mailer: git-send-email 1.7.10.4
\r
50 ALoCoQmkHTRpTb976vwxOo9A6msZjaxp0jhYEO//QsM2qChZLuT4ihhuxotFQNiR8j26B36vF40p
\r
51 X-BeenThere: notmuch@notmuchmail.org
\r
52 X-Mailman-Version: 2.1.13
\r
54 List-Id: "Use and development of the notmuch mail system."
\r
55 <notmuch.notmuchmail.org>
\r
56 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
57 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
58 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
59 List-Post: <mailto:notmuch@notmuchmail.org>
\r
60 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
61 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
62 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
63 X-List-Received-Date: Thu, 07 Mar 2013 21:34:35 -0000
\r
65 Support for out-of-tree builds was added in
\r
66 commit 3e4a9d60a9419621b08c647a306843d76c47c2cb
\r
67 Author: Carl Worth <cworth@cworth.org>
\r
68 Date: Wed Mar 9 15:02:42 2011 -0800
\r
70 build: Add support for non-source-directory builds.
\r
73 commit 7beeb8c88a014ecbc53d8241f10683b3c4c16228
\r
74 Author: David Bremner <bremner@debian.org>
\r
75 Date: Sat Nov 17 12:28:15 2012 -0400
\r
77 test: initial performance testing infrastructure
\r
79 Fix the build breakage. Out-of-tree 'make test' has been broken since
\r
80 earlier than the above, and remains broken, but at least the build now
\r
85 David, does the perf test still work for you with these changes?
\r
88 performance-test/Makefile.local | 10 +++++-----
\r
89 2 files changed, 6 insertions(+), 7 deletions(-)
\r
91 diff --git a/Makefile b/Makefile
\r
92 index 73a8554..3301d30 100644
\r
98 # List all subdirectories here. Each contains its own Makefile.local
\r
99 -subdirs := compat completion emacs lib man parse-time-string
\r
100 -subdirs += performance-test util test
\r
101 +subdirs = compat completion emacs lib man parse-time-string performance-test util test
\r
103 # We make all targets depend on the Makefiles themselves.
\r
104 global_deps = Makefile Makefile.config Makefile.local \
\r
105 diff --git a/performance-test/Makefile.local b/performance-test/Makefile.local
\r
106 index 73aa963..d9623d7 100644
\r
107 --- a/performance-test/Makefile.local
\r
108 +++ b/performance-test/Makefile.local
\r
111 dir := performance-test
\r
113 -include $(dir)/version.sh
\r
114 +include $(srcdir)/$(dir)/version.sh
\r
116 -TIME_TEST_SCRIPT := ${dir}/notmuch-time-test
\r
117 -MEMORY_TEST_SCRIPT := ${dir}/notmuch-memory-test
\r
118 +TIME_TEST_SCRIPT :=$ $(srcdir)/$(dir)/notmuch-time-test
\r
119 +MEMORY_TEST_SCRIPT := $(srcdir)/$(dir)/notmuch-memory-test
\r
121 CORPUS_NAME := notmuch-email-corpus-$(PERFTEST_VERSION).tar.xz
\r
122 -TXZFILE := ${dir}/download/${CORPUS_NAME}
\r
123 +TXZFILE := $(srcdir)/$(dir)/download/${CORPUS_NAME}
\r
124 SIGFILE := ${TXZFILE}.asc
\r
125 DEFAULT_URL := http://notmuchmail.org/releases/${CORPUS_NAME}
\r
127 @@ -39,4 +39,4 @@ $(TXZFILE):
\r
129 wget -O ${TXZFILE} ${DEFAULT_URL}
\r
131 -CLEAN := $(CLEAN) $(dir)/tmp.* $(dir)/log.* $(dir)/corpus $(dir)/notmuch.cache.*
\r
132 +CLEAN := $(CLEAN) $(srcdir)/$(dir)/tmp.* $(srcdir)/$(dir)/log.* $(srcdir)/$(dir)/corpus $(srcdir)/$(dir)/notmuch.cache.*
\r