Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id B02AC431FBC for ; Tue, 9 Feb 2010 19:48:29 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.723 X-Spam-Level: X-Spam-Status: No, score=-0.723 tagged_above=-999 required=5 tests=[AWL=-0.538, BAYES_40=-0.185] autolearn=ham Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6gAHRp1gdFDZ for ; Tue, 9 Feb 2010 19:48:28 -0800 (PST) Received: from pivot.cs.unb.ca (pivot.cs.unb.ca [131.202.240.57]) by olra.theworths.org (Postfix) with ESMTP id B5119431FAE for ; Tue, 9 Feb 2010 19:48:28 -0800 (PST) Received: from fctnnbsc30w-142167166109.pppoe-dynamic.high-speed.nb.bellaliant.net ([142.167.166.109] helo=rocinante.cs.unb.ca) by pivot.cs.unb.ca with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1Nf3Yx-0007ts-QT; Tue, 09 Feb 2010 23:48:28 -0400 Received: from bremner by rocinante.cs.unb.ca with local (Exim 4.71) (envelope-from ) id 1Nf3WK-00083G-14; Tue, 09 Feb 2010 23:45:44 -0400 From: david@tethera.net To: notmuch@notmuchmail.org Date: Tue, 9 Feb 2010 23:45:28 -0400 Message-Id: <1265773528-30794-1-git-send-email-david@tethera.net> X-Mailer: git-send-email 1.6.5 X-Sender-Verified: bremner@pivot.cs.unb.ca Cc: David Bremner Subject: [notmuch] [PATCH] emacs: Move emacs UI (currently just one file) to subdirectory. X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Feb 2010 03:48:29 -0000 From: David Bremner Add emacs/Makefile.local and emacs/Makefile. Move emacs targets into emacs/Makefile.local, but leave the byte compilation rule in the top level Makefile. --- I decided to put the actual targets for byte compilation and installation in emacs/Makefile.local. This seems more modular to me. Makefile | 1 + Makefile.local | 10 ---------- emacs/Makefile | 7 +++++++ emacs/Makefile.local | 19 +++++++++++++++++++ notmuch.el => emacs/notmuch.el | 0 5 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 emacs/Makefile create mode 100644 emacs/Makefile.local rename notmuch.el => emacs/notmuch.el (100%) diff --git a/Makefile b/Makefile index 64b9d4a..bd8f50a 100644 --- a/Makefile +++ b/Makefile @@ -38,6 +38,7 @@ include Makefile.config include lib/Makefile.local include compat/Makefile.local +include emacs/Makefile.local include Makefile.local # The user has not set any verbosity, default to quiet mode and inform the diff --git a/Makefile.local b/Makefile.local index 04bac83..8431eba 100644 --- a/Makefile.local +++ b/Makefile.local @@ -1,5 +1,3 @@ -emacs: notmuch.elc - notmuch_client_srcs = \ $(notmuch_compat_srcs) \ debugger.c \ @@ -35,14 +33,6 @@ install: all notmuch.1.gz install notmuch $(DESTDIR)$(prefix)/bin/ install -m0644 notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/ -install-emacs: install emacs - for d in $(DESTDIR)/$(emacs_lispdir) ; \ - do \ - install -d $$d ; \ - done ; - install -m0644 notmuch.el $(DESTDIR)$(emacs_lispdir) - install -m0644 notmuch.elc $(DESTDIR)$(emacs_lispdir) - install-desktop: install -d $(DESTDIR)$(desktop_dir) desktop-file-install --mode 0644 --dir $(DESTDIR)$(desktop_dir) notmuch.desktop diff --git a/emacs/Makefile b/emacs/Makefile new file mode 100644 index 0000000..b6859ea --- /dev/null +++ b/emacs/Makefile @@ -0,0 +1,7 @@ +# See Makfefile.local for the list of files to be compiled in this +# directory. +all: + $(MAKE) -C .. all + +.DEFAULT: + $(MAKE) -C .. $@ diff --git a/emacs/Makefile.local b/emacs/Makefile.local new file mode 100644 index 0000000..c6ca142 --- /dev/null +++ b/emacs/Makefile.local @@ -0,0 +1,19 @@ +dir=emacs +emacs_sources= \ + $(dir)/notmuch.el + +emacs_bytecode=$(subst .el,.elc,$(emacs_sources)) + +emacs: $(emacs_bytecode) + +install-emacs: install emacs + for d in $(DESTDIR)/$(emacs_lispdir) ; \ + do \ + install -d $$d ; \ + done ; + for f in $(emacs_sources) $(emacs_bytecode); \ + do \ + install -m0644 $$f $(DESTDIR)$(emacs_lispdir) ;\ + done; + +CLEAN := $(CLEAN) $(emacs_bytecode) diff --git a/notmuch.el b/emacs/notmuch.el similarity index 100% rename from notmuch.el rename to emacs/notmuch.el -- 1.6.5