X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile;h=b7ebfb816802cb4a4a1ff7ee3b2c0330a1fe33d2;hp=c1fbd2a19bcc2d6f09c67677b25073660fb6009f;hb=0e777a8f800af062aba39a95a003f3e1d8f33793;hpb=36640b303ea68ae28e89f27694356141f515819b

diff --git a/Makefile b/Makefile
index c1fbd2a1..b7ebfb81 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,20 @@
 PROGS=notmuch notmuch-index-message xapian-dump
 
-MYCFLAGS=-Wall -O0 -g
-MYCXXFLAGS=-Wall -O0 -g
+MYCFLAGS=-Wall -O0 -g `pkg-config --cflags glib-2.0`
+MYCXXFLAGS=$(MYCFLAGS) `xapian-config --cxxflags`
+
+MYLDFLAGS=`pkg-config --libs glib-2.0` `xapian-config --libs`
 
 all: $(PROGS)
 
-notmuch: notmuch.c
-	$(CC) $(CFLAGS) $(MYCFLAGS) notmuch.c `pkg-config --cflags --libs glib-2.0` -o notmuch
+%.o: %.cc
+	$(CXX) -c $(CXXFLAGS) $(MYCXXFLAGS) $^ -o $@
+
+%.o: %.c
+	$(CC) -c $(CFLAGS) $(MYCFLAGS) $^ -o $@
+
+notmuch: notmuch.o database.o message.o xutil.o
+	$(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
@@ -15,4 +23,4 @@ xapian-dump: xapian-dump.cc
 	$(CXX) $(CXXFLAGS) $(MYCXXFLAGS) xapian-dump.cc `xapian-config --libs --cxxflags` -o xapian-dump
 
 clean:
-	rm -f $(PROGS)
+	rm -f $(PROGS) *.o