X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile;h=061c55a1948aa821da17e1537c7da36c866606bb;hp=7549b40d171fdde519697e5fe3d67de307ddbf20;hb=3fed6736a7ef8b8b1f05d0fabb136bdd3b5917ee;hpb=e6ba2c63c9ba3d8999bd2f1c5eac3c5bf7c14167

diff --git a/Makefile b/Makefile
index 7549b40d..061c55a1 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,11 @@
 # given explicitly on the command line) so mention it first.
 all:
 
-# List all subdirectories here. Each contains its own Makefile.local
-subdirs = compat completion emacs lib test
+# List all subdirectories here. Each contains its own Makefile.local.
+# Use of '=', without '+=', seems to be required for out-of-tree
+# builds to work.
+subdirs = compat completion doc emacs lib parse-time-string	\
+	performance-test util test test/test-databases
 
 # We make all targets depend on the Makefiles themselves.
 global_deps = Makefile Makefile.config Makefile.local \
@@ -16,17 +19,24 @@ extra_cflags :=
 extra_cxxflags :=
 
 # Get settings from the output of configure by running it to generate
-# Makefile.config if it doesn't exist yet. And add Makefile.config to
-# our global dependency list.
+# Makefile.config if it doesn't exist yet.
+
+# If Makefile.config doesn't exist, then srcdir won't be
+# set. Conditionally set it (assuming a plain srcdir build) so that
+# the rule to generate Makefile.config can actually work.
+srcdir ?= .
+
 include Makefile.config
-Makefile.config: configure
+Makefile.config: $(srcdir)/configure
+ifeq ($(configure_options),)
 	@echo ""
 	@echo "Note: Calling ./configure with no command-line arguments. This is often fine,"
 	@echo "      but if you want to specify any arguments (such as an alternate prefix"
 	@echo "      into which to install), call ./configure explicitly and then make again."
 	@echo "      See \"./configure --help\" for more details."
 	@echo ""
-	./configure
+endif
+	$(srcdir)/configure $(configure_options)
 
 # Finally, include all of the Makefile.local fragments where all the
 # real work is done.