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

[notmuch] / Makefile

diff --git a/Makefile b/Makefile
index ad34323901473932a33a6ef1378ca311568f0865..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
 
-global_deps = Makefile Makefile.local Makefile.config \
-                  lib/Makefile lib/Makefile.local
-
 extra_cflags :=
 extra_cxxflags :=
 
@@ -21,7 +18,8 @@ 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)
 
-all: all-without-message
+all: notmuch notmuch.1.gz
+ifeq ($(MAKECMDGOALS),)
        @echo ""
        @echo "Compilation of notmuch is now complete. You can install notmuch with:"
        @echo ""
@@ -30,8 +28,7 @@ all: all-without-message
        @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
+endif
 
 # Before including any other Makefile fragments, get settings from the
 # output of configure
@@ -44,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.