X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile;h=7a59ce0ade5dbebc997aa0b92570c36722768493;hp=c3feee1ddd17018c9a00afb59c980c476033fb3f;hb=f47bec55bda2f4ef745ba6a284545bd8d1f9fbcc;hpb=4b0327004a3f9a36352b81a5b778740d68bf3078

diff --git a/Makefile b/Makefile
index c3feee1d..7a59ce0a 100644
--- a/Makefile
+++ b/Makefile
@@ -2,14 +2,15 @@ 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
 
 bash_completion_dir = /etc/bash_completion.d
+zsh_completion_dir = /usr/share/zsh/functions/Completion/Unix
 
-all_deps = Makefile Makefile.local Makefile.config \
+global_deps = Makefile Makefile.local Makefile.config \
 		   lib/Makefile lib/Makefile.local
 
 extra_cflags :=
@@ -21,6 +22,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
@@ -29,6 +40,7 @@ Makefile.config: configure
 	@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
 
@@ -36,6 +48,7 @@ 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
@@ -51,24 +64,24 @@ 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) $< > $@.$$$$; \
+	$(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) $< > $@.$$$$; \
+	$(CXX) -M $(CPPFLAGS) $(FINAL_CXXFLAGS) $< > $@.$$$$ 2>/dev/null ; \
 	sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
 	rm -f $@.$$$$