Makefile: Make emacs compilation depend on global dependencies.

[notmuch] / emacs / Makefile.local

diff --git a/emacs/Makefile.local b/emacs/Makefile.local
index 86f9b07fe64bb46805f18bd3d2ad80c26dc3f0b7..ce0c3f007127e634404c0c540e88eee12cb8c1cb 100644 (file)
--- a/emacs/Makefile.local
+++ b/emacs/Makefile.local
@@ -12,29 +12,32 @@ emacs_sources := \
        $(dir)/notmuch-address.el \
        $(dir)/notmuch-maildir-fcc.el \
        $(dir)/notmuch-message.el \
+       $(dir)/notmuch-crypto.el \
        $(dir)/coolj.el
 
 emacs_images := \
-       $(dir)/notmuch-logo.png
+       $(srcdir)/$(dir)/notmuch-logo.png
 
-emacs_bytecode := $(subst .el,.elc,$(emacs_sources))
+emacs_bytecode = $(emacs_sources:.el=.elc)
 
-%.elc: %.el
+%.elc: %.el $(global_deps)
        $(call quiet,EMACS) --directory emacs -batch -f batch-byte-compile $<
 
+ifeq ($(WITH_EMACS),1)
 ifeq ($(HAVE_EMACS),1)
 all: $(emacs_bytecode)
 endif
 
 install: install-emacs
+endif
 
 .PHONY: install-emacs
 install-emacs:
-       mkdir -p $(DESTDIR)$(emacslispdir)
-       install -m0644 $(emacs_sources) $(DESTDIR)$(emacslispdir)
+       mkdir -p "$(DESTDIR)$(emacslispdir)"
+       install -m0644 $(emacs_sources) "$(DESTDIR)$(emacslispdir)"
 ifeq ($(HAVE_EMACS),1)
-       install -m0644 $(emacs_bytecode) $(DESTDIR)$(emacslispdir)
+       install -m0644 $(emacs_bytecode) "$(DESTDIR)$(emacslispdir)"
 endif
-       install -m0644 $(emacs_images) $(DESTDIR)$(emacslispdir)
+       install -m0644 $(emacs_images) "$(DESTDIR)$(emacslispdir)"
 
 CLEAN := $(CLEAN) $(emacs_bytecode)