Re: [PATCH v2] build: fix out-of-tree builds

diff --git a/b4/c63b1d06c4e085eed6a21bbf89d7eb96c1fdd8 b/b4/c63b1d06c4e085eed6a21bbf89d7eb96c1fdd8
new file mode 100644 (file)
index 0000000..c71167f
--- /dev/null
+++ b/b4/c63b1d06c4e085eed6a21bbf89d7eb96c1fdd8
@@ -0,0 +1,125 @@
+Return-Path: <tomi.ollila@iki.fi>\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 5EAAF431FBF\r
+       for <notmuch@notmuchmail.org>; Sun, 26 May 2013 04:35:14 -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 pzErhlv3piQR for <notmuch@notmuchmail.org>;\r
+       Sun, 26 May 2013 04:35:01 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 9A2DE431FAE\r
+       for <notmuch@notmuchmail.org>; Sun, 26 May 2013 04:35:01 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 893E7100093;\r
+       Sun, 26 May 2013 14:34:57 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v2] build: fix out-of-tree builds\r
+In-Reply-To: <1369480738-16551-1-git-send-email-jani@nikula.org>\r
+References: <1368615519-25977-1-git-send-email-jani@nikula.org>\r
+       <1369480738-16551-1-git-send-email-jani@nikula.org>\r
+User-Agent: Notmuch/0.15.2+115~g12cf6af (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Sun, 26 May 2013 14:34:57 +0300\r
+Message-ID: <m2txlqkm8u.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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: Sun, 26 May 2013 11:35:14 -0000\r
+\r
+On Sat, May 25 2013, Jani Nikula <jani@nikula.org> wrote:\r
+\r
+> Support for out-of-tree builds was added in\r
+> commit 3e4a9d60a9419621b08c647a306843d76c47c2cb\r
+> Author: Carl Worth <cworth@cworth.org>\r
+> Date:   Wed Mar 9 15:02:42 2011 -0800\r
+>\r
+>     build: Add support for non-source-directory builds.\r
+>\r
+> and broken in\r
+> commit 7beeb8c88a014ecbc53d8241f10683b3c4c16228\r
+> Author: David Bremner <bremner@debian.org>\r
+> Date:   Sat Nov 17 12:28:15 2012 -0400\r
+>\r
+>     test: initial performance testing infrastructure\r
+>\r
+> Fix the build breakage.\r
+>\r
+> Out-of-tree 'make test' has been broken since earlier than the above,\r
+> and remains broken, as does out-of-tree perf test, but at least the\r
+> build now works.\r
+>\r
+> ---\r
+\r
+LGTM.\r
+\r
+Tomi\r
+\r
+\r
+>\r
+> I didn't have the time to dig into the test and perf test breakage.\r
+> ---\r
+>  Makefile                        |    7 ++++---\r
+>  performance-test/Makefile.local |    2 +-\r
+>  2 files changed, 5 insertions(+), 4 deletions(-)\r
+>\r
+> diff --git a/Makefile b/Makefile\r
+> index 73a8554..0428160 100644\r
+> --- a/Makefile\r
+> +++ b/Makefile\r
+> @@ -2,9 +2,10 @@\r
+>  # given explicitly on the command line) so mention it first.\r
+>  all:\r
+>  \r
+> -# List all subdirectories here. Each contains its own Makefile.local\r
+> -subdirs := compat completion emacs lib man parse-time-string\r
+> -subdirs += performance-test util test\r
+> +# List all subdirectories here. Each contains its own Makefile.local.\r
+> +# Use of '=', without '+=', seems to be required for out-of-tree\r
+> +# builds to work.\r
+> +subdirs = compat completion emacs lib man parse-time-string performance-test util test\r
+>  \r
+>  # We make all targets depend on the Makefiles themselves.\r
+>  global_deps = Makefile Makefile.config Makefile.local \\r
+> diff --git a/performance-test/Makefile.local b/performance-test/Makefile.local\r
+> index 73aa963..e47219a 100644\r
+> --- a/performance-test/Makefile.local\r
+> +++ b/performance-test/Makefile.local\r
+> @@ -2,7 +2,7 @@\r
+>  \r
+>  dir := performance-test\r
+>  \r
+> -include $(dir)/version.sh\r
+> +include $(srcdir)/$(dir)/version.sh\r
+>  \r
+>  TIME_TEST_SCRIPT := ${dir}/notmuch-time-test\r
+>  MEMORY_TEST_SCRIPT := ${dir}/notmuch-memory-test\r
+> -- \r
+> 1.7.10.4\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r