util: Fix two corner-cases in boolean term quoting function

[notmuch] / Makefile

diff --git a/Makefile b/Makefile
index ef8d6410ad26a2202fbc2fd44fcd7493d145b4ac..061c55a1948aa821da17e1537c7da36c866606bb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,26 +1,44 @@
-PROGS=notmuch notmuch-index-message xapian-dump
-
-MYCFLAGS=-Wall -O0 -g `pkg-config --cflags glib-2.0`
-MYCXXFLAGS=$(MYCFLAGS) `xapian-config --cxxflags`
-
-MYLDFLAGS=`pkg-config --libs glib-2.0` `xapian-config --libs`
-
-all: $(PROGS)
-
-%.o: %.cc
-       $(CXX) -c $(CXXFLAGS) $(MYCXXFLAGS) $^ -o $@
-
-%.o: %.c
-       $(CC) -c $(CFLAGS) $(MYCFLAGS) $^ -o $@
-
-notmuch: notmuch.o database.o date.o message.o xutil.o
-       $(CC) $(MYLDFLAGS) $^ -o $@
-
-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
-
-xapian-dump: xapian-dump.cc
-       $(CXX) $(CXXFLAGS) $(MYCXXFLAGS) xapian-dump.cc `xapian-config --libs --cxxflags` -o xapian-dump
-
-clean:
-       rm -f $(PROGS) *.o
+# 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:
+
+# 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 \
+       $(subdirs:%=%/Makefile) $(subdirs:%=%/Makefile.local)
+
+# Sub-directory Makefile.local fragments can append to these variables
+# to have directory-specific cflags as necessary.
+
+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.
+
+include $(subdirs:%=%/Makefile.local) Makefile.local