From: Tomi Ollila <tomi.ollila@iki.fi>
To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org
Subject: Re: [PATCH v2] build: fix out-of-tree builds
Date: Sun, 26 May 2013 14:34:57 +0300 [thread overview]
Message-ID: <m2txlqkm8u.fsf@guru.guru-group.fi> (raw)
In-Reply-To: <1369480738-16551-1-git-send-email-jani@nikula.org>
On Sat, May 25 2013, Jani Nikula <jani@nikula.org> wrote:
> Support for out-of-tree builds was added in
> commit 3e4a9d60a9419621b08c647a306843d76c47c2cb
> Author: Carl Worth <cworth@cworth.org>
> 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 <bremner@debian.org>
> 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, as does out-of-tree perf test, but at least the
> build now works.
>
> ---
LGTM.
Tomi
>
> I didn't have the time to dig into the test and perf test breakage.
> ---
> Makefile | 7 ++++---
> performance-test/Makefile.local | 2 +-
> 2 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 73a8554..0428160 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -2,9 +2,10 @@
> # given explicitly on the command line) so mention it first.
> 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
> +# List all subdirectories here. Each contains its own Makefile.local.
> +# Use of '=', without '+=', seems to be required for out-of-tree
> +# builds to work.
> +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..e47219a 100644
> --- a/performance-test/Makefile.local
> +++ b/performance-test/Makefile.local
> @@ -2,7 +2,7 @@
>
> 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
> --
> 1.7.10.4
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch
next prev parent reply other threads:[~2013-05-26 11:35 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-15 10:58 [PATCH] build: fix out-of-tree builds Jani Nikula
2013-05-15 15:40 ` David Bremner
2013-05-15 16:31 ` Jani Nikula
2013-05-16 11:15 ` David Bremner
2013-05-16 12:01 ` Tomi Ollila
2013-05-25 11:18 ` [PATCH v2] " Jani Nikula
2013-05-26 11:34 ` Tomi Ollila [this message]
2013-05-26 23:37 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m2txlqkm8u.fsf@guru.guru-group.fi \
--to=tomi.ollila@iki.fi \
--cc=jani@nikula.org \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).