X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile;h=91ab9c02cd623f583e03b5b241858f4b0fb40f43;hp=17f29fb1960c202e00c56d70d1b65586340a5ed5;hb=c5dccd851a8b79d8cedbfc8f2d2b8f9be2b7fa5a;hpb=a2c467242ac646bb16638906dec1bd075e098674

diff --git a/Makefile b/Makefile
index 17f29fb1..91ab9c02 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,32 @@
-PROGS=notmuch-index-message xapian-dump
+WARN_FLAGS=-Wall -Wextra -Wmissing-declarations -Wwrite-strings -Wswitch-enum
 
-MYCXXFLAGS=-Wall -O0 -g
+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`
 
-all: $(PROGS)
+NOTMUCH_CFLAGS=$(WARN_FLAGS) -O0 -g $(NOTMUCH_DEPENDS_FLAGS)
+NOTMUCH_CXXFLAGS=$(WARN_FLAGS) -O0 -g $(NOTMUCH_CXX_DEPENDS_FLAGS)
 
-notmuch-index-message: notmuch-index-message.cc
-	$(CC) $(CXXFLAGS) $(MYCXXFLAGS) notmuch-index-message.cc `pkg-config --cflags --libs gmime-2.4` `xapian-config --cxxflags --libs` -o notmuch-index-message
+NOTMUCH_LDFLAGS=`pkg-config --libs glib-2.0 gmime-2.4 talloc` \
+		`xapian-config --libs`
 
-xapian-dump: xapian-dump.cc
-	$(CXX) $(CXXFLAGS) $(MYCXXFLAGS) xapian-dump.cc `xapian-config --libs --cxxflags` -o xapian-dump
+# 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) $(NOTMUCH_CXXFLAGS) $< -o $@
+
+%.o: %.c
+	$(CC) -c $(CFLAGS) $(NOTMUCH_CFLAGS) $< -o $@
+
+.depends: $(SRCS)
+	$(CXX) -M $(CPPFLAGS) $(NOTMUCH_DEPENDS_FLAGS) \
+	$(NOTMUCH_CXX_DEPENDS_FLAGS) $^ > $@
+-include .depends
+
+CLEAN := $(CLEAN) .depends
 
 clean:
-	rm -f $(PROGS)
+	rm -f $(CLEAN)
+
+