Merge branch 'release'

[notmuch] / emacs / Makefile.local

diff --git a/emacs/Makefile.local b/emacs/Makefile.local
index 51d045c3e108a0478fc9ca908b9eb96633a41227..90a57cca74ed40e1f56d0b962531a6048b5c64cb 100644 (file)
--- a/emacs/Makefile.local
+++ b/emacs/Makefile.local
@@ -3,27 +3,93 @@
 dir := emacs
 emacs_sources := \
        $(dir)/notmuch-lib.el \
+       $(dir)/notmuch-compat.el \
+       $(dir)/notmuch-parser.el \
        $(dir)/notmuch.el \
        $(dir)/notmuch-query.el \
-       $(dir)/notmuch-show.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 \
+       $(dir)/notmuch-version.el \
+       $(dir)/notmuch-jump.el \
+       $(dir)/notmuch-company.el \
+       $(dir)/notmuch-draft.el
 
-emacs_bytecode := $(subst .el,.elc,$(emacs_sources))
+$(dir)/notmuch-version.el: $(dir)/Makefile.local version.stamp
+$(dir)/notmuch-version.el: $(srcdir)/$(dir)/notmuch-version.el.tmpl
+       @sed -e 's/%AG%/Generated file (from $(<F)) -- do not edit!/' \
+            -e 's/%VERSION%/"$(VERSION)"/' $< > $@
 
-.PHONY: emacs
-emacs: $(emacs_bytecode)
+$(dir)/notmuch-pkg.el: $(srcdir)/$(dir)/notmuch-pkg.el.tmpl
+       @sed -e 's/%AG%/Generated file (from $(<F)) -- do not edit!/' \
+            -e 's/%VERSION%/"$(ELPA_VERSION)"/' $< > $@
+
+all: $(dir)/notmuch-pkg.el
+install-emacs: $(dir)/notmuch-pkg.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 && \
+               mv $@.tmp $@
+# We could include .eldeps directly, but that would cause a make
+# restart whenever any .el file was modified, even if dependencies
+# didn't change, because the mtime of .eldeps will change.  Instead,
+# we include a second file, .eldeps.x, which we ensure always has the
+# same content as .eldeps, but its mtime only changes when dependency
+# information changes, in which case a make restart is necessary
+# anyway.
+$(dir)/.eldeps.x: $(dir)/.eldeps
+       @cmp -s $^ $@ || cp $^ $@
+-include $(dir)/.eldeps.x
+
+# Add the one dependency make-deps.el does not have visibility to.
+$(dir)/notmuch-lib.elc: $(dir)/notmuch-version.elc
+
+endif
+CLEAN+=$(dir)/.eldeps $(dir)/.eldeps.tmp $(dir)/.eldeps.x
+
+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: install emacs
-       mkdir -p $(DESTDIR)/$(emacs_lispdir)
-       install -m0644 $(emacs_sources) $(emacs_bytecode) $(DESTDIR)$(emacs_lispdir)
-       @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 ""
-
-CLEAN := $(CLEAN) $(emacs_bytecode)
+install-emacs: $(emacs_sources) $(emacs_images)
+       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) $(dir)/notmuch-version.el $(dir)/notmuch-pkg.el