X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=emacs%2FMakefile.local;h=a910affadbdc02de2152037fbba2ed060ce489ca;hp=1c09d87aa8f33c2dd453392c2b7a15a346ae29d2;hb=b89ffba3012603d3eb9b1e144bf0a81480588ea3;hpb=3e4a9d60a9419621b08c647a306843d76c47c2cb

diff --git a/emacs/Makefile.local b/emacs/Makefile.local
index 1c09d87a..a910affa 100644
--- a/emacs/Makefile.local
+++ b/emacs/Makefile.local
@@ -3,6 +3,7 @@
 dir := emacs
 emacs_sources := \
 	$(dir)/notmuch-lib.el \
+	$(dir)/notmuch-parser.el \
 	$(dir)/notmuch.el \
 	$(dir)/notmuch-query.el \
 	$(dir)/notmuch-show.el \
@@ -12,14 +13,29 @@ emacs_sources := \
 	$(dir)/notmuch-address.el \
 	$(dir)/notmuch-maildir-fcc.el \
 	$(dir)/notmuch-message.el \
-	$(dir)/coolj.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)
 
-%.elc: %.el
+# 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.
+$(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
+CLEAN+=$(dir)/.eldeps $(dir)/.eldeps.tmp
+
+%.elc: %.el $(global_deps)
 	$(call quiet,EMACS) --directory emacs -batch -f batch-byte-compile $<
 
 ifeq ($(WITH_EMACS),1)
@@ -37,6 +53,7 @@ install-emacs:
 ifeq ($(HAVE_EMACS),1)
 	install -m0644 $(emacs_bytecode) "$(DESTDIR)$(emacslispdir)"
 endif
-	install -m0644 $(emacs_images) "$(DESTDIR)$(emacslispdir)"
+	mkdir -p "$(DESTDIR)$(emacsetcdir)"
+	install -m0644 $(emacs_images) "$(DESTDIR)$(emacsetcdir)"
 
 CLEAN := $(CLEAN) $(emacs_bytecode)