X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=91ab9c02cd623f583e03b5b241858f4b0fb40f43;hb=c5dccd851a8b79d8cedbfc8f2d2b8f9be2b7fa5a;hp=b4d77b4e3fcaf95134869b07e709d3f4e48afce0;hpb=2affed0851d85a08f6b0700f7128f97cae6b6024;p=notmuch

diff --git a/Makefile b/Makefile
index b4d77b4e..91ab9c02 100644
--- a/Makefile
+++ b/Makefile
@@ -1,42 +1,32 @@
-PROGS=notmuch
-
 WARN_FLAGS=-Wall -Wextra -Wmissing-declarations -Wwrite-strings -Wswitch-enum
 
-CDEPENDS_FLAGS=`pkg-config --cflags glib-2.0 talloc`
-CXXDEPENDS_FLAGS=`pkg-config --cflags glib-2.0 talloc` `xapian-config --cxxflags`
-
-MYCFLAGS=$(WARN_FLAGS) -O0 -g $(CDEPENDS_FLAGS)
-MYCXXFLAGS=$(WARN_FLAGS) -O0 -g $(CXXDEPENDS_FLAGS)
+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`
 
-MYLDFLAGS=`pkg-config --libs glib-2.0 talloc` `xapian-config --libs`
+NOTMUCH_CFLAGS=$(WARN_FLAGS) -O0 -g $(NOTMUCH_DEPENDS_FLAGS)
+NOTMUCH_CXXFLAGS=$(WARN_FLAGS) -O0 -g $(NOTMUCH_CXX_DEPENDS_FLAGS)
 
-MODULES=		\
-	notmuch.o	\
-	database.o	\
-	date.o		\
-	message.o	\
-	message-file.o	\
-	query.o		\
-	sha1.o		\
-	tags.o		\
-	thread.o	\
-	libsha1.o	\
-	xutil.o
+NOTMUCH_LDFLAGS=`pkg-config --libs glib-2.0 gmime-2.4 talloc` \
+		`xapian-config --libs`
 
-all: $(PROGS)
+# Include our local Makfile.local first so that its first target is default
+include Makefile.local
+include lib/Makefile.local
 
 %.o: %.cc
-	$(CXX) -c $(CFLAGS) $(CXXFLAGS) $(MYCXXFLAGS) $< -o $@
+	$(CXX) -c $(CFLAGS) $(CXXFLAGS) $(NOTMUCH_CXXFLAGS) $< -o $@
 
 %.o: %.c
-	$(CC) -c $(CFLAGS) $(MYCFLAGS) $< -o $@
+	$(CC) -c $(CFLAGS) $(NOTMUCH_CFLAGS) $< -o $@
 
-notmuch: $(MODULES)
-	$(CC) $(MYLDFLAGS) $^ -o $@
+.depends: $(SRCS)
+	$(CXX) -M $(CPPFLAGS) $(NOTMUCH_DEPENDS_FLAGS) \
+	$(NOTMUCH_CXX_DEPENDS_FLAGS) $^ > $@
+-include .depends
 
-Makefile.dep: *.c *.cc
-	$(CXX) -M $(CPPFLAGS) $(CDEPENDS_FLAGS) $(CXXDEPENDS_FLAGS) $^ > $@
--include Makefile.dep
+CLEAN := $(CLEAN) .depends
 
 clean:
-	rm -f $(PROGS) *.o Makefile.dep
+	rm -f $(CLEAN)
+
+