Add structured output formatter for JSON and plain text (but don't use them yet).

[notmuch] / Makefile.local

diff --git a/Makefile.local b/Makefile.local
index d3bf9478b3f75ac165693c03522436de8efcafde..296995d364a4d0979cceb24752247b6b4f1e30d3 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -256,26 +256,12 @@ 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 $@.$$$$
-
-DEPS := $(SRCS:%.c=.deps/%.d)
-DEPS := $(DEPS:%.cc=.deps/%.d)
--include $(DEPS)
+       @mkdir -p .deps/$(@D)
+       $(call quiet,CC $(CFLAGS)) -c $(FINAL_CFLAGS) $< -o $@ -MD -MP -MF .deps/$*.d
 
 .PHONY : clean
 clean:
@@ -304,9 +290,11 @@ notmuch_client_srcs =              \
        notmuch-show.c          \
        notmuch-tag.c           \
        notmuch-time.c          \
+       sprinter-json.c         \
+       sprinter-text.c         \
        query-string.c          \
-       show-message.c          \
        mime-node.c             \
+       crypto.c                \
        json.c
 
 notmuch_client_modules = $(notmuch_client_srcs:.c=.o)
@@ -350,3 +338,7 @@ install-desktop:
 
 SRCS  := $(SRCS) $(notmuch_client_srcs)
 CLEAN := $(CLEAN) notmuch notmuch-shared $(notmuch_client_modules) notmuch.elc
+
+DEPS := $(SRCS:%.c=.deps/%.d)
+DEPS := $(DEPS:%.cc=.deps/%.d)
+-include $(DEPS)