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

[notmuch] / Makefile

diff --git a/Makefile b/Makefile
index 6af7faf510ed15f1cd86bdcbe2ea5bc490c84334..7743ef52cf98f0b3babd0cd99d9c8c47f6de49bb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,40 +1,39 @@
-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          \
-       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 $@
+
+.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: $(MODULES)
-       $(CC) $(MYLDFLAGS) $^ -o $@
+.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 $@.$$$$
 
-Makefile.dep: *.c *.cc
-       $(CXX) -M $(CPPFLAGS) $(CDEPENDS_FLAGS) $(CXXDEPENDS_FLAGS) $^ > $@
--include Makefile.dep
+DEPS := $(SRCS:%.c=.deps/%.d)
+DEPS := $(DEPS:%.cc=.deps/%.d)
+-include $(DEPS)
 
 clean:
-       rm -f $(PROGS) *.o Makefile.dep
+       rm -f $(CLEAN); rm -rf .deps