1 Return-Path: <bremner@pivot.cs.unb.ca>
\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 B02AC431FBC
\r
6 for <notmuch@notmuchmail.org>; Tue, 9 Feb 2010 19:48:29 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.723 tagged_above=-999 required=5
\r
12 tests=[AWL=-0.538, BAYES_40=-0.185] autolearn=ham
\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 6gAHRp1gdFDZ for <notmuch@notmuchmail.org>;
\r
16 Tue, 9 Feb 2010 19:48:28 -0800 (PST)
\r
17 Received: from pivot.cs.unb.ca (pivot.cs.unb.ca [131.202.240.57])
\r
18 by olra.theworths.org (Postfix) with ESMTP id B5119431FAE
\r
19 for <notmuch@notmuchmail.org>; Tue, 9 Feb 2010 19:48:28 -0800 (PST)
\r
21 fctnnbsc30w-142167166109.pppoe-dynamic.high-speed.nb.bellaliant.net
\r
22 ([142.167.166.109] helo=rocinante.cs.unb.ca)
\r
23 by pivot.cs.unb.ca with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32)
\r
24 (Exim 4.69) (envelope-from <bremner@pivot.cs.unb.ca>)
\r
25 id 1Nf3Yx-0007ts-QT; Tue, 09 Feb 2010 23:48:28 -0400
\r
26 Received: from bremner by rocinante.cs.unb.ca with local (Exim 4.71)
\r
27 (envelope-from <bremner@rocinante.cs.unb.ca>)
\r
28 id 1Nf3WK-00083G-14; Tue, 09 Feb 2010 23:45:44 -0400
\r
29 From: david@tethera.net
\r
30 To: notmuch@notmuchmail.org
\r
31 Date: Tue, 9 Feb 2010 23:45:28 -0400
\r
32 Message-Id: <1265773528-30794-1-git-send-email-david@tethera.net>
\r
33 X-Mailer: git-send-email 1.6.5
\r
34 X-Sender-Verified: bremner@pivot.cs.unb.ca
\r
35 Cc: David Bremner <bremner@unb.ca>
\r
36 Subject: [notmuch] [PATCH] emacs: Move emacs UI (currently just one file) to
\r
38 X-BeenThere: notmuch@notmuchmail.org
\r
39 X-Mailman-Version: 2.1.13
\r
41 List-Id: "Use and development of the notmuch mail system."
\r
42 <notmuch.notmuchmail.org>
\r
43 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
44 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
45 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
46 List-Post: <mailto:notmuch@notmuchmail.org>
\r
47 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
48 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
49 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
50 X-List-Received-Date: Wed, 10 Feb 2010 03:48:29 -0000
\r
52 From: David Bremner <bremner@unb.ca>
\r
54 Add emacs/Makefile.local and emacs/Makefile. Move emacs targets into
\r
55 emacs/Makefile.local, but leave the byte compilation rule in the top
\r
60 I decided to put the actual targets for byte compilation and installation in
\r
61 emacs/Makefile.local. This seems more modular to me.
\r
64 Makefile.local | 10 ----------
\r
65 emacs/Makefile | 7 +++++++
\r
66 emacs/Makefile.local | 19 +++++++++++++++++++
\r
67 notmuch.el => emacs/notmuch.el | 0
\r
68 5 files changed, 27 insertions(+), 10 deletions(-)
\r
69 create mode 100644 emacs/Makefile
\r
70 create mode 100644 emacs/Makefile.local
\r
71 rename notmuch.el => emacs/notmuch.el (100%)
\r
73 diff --git a/Makefile b/Makefile
\r
74 index 64b9d4a..bd8f50a 100644
\r
77 @@ -38,6 +38,7 @@ include Makefile.config
\r
79 include lib/Makefile.local
\r
80 include compat/Makefile.local
\r
81 +include emacs/Makefile.local
\r
82 include Makefile.local
\r
84 # The user has not set any verbosity, default to quiet mode and inform the
\r
85 diff --git a/Makefile.local b/Makefile.local
\r
86 index 04bac83..8431eba 100644
\r
87 --- a/Makefile.local
\r
88 +++ b/Makefile.local
\r
92 notmuch_client_srcs = \
\r
93 $(notmuch_compat_srcs) \
\r
95 @@ -35,14 +33,6 @@ install: all notmuch.1.gz
\r
96 install notmuch $(DESTDIR)$(prefix)/bin/
\r
97 install -m0644 notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/
\r
99 -install-emacs: install emacs
\r
100 - for d in $(DESTDIR)/$(emacs_lispdir) ; \
\r
102 - install -d $$d ; \
\r
104 - install -m0644 notmuch.el $(DESTDIR)$(emacs_lispdir)
\r
105 - install -m0644 notmuch.elc $(DESTDIR)$(emacs_lispdir)
\r
108 install -d $(DESTDIR)$(desktop_dir)
\r
109 desktop-file-install --mode 0644 --dir $(DESTDIR)$(desktop_dir) notmuch.desktop
\r
110 diff --git a/emacs/Makefile b/emacs/Makefile
\r
111 new file mode 100644
\r
112 index 0000000..b6859ea
\r
114 +++ b/emacs/Makefile
\r
116 +# See Makfefile.local for the list of files to be compiled in this
\r
119 + $(MAKE) -C .. all
\r
123 diff --git a/emacs/Makefile.local b/emacs/Makefile.local
\r
124 new file mode 100644
\r
125 index 0000000..c6ca142
\r
127 +++ b/emacs/Makefile.local
\r
131 + $(dir)/notmuch.el
\r
133 +emacs_bytecode=$(subst .el,.elc,$(emacs_sources))
\r
135 +emacs: $(emacs_bytecode)
\r
137 +install-emacs: install emacs
\r
138 + for d in $(DESTDIR)/$(emacs_lispdir) ; \
\r
140 + install -d $$d ; \
\r
142 + for f in $(emacs_sources) $(emacs_bytecode); \
\r
144 + install -m0644 $$f $(DESTDIR)$(emacs_lispdir) ;\
\r
147 +CLEAN := $(CLEAN) $(emacs_bytecode)
\r
148 diff --git a/notmuch.el b/emacs/notmuch.el
\r
149 similarity index 100%
\r
150 rename from notmuch.el
\r
151 rename to emacs/notmuch.el
\r