X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile;h=894874ae6f2d3502a5f7eaaf3424e3511e83ba05;hp=17f29fb1960c202e00c56d70d1b65586340a5ed5;hb=c7482b4dce114b1c09cbac2f4ef6d0defdb23258;hpb=a2c467242ac646bb16638906dec1bd075e098674

diff --git a/Makefile b/Makefile
index 17f29fb1..894874ae 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,41 @@
-PROGS=notmuch-index-message xapian-dump
+PROGS=notmuch
 
-MYCXXFLAGS=-Wall -O0 -g
+CXXWARNINGS_FLAGS=-Wall -Wextra -Wmissing-declarations -Wwrite-strings
+CWARNINGS_FLAGS=$(CXXWARNINGS_FLAGS)
+
+CDEPENDS_FLAGS=`pkg-config --cflags glib-2.0 talloc`
+CXXDEPENDS_FLAGS=`pkg-config --cflags glib-2.0 talloc` `xapian-config --cxxflags`
+
+MYCFLAGS=$(CWARNINGS_FLAGS) -O0 -g $(CDEPENDS_FLAGS)
+MYCXXFLAGS=$(CXXWARNINGS_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)
 
-notmuch-index-message: notmuch-index-message.cc
-	$(CC) $(CXXFLAGS) $(MYCXXFLAGS) notmuch-index-message.cc `pkg-config --cflags --libs gmime-2.4` `xapian-config --cxxflags --libs` -o notmuch-index-message
+%.o: %.cc
+	$(CXX) -c $(CFLAGS) $(CXXFLAGS) $(MYCXXFLAGS) $< -o $@
+
+%.o: %.c
+	$(CC) -c $(CFLAGS) $(MYCFLAGS) $< -o $@
+
+notmuch: $(MODULES)
+	$(CC) $(MYLDFLAGS) $^ -o $@
 
-xapian-dump: xapian-dump.cc
-	$(CXX) $(CXXFLAGS) $(MYCXXFLAGS) xapian-dump.cc `xapian-config --libs --cxxflags` -o xapian-dump
+Makefile.dep: *.c *.cc
+	$(CC) -M $(CPPFLAGS) $(CDEPENDS_FLAGS) $^ > $@
+-include Makefile.dep
 
 clean:
-	rm -f $(PROGS)
+	rm -f $(PROGS) *.o Makefile.dep