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

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