TODO: Note that '=' should sometimes count from the end of the buffer.

[notmuch] / Makefile

diff --git a/Makefile b/Makefile
index bd8f50ad6e56b4f4b75ccf28dced0c89d022a3e2..46f001ce2fa5d2523ff08c577b4aadbecae853fa 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ WARN_CXXFLAGS=-Wall -Wextra -Wwrite-strings -Wswitch-enum
 WARN_CFLAGS=$(WARN_CXXFLAGS) -Wmissing-declarations
 
 # Additional programs that are used during the compilation process.
-EMACS ?= emacs
+EMACS ?= emacs --quick
 # Lowercase to avoid clash with GZIP environment variable for passing
 # arguments to gzip.
 gzip = gzip
@@ -10,9 +10,6 @@ gzip = gzip
 bash_completion_dir = /etc/bash_completion.d
 zsh_completion_dir = /usr/share/zsh/functions/Completion/Unix
 
-all_deps = Makefile Makefile.local Makefile.config \
-                  lib/Makefile lib/Makefile.local
-
 extra_cflags :=
 extra_cxxflags :=
 
@@ -22,6 +19,16 @@ FINAL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cfla
 FINAL_LDFLAGS = $(LDFLAGS) $(CONFIGURE_LDFLAGS)
 
 all: notmuch notmuch.1.gz
+ifeq ($(MAKECMDGOALS),)
+       @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."
+endif
 
 # Before including any other Makefile fragments, get settings from the
 # output of configure
@@ -34,12 +41,12 @@ Makefile.config: configure
        @echo ""
        ./configure
 
-include Makefile.config
+subdirs = compat emacs lib
+
+global_deps = Makefile Makefile.config Makefile.local \
+       $(subdirs:%=%/Makefile) $(subdirs:%=%/Makefile.local)
 
-include lib/Makefile.local
-include compat/Makefile.local
-include emacs/Makefile.local
-include Makefile.local
+include Makefile.config Makefile.local $(subdirs:%=%/Makefile.local)
 
 # The user has not set any verbosity, default to quiet mode and inform the
 # user how to enable verbose compiles.
@@ -54,22 +61,22 @@ endif
 # Otherwise, print the full command line.
 quiet ?= $($1)
 
-%.o: %.cc $(all_deps)
+%.o: %.cc $(global_deps)
        $(call quiet,CXX,$(CXXFLAGS)) -c $(FINAL_CXXFLAGS) $< -o $@
 
-%.o: %.c $(all_deps)
+%.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 $(all_deps)
+.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 $(all_deps)
+.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' < $@.$$$$ > $@; \