Re: [PATCH 1/1] build: remove trailing '/.' when doing mkdir -p .deps/.

diff --git a/d5/d35f884a3f6b95033178245d9fad3d4a4cf585 b/d5/d35f884a3f6b95033178245d9fad3d4a4cf585
new file mode 100644 (file)
index 0000000..68c46ac
--- /dev/null
+++ b/d5/d35f884a3f6b95033178245d9fad3d4a4cf585
@@ -0,0 +1,117 @@
+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 5391F429E48\r
+       for <notmuch@notmuchmail.org>; Sun,  3 Nov 2013 13:55:14 -0800 (PST)\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 AjVJArPEdd8k for <notmuch@notmuchmail.org>;\r
+       Sun,  3 Nov 2013 13:55:08 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 945AA429E38\r
+       for <notmuch@notmuchmail.org>; Sun,  3 Nov 2013 13:55:08 -0800 (PST)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 0A9F4100051;\r
+       Sun,  3 Nov 2013 23:55:01 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Jed Brown <jed@59A2.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 1/1] build: remove trailing '/.' when doing mkdir -p\r
+       .deps/.\r
+In-Reply-To: <87fvrd8pnc.fsf@mcs.anl.gov>\r
+References: <1383487535-21597-1-git-send-email-tomi.ollila@iki.fi>\r
+       <87fvrd8pnc.fsf@mcs.anl.gov>\r
+User-Agent: Notmuch/0.16+119~g219c55f (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, 03 Nov 2013 23:55:00 +0200\r
+Message-ID: <m2habtcfrf.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, 03 Nov 2013 21:55:14 -0000\r
+\r
+On Sun, Nov 03 2013, Jed Brown <jed@59A2.org> wrote:\r
+\r
+> Tomi Ollila <tomi.ollila@iki.fi> writes:\r
+>\r
+>>  %.o: %.cc $(global_deps)\r
+>> -   @mkdir -p .deps/$(@D)\r
+>> +   @mkdir -p $(patsubst %/.,%,.deps/$(@D))\r
+>>     $(call quiet,CXX $(CPPFLAGS) $(CXXFLAGS)) -c $(FINAL_CXXFLAGS) $< -o $@ -MD -MP -MF .deps/$*.d\r
+>\r
+> An alternative approach is to use directory marker files [1] to clean up\r
+> the recipes that need output directories and to satisfy Paul's second\r
+> rule of makefiles [2].\r
+>\r
+> .SECONDEXPANSION:\r
+>\r
+> %.o: %.cc $(global_deps) | .deps/$$(@D)/.DIR\r
+>      $(call quiet,CXX $(CPPFLAGS) $(CXXFLAGS)) -c $(FINAL_CXXFLAGS) $< -o $@ -MD -MP -MF .deps/$*.d\r
+>\r
+> %/.DIR:\r
+>      @mkdir -p $(patsubst %/.,%,$(@D))\r
+>      @touch $@\r
+>\r
+> .PRECIOUS: %.DIR\r
+\r
+Hmm, nice suggestion... the diff to be reviewed is just soo much bigger ;/\r
+\r
+Now that I learned new things [11] yet another alternative is:\r
+\r
+diff --git a/Makefile.local b/Makefile.local\r
+index 72524eb..cc1a0cb 100644\r
+--- a/Makefile.local\r
++++ b/Makefile.local\r
+@@ -235,12 +235,15 @@ endif\r
+ # Otherwise, print the full command line.\r
+ quiet ?= $($(shell echo $1 | sed -e s'/ .*//'))\r
+ \r
+-%.o: %.cc $(global_deps)\r
+-      @mkdir -p .deps/$(@D)\r
++depdirs = $(subdirs:%=.deps/%)\r
++\r
++$(depdirs):\r
++      @mkdir -p $(depdirs)\r
++\r
++%.o: %.cc $(global_deps) | $(depdirs)\r
+       $(call quiet,CXX $(CPPFLAGS) $(CXXFLAGS)) -c $(FINAL_CXXFLAGS) $< -o $@ -MD -MP -MF .deps/$*.d\r
+ \r
+-%.o: %.c $(global_deps)\r
+-      @mkdir -p .deps/$(@D)\r
++%.o: %.c $(global_deps) | $(depdirs)\r
+       $(call quiet,CC $(CPPFLAGS) $(CFLAGS)) -c $(FINAL_CFLAGS) $< -o $@ -MD -MP -MF .deps/$*.d\r
+ \r
+ .PHONY : clean\r
+\r
+\r
+still, for the time being I'd still use the patch I originally proposed\r
+due to the triviality I change...\r
+\r
+\r
+[11] http://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html\r
+\r
+Tomi\r
+\r
+\r
+> [1] http://www.cmcrossroads.com/article/making-directories-gnu-make\r
+> [2] http://make.paulandlesley.org/rules.html\r