Makefile: Fix dependency generation to make .d files themselves dependent.

[notmuch] / Makefile

diff --git a/Makefile b/Makefile
index 1e7f5f2c88a4e6d902573bf4cacc6d13caf03491..7743ef52cf98f0b3babd0cd99d9c8c47f6de49bb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,3 @@
-PROGS=notmuch
-
 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`
@@ -11,22 +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=                       \
-       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
-
-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 $@
@@ -34,22 +19,21 @@ all: $(PROGS)
 %.o: %.c
        $(CC) -c $(CFLAGS) $(NOTMUCH_CFLAGS) $< -o $@
 
-notmuch: $(MAIN) $(LIBRARY)
-       $(CC) $(NOTMUCH_LDFLAGS) $^ -o $@
-
-Makefile.dep: *.c lib/*.c lib/*.cc
-       $(CXX) -M $(CPPFLAGS) $(NOTMUCH_DEPENDS_FLAGS) \
-       $(NOTMUCH_CXX_DEPENDS_FLAGS) $^ > $@
--include Makefile.dep
+.deps/%.d: %.c
+       @set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
+       $(CC) -M $(CPPFLAGS) $(NOTMUCH_DEPENDS_FLAGS) $< > $@.$$$$; \
+       sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+       rm -f $@.$$$$
 
-notmuch.1.gz:
-       gzip --stdout notmuch.1 > notmuch.1.gz
+.deps/%.d: %.cc
+       @set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
+       $(CXX) -M $(CPPFLAGS) $(NOTMUCH_CXX_DEPENDS_FLAGS) $< > $@.$$$$; \
+       sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+       rm -f $@.$$$$
 
-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
+DEPS := $(SRCS:%.c=.deps/%.d)
+DEPS := $(DEPS:%.cc=.deps/%.d)
+-include $(DEPS)
 
 clean:
-       rm -f $(PROGS) lib/*.o *.o Makefile.dep
+       rm -f $(CLEAN); rm -rf .deps