X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=Makefile;h=1737a32e61dee659c9568e657e7c33577f06166b;hb=32ecfe72a1da9002b8617a8575ee1290c8fd3c6f;hp=ff654e11e7944624d55aaa3ab86c98028f35bfe3;hpb=466a7bbf620e4bf1b57097a6d3c474159c475b6d;p=notmuch

diff --git a/Makefile b/Makefile
index ff654e11..1737a32e 100644
--- a/Makefile
+++ b/Makefile
@@ -5,15 +5,26 @@ MYCXXFLAGS=$(MYCFLAGS) `xapian-config --cxxflags`
 
 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 $(CFLAGS) $(CXXFLAGS) $(MYCXXFLAGS) $< -o $@
 
 %.o: %.c
 	$(CC) -c $(CFLAGS) $(MYCFLAGS) $< -o $@
 
-notmuch: notmuch.o database.o date.o message.o message-file.o query.o xutil.o
+notmuch: $(MODULES)
 	$(CC) $(MYLDFLAGS) $^ -o $@
 
 Makefile.dep: *.c *.cc