--- /dev/null
+Return-Path: <jani@nikula.org>\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 4EF2F431FBF\r
+ for <notmuch@notmuchmail.org>; Tue, 25 Mar 2014 05:59:34 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 J+BGRr18-Ti4 for <notmuch@notmuchmail.org>;\r
+ Tue, 25 Mar 2014 05:59:30 -0700 (PDT)\r
+Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com\r
+ [209.85.212.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id DED17431FBD\r
+ for <notmuch@notmuchmail.org>; Tue, 25 Mar 2014 05:59:29 -0700 (PDT)\r
+Received: by mail-wi0-f181.google.com with SMTP id hm4so574441wib.8\r
+ for <notmuch@notmuchmail.org>; Tue, 25 Mar 2014 05:59:27 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=1e100.net; s=20130820;\r
+ h=x-gm-message-state:from:to:subject:in-reply-to:references\r
+ :user-agent:date:message-id:mime-version:content-type;\r
+ bh=gcq+rAf+BrG9nJAdfFndqR2RDCqmJX2PeQNUcLpw5Ro=;\r
+ b=PictS4aM90cjNNSN21pm8U4d600GXnRra7TvxMfRz6mNg2z96T7IdacG4HHZ2g8Y7s\r
+ bGs2HS8Cta2UsT0XXrvF5bjzISrruD65/sn/YIpPAQ1tfObrRquQUSSfqiiu7gxcY+Rx\r
+ sk3z0J9qDiPNyosDMt00EWZnpVLQ17EFGBJSgEbh8mHGu9kAu1xJzdjPrC+YLzSYZBqh\r
+ XAFXDYHeu8WzTJawPmAJjVr/zHJsggAEfAdnKNeHqS17qIKTOBENObYZRxn2nsUZi20d\r
+ UW6LndW8UvJC7axi79vQ1vi2nYYASy5yPRuarkinW1gN9jGBt6SpO0DH0lAAj70UZH9P\r
+ OzLQ==\r
+X-Gm-Message-State:\r
+ ALoCoQkOeEFr5sxRjLANmeRcPZ3JZoDDzDfjOxKmmdMqu3l9yhpygN8YowRrTXPRgN5QFzwhec1d\r
+X-Received: by 10.180.164.106 with SMTP id yp10mr23691115wib.48.1395752363756;\r
+ Tue, 25 Mar 2014 05:59:23 -0700 (PDT)\r
+Received: from localhost ([2001:4b98:dc0:43:216:3eff:fe1b:25f3])\r
+ by mx.google.com with ESMTPSA id em1sm50187949wid.5.2014.03.25.05.59.22\r
+ for <multiple recipients>\r
+ (version=TLSv1.1 cipher=RC4-SHA bits=128/128);\r
+ Tue, 25 Mar 2014 05:59:22 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: Tomi Ollila <tomi.ollila@iki.fi>, David Bremner <david@tethera.net>,\r
+ notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] build: move canonical list of subdirectories to configure\r
+ script\r
+In-Reply-To: <m2a9cejw79.fsf@guru.guru-group.fi>\r
+References: <87d2hbhvnq.fsf@zancas.localnet>\r
+ <1395747624-4411-1-git-send-email-david@tethera.net>\r
+ <m2a9cejw79.fsf@guru.guru-group.fi>\r
+User-Agent: Notmuch/0.17+153~g4752728 (http://notmuchmail.org) Emacs/23.2.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Tue, 25 Mar 2014 13:59:22 +0100\r
+Message-ID: <87pplafn85.fsf@nikula.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\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: Tue, 25 Mar 2014 12:59:34 -0000\r
+\r
+On Tue, 25 Mar 2014, Tomi Ollila <tomi.ollila@iki.fi> wrote:\r
+> On Tue, Mar 25 2014, David Bremner <david@tethera.net> wrote:\r
+>\r
+>> The configure script needs this list for out of tree builds. Grabbing\r
+>> it from the Makefile via sed was fragile and broken.\r
+>> ---\r
+>\r
+> This is exactly what I was going to suggest if I had the time.\r
+>\r
+> LGTM.\r
+\r
+Ditto, seems to work too.\r
+\r
+>\r
+> Tomi\r
+>\r
+>\r
+>> Makefile | 15 +++++----------\r
+>> configure | 8 +++++++-\r
+>> 2 files changed, 12 insertions(+), 11 deletions(-)\r
+>>\r
+>> diff --git a/Makefile b/Makefile\r
+>> index 061c55a..4c0e8c6 100644\r
+>> --- a/Makefile\r
+>> +++ b/Makefile\r
+>> @@ -2,16 +2,6 @@\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
+>> -# Use of '=', without '+=', seems to be required for out-of-tree\r
+>> -# builds to work.\r
+>> -subdirs = compat completion doc emacs lib parse-time-string \\r
+>> - performance-test util test test/test-databases\r
+>> -\r
+>> -# We make all targets depend on the Makefiles themselves.\r
+>> -global_deps = Makefile Makefile.config Makefile.local \\r
+>> - $(subdirs:%=%/Makefile) $(subdirs:%=%/Makefile.local)\r
+>> -\r
+>> # Sub-directory Makefile.local fragments can append to these variables\r
+>> # to have directory-specific cflags as necessary.\r
+>> \r
+>> @@ -27,6 +17,11 @@ extra_cxxflags :=\r
+>> srcdir ?= .\r
+>> \r
+>> include Makefile.config\r
+>> +\r
+>> +# We make all targets depend on the Makefiles themselves.\r
+>> +global_deps = Makefile Makefile.config Makefile.local \\r
+>> + $(subdirs:%=%/Makefile) $(subdirs:%=%/Makefile.local)\r
+>> +\r
+>> Makefile.config: $(srcdir)/configure\r
+>> ifeq ($(configure_options),)\r
+>> @echo ""\r
+>> diff --git a/configure b/configure\r
+>> index fb276f1..ab73317 100755\r
+>> --- a/configure\r
+>> +++ b/configure\r
+>> @@ -19,11 +19,14 @@ readonly DEFAULT_IFS="$IFS"\r
+>> \r
+>> srcdir=$(dirname "$0")\r
+>> \r
+>> +subdirs="util compat lib parse-time-string completion doc emacs"\r
+>> +subdirs="${subdirs} performance-test test test/test-databases"\r
+>> +\r
+>> # For a non-srcdir configure invocation (such as ../configure), create\r
+>> # the directory structure and copy Makefiles.\r
+>> if [ "$srcdir" != "." ]; then\r
+>> \r
+>> - for dir in . $(grep "^subdirs *=" "$srcdir"/Makefile | sed -e "s/subdirs *= *//"); do\r
+>> + for dir in . ${subdirs}; do\r
+>> mkdir -p "$dir"\r
+>> cp "$srcdir"/"$dir"/Makefile.local "$dir"\r
+>> cp "$srcdir"/"$dir"/Makefile "$dir"\r
+>> @@ -698,6 +701,9 @@ cat > Makefile.config <<EOF\r
+>> # directory (the current directory at the time configure was run).\r
+>> srcdir = ${srcdir}\r
+>> \r
+>> +# subdirectories to build\r
+>> +subdirs = ${subdirs}\r
+>> +\r
+>> configure_options = $@\r
+>> \r
+>> # We use vpath directives (rather than the VPATH variable) since the\r
+>> -- \r
+>> 1.9.0\r
+>>\r
+>> _______________________________________________\r
+>> notmuch mailing list\r
+>> notmuch@notmuchmail.org\r
+>> http://notmuchmail.org/mailman/listinfo/notmuch\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff