X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile;h=b4d77b4e3fcaf95134869b07e709d3f4e48afce0;hp=1737a32e61dee659c9568e657e7c33577f06166b;hb=c12823648ee84b4748e0e9f0cd97f7264911b589;hpb=526b7144f7d692e04ce950dfa7d0ee1bdf792cdc

diff --git a/Makefile b/Makefile
index 1737a32e..b4d77b4e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,12 @@
 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`
 
@@ -13,6 +18,8 @@ MODULES=		\
 	message-file.o	\
 	query.o		\
 	sha1.o		\
+	tags.o		\
+	thread.o	\
 	libsha1.o	\
 	xutil.o
 
@@ -28,7 +35,7 @@ notmuch: $(MODULES)
 	$(CC) $(MYLDFLAGS) $^ -o $@
 
 Makefile.dep: *.c *.cc
-	$(CC) -M $(CPPFLAGS) $(MYCFLAGS) $^ > $@
+	$(CXX) -M $(CPPFLAGS) $(CDEPENDS_FLAGS) $(CXXDEPENDS_FLAGS) $^ > $@
 -include Makefile.dep
 
 clean: