X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile;h=ae0f99120cc59c459c3b8d0e4819611e7c8b5c62;hp=0411cbbed663c933fad48d434d9168ea4508995e;hb=98b93a7d5ad3713a7c408e497065cd0a931d90c7;hpb=0a575c95804da3cb740ebe2fbece862f19dce35a

diff --git a/Makefile b/Makefile
index 0411cbbe..ae0f9912 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,12 @@
 WARN_FLAGS=-Wall -Wextra -Wmissing-declarations -Wwrite-strings -Wswitch-enum
 CFLAGS=-O2
 
+# 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)
@@ -10,9 +16,12 @@ 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/site-lisp
+	emacs_lispdir = $(prefix)/share/emacs/site-lisp
 endif
 
+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)
@@ -26,24 +35,40 @@ include Makefile.local
 include lib/Makefile.local
 
 # And get user settings from the output of configure
+Makefile.config: configure
+	./configure
+
 include Makefile.config
 
-%.o: %.cc
-	$(CXX) -c $(CFLAGS) $(CXXFLAGS) $< -o $@
+# The user has not set any verbosity, default to quiet mode and inform the
+# 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)
+endif
+# The user has explicitly enabled quiet compilation.
+ifeq ($(V),0)
+quiet = @echo "  $1	$@"; $($1)
+endif
+# Otherwise, print the full command line.
+quiet ?= $($1)
+
+%.o: %.cc $(all_deps)
+	$(call quiet,CXX) -c $(CXXFLAGS) $< -o $@
 
-%.o: %.c
-	$(CC) -c $(CFLAGS) $< -o $@
+%.o: %.c $(all_deps)
+	$(call quiet,CC) -c $(CFLAGS) $< -o $@
 
 %.elc: %.el
-	emacs -batch -f batch-byte-compile $<
+	$(call quiet,EMACS) -batch -f batch-byte-compile $<
 
-.deps/%.d: %.c
+.deps/%.d: %.c $(all_deps)
 	@set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
 	$(CC) -M $(CPPFLAGS) $(CFLAGS) $< > $@.$$$$; \
 	sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
 	rm -f $@.$$$$
 
-.deps/%.d: %.cc
+.deps/%.d: %.cc $(all_deps)
 	@set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
 	$(CXX) -M $(CPPFLAGS) $(CXXFLAGS) $< > $@.$$$$; \
 	sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
@@ -53,5 +78,6 @@ DEPS := $(SRCS:%.c=.deps/%.d)
 DEPS := $(DEPS:%.cc=.deps/%.d)
 -include $(DEPS)
 
+.PHONY : clean
 clean:
 	rm -f $(CLEAN); rm -rf .deps