X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=emacs%2FMakefile.local;h=52aca4efa89ac832838d6ac125f9ca0e71c22a97;hp=17ede8635e053326e51c83dd3ac83ab6433c73a1;hb=e2dd4ac00b9979de34bd517fa57de56260d38755;hpb=86232e62ab0ed6948de24a6aab5d9f2558171acf

diff --git a/emacs/Makefile.local b/emacs/Makefile.local
index 17ede863..52aca4ef 100644
--- a/emacs/Makefile.local
+++ b/emacs/Makefile.local
@@ -1,27 +1,29 @@
+# -*- makefile -*-
+
 dir := emacs
-emacs_sources := $(dir)/notmuch.el
+emacs_sources := \
+	$(dir)/notmuch-lib.el \
+	$(dir)/notmuch.el \
+	$(dir)/notmuch-query.el \
+	$(dir)/notmuch-show.el
 
 emacs_bytecode := $(subst .el,.elc,$(emacs_sources))
 
-emacs: $(emacs_bytecode)
+%.elc: %.el
+	$(call quiet,EMACS) --directory emacs -batch -f batch-byte-compile $<
+
+ifeq ($(HAVE_EMACS),1)
+all: $(emacs_bytecode)
+endif
+
+install: install-emacs
 
-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;
-	@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 ""
+.PHONY: install-emacs
+install-emacs:
+	mkdir -p $(DESTDIR)/$(emacs_lispdir)
+	install -m0644 $(emacs_sources) $(DESTDIR)$(emacs_lispdir)
+ifeq ($(HAVE_EMACS),1)
+	install -m0644 $(emacs_bytecode) $(DESTDIR)$(emacs_lispdir)
+endif
 
 CLEAN := $(CLEAN) $(emacs_bytecode)