notmuch-reply.c: accept the --format=default default option.

[notmuch] / Makefile

diff --git a/Makefile b/Makefile
index 6af7faf510ed15f1cd86bdcbe2ea5bc490c84334..2cd1b1bae4af648b07b51a110e08f623868fa66e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,40 +1,80 @@
-PROGS=notmuch
-
+# Default FLAGS, (can be overridden by user such as "make CFLAGS=-O2")
 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)
+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
+
+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)
+
+override LDFLAGS += \
+       $(shell pkg-config --libs glib-2.0 gmime-2.4 talloc) \
+       $(shell xapian-config --libs)
 
-CDEPENDS_FLAGS=`pkg-config --cflags glib-2.0 talloc`
-CXXDEPENDS_FLAGS=`pkg-config --cflags glib-2.0 talloc` `xapian-config --cxxflags`
+# Include our local Makefile.local first so that its first target is default
+include Makefile.local
+include lib/Makefile.local
 
-MYCFLAGS=$(WARN_FLAGS) -O0 -g $(CDEPENDS_FLAGS)
-MYCXXFLAGS=$(WARN_FLAGS) -O0 -g $(CXXDEPENDS_FLAGS)
+# And get user settings from the output of configure
+include Makefile.config
 
-MYLDFLAGS=`pkg-config --libs glib-2.0 talloc` `xapian-config --libs`
+# 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)
 
-MODULES=               \
-       notmuch.o       \
-       database.o      \
-       date.o          \
-       message.o       \
-       message-file.o  \
-       query.o         \
-       sha1.o          \
-       libsha1.o       \
-       xutil.o
+%.o: %.cc $(all_deps)
+       $(call quiet,CXX) -c $(CXXFLAGS) $< -o $@
 
-all: $(PROGS)
+%.o: %.c $(all_deps)
+       $(call quiet,CC) -c $(CFLAGS) $< -o $@
 
-%.o: %.cc
-       $(CXX) -c $(CFLAGS) $(CXXFLAGS) $(MYCXXFLAGS) $< -o $@
+%.elc: %.el
+       $(call quiet,EMACS) -batch -f batch-byte-compile $<
 
-%.o: %.c
-       $(CC) -c $(CFLAGS) $(MYCFLAGS) $< -o $@
+.deps/%.d: %.c $(all_deps)
+       @set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
+       $(CC) -M $(CPPFLAGS) $(CFLAGS) $< > $@.$$$$; \
+       sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
+       rm -f $@.$$$$
 
-notmuch: $(MODULES)
-       $(CC) $(MYLDFLAGS) $^ -o $@
+.deps/%.d: %.cc $(all_deps)
+       @set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
+       $(CXX) -M $(CPPFLAGS) $(CXXFLAGS) $< > $@.$$$$; \
+       sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
+       rm -f $@.$$$$
 
-Makefile.dep: *.c *.cc
-       $(CXX) -M $(CPPFLAGS) $(CDEPENDS_FLAGS) $(CXXDEPENDS_FLAGS) $^ > $@
--include Makefile.dep
+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