X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile;h=13f2b28d3f4a2081f4fd1b2075ec5ad1fbea3290;hp=ef8d6410ad26a2202fbc2fd44fcd7493d145b4ac;hb=c78358fa8adc0e8fa4f889e479df76e8df186264;hpb=fa562fa22b214a7d253e80c62d4f4c97138a6155

diff --git a/Makefile b/Makefile
index ef8d6410..13f2b28d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,26 +1,35 @@
-PROGS=notmuch notmuch-index-message xapian-dump
+PROGS=notmuch
 
-MYCFLAGS=-Wall -O0 -g `pkg-config --cflags glib-2.0`
+MYCFLAGS=-Wall -O0 -g `pkg-config --cflags glib-2.0 talloc`
 MYCXXFLAGS=$(MYCFLAGS) `xapian-config --cxxflags`
 
-MYLDFLAGS=`pkg-config --libs glib-2.0` `xapian-config --libs`
+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 $(CXXFLAGS) $(MYCXXFLAGS) $< -o $@
 
 %.o: %.c
-	$(CC) -c $(CFLAGS) $(MYCFLAGS) $^ -o $@
+	$(CC) -c $(CFLAGS) $(MYCFLAGS) $< -o $@
 
-notmuch: notmuch.o database.o date.o message.o xutil.o
+notmuch: $(MODULES)
 	$(CC) $(MYLDFLAGS) $^ -o $@
 
-notmuch-index-message: notmuch-index-message.cc
-	$(CXX) $(CXXFLAGS) $(MYCXXFLAGS) notmuch-index-message.cc `pkg-config --cflags --libs gmime-2.4` `xapian-config --cxxflags --libs` -o notmuch-index-message
-
-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) $(MYCFLAGS) $^ > $@
+-include Makefile.dep
 
 clean:
-	rm -f $(PROGS) *.o
+	rm -f $(PROGS) *.o Makefile.dep