debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 19:08:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
notmuch/emacs/Makefile.local

89 lines
2.8 KiB
Text
Raw Normal View History

Makefile.local: Automatically use makefile mode We add a magic line to the beginning of each Makefile.local file to help the editor know that it should use makefile mode for editing the file, (even though the filename isn't exactly "Makefile"). Edited-by: Carl Worth <cworth@cworth.org>: Expand treatment from emacs/Makefile.local to each instance of Makefile.local.
2010-03-21 10:54:08 +01:00
# -*- makefile -*-
Makefile: Fix Makefiles to depend on all child Makefile fragments. We were previously maintaining two lists of the child Makefile fragments---one for the includes and another for the dependencies. So, of course, they drifted and the dependency list wasn't up to date. We fix this by adding a single subdirs variable, and then using GNU Makefile substitution to generate both the include and the dependency lists. Some side effect of this change caused the '=' assignment of the dir variable to not work anymore. I'm not sure why that is, but using ':=' makes sense here and fixes the problem.
2010-03-10 19:59:57 +01:00
dir := emacs
emacs: Move notmuch-show functionality to notmuch-show.el To ease the transition to a JSON based implementation of `notmuch-show', move the current implementation into a separate file. Create `notmuch-lib.el' to hold common variables.
2010-04-01 19:36:21 +02:00
emacs_sources := \
$(dir)/notmuch-lib.el \
emacs: Streaming S-expression parser This provides the same interface as the streaming JSON parser, but reads S-expressions incrementally. The only difference is that the `notmuch-sexp-parse-partial-list' helper does not handle interleaved error messages (since we now have the ability to separate these out at the invocation level), so it no longer takes an error function and does not need to do the horrible resynchronization that the JSON parser had to. Some implementation improvements have been made over the JSON parser. This uses a vector instead of a list for the parser data structure, since this allows faster access to elements (and modern versions of Emacs handle storage of small vectors efficiently). Private functions follow the "prefix--name" convention. And the implementation is much simpler overall because S-expressions are much easier to parse.
2013-06-01 02:40:06 +02:00
$(dir)/notmuch-parser.el \
emacs: Move notmuch-show functionality to notmuch-show.el To ease the transition to a JSON based implementation of `notmuch-show', move the current implementation into a separate file. Create `notmuch-lib.el' to hold common variables.
2010-04-01 19:36:21 +02:00
$(dir)/notmuch.el \
notmuch-query.el: new file to support access to the notmuch database. Initially this file provides one main function notmuch-query-get-threads, which takes a set of search terms, and returns a parsed set of matching threads as a lisp data structure. A set of notmuch-query-map-* functions are provided to help map functions over the data structure. The function notmuch-query-get-message-ids uses this machinery to get the set of message-ids matching a query. Edited-by: Carl Worth <cworth@cworth.org>: Change comment syntax, (";;" rather than ";" to make emacs-lisp mode happy), and eliminate some excess whitespace, as suggested by David Edmonson.
2010-04-05 18:46:16 +02:00
$(dir)/notmuch-query.el \
emacs: Move body markup to a separate file Move the citation and signature markup for text/plain parts to a new file (notmuch-wash.el) and call it using a hook mechanism rather than directly.
2010-03-22 17:49:16 +01:00
$(dir)/notmuch-show.el \
emacs: add tree to the makefile
2013-10-29 23:55:31 +01:00
$(dir)/notmuch-tree.el \
emacs: Add notmuch-hello.el, a friendly frontend to notmuch This is based on the prototype that Carl Worth described in the TODO file. It provides a search bar as well as support for recent searches, saved searches, and a list of all tags in the database (as well as the number of messages with each tag).
2010-04-22 10:27:33 +02:00
$(dir)/notmuch-wash.el \
emacs: Re-arrange message sending code Define a new `mail-user-agent' (`notmuch-user-agent') and use it by default. Re-arrange various routines that send mail to use this (compose, reply, forward). Insert a `User-Agent:' header by default.
2010-04-22 11:03:32 +02:00
$(dir)/notmuch-hello.el \
emacs: Add notmuch-address.el for address completion using notmuch A tool `notmuch-addresses' is required to produce addresses which match a query string. An example of a suitable script can be found in the git repository at http://jkr.acm.jhu.edu/git/notmuch_addresses.git There are no doubt others.
2010-04-22 11:03:43 +02:00
$(dir)/notmuch-mua.el \
emacs: Add more functions to clean up text/plain parts Add: - notmuch-wash-wrap-long-lines: Wrap lines longer than the width of the current window whilst maintaining any citation prefix. - notmuch-wash-tidy-citations: Tidy up citations by: - compress repeated otherwise blank citation lines, - remove otherwise blank citation lines at the head and tail of a citation, - notmuch-wash-elide-blank-lines: Compress repeated blank lines and remove leading and trailing blank lines. None of these is enabled by default - add them to `notmuch-show-insert-text/plain-hook' to use. Reviewed-by: Carl Worth <cworth@cworth.org>: I previously committed a stale version of this patch.
2010-04-26 15:45:30 +02:00
$(dir)/notmuch-address.el \
Integrate notmuch-maildir-fcc into notmuch Require notmuch-maildir-fcc and also install it. Rename all jkr/* functions to notmuch-maildir-fcc-* Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
2010-04-26 10:23:16 +02:00
$(dir)/notmuch-maildir-fcc.el \
Add notmuch-message.el to emacs/Makefile.local When notmuch-message.el was added to the emacs directory, I neglected to add it to the makefile as one of the emacs_sources. This patch adds it.
2010-04-27 18:44:45 +02:00
$(dir)/notmuch-message.el \
emacs: Add support for PGP/MIME verification/decryption A new emacs configuration variable "notmuch-crypto-process-mime" controls the processing of PGP/MIME signatures and encrypted parts. When this is set true, notmuch-query will use the notmuch show --decrypt flag to decrypt encrypted messages and/or calculate the sigstatus of signed messages. If sigstatus is available, notmuch-show will place a specially color-coded header at the begining of the signed message. Also included is the ability to switch decryption/verification on/off on the fly, which is bound to M-RET in notmuch-search-mode.
2011-05-26 03:01:19 +02:00
$(dir)/notmuch-crypto.el \
emacs: create notmuch-tag.el, and move appropriate functions from notmuch.el Tagging functions are used in notmuch.el, notmuch-show.el, and notmuch-message.el. There are enough common functions for tagging that it makes sense to put them all in their own library. No code is modified, just moved around.
2012-04-14 20:52:50 +02:00
$(dir)/notmuch-tag.el \
emacs: Improved printing support. Add various functions to print notmuch messages and tie them together with a simple frontend. Add a binding ('#') in `notmuch-show-mode' to print the current message. one trailing space removed by db.
2012-01-18 09:00:21 +01:00
$(dir)/coolj.el \
emacs: add notmuch-version.el.tmpl and create notmuch-version.el from it The notmuch cli program and emacs lisp versions may differ (especially in remote usage). It helps to resolve problems if we can determine the versions of notmuch cli and notmuch emacs mua separately. The build process now creates notmuch-version.el from template file by filling the version info to notmuch-emacs-version variable.
2014-03-19 21:37:10 +01:00
$(dir)/notmuch-print.el \
emacs: Introduce notmuch-jump: shortcut keys to saved searches This introduces notmuch-jump, which is like a user-friendly, user-configurable global prefix map for saved searches. This provides a non-modal and much faster way to access saved searches than notmuch-hello. A user configures shortcut keys in notmuch-saved-searches, which are immediately accessible from anywhere in Notmuch under the "j" key (for "jump"). When the user hits "j", the minibuffer immediately shows a helpful table of bindings reminiscent of a completions buffer. This code is a combination of work from myself (originally, "notmuch-go"), David Edmondson, and modifications from Mark Walters.
2014-08-05 03:45:20 +02:00
$(dir)/notmuch-version.el \
$(dir)/notmuch-jump.el \
emacs: postpone a message This provides initial support for postponing in the emacs frontend; resuming will follow in a later commit. On saving/postponing it uses notmuch insert to put the message in the notmuch database Current bindings are C-x C-s to save a draft, C-c C-p to postpone a draft (save and exit compose buffer). Previous drafts get tagged deleted on subsequent saves, or on the message being sent. Each draft gets its own message-id, and we use the namespace draft-.... for draft message ids (so, at least for most people, drafts are easily distinguisable).
2016-11-13 15:08:48 +01:00
$(dir)/notmuch-company.el \
$(dir)/notmuch-draft.el
emacs: add notmuch-version.el.tmpl and create notmuch-version.el from it The notmuch cli program and emacs lisp versions may differ (especially in remote usage). It helps to resolve problems if we can determine the versions of notmuch cli and notmuch emacs mua separately. The build process now creates notmuch-version.el from template file by filling the version info to notmuch-emacs-version variable.
2014-03-19 21:37:10 +01:00
$(dir)/notmuch-version.el: $(dir)/Makefile.local version.stamp
emacs: add $(srcdir) to notmuch-version.el.tmpl dependency This fixes out-of-tree build when generating emacs/notmuch-version.el.
2014-04-12 13:59:46 +02:00
$(dir)/notmuch-version.el: $(srcdir)/$(dir)/notmuch-version.el.tmpl
emacs: add notmuch-version.el.tmpl and create notmuch-version.el from it The notmuch cli program and emacs lisp versions may differ (especially in remote usage). It helps to resolve problems if we can determine the versions of notmuch cli and notmuch emacs mua separately. The build process now creates notmuch-version.el from template file by filling the version info to notmuch-emacs-version variable.
2014-03-19 21:37:10 +01:00
@sed -e 's/%AG%/Generated file (from $(<F)) -- do not edit!/' \
-e 's/%VERSION%/"$(VERSION)"/' $< > $@
emacs: Add notmuch-hello.el, a friendly frontend to notmuch This is based on the prototype that Carl Worth described in the TODO file. It provides a search bar as well as support for recent searches, saved searches, and a list of all tags in the database (as well as the number of messages with each tag).
2010-04-22 10:27:33 +02:00
emacs_images := \
build: Add support for non-source-directory builds. Such as: mkdir build cd build ../configure make This is implemented by having the configure script set a srcdir variable in Makefile.config, and then sprinkling $(srcdir) into various make rules. We also use vpath directives to convince GNU make to find the source files from the original source directory.
2011-03-10 00:02:42 +01:00
$(srcdir)/$(dir)/notmuch-logo.png
emacs: Move emacs UI (currently just one file) to subdirectory. Add emacs/Makefile.local and emacs/Makefile. Move emacs targets into emacs/Makefile.local, but leave the byte compilation rule in the top level Makefile.
2010-02-10 04:45:28 +01:00
build: Add support for non-source-directory builds. Such as: mkdir build cd build ../configure make This is implemented by having the configure script set a srcdir variable in Makefile.config, and then sprinkling $(srcdir) into various make rules. We also use vpath directives to convince GNU make to find the source files from the original source directory.
2011-03-10 00:02:42 +01:00
emacs_bytecode = $(emacs_sources:.el=.elc)
emacs: Move emacs UI (currently just one file) to subdirectory. Add emacs/Makefile.local and emacs/Makefile. Move emacs targets into emacs/Makefile.local, but leave the byte compilation rule in the top level Makefile.
2010-02-10 04:45:28 +01:00
emacs: Compute build dependencies to fix byte compile issues Previously, we simply byte compiled each Elisp source file independently. This is actually the wrong thing to do and can lead to issues with macros and performance issues with substitutions because 1) when the byte compiler encounters a (require 'x) form, it will load x.elc in preference to x.el, even if x.el is newer, and as a result may load old macro and substitution definitions and 2) if we update a macro or substitution definition in one file, we currently won't re-compile other files that depend on the file containing the definition. This patch addresses these problems by computing make dependency rules from the (require 'x) forms in the Elisp source files, which we inject into make's dependency database.
2013-05-17 22:13:31 +02:00
# 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.
emacs: Makefile.local: HAVE_EMACS usage fixes If we don't have emacs, disable targets that used EMACS while doing the recipes of that target. If we do have emacs, make install-emacs depend on *.elc files, as making the target will attempt to install those.
2013-08-27 21:00:47 +02:00
ifeq ($(HAVE_EMACS),1)
emacs: Compute build dependencies to fix byte compile issues Previously, we simply byte compiled each Elisp source file independently. This is actually the wrong thing to do and can lead to issues with macros and performance issues with substitutions because 1) when the byte compiler encounters a (require 'x) form, it will load x.elc in preference to x.el, even if x.el is newer, and as a result may load old macro and substitution definitions and 2) if we update a macro or substitution definition in one file, we currently won't re-compile other files that depend on the file containing the definition. This patch addresses these problems by computing make dependency rules from the (require 'x) forms in the Elisp source files, which we inject into make's dependency database.
2013-05-17 22:13:31 +02:00
$(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 && \
emacs: Avoid rebuilding .eldeps even when there's nothing to do Previously, we updated .eldeps only if the file contents actually needed to change. This was done to avoid unnecessary make restarts (if the .eldeps rule changes the mtime of .eldeps, make has to restart to collect the new dependencies). However, this meant that, after a modification to any .el file that did not change dependencies, .eldeps would always be out of date, so every make invocation would run the .eldeps rule, which is both expensive because it starts up Emacs and noisy. This was true even when there was nothing to do. E.g., $ make clean && make ... $ touch emacs/notmuch-lib.el && make ... $ make Use "make V=1" to see the verbose compile lines. EMACS emacs/.eldeps make: Nothing to be done for `all'. $ make Use "make V=1" to see the verbose compile lines. EMACS emacs/.eldeps make: Nothing to be done for `all'. Fix this by replacing .eldeps with two files with identical content. One tracks the mtime of the dependency information and triggers the Emacs call to rebuild dependencies only when it may be necessary. The other tracks the content only; this rule over-triggers in the same way the old rule did, but this rule is cheap and quiet.
2014-02-20 05:24:24 +01:00
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
emacs/Makefile.local: notmuch-lib.elc depend on notmuch-version.elc emacs/make-depend.el will compute all other related dependencies except this one: notmuch-version is not top-level `require' expression in notmuc-lib.el[c] but conditional based on the existence of notmuch-version.el[c]. emacs/make-depend.el does not know now notmuch-version.el[c] becomes into existence but emacs/Makefile.local does know.
2015-09-25 23:45:39 +02:00
# Add the one dependency make-deps.el does not have visibility to.
$(dir)/notmuch-lib.elc: $(dir)/notmuch-version.elc
emacs: Makefile.local: HAVE_EMACS usage fixes If we don't have emacs, disable targets that used EMACS while doing the recipes of that target. If we do have emacs, make install-emacs depend on *.elc files, as making the target will attempt to install those.
2013-08-27 21:00:47 +02:00
endif
emacs: Avoid rebuilding .eldeps even when there's nothing to do Previously, we updated .eldeps only if the file contents actually needed to change. This was done to avoid unnecessary make restarts (if the .eldeps rule changes the mtime of .eldeps, make has to restart to collect the new dependencies). However, this meant that, after a modification to any .el file that did not change dependencies, .eldeps would always be out of date, so every make invocation would run the .eldeps rule, which is both expensive because it starts up Emacs and noisy. This was true even when there was nothing to do. E.g., $ make clean && make ... $ touch emacs/notmuch-lib.el && make ... $ make Use "make V=1" to see the verbose compile lines. EMACS emacs/.eldeps make: Nothing to be done for `all'. $ make Use "make V=1" to see the verbose compile lines. EMACS emacs/.eldeps make: Nothing to be done for `all'. Fix this by replacing .eldeps with two files with identical content. One tracks the mtime of the dependency information and triggers the Emacs call to rebuild dependencies only when it may be necessary. The other tracks the content only; this rule over-triggers in the same way the old rule did, but this rule is cheap and quiet.
2014-02-20 05:24:24 +01:00
CLEAN+=$(dir)/.eldeps $(dir)/.eldeps.tmp $(dir)/.eldeps.x
emacs: Compute build dependencies to fix byte compile issues Previously, we simply byte compiled each Elisp source file independently. This is actually the wrong thing to do and can lead to issues with macros and performance issues with substitutions because 1) when the byte compiler encounters a (require 'x) form, it will load x.elc in preference to x.el, even if x.el is newer, and as a result may load old macro and substitution definitions and 2) if we update a macro or substitution definition in one file, we currently won't re-compile other files that depend on the file containing the definition. This patch addresses these problems by computing make dependency rules from the (require 'x) forms in the Elisp source files, which we inject into make's dependency database.
2013-05-17 22:13:31 +02:00
emacs: Makefile.local: HAVE_EMACS usage fixes If we don't have emacs, disable targets that used EMACS while doing the recipes of that target. If we do have emacs, make install-emacs depend on *.elc files, as making the target will attempt to install those.
2013-08-27 21:00:47 +02:00
ifeq ($(HAVE_EMACS),1)
Makefile: Make emacs compilation depend on global dependencies. We call these "global_deps" for a reason, after all! Without this, emacs compilation would proceed even if the configure script failed, (such as for a missing dependency). That's undesirable as it can cause the helpful error messages from the configure failure to scroll away.
2011-06-28 20:42:29 +02:00
%.elc: %.el $(global_deps)
Makefile: Eliminate the "make install-emacs" target. Instead, simply byte-compile the emacs source files as part of "make" and install them as part of "make install". The byte compilation is made conditional on the configure script finding the emacs binary. That way, "make; make install" will still work for someone that doesn't have emacs installed, (which was the only reason we had made a separate "make install-emacs" target in the first place).
2010-04-06 19:35:20 +02:00
$(call quiet,EMACS) --directory emacs -batch -f batch-byte-compile $<
emacs: Makefile.local: HAVE_EMACS usage fixes If we don't have emacs, disable targets that used EMACS while doing the recipes of that target. If we do have emacs, make install-emacs depend on *.elc files, as making the target will attempt to install those.
2013-08-27 21:00:47 +02:00
endif
Makefile: Eliminate the "make install-emacs" target. Instead, simply byte-compile the emacs source files as part of "make" and install them as part of "make install". The byte compilation is made conditional on the configure script finding the emacs binary. That way, "make; make install" will still work for someone that doesn't have emacs installed, (which was the only reason we had made a separate "make install-emacs" target in the first place).
2010-04-06 19:35:20 +02:00
configure: add options to disable emacs/zsh/bash and choose install dir. add --bashcompletiondir and --zshcompletiondir (like --emacslispdir) to choose installation dir for bash/zsh completion files Make some features optional: --without-emacs / --with-emacs=no do not install lisp file --without-bash-completion / --with-bash-completion=no do not install bash files --without-zsh-completion / --with-zsh-completion=no do not install zsh files By default, everything is enabled. You can reenable something with --with-feature=yes
2011-01-23 14:33:43 +01:00
ifeq ($(WITH_EMACS),1)
Makefile: Eliminate the "make install-emacs" target. Instead, simply byte-compile the emacs source files as part of "make" and install them as part of "make install". The byte compilation is made conditional on the configure script finding the emacs binary. That way, "make; make install" will still work for someone that doesn't have emacs installed, (which was the only reason we had made a separate "make install-emacs" target in the first place).
2010-04-06 19:35:20 +02:00
ifeq ($(HAVE_EMACS),1)
all: $(emacs_bytecode)
emacs: Makefile.local: HAVE_EMACS usage fixes If we don't have emacs, disable targets that used EMACS while doing the recipes of that target. If we do have emacs, make install-emacs depend on *.elc files, as making the target will attempt to install those.
2013-08-27 21:00:47 +02:00
install-emacs: $(emacs_bytecode)
Makefile: Eliminate the "make install-emacs" target. Instead, simply byte-compile the emacs source files as part of "make" and install them as part of "make install". The byte compilation is made conditional on the configure script finding the emacs binary. That way, "make; make install" will still work for someone that doesn't have emacs installed, (which was the only reason we had made a separate "make install-emacs" target in the first place).
2010-04-06 19:35:20 +02:00
endif
install: install-emacs
configure: add options to disable emacs/zsh/bash and choose install dir. add --bashcompletiondir and --zshcompletiondir (like --emacslispdir) to choose installation dir for bash/zsh completion files Make some features optional: --without-emacs / --with-emacs=no do not install lisp file --without-bash-completion / --with-bash-completion=no do not install bash files --without-zsh-completion / --with-zsh-completion=no do not install zsh files By default, everything is enabled. You can reenable something with --with-feature=yes
2011-01-23 14:33:43 +01:00
endif
emacs: Move emacs UI (currently just one file) to subdirectory. Add emacs/Makefile.local and emacs/Makefile. Move emacs targets into emacs/Makefile.local, but leave the byte compilation rule in the top level Makefile.
2010-02-10 04:45:28 +01:00
Makfiles: Make the top-level targets PHONY Just to avoid any clash with files of the same names.
2010-04-05 21:59:06 +02:00
.PHONY: install-emacs
emacs install: make sure all components to be installed are there `make install-emacs` will copy $(emacs_sources), $(emacs_images) and $(emacs_bytecode) to their target directories. $(emacs_bytecode) was already a prerequisite of make install-emacs as these obviously needed to be build. Until a while ago all of $(emacs_sources) was available in the repository, but now it includes `notmuch-version.el` which is generated. In the future we may have generated emacs images too.
2014-05-10 23:36:43 +02:00
install-emacs: $(emacs_sources) $(emacs_images)
Makefile: Quote variables used as filenames in shell commands This allows support for filenames with spaces in them.
2011-01-26 14:29:15 +01:00
mkdir -p "$(DESTDIR)$(emacslispdir)"
install -m0644 $(emacs_sources) "$(DESTDIR)$(emacslispdir)"
Makefile: Eliminate the "make install-emacs" target. Instead, simply byte-compile the emacs source files as part of "make" and install them as part of "make install". The byte compilation is made conditional on the configure script finding the emacs binary. That way, "make; make install" will still work for someone that doesn't have emacs installed, (which was the only reason we had made a separate "make install-emacs" target in the first place).
2010-04-06 19:35:20 +02:00
ifeq ($(HAVE_EMACS),1)
Makefile: Quote variables used as filenames in shell commands This allows support for filenames with spaces in them.
2011-01-26 14:29:15 +01:00
install -m0644 $(emacs_bytecode) "$(DESTDIR)$(emacslispdir)"
Makefile: Eliminate the "make install-emacs" target. Instead, simply byte-compile the emacs source files as part of "make" and install them as part of "make install". The byte compilation is made conditional on the configure script finding the emacs binary. That way, "make; make install" will still work for someone that doesn't have emacs installed, (which was the only reason we had made a separate "make install-emacs" target in the first place).
2010-04-06 19:35:20 +02:00
endif
Separate Emacs misc. files dir. from Emacs code dir. New option --emacsetcdir was added, but it's set default to the same value as --emacslispdir for backward compatibility.
2011-10-25 10:07:02 +02:00
mkdir -p "$(DESTDIR)$(emacsetcdir)"
install -m0644 $(emacs_images) "$(DESTDIR)$(emacsetcdir)"
emacs: Move emacs UI (currently just one file) to subdirectory. Add emacs/Makefile.local and emacs/Makefile. Move emacs targets into emacs/Makefile.local, but leave the byte compilation rule in the top level Makefile.
2010-02-10 04:45:28 +01:00
emacs: add notmuch-version.el.tmpl and create notmuch-version.el from it The notmuch cli program and emacs lisp versions may differ (especially in remote usage). It helps to resolve problems if we can determine the versions of notmuch cli and notmuch emacs mua separately. The build process now creates notmuch-version.el from template file by filling the version info to notmuch-emacs-version variable.
2014-03-19 21:37:10 +01:00
CLEAN := $(CLEAN) $(emacs_bytecode) $(dir)/notmuch-version.el
Reference in a new issue Copy permalink