Implement a non-recursive make.

[notmuch] / Makefile

diff --git a/Makefile b/Makefile
index 348d8772d7842e07171b8bc5904800d67b4d1ae4..91ab9c02cd623f583e03b5b241858f4b0fb40f43 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,6 @@
-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,23 +9,9 @@ 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)
+# 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 $@
@@ -35,22 +19,14 @@ all: $(PROGS)
 %.o: %.c
        $(CC) -c $(CFLAGS) $(NOTMUCH_CFLAGS) $< -o $@
 
-notmuch: $(MAIN) $(LIBRARY)
-       $(CC) $(NOTMUCH_LDFLAGS) $^ -o $@
-
-Makefile.dep: *.c *.cc
+.depends: $(SRCS)
        $(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 -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 := $(CLEAN) .depends
 
 clean:
-       rm -f $(PROGS) *.o Makefile.dep
+       rm -f $(CLEAN)
+
+