From: david Date: Thu, 2 Aug 2012 13:22:36 +0000 (+2100) Subject: [PATCH 2/3] build system: remove configure output in Make distclean. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=a92010956afae0c69818fda48be8212c901f2c2a;p=notmuch-archives.git [PATCH 2/3] build system: remove configure output in Make distclean. --- diff --git a/fd/4f3edb80c14e46463214f1bbf2f6b9e28cc6fc b/fd/4f3edb80c14e46463214f1bbf2f6b9e28cc6fc new file mode 100644 index 000000000..6e786b133 --- /dev/null +++ b/fd/4f3edb80c14e46463214f1bbf2f6b9e28cc6fc @@ -0,0 +1,96 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id BB02E431FB6 + for ; Thu, 2 Aug 2012 06:23:01 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id Rkjiu70906z3 for ; + Thu, 2 Aug 2012 06:23:00 -0700 (PDT) +Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238]) + (using TLSv1 with cipher AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 6D9B9431FAF + for ; Thu, 2 Aug 2012 06:22:55 -0700 (PDT) +Received: from fctnnbsc30w-156034089108.dhcp-dynamic.fibreop.nb.bellaliant.net + ([156.34.89.108] helo=zancas.localnet) + by tesseract.cs.unb.ca with esmtpsa + (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) + (envelope-from ) + id 1SwvMb-0003L7-Sp; Thu, 02 Aug 2012 10:22:54 -0300 +Received: from bremner by zancas.localnet with local (Exim 4.80) + (envelope-from ) + id 1SwvMW-0006A7-E7; Thu, 02 Aug 2012 10:22:48 -0300 +From: david@tethera.net +To: notmuch@notmuchmail.org +Subject: [PATCH 2/3] build system: remove configure output in Make distclean. +Date: Thu, 2 Aug 2012 10:22:36 -0300 +Message-Id: <1343913757-23472-3-git-send-email-david@tethera.net> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: <1343913757-23472-1-git-send-email-david@tethera.net> +References: + <1343913757-23472-1-git-send-email-david@tethera.net> +X-Spam_bar: - +Cc: David Bremner +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Thu, 02 Aug 2012 13:23:02 -0000 + +From: David Bremner + +Create a variable DISTCLEAN which contains a list of things to clean +in the distclean target (in addition to running the clean target). + +The deleted comment seems to be false these days, since we do create +files during configuration. + +Use "rm -rf" here as well in case we want to add directories to DISTCLEAN. +--- + Makefile.local | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/Makefile.local b/Makefile.local +index 6d6896a..b3b960c 100644 +--- a/Makefile.local ++++ b/Makefile.local +@@ -267,10 +267,9 @@ quiet ?= $($(shell echo $1 | sed -e s'/ .*//')) + clean: + rm -rf $(CLEAN); rm -rf .deps + +-# We don't (yet) have any distributed files not in the upstream repository. +-# So distclean is currently identical to clean. + .PHONY: distclean + distclean: clean ++ rm -rf $(DISTCLEAN) + + notmuch_client_srcs = \ + command-line-arguments.c\ +@@ -339,6 +338,8 @@ install-desktop: + SRCS := $(SRCS) $(notmuch_client_srcs) + CLEAN := $(CLEAN) notmuch notmuch-shared $(notmuch_client_modules) notmuch.elc + ++DISTCLEAN := $(DISTCLEAN) .first-build-message Makefile.config ++ + DEPS := $(SRCS:%.c=.deps/%.d) + DEPS := $(DEPS:%.cc=.deps/%.d) + -include $(DEPS) +-- +1.7.10.4 +