X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2FMakefile.local;h=5e4ae1bda257f61cac0f296ee5a9ff2bec80f4f9;hb=ef07e3f3bdd01a7266e0268227cd9b78f3c47c68;hp=c0d6b190c3c88ffa0b02a8a3471560e3df846ce2;hpb=f0ad36cb7f400f476ada451b683e1d272de7353b;p=notmuch diff --git a/emacs/Makefile.local b/emacs/Makefile.local index c0d6b190..5e4ae1bd 100644 --- a/emacs/Makefile.local +++ b/emacs/Makefile.local @@ -3,6 +3,7 @@ dir := emacs emacs_sources := \ $(dir)/notmuch-lib.el \ + $(dir)/notmuch-compat.el \ $(dir)/notmuch-parser.el \ $(dir)/notmuch.el \ $(dir)/notmuch-query.el \ @@ -18,13 +19,27 @@ emacs_sources := \ $(dir)/notmuch-tag.el \ $(dir)/coolj.el \ $(dir)/notmuch-print.el \ - $(dir)/notmuch-version.el + $(dir)/notmuch-version.el \ + $(dir)/notmuch-jump.el \ + $(dir)/notmuch-company.el \ + $(dir)/notmuch-draft.el + +elpa_sources := ${emacs_sources} $(dir)/notmuch-pkg.el $(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 $( $@ +$(dir)/notmuch-pkg.el: $(srcdir)/$(dir)/notmuch-pkg.el.tmpl + @sed -e 's/%AG%/Generated file (from $( $@ + +all: $(dir)/notmuch-pkg.el +install-emacs: $(dir)/notmuch-pkg.el + +emacs_mua := $(dir)/notmuch-emacs-mua +emacs_mua_desktop := $(dir)/notmuch-emacs-mua.desktop emacs_images := \ $(srcdir)/$(dir)/notmuch-logo.png @@ -51,6 +66,10 @@ $(dir)/.eldeps: $(dir)/Makefile.local $(dir)/make-deps.el $(emacs_sources) $(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 @@ -59,6 +78,19 @@ ifeq ($(HAVE_EMACS),1) $(call quiet,EMACS) --directory emacs -batch -f batch-byte-compile $< endif +elpa: $(ELPA_FILE) + +ELPA_DIR=.elpa-build/notmuch-${ELPA_VERSION} +notmuch-emacs-%.tar: ${elpa_sources} build-info + mkdir -p .elpa-build/notmuch-${ELPA_VERSION} + cp ${elpa_sources} ${ELPA_DIR} +ifeq ($(HAVE_SPHINX)$(HAVE_MAKEINFO)$(HAVE_INSTALL_INFO),111) + cp ${INFO_INFO_FILES} ${ELPA_DIR} + for file in ${INFO_INFO_FILES}; do install-info $$file ${ELPA_DIR}/dir; done +endif + tar -C .elpa-build -cf $@ notmuch-${ELPA_VERSION} + rm -r .elpa-build + ifeq ($(WITH_EMACS),1) ifeq ($(HAVE_EMACS),1) all: $(emacs_bytecode) @@ -77,5 +109,15 @@ ifeq ($(HAVE_EMACS),1) endif mkdir -p "$(DESTDIR)$(emacsetcdir)" install -m0644 $(emacs_images) "$(DESTDIR)$(emacsetcdir)" + mkdir -p "$(DESTDIR)$(prefix)/bin/" +ifeq ($(HAVE_BASH),1) + sed "1s|^#!.*|#! $(BASH_ABSOLUTE)|" < $(emacs_mua) > $(DESTDIR)$(prefix)/bin/notmuch-emacs-mua + chmod 755 $(DESTDIR)$(prefix)/bin/notmuch-emacs-mua +endif +ifeq ($(WITH_DESKTOP),1) + mkdir -p "$(DESTDIR)$(desktop_dir)" + desktop-file-install --mode 0644 --dir "$(DESTDIR)$(desktop_dir)" $(emacs_mua_desktop) + -update-desktop-database "$(DESTDIR)$(desktop_dir)" +endif -CLEAN := $(CLEAN) $(emacs_bytecode) $(dir)/notmuch-version.el +CLEAN := $(CLEAN) $(emacs_bytecode) $(dir)/notmuch-version.el $(dir)/notmuch-pkg.el