1 Return-Path: <dottedmag@dottedmag.net>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 19308431FBC
\r
6 for <notmuch@notmuchmail.org>; Fri, 20 Nov 2009 05:18:39 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
8 Received: from olra.theworths.org ([127.0.0.1])
\r
9 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
10 with ESMTP id 9F+E0v2X3ljI for <notmuch@notmuchmail.org>;
\r
11 Fri, 20 Nov 2009 05:18:38 -0800 (PST)
\r
12 Received: from dottedmag.net (burger.dottedmag.net [212.75.37.82])
\r
13 by olra.theworths.org (Postfix) with ESMTP id 23C86431FAE
\r
14 for <notmuch@notmuchmail.org>; Fri, 20 Nov 2009 05:18:38 -0800 (PST)
\r
15 Received: from vertex.dottedmag (unknown [91.197.127.125])
\r
16 by dottedmag.net (Postfix) with ESMTPSA id 9ADC98C069
\r
17 for <notmuch@notmuchmail.org>; Fri, 20 Nov 2009 14:18:36 +0100 (CET)
\r
18 Received: from dottedmag by vertex.dottedmag with local (Exim 4.69)
\r
19 (envelope-from <dottedmag@dottedmag.net>) id 1NBTNb-0003pl-95
\r
20 for notmuch@notmuchmail.org; Fri, 20 Nov 2009 19:18:27 +0600
\r
21 From: Mikhail Gusarov <dottedmag@dottedmag.net>
\r
22 To: notmuch@notmuchmail.org
\r
23 Date: Fri, 20 Nov 2009 19:18:27 +0600
\r
24 Message-Id: <1258723107-14704-1-git-send-email-dottedmag@dottedmag.net>
\r
25 X-Mailer: git-send-email 1.6.3.3
\r
26 Subject: [notmuch] [PATCH] RFC: quiet make
\r
27 X-BeenThere: notmuch@notmuchmail.org
\r
28 X-Mailman-Version: 2.1.12
\r
30 List-Id: "Use and development of the notmuch mail system."
\r
31 <notmuch.notmuchmail.org>
\r
32 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
33 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
34 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
35 List-Post: <mailto:notmuch@notmuchmail.org>
\r
36 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
37 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
38 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
39 X-List-Received-Date: Fri, 20 Nov 2009 13:18:39 -0000
\r
41 I don't entirely like duplicating every command line in makefile,
\r
42 so this patch is RFC. Someone with bigger Make-fu than mine probably
\r
45 Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
\r
47 Makefile | 36 ++++++++++++++++++++++++++++++++++++
\r
48 Makefile.local | 10 ++++++++++
\r
49 lib/Makefile.local | 5 +++++
\r
50 3 files changed, 51 insertions(+), 0 deletions(-)
\r
52 diff --git a/Makefile b/Makefile
\r
53 index b6861e9..72a72ae 100644
\r
56 @@ -32,29 +32,65 @@ include lib/Makefile.local
\r
57 include Makefile.config
\r
59 %.o: %.cc $(all_deps)
\r
61 $(CXX) -c $(CFLAGS) $(CXXFLAGS) $< -o $@
\r
64 + @$(CXX) -c $(CFLAGS) $(CXXFLAGS) $< -o $@
\r
67 %.o: %.c $(all_deps)
\r
69 $(CC) -c $(CFLAGS) $< -o $@
\r
72 + @$(CC) -c $(CFLAGS) $< -o $@
\r
77 emacs -batch -f batch-byte-compile $<
\r
79 + @echo ELCOMPILE $<
\r
80 + @emacs -batch -f batch-byte-compile $<
\r
83 .deps/%.d: %.c $(all_deps)
\r
85 + set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
\r
86 + $(CC) -M $(CPPFLAGS) $(CFLAGS) $< > $@.$$$$; \
\r
87 + sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
\r
91 @set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
\r
92 $(CC) -M $(CPPFLAGS) $(CFLAGS) $< > $@.$$$$; \
\r
93 sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
\r
97 .deps/%.d: %.cc $(all_deps)
\r
99 + set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
\r
100 + $(CXX) -M $(CPPFLAGS) $(CXXFLAGS) $< > $@.$$$$; \
\r
101 + sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
\r
105 @set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
\r
106 $(CXX) -M $(CPPFLAGS) $(CXXFLAGS) $< > $@.$$$$; \
\r
107 sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
\r
111 DEPS := $(SRCS:%.c=.deps/%.d)
\r
112 DEPS := $(DEPS:%.cc=.deps/%.d)
\r
117 rm -f $(CLEAN); rm -rf .deps
\r
120 + @rm -f $(CLEAN); rm -rf .deps
\r
122 diff --git a/Makefile.local b/Makefile.local
\r
123 index bf81c03..0addfed 100644
\r
124 --- a/Makefile.local
\r
125 +++ b/Makefile.local
\r
126 @@ -20,10 +20,20 @@ notmuch_client_srcs = \
\r
128 notmuch_client_modules = $(notmuch_client_srcs:.c=.o)
\r
129 notmuch: $(notmuch_client_modules) lib/notmuch.a
\r
131 $(CXX) $^ $(LDFLAGS) -o $@
\r
134 + @$(CXX) $^ $(LDFLAGS) -o $@
\r
137 notmuch.1.gz: notmuch.1
\r
139 gzip --stdout notmuch.1 > notmuch.1.gz
\r
142 + @gzip --stdout notmuch.1 > notmuch.1.gz
\r
145 install: all notmuch.1.gz
\r
146 for d in $(DESTDIR)$(prefix)/bin/ $(DESTDIR)$(prefix)/share/man/man1 \
\r
147 diff --git a/lib/Makefile.local b/lib/Makefile.local
\r
148 index 79f7b0b..5a66716 100644
\r
149 --- a/lib/Makefile.local
\r
150 +++ b/lib/Makefile.local
\r
151 @@ -18,7 +18,12 @@ libnotmuch_cxx_srcs = \
\r
153 libnotmuch_modules = $(libnotmuch_c_srcs:.c=.o) $(libnotmuch_cxx_srcs:.cc=.o)
\r
154 $(dir)/notmuch.a: $(libnotmuch_modules)
\r
162 SRCS := $(SRCS) $(libnotmuch_c_srcs) $(libnotmuch_cxx_srcs)
\r
163 CLEAN := $(CLEAN) $(libnotmuch_modules) $(dir)/notmuch.a
\r