X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile;h=889a78c9d1ed243c1019fcc35e272b92f6ec8e27;hp=17be8b482a03f1ade341f250ceb6fc7bdc341455;hb=c7f971e8c02524ee2435406f0c14791b75c10e20;hpb=650f6ac573ae6d08dbd2752fe58e670b28fee957

diff --git a/Makefile b/Makefile
index 17be8b48..889a78c9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,36 +1,27 @@
-# Default FLAGS, (can be overridden by user such as "make CFLAGS=-O2")
-WARN_FLAGS=-Wall -Wextra -Wmissing-declarations -Wwrite-strings -Wswitch-enum
+# 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
+
 # Additional programs that are used during the compilation process.
 EMACS ?= emacs
 # Lowercase to avoid clash with GZIP environment variable for passing
 # arguments to gzip.
 gzip = gzip
 
-# Additional flags that we will append to whatever the user set.
-# These aren't intended for the user to manipulate.
-extra_cflags := $(shell pkg-config --cflags glib-2.0 gmime-2.4 talloc)
-extra_cxxflags := $(shell xapian-config --cxxflags)
-
-emacs_lispdir := $(shell pkg-config emacs --variable sitepkglispdir)
-# Hard-code if this system doesn't have an emacs.pc file
-ifeq ($(emacs_lispdir),)
-	emacs_lispdir = $(prefix)/share/emacs/site-lisp
-endif
-
 bash_completion_dir = /etc/bash_completion.d
 
 all_deps = Makefile Makefile.local Makefile.config \
 		   lib/Makefile lib/Makefile.local
 
-# Now smash together user's values with our extra values
-override CFLAGS += $(WARN_FLAGS) $(extra_cflags)
-override CXXFLAGS += $(WARN_FLAGS) $(extra_cflags) $(extra_cxxflags)
+extra_cflags :=
+extra_cxxflags :=
 
-override LDFLAGS += \
-	$(shell pkg-config --libs glib-2.0 gmime-2.4 talloc) \
-	$(shell xapian-config --libs)
+# Now smash together user's values with our extra values
+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
 
@@ -49,33 +40,33 @@ 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 = @echo $(quiet_DOC)$(eval quiet_DOC:=)"  $1	$@"; $($1)
+quiet = @printf $(quiet_DOC)$(eval quiet_DOC:=)"  $1 $2	$@\n"; $($1)
 endif
 # The user has explicitly enabled quiet compilation.
 ifeq ($(V),0)
-quiet = @echo "  $1	$@"; $($1)
+quiet = @printf "  $1	$@\n"; $($1)
 endif
 # Otherwise, print the full command line.
 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) $< > $@.$$$$; \
 	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) $< > $@.$$$$; \
 	sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
 	rm -f $@.$$$$