summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
f47bec5)
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.
bash_completion_dir = /etc/bash_completion.d
zsh_completion_dir = /usr/share/zsh/functions/Completion/Unix
bash_completion_dir = /etc/bash_completion.d
zsh_completion_dir = /usr/share/zsh/functions/Completion/Unix
-global_deps = Makefile Makefile.local Makefile.config \
- lib/Makefile lib/Makefile.local
-
extra_cflags :=
extra_cxxflags :=
extra_cflags :=
extra_cxxflags :=
+subdirs = compat emacs lib
+
+global_deps = Makefile Makefile.config Makefile.local \
+ $(subdirs:%=%/Makefile) $(subdirs:%=%/Makefile.local)
-include lib/Makefile.local
-include compat/Makefile.local
-include emacs/Makefile.local
-include Makefile.local
+include Makefile.config Makefile.local $(subdirs:%=%/Makefile.local)
# The user has not set any verbosity, default to quiet mode and inform the
# user how to enable verbose compiles.
# The user has not set any verbosity, default to quiet mode and inform the
# user how to enable verbose compiles.
extra_cflags += -I$(dir)
notmuch_compat_srcs =
extra_cflags += -I$(dir)
notmuch_compat_srcs =
-dir=emacs
-emacs_sources= \
- $(dir)/notmuch.el
+dir := emacs
+emacs_sources := $(dir)/notmuch.el
-emacs_bytecode=$(subst .el,.elc,$(emacs_sources))
+emacs_bytecode := $(subst .el,.elc,$(emacs_sources))
extra_cflags += -I$(dir)
libnotmuch_c_srcs = \
extra_cflags += -I$(dir)
libnotmuch_c_srcs = \