X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile;h=a9d91d8667ad83e49b018c6c80e79be2cccd9cd3;hp=8fa81c617a8c0d0f8ae3b368d7d2489647a2ef8b;hb=3cdb24d38aaa4cf043526a946e0a4ae290a6881d;hpb=fa226a7a10ba95f8d8a7ff92dbfc44f6404d9d4d

diff --git a/Makefile b/Makefile
index 8fa81c61..a9d91d86 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ PROGS=notmuch
 
 WARN_FLAGS=-Wall -Wextra -Wmissing-declarations -Wwrite-strings -Wswitch-enum
 
-NOTMUCH_DEPENDS_FLAGS=`pkg-config --cflags glib-2.0 gmime-2.4 talloc`
+NOTMUCH_DEPENDS_FLAGS=-I./lib `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)
@@ -11,17 +11,17 @@ 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	\
-	index.o		\
-	libsha1.o	\
-	message.o	\
-	message-file.o	\
-	query.o		\
-	sha1.o		\
-	tags.o		\
-	thread.o	\
-	xutil.o
+LIBRARY=			\
+	lib/database.o		\
+	lib/index.o		\
+	lib/libsha1.o		\
+	lib/message.o		\
+	lib/message-file.o	\
+	lib/query.o		\
+	lib/sha1.o		\
+	lib/tags.o		\
+	lib/thread.o		\
+	lib/xutil.o
 
 MAIN=			\
 	notmuch.o
@@ -37,19 +37,19 @@ all: $(PROGS)
 notmuch: $(MAIN) $(LIBRARY)
 	$(CC) $(NOTMUCH_LDFLAGS) $^ -o $@
 
-Makefile.dep: *.c *.cc
+.depends: *.c lib/*.c lib/*.cc
 	$(CXX) -M $(CPPFLAGS) $(NOTMUCH_DEPENDS_FLAGS) \
 	$(NOTMUCH_CXX_DEPENDS_FLAGS) $^ > $@
--include Makefile.dep
+-include .depends
 
 notmuch.1.gz:
 	gzip --stdout notmuch.1 > notmuch.1.gz
 
-install: notmuch.1.gz
+install: all 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 Makefile.dep
+	rm -f $(PROGS) lib/*.o *.o .depends