X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile;h=348d8772d7842e07171b8bc5904800d67b4d1ae4;hp=4af5a2ebfa5de2d38506e2dfd2e772bc30fe2ea0;hb=f6183a92b5b375370238fe5dc9da672d115bdd6a;hpb=10c176ba0e6d71e920b72a3165c0e56f26b5e4b3

diff --git a/Makefile b/Makefile
index 4af5a2eb..348d8772 100644
--- a/Makefile
+++ b/Makefile
@@ -1,26 +1,56 @@
-PROGS=notmuch notmuch-index-message xapian-dump
+PROGS=notmuch
 
-MYCFLAGS=-Wall -O0 -g `pkg-config --cflags gmime-2.4`
-MYCXXFLAGS=$(MYCFLAGS) `xapian-config --cxxflags`
+WARN_FLAGS=-Wall -Wextra -Wmissing-declarations -Wwrite-strings -Wswitch-enum
 
-MYLDFLAGS=`pkg-config --libs gmime-2.4` `xapian-config --libs`
+NOTMUCH_DEPENDS_FLAGS=`pkg-config --cflags glib-2.0 gmime-2.4 talloc`
+NOTMUCH_CXX_DEPENDS_FLAGS=$(NOTMUCH_DEPENDS_FLAGS) `xapian-config --cxxflags`
+
+NOTMUCH_CFLAGS=$(WARN_FLAGS) -O0 -g $(NOTMUCH_DEPENDS_FLAGS)
+NOTMUCH_CXXFLAGS=$(WARN_FLAGS) -O0 -g $(NOTMUCH_CXX_DEPENDS_FLAGS)
+
+NOTMUCH_LDFLAGS=`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) $(NOTMUCH_CXXFLAGS) $< -o $@
 
 %.o: %.c
-	$(CC) -c $(CFLAGS) $(MYCFLAGS) $^ -o $@
+	$(CC) -c $(CFLAGS) $(NOTMUCH_CFLAGS) $< -o $@
+
+notmuch: $(MAIN) $(LIBRARY)
+	$(CC) $(NOTMUCH_LDFLAGS) $^ -o $@
 
-notmuch: notmuch.o database.o xutil.o
-	$(CC) $(MYLDFLAGS) $^ -o $@
+Makefile.dep: *.c *.cc
+	$(CXX) -M $(CPPFLAGS) $(NOTMUCH_DEPENDS_FLAGS) \
+	$(NOTMUCH_CXX_DEPENDS_FLAGS) $^ > $@
+-include Makefile.dep
 
-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
+notmuch.1.gz:
+	gzip --stdout notmuch.1 > notmuch.1.gz
 
-xapian-dump: xapian-dump.cc
-	$(CXX) $(CXXFLAGS) $(MYCXXFLAGS) xapian-dump.cc `xapian-config --libs --cxxflags` -o xapian-dump
+install: notmuch.1.gz
+	install -C -D notmuch $(DESTDIR)/usr/bin/notmuch
+	install -C -D notmuch.1.gz $(DESTDIR)/usr/share/man/man1
+	install -C -D notmuch-completion.bash \
+		$(DESTDIR)/etc/bash_completion.d/notmuch
 
 clean:
-	rm -f $(PROGS) *.o
+	rm -f $(PROGS) *.o Makefile.dep