X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile;h=4c0e8c62011393277cc1041a69859cde5296c2ea;hp=894874ae6f2d3502a5f7eaaf3424e3511e83ba05;hb=4e2c351c588ad74f4800ca0344232be90387c54a;hpb=c7482b4dce114b1c09cbac2f4ef6d0defdb23258

diff --git a/Makefile b/Makefile
index 894874ae..4c0e8c62 100644
--- a/Makefile
+++ b/Makefile
@@ -1,41 +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:
 
-CXXWARNINGS_FLAGS=-Wall -Wextra -Wmissing-declarations -Wwrite-strings
-CWARNINGS_FLAGS=$(CXXWARNINGS_FLAGS)
+# Sub-directory Makefile.local fragments can append to these variables
+# to have directory-specific cflags as necessary.
 
-CDEPENDS_FLAGS=`pkg-config --cflags glib-2.0 talloc`
-CXXDEPENDS_FLAGS=`pkg-config --cflags glib-2.0 talloc` `xapian-config --cxxflags`
+extra_cflags :=
+extra_cxxflags :=
 
-MYCFLAGS=$(CWARNINGS_FLAGS) -O0 -g $(CDEPENDS_FLAGS)
-MYCXXFLAGS=$(CXXWARNINGS_FLAGS) -O0 -g $(CXXDEPENDS_FLAGS)
+# Get settings from the output of configure by running it to generate
+# Makefile.config if it doesn't exist yet.
 
-MYLDFLAGS=`pkg-config --libs glib-2.0 talloc` `xapian-config --libs`
+# 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 ?= .
 
-MODULES=		\
-	notmuch.o	\
-	database.o	\
-	date.o		\
-	message.o	\
-	message-file.o	\
-	query.o		\
-	sha1.o		\
-	libsha1.o	\
-	xutil.o
+include Makefile.config
 
-all: $(PROGS)
+# We make all targets depend on the Makefiles themselves.
+global_deps = Makefile Makefile.config Makefile.local \
+	$(subdirs:%=%/Makefile) $(subdirs:%=%/Makefile.local)
 
-%.o: %.cc
-	$(CXX) -c $(CFLAGS) $(CXXFLAGS) $(MYCXXFLAGS) $< -o $@
+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)
 
-%.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
-	$(CC) -M $(CPPFLAGS) $(CDEPENDS_FLAGS) $^ > $@
--include Makefile.dep
-
-clean:
-	rm -f $(PROGS) *.o Makefile.dep
+include $(subdirs:%=%/Makefile.local) Makefile.local