X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=emacs%2FMakefile.local;h=f759c0dc3f5daa7bbe3ddf1eeb26a8e58c20384f;hp=b895d11a9d6978ae8ba75485f9e25efbeaddd6ff;hb=3b3da097d88795fe9a6fca419f32fd59aa2da418;hpb=ce6cfd6408e805aa8eee45131c4d6e6e4e62928a

diff --git a/emacs/Makefile.local b/emacs/Makefile.local
index b895d11a..f759c0dc 100644
--- a/emacs/Makefile.local
+++ b/emacs/Makefile.local
@@ -1,28 +1,30 @@
-dir=emacs
-emacs_sources=                 \
-	$(dir)/notmuch.el
+# -*- makefile -*-
 
-emacs_bytecode=$(subst .el,.elc,$(emacs_sources))
+dir := emacs
+emacs_sources := \
+	$(dir)/notmuch-lib.el \
+	$(dir)/notmuch.el \
+	$(dir)/notmuch-query.el \
+	$(dir)/notmuch-show.el \
+	$(dir)/notmuch-wash.el
 
-emacs: $(emacs_bytecode)
+emacs_bytecode := $(subst .el,.elc,$(emacs_sources))
 
-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 ""
+%.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
 
 CLEAN := $(CLEAN) $(emacs_bytecode)