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

[notmuch] / Makefile

diff --git a/Makefile b/Makefile
index b4d77b4e3fcaf95134869b07e709d3f4e48afce0..ffee659b0eb5f4ccf2921647838a16a66c2f6c69 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,42 +1,39 @@
-PROGS=notmuch
+# 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:
 
-WARN_FLAGS=-Wall -Wextra -Wmissing-declarations -Wwrite-strings -Wswitch-enum
+# List all subdirectories here. Each contains its own Makefile.local
+subdirs = compat completion emacs lib test
 
-CDEPENDS_FLAGS=`pkg-config --cflags glib-2.0 talloc`
-CXXDEPENDS_FLAGS=`pkg-config --cflags glib-2.0 talloc` `xapian-config --cxxflags`
+# We make all targets depend on the Makefiles themselves.
+global_deps = Makefile Makefile.config Makefile.local \
+       $(subdirs:%=%/Makefile) $(subdirs:%=%/Makefile.local)
 
-MYCFLAGS=$(WARN_FLAGS) -O0 -g $(CDEPENDS_FLAGS)
-MYCXXFLAGS=$(WARN_FLAGS) -O0 -g $(CXXDEPENDS_FLAGS)
+# Sub-directory Makefile.local fragments can append to these variables
+# to have directory-specific cflags as necessary.
 
-MYLDFLAGS=`pkg-config --libs glib-2.0 talloc` `xapian-config --libs`
+extra_cflags :=
+extra_cxxflags :=
 
-MODULES=               \
-       notmuch.o       \
-       database.o      \
-       date.o          \
-       message.o       \
-       message-file.o  \
-       query.o         \
-       sha1.o          \
-       tags.o          \
-       thread.o        \
-       libsha1.o       \
-       xutil.o
+# Get settings from the output of configure by running it to generate
+# Makefile.config if it doesn't exist yet.
 
-all: $(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 ?= .
 
-%.o: %.cc
-       $(CXX) -c $(CFLAGS) $(CXXFLAGS) $(MYCXXFLAGS) $< -o $@
+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
 
-%.o: %.c
-       $(CC) -c $(CFLAGS) $(MYCFLAGS) $< -o $@
+# Finally, include all of the Makefile.local fragments where all the
+# real work is done.
 
-notmuch: $(MODULES)
-       $(CC) $(MYLDFLAGS) $^ -o $@
-
-Makefile.dep: *.c *.cc
-       $(CXX) -M $(CPPFLAGS) $(CDEPENDS_FLAGS) $(CXXDEPENDS_FLAGS) $^ > $@
--include Makefile.dep
-
-clean:
-       rm -f $(PROGS) *.o Makefile.dep
+include $(subdirs:%=%/Makefile.local) Makefile.local