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 BF42E431FC0 for ; Sat, 21 Nov 2009 11:02:28 -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 7KscHBcn0qvN for ; Sat, 21 Nov 2009 11:02:27 -0800 (PST) Received: from orsmga101.jf.intel.com (mga06.intel.com [134.134.136.21]) by olra.theworths.org (Postfix) with ESMTP id 8B395431FAE for ; Sat, 21 Nov 2009 11:02:27 -0800 (PST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 21 Nov 2009 11:02:19 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.47,264,1257148800"; d="scan'208";a="571844771" Received: from unknown (HELO localhost.localdomain) ([10.255.16.192]) by orsmga001.jf.intel.com with ESMTP; 21 Nov 2009 11:02:15 -0800 From: Chris Wilson To: notmuch@notmuchmail.org Date: Sat, 21 Nov 2009 19:02:22 +0000 Message-Id: <1258830142-13311-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 19:02:28 -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 | 22 +++++++++++++++++++--- Makefile.local | 4 ++-- lib/Makefile.local | 2 +- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 3fedcf1..77e70ed 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,10 @@ WARN_FLAGS=-Wall -Wextra -Wmissing-declarations -Wwrite-strings -Wswitch-enum CFLAGS=-O2 +# Additional programs that are used during the compilation process. +EMACS ?= emacs +GZIP ?= gzip + # Additional flags that we will append to whatever the user set. # These aren't intended for the user to manipulate. extra_cflags := $(shell pkg-config --cflags glib-2.0 gmime-2.4 talloc) @@ -31,14 +35,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 $@"; $($1) +endif +# The user has explicitly enabled quiet compilation. +ifeq ($(V),0) +quiet = @echo " $1 $@"; $($1) +endif +# Otherwise, print the full command line. + %.o: %.cc $(all_deps) - $(CXX) -c $(CXXFLAGS) $< -o $@ + $(call quiet,CXX) -c $(CXXFLAGS) $< -o $@ %.o: %.c $(all_deps) - $(CC) -c $(CFLAGS) $< -o $@ + $(call quiet,CC) -c $(CFLAGS) $< -o $@ %.elc: %.el - emacs -batch -f batch-byte-compile $< + $(call quiet,EMACS) -batch -f batch-byte-compile $< .deps/%.d: %.c $(all_deps) @set -e; rm -f $@; mkdir -p $$(dirname $@) ; \ diff --git a/Makefile.local b/Makefile.local index 3c99624..5fd5d4f 100644 --- a/Makefile.local +++ b/Makefile.local @@ -20,10 +20,10 @@ notmuch_client_srcs = \ notmuch_client_modules = $(notmuch_client_srcs:.c=.o) notmuch: $(notmuch_client_modules) lib/notmuch.a - $(CXX) $^ $(LDFLAGS) -o $@ + $(call quiet,CXX) $^ $(LDFLAGS) -o $@ notmuch.1.gz: notmuch.1 - gzip --stdout notmuch.1 > notmuch.1.gz + $(call quiet,GZIP) --stdout $^ > $@ install: all notmuch.1.gz for d in $(DESTDIR)$(prefix)/bin/ $(DESTDIR)$(prefix)/share/man/man1 \ diff --git a/lib/Makefile.local b/lib/Makefile.local index 79f7b0b..a7562c9 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) rcs $@ $^ SRCS := $(SRCS) $(libnotmuch_c_srcs) $(libnotmuch_cxx_srcs) CLEAN := $(CLEAN) $(libnotmuch_modules) $(dir)/notmuch.a -- 1.6.5.3