-MYCFLAGS=-Wall -O0 -g `pkg-config --cflags glib-2.0 talloc`
-MYCXXFLAGS=$(MYCFLAGS) `xapian-config --cxxflags`
-
-MYLDFLAGS=`pkg-config --libs glib-2.0 talloc` `xapian-config --libs`
-
-MODULES= \
- notmuch.o \
- database.o \
- date.o \
- message.o \
- message-file.o \
- query.o \
- sha1.o \
- libsha1.o \
- xutil.o
+WARN_FLAGS=-Wall -Wextra -Wmissing-declarations -Wwrite-strings -Wswitch-enum
+
+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)
+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= \
+ 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