Drop dead function add_term.

[notmuch] / Makefile

diff --git a/Makefile b/Makefile
index ff654e11e7944624d55aaa3ab86c98028f35bfe3..6af7faf510ed15f1cd86bdcbe2ea5bc490c84334 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,39 @@
 PROGS=notmuch
 
-MYCFLAGS=-Wall -O0 -g `pkg-config --cflags glib-2.0 talloc`
-MYCXXFLAGS=$(MYCFLAGS) `xapian-config --cxxflags`
+WARN_FLAGS=-Wall -Wextra -Wmissing-declarations -Wwrite-strings -Wswitch-enum
+
+CDEPENDS_FLAGS=`pkg-config --cflags glib-2.0 talloc`
+CXXDEPENDS_FLAGS=`pkg-config --cflags glib-2.0 talloc` `xapian-config --cxxflags`
+
+MYCFLAGS=$(WARN_FLAGS) -O0 -g $(CDEPENDS_FLAGS)
+MYCXXFLAGS=$(WARN_FLAGS) -O0 -g $(CXXDEPENDS_FLAGS)
 
 MYLDFLAGS=`pkg-config --libs glib-2.0 talloc` `xapian-config --libs`
 
+MODULES=               \
+       notmuch.o       \
+       database.o      \
+       date.o          \
+       message.o       \
+       message-file.o  \
+       query.o         \
+       sha1.o          \
+       libsha1.o       \
+       xutil.o
+
 all: $(PROGS)
 
 %.o: %.cc
-       $(CXX) -c $(CXXFLAGS) $(MYCXXFLAGS) $< -o $@
+       $(CXX) -c $(CFLAGS) $(CXXFLAGS) $(MYCXXFLAGS) $< -o $@
 
 %.o: %.c
        $(CC) -c $(CFLAGS) $(MYCFLAGS) $< -o $@
 
-notmuch: notmuch.o database.o date.o message.o message-file.o query.o xutil.o
+notmuch: $(MODULES)
        $(CC) $(MYLDFLAGS) $^ -o $@
 
 Makefile.dep: *.c *.cc
-       $(CC) -M $(CPPFLAGS) $(MYCFLAGS) $^ > $@
+       $(CXX) -M $(CPPFLAGS) $(CDEPENDS_FLAGS) $(CXXDEPENDS_FLAGS) $^ > $@
 -include Makefile.dep
 
 clean: