Move find_prefix function from database.cc to message.cc

[notmuch] / Makefile

diff --git a/Makefile b/Makefile
index ef8d6410ad26a2202fbc2fd44fcd7493d145b4ac..ff654e11e7944624d55aaa3ab86c98028f35bfe3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,26 +1,24 @@
-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`
 
 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: notmuch.o database.o date.o message.o message-file.o query.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
-
-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