[PATCH] Fix dependency generation for compat, test, and util

diff --git a/9a/54fb0d4c485f1e201b93da4c04734a928912c5 b/9a/54fb0d4c485f1e201b93da4c04734a928912c5
new file mode 100644 (file)
index 0000000..cf91112
--- /dev/null
+++ b/9a/54fb0d4c485f1e201b93da4c04734a928912c5
@@ -0,0 +1,113 @@
+Return-Path: <amthrax@drake.mit.edu>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 5E62C431FBF\r
+       for <notmuch@notmuchmail.org>; Sun, 15 Jan 2012 12:20:46 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id GdyMC5jSpSea for <notmuch@notmuchmail.org>;\r
+       Sun, 15 Jan 2012 12:20:46 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-5.mit.edu (DMZ-MAILSEC-SCANNER-5.MIT.EDU\r
+       [18.7.68.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id D2E71431FAE\r
+       for <notmuch@notmuchmail.org>; Sun, 15 Jan 2012 12:20:45 -0800 (PST)\r
+X-AuditID: 12074422-b7fd66d0000008f9-f8-4f13351d0d9e\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+       by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 7F.E8.02297.D15331F4; Sun, 15 Jan 2012 15:20:45 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q0FKKjdj004510; \r
+       Sun, 15 Jan 2012 15:20:45 -0500\r
+Received: from drake.mit.edu\r
+       (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [209.6.116.242]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q0FKKivs029974\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Sun, 15 Jan 2012 15:20:45 -0500 (EST)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+       (envelope-from <amthrax@drake.mit.edu>)\r
+       id 1RmWZI-0004T8-3O; Sun, 15 Jan 2012 15:20:44 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] Fix dependency generation for compat, test, and util\r
+Date: Sun, 15 Jan 2012 15:20:42 -0500\r
+Message-Id: <1326658842-17133-1-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.7.3\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFprJIsWRmVeSWpSXmKPExsUixG6nritrKuxv8OyLjMX1mzOZHRg9nq26\r
+       xRzAGMVlk5Kak1mWWqRvl8CV8enOEsaCq1wVa7cJNTB+5ehi5OSQEDCR+PNgPiuELSZx4d56\r
+       ti5GLg4hgX2MEu83N7FCOBsYJebOe8kE4dxnkthwdAcjhDOfUWLCyWnsIP1sAhoS2/YvZwSx\r
+       RQSkJXbenQ3UzsHBLCAi8W4mE0hYWMBVomfXHCaQMIuAqsSxJ7IgYV4BB4l1uz8yQlyhIHFu\r
+       9Tn2CYy8CxgZVjHKpuRW6eYmZuYUpybrFicn5uWlFuma6uVmluilppRuYgSHgIvSDsafB5UO\r
+       MQpwMCrx8AqrCvkLsSaWFVfmHmKU5GBSEuUt0hb2F+JLyk+pzEgszogvKs1JLT7EKMHBrCTC\r
+       26YPlONNSaysSi3Kh0lJc7AoifOqa73zExJITyxJzU5NLUgtgsnKcHAoSfDKmwA1ChalpqdW\r
+       pGXmlCCkmTg4QYbzAA2PAqnhLS5IzC3OTIfIn2JUlBLnNQJJCIAkMkrz4HphMfqKURzoFWHe\r
+       QJAqHmB8w3W/AhrMBDQ4p1UIZHBJIkJKqoExMs7ijWnPrMCz4W9Flm70nK9w5ZfeG86XCw/P\r
+       a9/k2dXUcGVTXLV2XOqEWy4z3gQ9PmwS5/OEpWUq86KPfx89njNhsX+MJv+qY3bph6f9d/A3\r
+       rDeMftnZ9XhrDoNy4/3dax7MnnpbZ/Znh9idR55NY/27sErvQvfzbAUXztQ69ftLDT77NlcF\r
+       KrEUZyQaajEXFScCAL16ZFCsAgAA\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 15 Jan 2012 20:20:46 -0000\r
+\r
+This adds source files in compat, test, and util to SRCS so that the\r
+top-level Makefile.local will generate dependency files for them.\r
+---\r
+ compat/Makefile.local |    2 ++\r
+ test/Makefile.local   |    1 +\r
+ util/Makefile.local   |    1 +\r
+ 3 files changed, 4 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/compat/Makefile.local b/compat/Makefile.local\r
+index 504eb71..13f16cd 100644\r
+--- a/compat/Makefile.local\r
++++ b/compat/Makefile.local\r
+@@ -12,3 +12,5 @@ endif\r
+ ifneq ($(HAVE_STRCASESTR),1)\r
+ notmuch_compat_srcs += $(dir)/strcasestr.c\r
+ endif\r
++\r
++SRCS := $(SRCS) $(notmuch_compat_srcs)\r
+diff --git a/test/Makefile.local b/test/Makefile.local\r
+index fa2df73..4a6a4b1 100644\r
+--- a/test/Makefile.local\r
++++ b/test/Makefile.local\r
+@@ -28,6 +28,7 @@ test:        all test-binaries\r
+ \r
+ check: test\r
+ \r
++SRCS := $(SRCS) $(smtp_dummy_srcs)\r
+ CLEAN := $(CLEAN) $(dir)/smtp-dummy $(dir)/smtp-dummy.o \\r
+        $(dir)/symbol-test $(dir)/symbol-test.o \\r
+        $(dir)/arg-test $(dir)/arg-test.o\r
+diff --git a/util/Makefile.local b/util/Makefile.local\r
+index 26e4c3f..c7cae61 100644\r
+--- a/util/Makefile.local\r
++++ b/util/Makefile.local\r
+@@ -10,4 +10,5 @@ libutil_modules := $(libutil_c_srcs:.c=.o)\r
+ $(dir)/libutil.a: $(libutil_modules)\r
+       $(call quiet,AR) rcs $@ $^\r
+ \r
++SRCS := $(SRCS) $(libutil_c_srcs)\r
+ CLEAN := $(CLEAN) $(libutil_modules) $(dir)/libutil.a\r
+-- \r
+1.7.7.3\r
+\r