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

diff --git a/emacs/Makefile.local b/emacs/Makefile.local
index 17ede863..42bfbd96 100644
--- a/emacs/Makefile.local
+++ b/emacs/Makefile.local
@@ -1,27 +1,65 @@
+# -*- makefile -*-
+
 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;
-	@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 ""
+emacs_sources := \
+	$(dir)/notmuch-lib.el \
+	$(dir)/notmuch-parser.el \
+	$(dir)/notmuch.el \
+	$(dir)/notmuch-query.el \
+	$(dir)/notmuch-show.el \
+	$(dir)/notmuch-tree.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)/notmuch-crypto.el \
+	$(dir)/notmuch-tag.el \
+	$(dir)/coolj.el \
+	$(dir)/notmuch-print.el
+
+emacs_images := \
+	$(srcdir)/$(dir)/notmuch-logo.png
+
+emacs_bytecode = $(emacs_sources:.el=.elc)
+
+# Because of defmacro's and defsubst's, we have to account for load
+# dependencies between Elisp files when byte compiling.  Otherwise,
+# the byte compiler may load an old .elc file when processing a
+# "require" or we may fail to rebuild a .elc that depended on a macro
+# from an updated file.
+ifeq ($(HAVE_EMACS),1)
+$(dir)/.eldeps: $(dir)/Makefile.local $(dir)/make-deps.el $(emacs_sources)
+	$(call quiet,EMACS) --directory emacs -batch -l make-deps.el \
+		-f batch-make-deps $(emacs_sources) > $@.tmp && \
+		(cmp -s $@.tmp $@ || mv $@.tmp $@)
+-include $(dir)/.eldeps
+endif
+CLEAN+=$(dir)/.eldeps $(dir)/.eldeps.tmp
+
+ifeq ($(HAVE_EMACS),1)
+%.elc: %.el $(global_deps)
+	$(call quiet,EMACS) --directory emacs -batch -f batch-byte-compile $<
+endif
+
+ifeq ($(WITH_EMACS),1)
+ifeq ($(HAVE_EMACS),1)
+all: $(emacs_bytecode)
+install-emacs: $(emacs_bytecode)
+endif
+
+install: install-emacs
+endif
+
+.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
+	mkdir -p "$(DESTDIR)$(emacsetcdir)"
+	install -m0644 $(emacs_images) "$(DESTDIR)$(emacsetcdir)"
 
 CLEAN := $(CLEAN) $(emacs_bytecode)