Merge branch '0.3.x' immediately after the 0.3.1 release

[notmuch] / emacs / Makefile.local

diff --git a/emacs/Makefile.local b/emacs/Makefile.local
index 95b6fa456c48d57eab48db2833d0c20e84454ae3..86f9b07fe64bb46805f18bd3d2ad80c26dc3f0b7 100644 (file)
--- a/emacs/Makefile.local
+++ b/emacs/Makefile.local
@@ -4,23 +4,37 @@ dir := emacs
 emacs_sources := \
        $(dir)/notmuch-lib.el \
        $(dir)/notmuch.el \
-       $(dir)/notmuch-show.el
+       $(dir)/notmuch-query.el \
+       $(dir)/notmuch-show.el \
+       $(dir)/notmuch-wash.el \
+       $(dir)/notmuch-hello.el \
+       $(dir)/notmuch-mua.el \
+       $(dir)/notmuch-address.el \
+       $(dir)/notmuch-maildir-fcc.el \
+       $(dir)/notmuch-message.el \
+       $(dir)/coolj.el
+
+emacs_images := \
+       $(dir)/notmuch-logo.png
 
 emacs_bytecode := $(subst .el,.elc,$(emacs_sources))
 
-emacs: $(emacs_bytecode)
-
-install-emacs: install emacs
-       $(call quiet_mkdir, $(DESTDIR)/$(emacs_lispdir))
-       $(call quiet_install_data, $(emacs_sources) $(emacs_bytecode) $(DESTDIR)$(emacs_lispdir))
-       @echo ""
-       @echo "The notmuch emacs client is now installed."
-       @echo ""
-       @echo "To run this, each user should add the following line to the ~/.emacs file:"
-       @echo ""
-       @echo " (require 'notmuch)"
-       @echo ""
-       @echo "And should then run \"M-x notmuch\" from within emacs or run \"emacs -f notmuch\""
-       @echo ""
+%.elc: %.el
+       $(call quiet,EMACS) --directory emacs -batch -f batch-byte-compile $<
+
+ifeq ($(HAVE_EMACS),1)
+all: $(emacs_bytecode)
+endif
+
+install: install-emacs
+
+.PHONY: install-emacs
+install-emacs:
+       mkdir -p $(DESTDIR)$(emacslispdir)
+       install -m0644 $(emacs_sources) $(DESTDIR)$(emacslispdir)
+ifeq ($(HAVE_EMACS),1)
+       install -m0644 $(emacs_bytecode) $(DESTDIR)$(emacslispdir)
+endif
+       install -m0644 $(emacs_images) $(DESTDIR)$(emacslispdir)
 
 CLEAN := $(CLEAN) $(emacs_bytecode)