projects
/
notmuch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
emacs/address: use member instead of memq to check for pair
[notmuch.git]
/
Makefile.local
diff --git
a/Makefile.local
b/Makefile.local
index 3548ed9665c974f236b7a01469da46bb15026641..9d9c52c26d9e85d7eac1420b0002e9b6dd9e1872 100644
(file)
--- a/
Makefile.local
+++ b/
Makefile.local
@@
-31,17
+31,18
@@
$(TAR_FILE):
fi ; \
git archive --format=tar --prefix=$(PACKAGE)-$(VERSION)/ $$ref > $(TAR_FILE).tmp
echo $(VERSION) > version.tmp
fi ; \
git archive --format=tar --prefix=$(PACKAGE)-$(VERSION)/ $$ref > $(TAR_FILE).tmp
echo $(VERSION) > version.tmp
- tar --append -f $(TAR_FILE).tmp --transform s_^_$(PACKAGE)-$(VERSION)/_ --transform 's_.tmp$$__' version.tmp
+ tar --owner root --group root --append -f $(TAR_FILE).tmp \
+ --transform s_^_$(PACKAGE)-$(VERSION)/_ \
+ --transform 's_.tmp$$__' version.tmp
rm version.tmp
gzip < $(TAR_FILE).tmp > $(TAR_FILE)
@echo "Source is ready for release in $(TAR_FILE)"
rm version.tmp
gzip < $(TAR_FILE).tmp > $(TAR_FILE)
@echo "Source is ready for release in $(TAR_FILE)"
-$(SHA
1
_FILE): $(TAR_FILE)
- sha
1
sum $^ > $@
+$(SHA
256
_FILE): $(TAR_FILE)
+ sha
256
sum $^ > $@
-$(GPG_FILE): $(SHA1_FILE)
- @echo "Please enter your GPG password to sign the checksum."
- gpg --armor --sign $^
+$(GPG_FILE): $(SHA256_FILE)
+ gpg --armor --sign $^
.PHONY: dist
dist: $(TAR_FILE)
.PHONY: dist
dist: $(TAR_FILE)
@@
-71,11
+72,11
@@
release: verify-source-tree-and-version
pristine-tar commit $(DEB_TAR_FILE) $(UPSTREAM_TAG)
git tag -s -m "$(PACKAGE) Debian $(VERSION)-1 upload (same as $(VERSION))" $(DEB_TAG)
mkdir -p releases
pristine-tar commit $(DEB_TAR_FILE) $(UPSTREAM_TAG)
git tag -s -m "$(PACKAGE) Debian $(VERSION)-1 upload (same as $(VERSION))" $(DEB_TAG)
mkdir -p releases
- mv $(TAR_FILE) $(SHA
1
_FILE) $(GPG_FILE) releases
+ mv $(TAR_FILE) $(SHA
256
_FILE) $(GPG_FILE) releases
$(MAKE) VERSION=$(VERSION) release-message > $(PACKAGE)-$(VERSION).announce
ifeq ($(REALLY_UPLOAD),yes)
git push origin $(VERSION)
$(MAKE) VERSION=$(VERSION) release-message > $(PACKAGE)-$(VERSION).announce
ifeq ($(REALLY_UPLOAD),yes)
git push origin $(VERSION)
- cd releases && scp $(TAR_FILE) $(SHA
1
_FILE) $(GPG_FILE) $(RELEASE_HOST):$(RELEASE_DIR)
+ cd releases && scp $(TAR_FILE) $(SHA
256
_FILE) $(GPG_FILE) $(RELEASE_HOST):$(RELEASE_DIR)
ssh $(RELEASE_HOST) "rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-* ; ln -s $(TAR_FILE) $(RELEASE_DIR)/LATEST-$(TAR_FILE)"
endif
@echo "Please send a release announcement using $(PACKAGE)-$(VERSION).announce as a template."
ssh $(RELEASE_HOST) "rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-* ; ln -s $(TAR_FILE) $(RELEASE_DIR)/LATEST-$(TAR_FILE)"
endif
@echo "Please send a release announcement using $(PACKAGE)-$(VERSION).announce as a template."
@@
-115,9
+116,9
@@
release-message:
@echo ""
@echo "Which can be verified with:"
@echo ""
@echo ""
@echo "Which can be verified with:"
@echo ""
- @echo " $(RELEASE_URL)/$(SHA
1
_FILE)"
+ @echo " $(RELEASE_URL)/$(SHA
256
_FILE)"
@echo -n " "
@echo -n " "
- @cat releases/$(SHA
1
_FILE)
+ @cat releases/$(SHA
256
_FILE)
@echo ""
@echo " $(RELEASE_URL)/$(GPG_FILE)"
@echo " (signed by `getent passwd "$$USER" | cut -d: -f 5 | cut -d, -f 1`)"
@echo ""
@echo " $(RELEASE_URL)/$(GPG_FILE)"
@echo " (signed by `getent passwd "$$USER" | cut -d: -f 5 | cut -d, -f 1`)"
@@
-181,14
+182,14
@@
verify-newer:
# user how to enable verbose compiles.
ifeq ($(V),)
quiet_DOC := "Use \"$(MAKE) V=1\" to see the verbose compile lines.\n"
# user how to enable verbose compiles.
ifeq ($(V),)
quiet_DOC := "Use \"$(MAKE) V=1\" to see the verbose compile lines.\n"
-quiet = @printf $(quiet_DOC)$(eval quiet_DOC:=)"$
1 $@\n"; $($(shell echo $1 | sed -e s'/ .*//'
))
+quiet = @printf $(quiet_DOC)$(eval quiet_DOC:=)"$
(1) $(or $(2),$@)\n"; $($(word 1, $(1)
))
endif
# The user has explicitly enabled quiet compilation.
ifeq ($(V),0)
endif
# The user has explicitly enabled quiet compilation.
ifeq ($(V),0)
-quiet = @printf "$
1 $@\n"; $($(shell echo $1 | sed -e s'/ .*//'
))
+quiet = @printf "$
(1) $(or $(2),$@)\n"; $($(word 1, $(1)
))
endif
# Otherwise, print the full command line.
endif
# Otherwise, print the full command line.
-quiet ?= $($(
shell echo $1 | sed -e s'/ .*//'
))
+quiet ?= $($(
word 1, $(1)
))
%.o: %.cc $(global_deps)
@mkdir -p $(patsubst %/.,%,.deps/$(@D))
%.o: %.cc $(global_deps)
@mkdir -p $(patsubst %/.,%,.deps/$(@D))
@@
-198,9
+199,17
@@
quiet ?= $($(shell echo $1 | sed -e s'/ .*//'))
@mkdir -p $(patsubst %/.,%,.deps/$(@D))
$(call quiet,CC $(CPPFLAGS) $(CFLAGS)) -c $(FINAL_CFLAGS) $< -o $@ -MD -MP -MF .deps/$*.d
@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:
.PHONY : clean
clean:
- rm -rf $(CLEAN)
; rm -rf .deps
+ rm -rf $(CLEAN)
.PHONY: distclean
distclean: clean
.PHONY: distclean
distclean: clean
@@
-211,6
+220,7
@@
dataclean: distclean
rm -rf $(DATACLEAN)
notmuch_client_srcs = \
rm -rf $(DATACLEAN)
notmuch_client_srcs = \
+ $(notmuch_compat_srcs) \
command-line-arguments.c\
debugger.c \
status.c \
command-line-arguments.c\
debugger.c \
status.c \
@@
-223,6
+233,7
@@
notmuch_client_srcs = \
notmuch-dump.c \
notmuch-insert.c \
notmuch-new.c \
notmuch-dump.c \
notmuch-insert.c \
notmuch-new.c \
+ notmuch-reindex.c \
notmuch-reply.c \
notmuch-restore.c \
notmuch-search.c \
notmuch-reply.c \
notmuch-restore.c \
notmuch-search.c \
@@
-242,7
+253,7
@@
notmuch_client_modules = $(notmuch_client_srcs:.c=.o)
notmuch.o: version.stamp
notmuch.o: version.stamp
-notmuch: $(notmuch_client_modules) lib/libnotmuch.a util/libutil.a parse-time-string/libparse-time-string.a
+notmuch: $(notmuch_client_modules) lib/libnotmuch.a util/lib
notmuch_
util.a parse-time-string/libparse-time-string.a
$(call quiet,CXX $(CFLAGS)) $^ $(FINAL_LIBNOTMUCH_LDFLAGS) -o $@
notmuch-shared: $(notmuch_client_modules) lib/$(LINKER_NAME)
$(call quiet,CXX $(CFLAGS)) $^ $(FINAL_LIBNOTMUCH_LDFLAGS) -o $@
notmuch-shared: $(notmuch_client_modules) lib/$(LINKER_NAME)
@@
-277,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
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
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)
DEPS := $(SRCS:%.c=.deps/%.d)
DEPS := $(DEPS:%.cc=.deps/%.d)
-include $(DEPS)