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 3D0DC431FBC for ; Sat, 21 Nov 2009 05:50:43 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org 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 H4TXvkZ7lLe7 for ; Sat, 21 Nov 2009 05:50:42 -0800 (PST) Received: from fmsmga102.fm.intel.com (mga10.intel.com [192.55.52.92]) by olra.theworths.org (Postfix) with ESMTP id EE723431FAE for ; Sat, 21 Nov 2009 05:50:41 -0800 (PST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 21 Nov 2009 05:46:54 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.47,263,1257148800"; d="scan'208";a="516100848" Received: from unknown (HELO localhost.localdomain) ([10.255.16.192]) by fmsmga002.fm.intel.com with ESMTP; 21 Nov 2009 05:44:26 -0800 From: Chris Wilson To: notmuch@notmuchmail.org Date: Sat, 21 Nov 2009 13:48:55 +0000 Message-Id: <1258811335-7082-1-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 1.6.5.3 Subject: [notmuch] [PATCH] Makefile: Magic silent rules. X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.12 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: Sat, 21 Nov 2009 13:50:43 -0000 Use the facilities of GNU make to create a magic function that will on the first invocation print a description of how to enable verbose compile lines and then print the quiet rule. Signed-off-by: Chris Wilson Signed-off-by: Carl Worth Cc: Mikhail Gusarov --- Makefile | 18 +++++++++++++++--- Makefile.local | 2 +- lib/Makefile.local | 2 +- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 0411cbb..96fcdd5 100644 --- a/Makefile +++ b/Makefile @@ -28,14 +28,26 @@ include lib/Makefile.local # And get user settings from the output of configure include Makefile.config +# The user has not set any verbosity, default to quiet mode and inform the +# user how to enable verbose compiles. +ifeq ($(V),) +quiet_DOC := "Use \"$(MAKE) V=1\" to see the verbose compile lines.\n" +quiet = @echo $(quiet_DOC)$(eval quiet_DOC:=)" $1 $@"; +endif +# The user has explicitly enabled quiet compilation. +ifeq ($(V),0) +quiet = @echo " $1 $@"; +endif +# Otherwise, print the full command line. + %.o: %.cc - $(CXX) -c $(CFLAGS) $(CXXFLAGS) $< -o $@ + $(call quiet,CXX) $(CXX) -c $(CFLAGS) $(CXXFLAGS) $< -o $@ %.o: %.c - $(CC) -c $(CFLAGS) $< -o $@ + $(call quiet,CC) $(CC) -c $(CFLAGS) $< -o $@ %.elc: %.el - emacs -batch -f batch-byte-compile $< + $(call quiet,EMACS) emacs -batch -f batch-byte-compile $< .deps/%.d: %.c @set -e; rm -f $@; mkdir -p $$(dirname $@) ; \ diff --git a/Makefile.local b/Makefile.local index ecd4ceb..115de0e 100644 --- a/Makefile.local +++ b/Makefile.local @@ -20,7 +20,7 @@ notmuch_client_srcs = \ notmuch_client_modules = $(notmuch_client_srcs:.c=.o) notmuch: $(notmuch_client_modules) lib/notmuch.a - $(CXX) $^ $(LDFLAGS) -o $@ + $(call quiet,CXX) $(CXX) $^ $(LDFLAGS) -o $@ notmuch.1.gz: notmuch.1 gzip --stdout notmuch.1 > notmuch.1.gz diff --git a/lib/Makefile.local b/lib/Makefile.local index 79f7b0b..f635da7 100644 --- a/lib/Makefile.local +++ b/lib/Makefile.local @@ -18,7 +18,7 @@ libnotmuch_cxx_srcs = \ libnotmuch_modules = $(libnotmuch_c_srcs:.c=.o) $(libnotmuch_cxx_srcs:.cc=.o) $(dir)/notmuch.a: $(libnotmuch_modules) - $(AR) rcs $@ $^ + $(call quiet,AR) $(AR) rcs $@ $^ SRCS := $(SRCS) $(libnotmuch_c_srcs) $(libnotmuch_cxx_srcs) CLEAN := $(CLEAN) $(libnotmuch_modules) $(dir)/notmuch.a -- 1.6.5.3