build: Fix a plain "make" to automatically run configure.

[notmuch] / Makefile

diff --git a/Makefile b/Makefile
index 4af5a2ebfa5de2d38506e2dfd2e772bc30fe2ea0..ffee659b0eb5f4ccf2921647838a16a66c2f6c69 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,26 +1,39 @@
-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 `pkg-config --cflags gmime-2.4`
-MYCXXFLAGS=$(MYCFLAGS) `xapian-config --cxxflags`
+# List all subdirectories here. Each contains its own Makefile.local
+subdirs = compat completion emacs lib test
 
-MYLDFLAGS=`pkg-config --libs gmime-2.4` `xapian-config --libs`
+# We make all targets depend on the Makefiles themselves.
+global_deps = Makefile Makefile.config Makefile.local \
+       $(subdirs:%=%/Makefile) $(subdirs:%=%/Makefile.local)
 
-all: $(PROGS)
+# Sub-directory Makefile.local fragments can append to these variables
+# to have directory-specific cflags as necessary.
 
-%.o: %.cc
-       $(CXX) -c $(CXXFLAGS) $(MYCXXFLAGS) $^ -o $@
+extra_cflags :=
+extra_cxxflags :=
 
-%.o: %.c
-       $(CC) -c $(CFLAGS) $(MYCFLAGS) $^ -o $@
+# Get settings from the output of configure by running it to generate
+# Makefile.config if it doesn't exist yet.
 
-notmuch: notmuch.o database.o xutil.o
-       $(CC) $(MYLDFLAGS) $^ -o $@
+# 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 ?= .
 
-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
+include Makefile.config
+Makefile.config: $(srcdir)/configure
+       @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
 
-xapian-dump: xapian-dump.cc
-       $(CXX) $(CXXFLAGS) $(MYCXXFLAGS) xapian-dump.cc `xapian-config --libs --cxxflags` -o xapian-dump
+# Finally, include all of the Makefile.local fragments where all the
+# real work is done.
 
-clean:
-       rm -f $(PROGS) *.o
+include $(subdirs:%=%/Makefile.local) Makefile.local