X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile;h=26ab8da8e748b32beb143e4f92d7ab02707a5eb2;hp=34716c294bb6233ab6ec2e17ca377a65da2c177a;hb=c33eed84f2c1a23d7f3835f7f7d480fde179ff4d;hpb=cd4a8734d3bb151df70d51a84903bff994439b05

diff --git a/Makefile b/Makefile
index 34716c29..26ab8da8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,49 @@
 PROGS=notmuch
 
-MYCFLAGS=-Wall -O0 -g `pkg-config --cflags glib-2.0`
-MYCXXFLAGS=$(MYCFLAGS) `xapian-config --cxxflags`
+WARN_FLAGS=-Wall -Wextra -Wmissing-declarations -Wwrite-strings -Wswitch-enum
 
-MYLDFLAGS=`pkg-config --libs glib-2.0` `xapian-config --libs`
+CDEPENDS_FLAGS=`pkg-config --cflags glib-2.0 gmime-2.4 talloc`
+CXXDEPENDS_FLAGS=$(CDEPENDS_FLAGS) `xapian-config --cxxflags`
+
+MYCFLAGS=$(WARN_FLAGS) -O0 -g $(CDEPENDS_FLAGS)
+MYCXXFLAGS=$(WARN_FLAGS) -O0 -g $(CXXDEPENDS_FLAGS)
+
+MYLDFLAGS=`pkg-config --libs glib-2.0 gmime-2.4 talloc` `xapian-config --libs`
+
+LIBRARY=		\
+	database.o	\
+	date.o		\
+	index.o		\
+	libsha1.o	\
+	message.o	\
+	message-file.o	\
+	query.o		\
+	sha1.o		\
+	tags.o		\
+	thread.o	\
+	xutil.o
+
+MAIN=			\
+	notmuch.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-file.o xutil.o
+notmuch: $(MAIN) $(LIBRARY)
 	$(CC) $(MYLDFLAGS) $^ -o $@
 
 Makefile.dep: *.c *.cc
-	$(CC) -M $(CPPFLAGS) $(MYCFLAGS) $^ > $@
+	$(CXX) -M $(CPPFLAGS) $(CDEPENDS_FLAGS) $(CXXDEPENDS_FLAGS) $^ > $@
 -include Makefile.dep
 
+install:
+	install -C -D notmuch $(DESTDIR)/usr/bin/notmuch
+	install -C -D notmuch-completion.bash $(DESTDIR)/etc/bash_completion.d/notmuch
+
 clean:
 	rm -f $(PROGS) *.o Makefile.dep