X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile;h=021fdb82a06d60dff275e1d52ad324525b78321c;hp=889a78c9d1ed243c1019fcc35e272b92f6ec8e27;hb=59265c0233a04a6d782c5202f8e3eb26ed692df1;hpb=c7f971e8c02524ee2435406f0c14791b75c10e20

diff --git a/Makefile b/Makefile
index 889a78c9..021fdb82 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,3 @@
-# Default FLAGS, (can be overridden by user such as "make CFLAGS=-g")
-CFLAGS=-O2
-
 WARN_CXXFLAGS=-Wall -Wextra -Wwrite-strings -Wswitch-enum
 WARN_CFLAGS=$(WARN_CXXFLAGS) -Wmissing-declarations
 
@@ -28,6 +25,12 @@ all: notmuch notmuch.1.gz
 # Before including any other Makefile fragments, get settings from the
 # output of configure
 Makefile.config: 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"
+	@echo "      into which to install), call ./configure explicitly and then make again."
+	@echo "      See \"./configure --help\" for more details."
+	@echo ""
 	./configure
 
 include Makefile.config
@@ -60,13 +63,13 @@ quiet ?= $($1)
 
 .deps/%.d: %.c $(all_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)
 	@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 $@.$$$$