Emacs: Add address completion based on company-mode

[notmuch.git] / emacs / Makefile.local

diff --git a/emacs/Makefile.local b/emacs/Makefile.local
index dcb4995323af9e866766d35e58a3c42dcdb9a6a5..6c93e739368415cc9bbb69cdf0592aa63be49334 100644 (file)
--- a/emacs/Makefile.local
+++ b/emacs/Makefile.local
@@ -18,7 +18,9 @@ emacs_sources := \
        $(dir)/notmuch-tag.el \
        $(dir)/coolj.el \
        $(dir)/notmuch-print.el \
-       $(dir)/notmuch-version.el
+       $(dir)/notmuch-version.el \
+       $(dir)/notmuch-jump.el \
+       $(dir)/notmuch-company.el
 
 $(dir)/notmuch-version.el: $(dir)/Makefile.local version.stamp
 $(dir)/notmuch-version.el: $(srcdir)/$(dir)/notmuch-version.el.tmpl
@@ -29,7 +31,10 @@ $(dir)/notmuch-version.el: $(srcdir)/$(dir)/notmuch-version.el.tmpl
 emacs_images := \
        $(srcdir)/$(dir)/notmuch-logo.png
 
-emacs_bytecode = $(emacs_sources:.el=.elc)
+# Do not try to install files that are not byte-compiled.
+emacs_no_byte_compile := $(dir)/notmuch-company.el
+
+emacs_bytecode = $(patsubst %.el,%.elc,$(filter-out $(emacs_no_byte_compile),$(emacs_sources)))
 
 # Because of defmacro's and defsubst's, we have to account for load
 # dependencies between Elisp files when byte compiling.  Otherwise,
@@ -69,7 +74,7 @@ install: install-emacs
 endif
 
 .PHONY: install-emacs
-install-emacs:
+install-emacs: $(emacs_sources) $(emacs_images)
        mkdir -p "$(DESTDIR)$(emacslispdir)"
        install -m0644 $(emacs_sources) "$(DESTDIR)$(emacslispdir)"
 ifeq ($(HAVE_EMACS),1)