aboutsummaryrefslogtreecommitdiff
path: root/Makefile.local
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile.local')
-rw-r--r--Makefile.local37
1 files changed, 15 insertions, 22 deletions
diff --git a/Makefile.local b/Makefile.local
index d3bf947..b3b960c 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -256,35 +256,20 @@ 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:
- 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.
.PHONY: distclean
distclean: clean
+ rm -rf $(DISTCLEAN)
notmuch_client_srcs = \
command-line-arguments.c\
@@ -304,9 +289,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 +337,9 @@ install-desktop:
SRCS := $(SRCS) $(notmuch_client_srcs)
CLEAN := $(CLEAN) notmuch notmuch-shared $(notmuch_client_modules) notmuch.elc
+
+DISTCLEAN := $(DISTCLEAN) .first-build-message Makefile.config
+
+DEPS := $(SRCS:%.c=.deps/%.d)
+DEPS := $(DEPS:%.cc=.deps/%.d)
+-include $(DEPS)