notmuch show: Detect an internal error if a thread has no messages.

[notmuch] / Makefile

diff --git a/Makefile b/Makefile
index 894874ae6f2d3502a5f7eaaf3424e3511e83ba05..436dacfc4c6318e76f076c007771afe34153f52f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,41 +1,47 @@
-PROGS=notmuch
+# Default FLAGS, (can be overriden by user such as "make CFLAGS=-O2")
+WARN_FLAGS=-Wall -Wextra -Wmissing-declarations -Wwrite-strings -Wswitch-enum
+CFLAGS=-O2
 
-CXXWARNINGS_FLAGS=-Wall -Wextra -Wmissing-declarations -Wwrite-strings
-CWARNINGS_FLAGS=$(CXXWARNINGS_FLAGS)
+# Additional flags that we will append to whatever the user set.
+# These aren't intended for the user to manipulate.
+extra_cflags = `pkg-config --cflags glib-2.0 gmime-2.4 talloc`
+extra_cxxflags = `xapian-config --cxxflags`
 
-CDEPENDS_FLAGS=`pkg-config --cflags glib-2.0 talloc`
-CXXDEPENDS_FLAGS=`pkg-config --cflags glib-2.0 talloc` `xapian-config --cxxflags`
+# Now smash together user's values with our extra values
+override CFLAGS += $(WARN_FLAGS) $(extra_cflags)
+override CXXFLAGS += $(WARN_FLAGS) $(extra_cflags) $(extra_cxxflags)
 
-MYCFLAGS=$(CWARNINGS_FLAGS) -O0 -g $(CDEPENDS_FLAGS)
-MYCXXFLAGS=$(CXXWARNINGS_FLAGS) -O0 -g $(CXXDEPENDS_FLAGS)
+override LDFLAGS += `pkg-config --libs glib-2.0 gmime-2.4 talloc` \
+                       `xapian-config --libs`
 
-MYLDFLAGS=`pkg-config --libs glib-2.0 talloc` `xapian-config --libs`
+# Include our local Makfile.local first so that its first target is default
+include Makefile.local
+include lib/Makefile.local
 
-MODULES=               \
-       notmuch.o       \
-       database.o      \
-       date.o          \
-       message.o       \
-       message-file.o  \
-       query.o         \
-       sha1.o          \
-       libsha1.o       \
-       xutil.o
-
-all: $(PROGS)
+# And get user settings from the output of configure
+include Makefile.config
 
 %.o: %.cc
-       $(CXX) -c $(CFLAGS) $(CXXFLAGS) $(MYCXXFLAGS) $< -o $@
+       $(CXX) -c $(CFLAGS) $(CXXFLAGS) $< -o $@
 
 %.o: %.c
-       $(CC) -c $(CFLAGS) $(MYCFLAGS) $< -o $@
+       $(CC) -c $(CFLAGS) $< -o $@
+
+.deps/%.d: %.c
+       @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
+       @set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
+       $(CXX) -M $(CPPFLAGS) $(CXXFLAGS) $< > $@.$$$$; \
+       sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
+       rm -f $@.$$$$
 
-Makefile.dep: *.c *.cc
-       $(CC) -M $(CPPFLAGS) $(CDEPENDS_FLAGS) $^ > $@
--include Makefile.dep
+DEPS := $(SRCS:%.c=.deps/%.d)
+DEPS := $(DEPS:%.cc=.deps/%.d)
+-include $(DEPS)
 
 clean:
-       rm -f $(PROGS) *.o Makefile.dep
+       rm -f $(CLEAN); rm -rf .deps