emacs/notmuch-show.el: Avoid passing unintended format strings to `message'

[notmuch] / Makefile

diff --git a/Makefile b/Makefile
index 4af5a2ebfa5de2d38506e2dfd2e772bc30fe2ea0..619392d39562aa1f6553e762b91b01106f689061 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,26 +1,34 @@
-PROGS=notmuch notmuch-index-message xapian-dump
-
-MYCFLAGS=-Wall -O0 -g `pkg-config --cflags gmime-2.4`
-MYCXXFLAGS=$(MYCFLAGS) `xapian-config --cxxflags`
-
-MYLDFLAGS=`pkg-config --libs gmime-2.4` `xapian-config --libs`
-
-all: $(PROGS)
-
-%.o: %.cc
-       $(CXX) -c $(CXXFLAGS) $(MYCXXFLAGS) $^ -o $@
-
-%.o: %.c
-       $(CC) -c $(CFLAGS) $(MYCFLAGS) $^ -o $@
-
-notmuch: notmuch.o database.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
+subdirs = compat completion emacs lib
+
+# 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. And add Makefile.config to
+# our global dependency list.
+include Makefile.config
+Makefile.config: 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
+
+# Finally, include all of the Makefile.local fragments where all the
+# real work is done.
+
+include $(subdirs:%=%/Makefile.local) Makefile.local