X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile;h=ffee659b0eb5f4ccf2921647838a16a66c2f6c69;hp=ad34323901473932a33a6ef1378ca311568f0865;hb=c4302656123e8c8bc8120400dc266f4acac5a16e;hpb=2b8131f079d5aa3dc0ece4dcbc6635eb4cf24209

diff --git a/Makefile b/Makefile
index ad343239..ffee659b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,41 +1,30 @@
-WARN_CXXFLAGS=-Wall -Wextra -Wwrite-strings -Wswitch-enum
-WARN_CFLAGS=$(WARN_CXXFLAGS) -Wmissing-declarations
+# 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:
 
-# Additional programs that are used during the compilation process.
-EMACS ?= emacs
-# Lowercase to avoid clash with GZIP environment variable for passing
-# arguments to gzip.
-gzip = gzip
+# List all subdirectories here. Each contains its own Makefile.local
+subdirs = compat completion emacs lib test
 
-bash_completion_dir = /etc/bash_completion.d
-zsh_completion_dir = /usr/share/zsh/functions/Completion/Unix
+# We make all targets depend on the Makefiles themselves.
+global_deps = Makefile Makefile.config Makefile.local \
+	$(subdirs:%=%/Makefile) $(subdirs:%=%/Makefile.local)
 
-global_deps = Makefile Makefile.local Makefile.config \
-		   lib/Makefile lib/Makefile.local
+# Sub-directory Makefile.local fragments can append to these variables
+# to have directory-specific cflags as necessary.
 
 extra_cflags :=
 extra_cxxflags :=
 
-# Now smash together user's values with our extra values
-FINAL_CFLAGS = $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags)
-FINAL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags)
-FINAL_LDFLAGS = $(LDFLAGS) $(CONFIGURE_LDFLAGS)
+# Get settings from the output of configure by running it to generate
+# Makefile.config if it doesn't exist yet.
 
-all: all-without-message
-	@echo ""
-	@echo "Compilation of notmuch is now complete. You can install notmuch with:"
-	@echo ""
-	@echo "	make install"
-	@echo ""
-	@echo "Note that depending on the prefix to which you are installing"
-	@echo "you may need root permission (such as \"sudo make install\")."
-	@echo "See \"./configure --help\" for help on setting an alternate prefix."
-
-all-without-message: notmuch notmuch.1.gz
+# 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 ?= .
 
-# Before including any other Makefile fragments, get settings from the
-# output of configure
-Makefile.config: configure
+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"
@@ -44,51 +33,7 @@ Makefile.config: configure
 	@echo ""
 	./configure
 
-include Makefile.config
-
-include lib/Makefile.local
-include compat/Makefile.local
-include emacs/Makefile.local
-include Makefile.local
-
-# The user has not set any verbosity, default to quiet mode and inform the
-# user how to enable verbose compiles.
-ifeq ($(V),)
-quiet_DOC := "Use \"$(MAKE) V=1\" to see the verbose compile lines.\n"
-quiet = @printf $(quiet_DOC)$(eval quiet_DOC:=)"  $1 $2	$@\n"; $($1)
-endif
-# The user has explicitly enabled quiet compilation.
-ifeq ($(V),0)
-quiet = @printf "  $1	$@\n"; $($1)
-endif
-# Otherwise, print the full command line.
-quiet ?= $($1)
-
-%.o: %.cc $(global_deps)
-	$(call quiet,CXX,$(CXXFLAGS)) -c $(FINAL_CXXFLAGS) $< -o $@
-
-%.o: %.c $(global_deps)
-	$(call quiet,CC,$(CFLAGS)) -c $(FINAL_CFLAGS) $< -o $@
-
-%.elc: %.el
-	$(call quiet,EMACS) -batch -f batch-byte-compile $<
-
-.deps/%.d: %.c $(global_deps)
-	@set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
-	$(CC) -M $(CPPFLAGS) $(FINAL_CFLAGS) $< > $@.$$$$ 2>/dev/null ; \
-	sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
-	rm -f $@.$$$$
-
-.deps/%.d: %.cc $(global_deps)
-	@set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
-	$(CXX) -M $(CPPFLAGS) $(FINAL_CXXFLAGS) $< > $@.$$$$ 2>/dev/null ; \
-	sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
-	rm -f $@.$$$$
-
-DEPS := $(SRCS:%.c=.deps/%.d)
-DEPS := $(DEPS:%.cc=.deps/%.d)
--include $(DEPS)
+# Finally, include all of the Makefile.local fragments where all the
+# real work is done.
 
-.PHONY : clean
-clean:
-	rm -f $(CLEAN); rm -rf .deps
+include $(subdirs:%=%/Makefile.local) Makefile.local