build system: remove directories created by tests in "make clean"

[notmuch] / Makefile.local

diff --git a/Makefile.local b/Makefile.local
index 935f0f1e22fca8263ded4c90a15c747d42347d72..6d6896a353c4e2563f8936024608d3935cb7c50d 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -256,26 +256,16 @@ endif
 quiet ?= $($(shell echo $1 | sed -e s'/ .*//'))
 
 %.o: %.cc $(global_deps)
-       $(call quiet,CXX $(CXXFLAGS)) -c $(FINAL_CXXFLAGS) $< -o $@
+       @mkdir -p .deps/$(@D)
+       $(call quiet,CXX $(CXXFLAGS)) -c $(FINAL_CXXFLAGS) $< -o $@ -MD -MP -MF .deps/$*.d
 
 %.o: %.c $(global_deps)
-       $(call quiet,CC $(CFLAGS)) -c $(FINAL_CFLAGS) $< -o $@
-
-.deps/%.d: %.c $(global_deps)
-       @set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
-       $(CC) -M $(CPPFLAGS) $(FINAL_CFLAGS) $< > $@.$$$$ 2>/dev/null ; \
-       sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
-       rm -f $@.$$$$
-
-.deps/%.d: %.cc $(global_deps)
-       @set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
-       $(CXX) -M $(CPPFLAGS) $(FINAL_CXXFLAGS) $< > $@.$$$$ 2>/dev/null ; \
-       sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
-       rm -f $@.$$$$
+       @mkdir -p .deps/$(@D)
+       $(call quiet,CC $(CFLAGS)) -c $(FINAL_CFLAGS) $< -o $@ -MD -MP -MF .deps/$*.d
 
 .PHONY : clean
 clean:
-       rm -f $(CLEAN); rm -rf .deps
+       rm -rf $(CLEAN); rm -rf .deps
 
 # We don't (yet) have any distributed files not in the upstream repository.
 # So distclean is currently identical to clean.
@@ -300,8 +290,11 @@ notmuch_client_srcs =              \
        notmuch-show.c          \
        notmuch-tag.c           \
        notmuch-time.c          \
+       sprinter-json.c         \
+       sprinter-text.c         \
        query-string.c          \
        mime-node.c             \
+       crypto.c                \
        json.c
 
 notmuch_client_modules = $(notmuch_client_srcs:.c=.o)