1 Return-Path: <jan@iptel.org>
\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 710FC431FBF
\r
6 for <notmuch@notmuchmail.org>; Wed, 18 Nov 2009 16:37:31 -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 FxVeyo4NEuzX for <notmuch@notmuchmail.org>;
\r
11 Wed, 18 Nov 2009 16:37:30 -0800 (PST)
\r
12 Received: from mail.iptel.org (smtp.iptel.org [213.192.59.67])
\r
13 by olra.theworths.org (Postfix) with ESMTP id ACF0D431FBC
\r
14 for <notmuch@notmuchmail.org>; Wed, 18 Nov 2009 16:37:30 -0800 (PST)
\r
15 Received: by mail.iptel.org (Postfix, from userid 103)
\r
16 id 1EAA63707E1; Thu, 19 Nov 2009 01:37:27 +0100 (CET)
\r
17 Received: from x61s.janakj (r2c34.net.upc.cz [62.245.66.34])
\r
18 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
\r
19 (Client did not present a certificate)
\r
20 by mail.iptel.org (Postfix) with ESMTPSA id B33C03707BE
\r
21 for <notmuch@notmuchmail.org>; Thu, 19 Nov 2009 01:37:26 +0100 (CET)
\r
22 Received: by x61s.janakj (Postfix, from userid 1000)
\r
23 id DF4B3440655; Thu, 19 Nov 2009 01:37:25 +0100 (CET)
\r
24 From: Jan Janak <jan@ryngle.com>
\r
25 To: notmuch@notmuchmail.org
\r
26 Date: Thu, 19 Nov 2009 01:37:25 +0100
\r
27 Message-Id: <1258591045-16494-1-git-send-email-jan@ryngle.com>
\r
28 X-Mailer: git-send-email 1.6.3.3
\r
29 Subject: [notmuch] [PATCH] Makefile: Make object targets depend on Makefiles
\r
30 X-BeenThere: notmuch@notmuchmail.org
\r
31 X-Mailman-Version: 2.1.12
\r
33 List-Id: "Use and development of the notmuch mail system."
\r
34 <notmuch.notmuchmail.org>
\r
35 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
36 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
37 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
38 List-Post: <mailto:notmuch@notmuchmail.org>
\r
39 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
40 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
41 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
42 X-List-Received-Date: Thu, 19 Nov 2009 00:37:31 -0000
\r
44 All objects need to be recompiled when any of the Makefiles changes, so
\r
45 we make them all depend on all the Makefiles.
\r
47 Signed-off-by: Jan Janak <jan@ryngle.com>
\r
49 Makefile | 11 +++++++----
\r
50 1 files changed, 7 insertions(+), 4 deletions(-)
\r
52 diff --git a/Makefile b/Makefile
\r
53 index 96aaa73..2787aff 100644
\r
56 @@ -7,6 +7,9 @@ CFLAGS=-O2
\r
57 extra_cflags = `pkg-config --cflags glib-2.0 gmime-2.4 talloc`
\r
58 extra_cxxflags = `xapian-config --cxxflags`
\r
60 +all_deps = Makefile Makefile.local Makefile.config \
\r
61 + lib/Makefile lib/Makefile.local
\r
63 # Now smash together user's values with our extra values
\r
64 override CFLAGS += $(WARN_FLAGS) $(extra_cflags)
\r
65 override CXXFLAGS += $(WARN_FLAGS) $(extra_cflags) $(extra_cxxflags)
\r
66 @@ -21,19 +24,19 @@ include lib/Makefile.local
\r
67 # And get user settings from the output of configure
\r
68 include Makefile.config
\r
71 +%.o: %.cc $(all_deps)
\r
72 $(CXX) -c $(CFLAGS) $(CXXFLAGS) $< -o $@
\r
75 +%.o: %.c $(all_deps)
\r
76 $(CC) -c $(CFLAGS) $< -o $@
\r
79 +.deps/%.d: %.c $(all_deps)
\r
80 @set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
\r
81 $(CC) -M $(CPPFLAGS) $(CFLAGS) $< > $@.$$$$; \
\r
82 sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
\r
86 +.deps/%.d: %.cc $(all_deps)
\r
87 @set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
\r
88 $(CXX) -M $(CPPFLAGS) $(CXXFLAGS) $< > $@.$$$$; \
\r
89 sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
\r