From: David Bremner <david@tethera.net>
Date: Thu, 20 Mar 2014 00:48:04 +0000 (+2100)
Subject: [PATCH 3/3] test: use $(srcdir) instead of . as include path
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7e5af73debbf700f32f192f1c36efb74a1f1c05e;p=notmuch-archives.git

[PATCH 3/3] test: use $(srcdir) instead of . as include path
---

diff --git a/6f/2486884b824578d31b2ede3e3832a000993eb5 b/6f/2486884b824578d31b2ede3e3832a000993eb5
new file mode 100644
index 000000000..5f4edfe55
--- /dev/null
+++ b/6f/2486884b824578d31b2ede3e3832a000993eb5
@@ -0,0 +1,83 @@
+Return-Path: <bremner@tethera.net>
+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 3F992431FD0
+	for <notmuch@notmuchmail.org>; Wed, 19 Mar 2014 17:48:26 -0700 (PDT)
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
+X-Spam-Flag: NO
+X-Spam-Score: 0
+X-Spam-Level: 
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
+	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 mcF7DWlq7Y85 for <notmuch@notmuchmail.org>;
+	Wed, 19 Mar 2014 17:48:21 -0700 (PDT)
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])
+	(using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
+	(No client certificate requested)
+	by olra.theworths.org (Postfix) with ESMTPS id 7B099431FAF
+	for <notmuch@notmuchmail.org>; Wed, 19 Mar 2014 17:48:21 -0700 (PDT)
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)
+	(envelope-from <bremner@tethera.net>)
+	id 1WQR9f-0000HZ-3n; Wed, 19 Mar 2014 21:48:19 -0300
+Received: (nullmailer pid 22557 invoked by uid 1000); Thu, 20 Mar 2014
+	00:48:12 -0000
+From: David Bremner <david@tethera.net>
+To: notmuch@notmuchmail.org
+Subject: [PATCH 3/3] test: use $(srcdir) instead of . as include path
+Date: Wed, 19 Mar 2014 21:48:04 -0300
+Message-Id: <1395276484-22363-4-git-send-email-david@tethera.net>
+X-Mailer: git-send-email 1.9.0
+In-Reply-To: <1395276484-22363-1-git-send-email-david@tethera.net>
+References: <1395276484-22363-1-git-send-email-david@tethera.net>
+X-BeenThere: notmuch@notmuchmail.org
+X-Mailman-Version: 2.1.13
+Precedence: list
+List-Id: "Use and development of the notmuch mail system."
+	<notmuch.notmuchmail.org>
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>
+List-Post: <mailto:notmuch@notmuchmail.org>
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
+X-List-Received-Date: Thu, 20 Mar 2014 00:48:26 -0000
+
+This is needed for out of tree builds. The functional change is the
+modification of extra_cflags; the other changes are cosmetic.
+---
+ test/Makefile.local | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/test/Makefile.local b/test/Makefile.local
+index 36b1c1b..ae9db80 100644
+--- a/test/Makefile.local
++++ b/test/Makefile.local
+@@ -4,7 +4,7 @@ dir := test
+ 
+ # save against changes in $(dir)
+ test_src_dir := $(dir)
+-extra_cflags += -I.
++extra_cflags += -I$(srcdir)
+ 
+ smtp_dummy_srcs =		\
+ 	$(notmuch_compat_srcs)	\
+@@ -13,10 +13,10 @@ smtp_dummy_srcs =		\
+ smtp_dummy_modules = $(smtp_dummy_srcs:.c=.o)
+ 
+ $(dir)/arg-test: $(dir)/arg-test.o command-line-arguments.o util/libutil.a
+-	$(call quiet,CC) -I. $^ -o $@
++	$(call quiet,CC) $^ -o $@
+ 
+ $(dir)/hex-xcode: $(dir)/hex-xcode.o command-line-arguments.o util/libutil.a
+-	$(call quiet,CC) -I. $^ -o $@ -ltalloc
++	$(call quiet,CC) $^ -o $@ -ltalloc
+ 
+ random_corpus_deps =  $(dir)/random-corpus.o  $(dir)/database-test.o \
+ 			notmuch-config.o command-line-arguments.o \
+-- 
+1.9.0
+