1c/427e18f31b2119850fab208791e62250e15314

   1 Return-Path: <amthrax@drake.mit.edu>\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 E2775431FBC\r
   6         for <notmuch@notmuchmail.org>; Sun, 15 Jan 2012 12:20:32 -0800 (PST)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id DOSS14--QvD3 for <notmuch@notmuchmail.org>;\r
  16         Sun, 15 Jan 2012 12:20:31 -0800 (PST)\r
  17 Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU\r
  18         [18.9.25.13])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 0DD6D431FAE\r
  20         for <notmuch@notmuchmail.org>; Sun, 15 Jan 2012 12:20:30 -0800 (PST)\r
  21 X-AuditID: 1209190d-b7fbf6d0000008ba-83-4f13350ee4c0\r
  22 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
  23         by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id A3.DA.02234.E05331F4; Sun, 15 Jan 2012 15:20:30 -0500 (EST)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q0FKKTTT004493; \r
  27         Sun, 15 Jan 2012 15:20:29 -0500\r
  28 Received: from drake.mit.edu\r
  29         (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
  30         [209.6.116.242]) (authenticated bits=0)\r
  31         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  32         by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q0FKKSNx029944\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Sun, 15 Jan 2012 15:20:29 -0500 (EST)\r
  35 Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
  36         (envelope-from <amthrax@drake.mit.edu>)\r
  37         id 1RmWZ1-0004S9-VR; Sun, 15 Jan 2012 15:20:28 -0500\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH] Fix dependency generation for CLI sources\r
  41 Date: Sun, 15 Jan 2012 15:20:23 -0500\r
  42 Message-Id: <1326658823-17068-1-git-send-email-amdragon@mit.edu>\r
  43 X-Mailer: git-send-email 1.7.7.3\r
  44 X-Brightmail-Tracker:\r
  45  H4sIAAAAAAAAA+NgFprFIsWRmVeSWpSXmKPExsUixG6nrstnKuxvcHmNjMX1mzOZHRg9nq26\r
  46         xRzAGMVlk5Kak1mWWqRvl8CVcWTBN/aCB+wVN462sTQwLmbrYuTkkBAwkVh5/Do7hC0mceHe\r
  47         eqA4F4eQwD5GiRdXDrJCOBsYJTZPm8QO4dxnklg97Q4jhDOfUeLC+fWsIP1sAhoS2/YvZwSx\r
  48         RQSkJXbenQ0U5+BgFhCReDeTCcQUFrCSmLHAGKSCRUBVomvFHLBOXgEHiY13djNDXKEgcW71\r
  49         OfYJjLwLGBlWMcqm5Fbp5iZm5hSnJusWJyfm5aUW6Rrp5WaW6KWmlG5iBAUBpyTvDsZ3B5UO\r
  50         MQpwMCrx8AqrCvkLsSaWFVfmHmKU5GBSEuUt0hb2F+JLyk+pzEgszogvKs1JLT7EKMHBrCTC\r
  51         26YPlONNSaysSi3Kh0lJc7AoifOqar3zExJITyxJzU5NLUgtgsnKcHAoSfAuNAFqFCxKTU+t\r
  52         SMvMKUFIM3FwggznARreDFLDW1yQmFucmQ6RP8WoKCXOWwySEABJZJTmwfXCovQVozjQK8IQ\r
  53         K3iAEQ7X/QpoMBPQ4JxWIZDBJYkIKakGxoLyH5NEg21FzqtXzbu08OLZQxYno+7PvBWhcLmz\r
  54         4vB/5bx1bdELRaJ3TahnmDBh98eE6TmOQtUer24pGAvMb2IxY2pU7lhn4y/0d9nWKUteltWq\r
  55         TJphY1bpf8L+oVKWTGi4jqFY6UL5B7KXFr++82nD1b+MDsVTMo8+WDHL6efhK86m/jG6Okos\r
  56         xRmJhlrMRcWJAKPDtVWtAgAA\r
  57 X-BeenThere: notmuch@notmuchmail.org\r
  58 X-Mailman-Version: 2.1.13\r
  59 Precedence: list\r
  60 List-Id: "Use and development of the notmuch mail system."\r
  61         <notmuch.notmuchmail.org>\r
  62 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  63         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  64 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  65 List-Post: <mailto:notmuch@notmuchmail.org>\r
  66 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  67 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  68         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  69 X-List-Received-Date: Sun, 15 Jan 2012 20:20:33 -0000\r
  70 \r
  71 Previously, the dependency file list was generated before the CLI\r
  72 sources were added to SRCS, so dependency files weren't generated for\r
  73 CLI sources.  This moves that code to after the CLI sources are added.\r
  74 ---\r
  75  Makefile.local |    8 ++++----\r
  76  1 files changed, 4 insertions(+), 4 deletions(-)\r
  77 \r
  78 diff --git a/Makefile.local b/Makefile.local\r
  79 index d3bf947..1131dea 100644\r
  80 --- a/Makefile.local\r
  81 +++ b/Makefile.local\r
  82 @@ -273,10 +273,6 @@ quiet ?= $($(shell echo $1 | sed -e s'/ .*//'))\r
  83         sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \\r
  84         rm -f $@.$$$$\r
  85  \r
  86 -DEPS := $(SRCS:%.c=.deps/%.d)\r
  87 -DEPS := $(DEPS:%.cc=.deps/%.d)\r
  88 --include $(DEPS)\r
  89 -\r
  90  .PHONY : clean\r
  91  clean:\r
  92         rm -f $(CLEAN); rm -rf .deps\r
  93 @@ -350,3 +346,7 @@ install-desktop:\r
  94  \r
  95  SRCS  := $(SRCS) $(notmuch_client_srcs)\r
  96  CLEAN := $(CLEAN) notmuch notmuch-shared $(notmuch_client_modules) notmuch.elc\r
  97 +\r
  98 +DEPS := $(SRCS:%.c=.deps/%.d)\r
  99 +DEPS := $(DEPS:%.cc=.deps/%.d)\r
 100 +-include $(DEPS)\r
 101 -- \r
 102 1.7.7.3\r
 103 \r