lib: work around xapian bug with get_mset(0,0, x)

[notmuch] / Makefile.local

diff --git a/Makefile.local b/Makefile.local
index 2eb55e6ce1cdd3ead68b8b0db8d90b7d4873f5a0..1535c2ae8a7bcbe53ccfaa38efcdf2721ca28267 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -31,11 +31,12 @@ $(TAR_FILE):
        fi ; \
        git archive --format=tar --prefix=$(PACKAGE)-$(VERSION)/ $$ref > $(TAR_FILE).tmp
        echo $(VERSION) > version.tmp
+       ct=`git --no-pager log -1 --pretty=format:%ct $$ref` ; \
        tar --owner root --group root --append -f $(TAR_FILE).tmp \
                --transform s_^_$(PACKAGE)-$(VERSION)/_  \
-               --transform 's_.tmp$$__' version.tmp
+               --transform 's_.tmp$$__' --mtime=@$$ct version.tmp
        rm version.tmp
-       gzip < $(TAR_FILE).tmp > $(TAR_FILE)
+       gzip -n < $(TAR_FILE).tmp > $(TAR_FILE)
        @echo "Source is ready for release in $(TAR_FILE)"
 
 $(SHA256_FILE): $(TAR_FILE)
@@ -199,9 +200,17 @@ quiet ?= $($(word 1, $(1)))
        @mkdir -p $(patsubst %/.,%,.deps/$(@D))
        $(call quiet,CC $(CPPFLAGS) $(CFLAGS)) -c $(FINAL_CFLAGS) $< -o $@ -MD -MP -MF .deps/$*.d
 
+CPPCHECK=cppcheck
+.stamps/cppcheck/%: %
+       @mkdir -p $(@D)
+       $(call quiet,CPPCHECK,$<) --template=gcc --error-exitcode=1 --quiet $<
+       @touch $@
+
+CLEAN := $(CLEAN) .stamps
+
 .PHONY : clean
 clean:
-       rm -rf $(CLEAN); rm -rf .deps
+       rm -rf $(CLEAN)
 
 .PHONY: distclean
 distclean: clean
@@ -238,7 +247,6 @@ notmuch_client_srcs =               \
        sprinter-text.c         \
        query-string.c          \
        mime-node.c             \
-       crypto.c                \
        tag-util.c
 
 notmuch_client_modules = $(notmuch_client_srcs:.c=.o)
@@ -280,9 +288,20 @@ endif
 SRCS  := $(SRCS) $(notmuch_client_srcs)
 CLEAN := $(CLEAN) notmuch notmuch-shared $(notmuch_client_modules)
 CLEAN := $(CLEAN) version.stamp notmuch-*.tar.gz.tmp
+CLEAN := $(CLEAN) .deps
 
 DISTCLEAN := $(DISTCLEAN) .first-build-message Makefile.config sh.config
 
+CPPCHECK_STAMPS := $(SRCS:%=.stamps/cppcheck/%)
+.PHONY: cppcheck
+ifeq ($(HAVE_CPPCHECK),1)
+cppcheck: ${CPPCHECK_STAMPS}
+else
+cppcheck:
+       @echo "No cppcheck found during configure; skipping static checking"
+endif
+
+
 DEPS := $(SRCS:%.c=.deps/%.d)
 DEPS := $(DEPS:%.cc=.deps/%.d)
 -include $(DEPS)