Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id DB6F9431FAF for ; Thu, 7 Mar 2013 13:34:34 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.7 X-Spam-Level: X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id y6nHeAwIC1Sh for ; Thu, 7 Mar 2013 13:34:34 -0800 (PST) Received: from mail-la0-f45.google.com (mail-la0-f45.google.com [209.85.215.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 1EBDE431FAE for ; Thu, 7 Mar 2013 13:34:33 -0800 (PST) Received: by mail-la0-f45.google.com with SMTP id er20so1029656lab.18 for ; Thu, 07 Mar 2013 13:34:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:subject:date:message-id:x-mailer :x-gm-message-state; bh=OjPKV7+n2tslCxTOiOx6xfJFCD/cGIO66onu0UtwJY4=; b=VJWlgG7UIahEfARnL4Sei1CqvNggpZKu4YHzsn+po3DRKKIX+bq3bCY9P3uiO+TfZx EV1Peom8qfMny5Y3TzG3b+hit2XTbWnahxLpk07oS6ZDvHCUOp9ZrtJrDbXTVksIdY5P k0rzIGZxirL4XzCe/xTyjHZygjAflN6zNvWEq+kD0/knMqPiOHbSdpOKjl+z7UEqkfBq xM/7+GIcZpv9pn5IxY1Ba+JcD5MCAqa0X00O5IfI2hLG/DpkGY6jnGQ2RFIrhGP5gWRl vVCWefSWUjXHGdPEC+HslB/ZdZK4YeByvFPMGxVm0gTEqkKRiZRF+f7LMQxWZwW9b/Hs PYmQ== X-Received: by 10.152.45.140 with SMTP id n12mr30103229lam.36.1362692071151; Thu, 07 Mar 2013 13:34:31 -0800 (PST) Received: from localhost (dsl-hkibrasgw4-50df51-27.dhcp.inet.fi. [80.223.81.27]) by mx.google.com with ESMTPS id k15sm998685lbd.6.2013.03.07.13.34.29 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 07 Mar 2013 13:34:30 -0800 (PST) From: Jani Nikula To: notmuch@notmuchmail.org, david@tethera.net Subject: [PATCH] build: fix out-of-tree builds Date: Thu, 7 Mar 2013 23:34:28 +0200 Message-Id: <1362692068-30142-1-git-send-email-jani@nikula.org> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQmkHTRpTb976vwxOo9A6msZjaxp0jhYEO//QsM2qChZLuT4ihhuxotFQNiR8j26B36vF40p X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Mar 2013 21:34:35 -0000 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, but at least the build now works. --- David, does the perf test still work for you with these changes? --- Makefile | 3 +-- performance-test/Makefile.local | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 73a8554..3301d30 100644 --- a/Makefile +++ b/Makefile @@ -3,8 +3,7 @@ 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 +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 73aa963..d9623d7 100644 --- a/performance-test/Makefile.local +++ b/performance-test/Makefile.local @@ -2,13 +2,13 @@ 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 +TIME_TEST_SCRIPT :=$ $(srcdir)/$(dir)/notmuch-time-test +MEMORY_TEST_SCRIPT := $(srcdir)/$(dir)/notmuch-memory-test CORPUS_NAME := notmuch-email-corpus-$(PERFTEST_VERSION).tar.xz -TXZFILE := ${dir}/download/${CORPUS_NAME} +TXZFILE := $(srcdir)/$(dir)/download/${CORPUS_NAME} SIGFILE := ${TXZFILE}.asc DEFAULT_URL := http://notmuchmail.org/releases/${CORPUS_NAME} @@ -39,4 +39,4 @@ $(TXZFILE): download-corpus: wget -O ${TXZFILE} ${DEFAULT_URL} -CLEAN := $(CLEAN) $(dir)/tmp.* $(dir)/log.* $(dir)/corpus $(dir)/notmuch.cache.* +CLEAN := $(CLEAN) $(srcdir)/$(dir)/tmp.* $(srcdir)/$(dir)/log.* $(srcdir)/$(dir)/corpus $(srcdir)/$(dir)/notmuch.cache.* -- 1.7.10.4