X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile;h=a1a7a15ce523eaa9e82f586a146ec589bab69cca;hp=13f2b28d3f4a2081f4fd1b2075ec5ad1fbea3290;hb=f9bbd7baa07110c7f345c8413e2426d00382cb1c;hpb=6a4992bc611881b363583b4a20fc530c770aedd8

diff --git a/Makefile b/Makefile
index 13f2b28d..a1a7a15c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,34 +1,44 @@
 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
 
-MYLDFLAGS=`pkg-config --libs glib-2.0 talloc` `xapian-config --libs`
+CDEPENDS_FLAGS=`pkg-config --cflags glib-2.0 gmime-2.4 talloc`
+CXXDEPENDS_FLAGS=$(CDEPENDS_FLAGS) `xapian-config --cxxflags`
 
-MODULES=		\
-	notmuch.o	\
+MYCFLAGS=$(WARN_FLAGS) -O0 -g $(CDEPENDS_FLAGS)
+MYCXXFLAGS=$(WARN_FLAGS) -O0 -g $(CXXDEPENDS_FLAGS)
+
+MYLDFLAGS=`pkg-config --libs glib-2.0 gmime-2.4 talloc` `xapian-config --libs`
+
+LIBRARY=		\
 	database.o	\
 	date.o		\
+	index.o		\
+	libsha1.o	\
 	message.o	\
 	message-file.o	\
 	query.o		\
 	sha1.o		\
-	libsha1.o	\
+	tags.o		\
+	thread.o	\
 	xutil.o
 
+MAIN=			\
+	notmuch.o
+
 all: $(PROGS)
 
 %.o: %.cc
-	$(CXX) -c $(CXXFLAGS) $(MYCXXFLAGS) $< -o $@
+	$(CXX) -c $(CFLAGS) $(CXXFLAGS) $(MYCXXFLAGS) $< -o $@
 
 %.o: %.c
 	$(CC) -c $(CFLAGS) $(MYCFLAGS) $< -o $@
 
-notmuch: $(MODULES)
+notmuch: $(MAIN) $(LIBRARY)
 	$(CC) $(MYLDFLAGS) $^ -o $@
 
 Makefile.dep: *.c *.cc
-	$(CC) -M $(CPPFLAGS) $(MYCFLAGS) $^ > $@
+	$(CXX) -M $(CPPFLAGS) $(CDEPENDS_FLAGS) $(CXXDEPENDS_FLAGS) $^ > $@
 -include Makefile.dep
 
 clean: