X-Git-Url: http://rtime.felk.cvut.cz/gitweb/notmuch.git/blobdiff_plain/c10085c77b407d9ea704f8b4f9e0a805f63e72cb..3901bbca2eb3f24dd8ffa628a2c057ec1a28a1d0:/Makefile

diff --git a/Makefile b/Makefile
index faaaec64..73a85546 100644
--- a/Makefile
+++ b/Makefile
@@ -3,10 +3,11 @@
 all:
 
 # List all subdirectories here. Each contains its own Makefile.local
-subdirs = compat completion emacs lib
+subdirs := compat completion emacs lib man parse-time-string
+subdirs += performance-test util test
 
 # We make all targets depend on the Makefiles themselves.
-global_deps = Makefile Makefile.local \
+global_deps = Makefile Makefile.config Makefile.local \
 	$(subdirs:%=%/Makefile) $(subdirs:%=%/Makefile.local)
 
 # Sub-directory Makefile.local fragments can append to these variables
@@ -15,6 +16,26 @@ global_deps = Makefile Makefile.local \
 extra_cflags :=
 extra_cxxflags :=
 
+# Get settings from the output of configure by running it to generate
+# 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: $(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 ""
+endif
+	$(srcdir)/configure $(configure_options)
+
 # Finally, include all of the Makefile.local fragments where all the
 # real work is done.