X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile;h=021fdb82a06d60dff275e1d52ad324525b78321c;hp=588f8538eb44d4ab1002390bad7457a47b1e0da1;hb=406ec4b15d65f1104c7ff3ee654a5e9cd5b39f29;hpb=222ee87dfefdd85ddbd7f148d5636746919d4100

diff --git a/Makefile b/Makefile
index 588f8538..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
 
@@ -19,14 +16,21 @@ extra_cflags :=
 extra_cxxflags :=
 
 # Now smash together user's values with our extra values
-override CFLAGS += $(WARN_CFLAGS) $(extra_cflags)
-override CXXFLAGS += $(WARN_CXXFLAGS) $(extra_cflags) $(extra_cxxflags)
+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: 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
@@ -39,7 +43,7 @@ include Makefile.local
 # 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	$@\n"; $($1)
+quiet = @printf $(quiet_DOC)$(eval quiet_DOC:=)"  $1 $2	$@\n"; $($1)
 endif
 # The user has explicitly enabled quiet compilation.
 ifeq ($(V),0)
@@ -49,23 +53,23 @@ endif
 quiet ?= $($1)
 
 %.o: %.cc $(all_deps)
-	$(call quiet,CXX) -c $(CXXFLAGS) $< -o $@
+	$(call quiet,CXX,$(CXXFLAGS)) -c $(FINAL_CXXFLAGS) $< -o $@
 
 %.o: %.c $(all_deps)
-	$(call quiet,CC) -c $(CFLAGS) $< -o $@
+	$(call quiet,CC,$(CFLAGS)) -c $(FINAL_CFLAGS) $< -o $@
 
 %.elc: %.el
 	$(call quiet,EMACS) -batch -f batch-byte-compile $<
 
 .deps/%.d: %.c $(all_deps)
 	@set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
-	$(CC) -M $(CPPFLAGS) $(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) $(CXXFLAGS) $< > $@.$$$$; \
+	$(CXX) -M $(CPPFLAGS) $(FINAL_CXXFLAGS) $< > $@.$$$$ 2>/dev/null ; \
 	sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
 	rm -f $@.$$$$