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

[notmuch] / Makefile

diff --git a/Makefile b/Makefile
index 8eee3096a76918f7c71a5ab0a6ceb880ee61e163..436dacfc4c6318e76f076c007771afe34153f52f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # Default FLAGS, (can be overriden by user such as "make CFLAGS=-O2")
 WARN_FLAGS=-Wall -Wextra -Wmissing-declarations -Wwrite-strings -Wswitch-enum
-CFLAGS=-g -O0
+CFLAGS=-O2
 
 # Additional flags that we will append to whatever the user set.
 # These aren't intended for the user to manipulate.
@@ -18,6 +18,9 @@ override LDFLAGS += `pkg-config --libs glib-2.0 gmime-2.4 talloc` \
 include Makefile.local
 include lib/Makefile.local
 
+# And get user settings from the output of configure
+include Makefile.config
+
 %.o: %.cc
        $(CXX) -c $(CFLAGS) $(CXXFLAGS) $< -o $@
 
@@ -27,13 +30,13 @@ include lib/Makefile.local
 .deps/%.d: %.c
        @set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
        $(CC) -M $(CPPFLAGS) $(CFLAGS) $< > $@.$$$$; \
-       sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+       sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
        rm -f $@.$$$$
 
 .deps/%.d: %.cc
        @set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
        $(CXX) -M $(CPPFLAGS) $(CXXFLAGS) $< > $@.$$$$; \
-       sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+       sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
        rm -f $@.$$$$
 
 DEPS := $(SRCS:%.c=.deps/%.d)