X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile;h=46f001ce2fa5d2523ff08c577b4aadbecae853fa;hp=1e7f5f2c88a4e6d902573bf4cacc6d13caf03491;hb=357b48d34b9cd32473d39321b1ae460d05f5c7cd;hpb=146549321044615d9aef2b30cedccda9c49f3f38

diff --git a/Makefile b/Makefile
index 1e7f5f2c..46f001ce 100644
--- a/Makefile
+++ b/Makefile
@@ -1,55 +1,91 @@
-PROGS=notmuch
+WARN_CXXFLAGS=-Wall -Wextra -Wwrite-strings -Wswitch-enum
+WARN_CFLAGS=$(WARN_CXXFLAGS) -Wmissing-declarations
 
-WARN_FLAGS=-Wall -Wextra -Wmissing-declarations -Wwrite-strings -Wswitch-enum
+# Additional programs that are used during the compilation process.
+EMACS ?= emacs --quick
+# Lowercase to avoid clash with GZIP environment variable for passing
+# arguments to gzip.
+gzip = gzip
 
-NOTMUCH_DEPENDS_FLAGS=-I./lib `pkg-config --cflags glib-2.0 gmime-2.4 talloc`
-NOTMUCH_CXX_DEPENDS_FLAGS=$(NOTMUCH_DEPENDS_FLAGS) `xapian-config --cxxflags`
+bash_completion_dir = /etc/bash_completion.d
+zsh_completion_dir = /usr/share/zsh/functions/Completion/Unix
 
-NOTMUCH_CFLAGS=$(WARN_FLAGS) -O0 -g $(NOTMUCH_DEPENDS_FLAGS)
-NOTMUCH_CXXFLAGS=$(WARN_FLAGS) -O0 -g $(NOTMUCH_CXX_DEPENDS_FLAGS)
+extra_cflags :=
+extra_cxxflags :=
 
-NOTMUCH_LDFLAGS=`pkg-config --libs glib-2.0 gmime-2.4 talloc` \
-		`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)
 
-LIBRARY=			\
-	lib/database.o		\
-	lib/index.o		\
-	lib/libsha1.o		\
-	lib/message.o		\
-	lib/message-file.o	\
-	lib/query.o		\
-	lib/sha1.o		\
-	lib/tags.o		\
-	lib/thread.o		\
-	lib/xutil.o
+all: notmuch notmuch.1.gz
+ifeq ($(MAKECMDGOALS),)
+	@echo ""
+	@echo "Compilation of notmuch is now complete. You can install notmuch with:"
+	@echo ""
+	@echo "	make install"
+	@echo ""
+	@echo "Note that depending on the prefix to which you are installing"
+	@echo "you may need root permission (such as \"sudo make install\")."
+	@echo "See \"./configure --help\" for help on setting an alternate prefix."
+endif
 
-MAIN=			\
-	notmuch.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
 
-all: $(PROGS)
+subdirs = compat emacs lib
 
-%.o: %.cc
-	$(CXX) -c $(CFLAGS) $(CXXFLAGS) $(NOTMUCH_CXXFLAGS) $< -o $@
+global_deps = Makefile Makefile.config Makefile.local \
+	$(subdirs:%=%/Makefile) $(subdirs:%=%/Makefile.local)
 
-%.o: %.c
-	$(CC) -c $(CFLAGS) $(NOTMUCH_CFLAGS) $< -o $@
+include Makefile.config Makefile.local $(subdirs:%=%/Makefile.local)
 
-notmuch: $(MAIN) $(LIBRARY)
-	$(CC) $(NOTMUCH_LDFLAGS) $^ -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 = @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)
 
-Makefile.dep: *.c lib/*.c lib/*.cc
-	$(CXX) -M $(CPPFLAGS) $(NOTMUCH_DEPENDS_FLAGS) \
-	$(NOTMUCH_CXX_DEPENDS_FLAGS) $^ > $@
--include Makefile.dep
+%.o: %.cc $(global_deps)
+	$(call quiet,CXX,$(CXXFLAGS)) -c $(FINAL_CXXFLAGS) $< -o $@
 
-notmuch.1.gz:
-	gzip --stdout notmuch.1 > notmuch.1.gz
+%.o: %.c $(global_deps)
+	$(call quiet,CC,$(CFLAGS)) -c $(FINAL_CFLAGS) $< -o $@
 
-install: all notmuch.1.gz
-	install -C -D notmuch $(DESTDIR)/usr/bin/notmuch
-	install -C -D notmuch.1.gz $(DESTDIR)/usr/share/man/man1
-	install -C -D notmuch-completion.bash \
-		$(DESTDIR)/etc/bash_completion.d/notmuch
+%.elc: %.el
+	$(call quiet,EMACS) -batch -f batch-byte-compile $<
 
+.deps/%.d: %.c $(global_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 $(global_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) lib/*.o *.o Makefile.dep
+	rm -f $(CLEAN); rm -rf .deps