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

diff --git a/Makefile b/Makefile
index 5188e5d5..021fdb82 100644
--- a/Makefile
+++ b/Makefile
@@ -1,41 +1,82 @@
-PROGS=notmuch
+WARN_CXXFLAGS=-Wall -Wextra -Wwrite-strings -Wswitch-enum
+WARN_CFLAGS=$(WARN_CXXFLAGS) -Wmissing-declarations
 
-CXXWARNINGS_FLAGS=-Wall
-CWARNINGS_FLAGS=$(CXX_WARNINGS_FLAGS)
+# 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
 
-CDEPENDS_FLAGS=`pkg-config --cflags glib-2.0 talloc`
-CXXDEPENDS_FLAGS=`pkg-config --cflags glib-2.0 talloc` `xapian-config --cxxflags`
+bash_completion_dir = /etc/bash_completion.d
 
-MYCFLAGS=$(CWARNINGS_FLAGS) -O0 -g $(CDEPENDS_FLAGS)
-MYCXXFLAGS=$(CXXWARNINGS_FLAGS) -O0 -g $(CXXDEPENDS_FLAGS)
+all_deps = Makefile Makefile.local Makefile.config \
+		   lib/Makefile lib/Makefile.local
 
-MYLDFLAGS=`pkg-config --libs glib-2.0 talloc` `xapian-config --libs`
+extra_cflags :=
+extra_cxxflags :=
 
-MODULES=		\
-	notmuch.o	\
-	database.o	\
-	date.o		\
-	message.o	\
-	message-file.o	\
-	query.o		\
-	sha1.o		\
-	libsha1.o	\
-	xutil.o
+# 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: $(PROGS)
+all: notmuch notmuch.1.gz
 
-%.o: %.cc
-	$(CXX) -c $(CFLAGS) $(CXXFLAGS) $(MYCXXFLAGS) $< -o $@
+# 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
 
-%.o: %.c
-	$(CC) -c $(CFLAGS) $(MYCFLAGS) $< -o $@
+include Makefile.config
 
-notmuch: $(MODULES)
-	$(CC) $(MYLDFLAGS) $^ -o $@
+include lib/Makefile.local
+include compat/Makefile.local
+include Makefile.local
 
-Makefile.dep: *.c *.cc
-	$(CC) -M $(CPPFLAGS) $(CDEPENDS_FLAGS) $^ > $@
--include Makefile.dep
+# 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 = @printf $(quiet_DOC)$(eval quiet_DOC:=)"  $1 $2	$@\n"; $($1)
+endif
+# The user has explicitly enabled quiet compilation.
+ifeq ($(V),0)
+quiet = @printf "  $1	$@\n"; $($1)
+endif
+# Otherwise, print the full command line.
+quiet ?= $($1)
 
+%.o: %.cc $(all_deps)
+	$(call quiet,CXX,$(CXXFLAGS)) -c $(FINAL_CXXFLAGS) $< -o $@
+
+%.o: %.c $(all_deps)
+	$(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) $(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) $< > $@.$$$$ 2>/dev/null ; \
+	sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
+	rm -f $@.$$$$
+
+DEPS := $(SRCS:%.c=.deps/%.d)
+DEPS := $(DEPS:%.cc=.deps/%.d)
+-include $(DEPS)
+
+.PHONY : clean
 clean:
-	rm -f $(PROGS) *.o Makefile.dep
+	rm -f $(CLEAN); rm -rf .deps