X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile;h=73a85546948fc71df0002adb1257c13aa248fc5b;hp=c1fbd2a19bcc2d6f09c67677b25073660fb6009f;hb=d273ed6cf1bdaa2d644cec4909cbf415ff4d257b;hpb=36640b303ea68ae28e89f27694356141f515819b

diff --git a/Makefile b/Makefile
index c1fbd2a1..73a85546 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,42 @@
-PROGS=notmuch notmuch-index-message xapian-dump
+# We want the all target to be the implicit target (if no target is
+# given explicitly on the command line) so mention it first.
+all:
 
-MYCFLAGS=-Wall -O0 -g
-MYCXXFLAGS=-Wall -O0 -g
+# List all subdirectories here. Each contains its own Makefile.local
+subdirs := compat completion emacs lib man parse-time-string
+subdirs += performance-test util test
 
-all: $(PROGS)
+# We make all targets depend on the Makefiles themselves.
+global_deps = Makefile Makefile.config Makefile.local \
+	$(subdirs:%=%/Makefile) $(subdirs:%=%/Makefile.local)
 
-notmuch: notmuch.c
-	$(CC) $(CFLAGS) $(MYCFLAGS) notmuch.c `pkg-config --cflags --libs glib-2.0` -o notmuch
+# Sub-directory Makefile.local fragments can append to these variables
+# to have directory-specific cflags as necessary.
 
-notmuch-index-message: notmuch-index-message.cc
-	$(CXX) $(CXXFLAGS) $(MYCXXFLAGS) notmuch-index-message.cc `pkg-config --cflags --libs gmime-2.4` `xapian-config --cxxflags --libs` -o notmuch-index-message
+extra_cflags :=
+extra_cxxflags :=
 
-xapian-dump: xapian-dump.cc
-	$(CXX) $(CXXFLAGS) $(MYCXXFLAGS) xapian-dump.cc `xapian-config --libs --cxxflags` -o xapian-dump
+# Get settings from the output of configure by running it to generate
+# Makefile.config if it doesn't exist yet.
 
-clean:
-	rm -f $(PROGS)
+# 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.
+
+include $(subdirs:%=%/Makefile.local) Makefile.local