X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile.local;h=71525e2c5a07c02bb855ea5b282f78d6d55c888d;hp=bda9ede1ce269005bfcabe6302d8d57f8a9a2019;hb=09aaff13245457f6fcb5c6c5b7d9fdef69567a23;hpb=8782bd926e9cc5c3ea42a7dff6bd5870023d3d54 diff --git a/Makefile.local b/Makefile.local index bda9ede1..71525e2c 100644 --- a/Makefile.local +++ b/Makefile.local @@ -7,11 +7,10 @@ # digit when we reach particularly major milestones of usability. # # Between releases, (such as when compiling notmuch from the git -# repository), we add a third digit, (0.1.1, 0.1.2, etc.), and -# increment it occasionally, (such as after a big batch of commits are -# merged. +# repository), we let git to append identification of the actual +# commit. PACKAGE=notmuch -VERSION=0.1.1 +VERSION:=$(shell if [ -f version ]; then cat version; else git describe --match '[0-9].[0-9]*'; fi) RELEASE_HOST=notmuchmail.org RELEASE_DIR=/srv/notmuchmail.org/www/releases @@ -42,7 +41,8 @@ extra_cxxflags := # Smash together user's values with our extra values FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags) FINAL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags) -FINAL_LDFLAGS = $(LDFLAGS) $(CONFIGURE_LDFLAGS) +FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Llib -lnotmuch +FINAL_LIBNOTMUCH_LDFLAGS = $(LDFLAGS) $(CONFIGURE_LDFLAGS) .PHONY: all all: notmuch notmuch-shared notmuch.1.gz @@ -62,7 +62,11 @@ endif endif $(TAR_FILE): - git archive --format=tar --prefix=$(PACKAGE)-$(VERSION)/ HEAD | gzip > $(TAR_FILE) + git archive --format=tar --prefix=$(PACKAGE)-$(VERSION)/ HEAD > $(TAR_FILE).tmp + echo $(VERSION) > version + tar --append -f $(TAR_FILE).tmp --transform s_^_$(PACKAGE)-$(VERSION)/_ version + rm version + gzip < $(TAR_FILE).tmp > $(TAR_FILE) @echo "Source is ready for release in $(TAR_FILE)" $(SHA1_FILE): $(TAR_FILE) @@ -80,7 +84,11 @@ dist: $(TAR_FILE) .PHONY: release release: release-verify-newer $(MAKE) release-upload + @echo "Please send a release announcement as follows:" + @echo "" $(MAKE) release-message + $(MAKE) release-message > $(PACKAGE)-$(VERSION).announce + @echo "(This message is also available in $(PACKAGE)-$(VERSION).announce" .PHONY: release-upload release-upload: $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) @@ -93,12 +101,10 @@ release-upload: $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) .PHONY: release-message release-message: - @echo "Please send a release announcement as follows:" - @echo "" @echo "To: notmuch@notmuchmail.org" @echo "Subject: $(PACKAGE) release $(VERSION) now available" @echo "" - @echo "Where to obtain $(PACKAGE) $(VERSION)" + @echo "Where to obtain notmuch $(VERSION)" @echo "===========================" @echo " $(RELEASE_URL)/$(TAR_FILE)" @echo "" @@ -110,6 +116,20 @@ release-message: @echo "" @echo " $(RELEASE_URL)/$(GPG_FILE)" @echo " (signed by `getent passwd "$$USER" | cut -d: -f 5 | cut -d, -f 1`)" + @echo "" + @echo "What's new in notmuch $(VERSION)" + @echo "=========================" + @sed -ne '/^[Nn]otmuch 0.1/{n;n;b NEWS}; d; :NEWS /^===/q; {p;n;b NEWS}' < NEWS | head -n -2 + @echo "" + @echo "What is notmuch" + @echo "===============" + @echo "Notmuch is a system for indexing, searching, reading, and tagging" + @echo "large collections of email messages in maildir or mh format. It uses" + @echo "the Xapian library to provide fast, full-text search with a convenient" + @echo "search syntax." + @echo "" + @echo "For more about notmuch, see http://notmuchmail.org" + .PHONY: release-verify-version release-verify-version: @@ -132,31 +152,20 @@ release-verify-newer: release-verify-version # 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:=)" %12s $@\n" "$1 $2"; $($1) -quiet_args = @printf $(quiet_DOC)$(eval quiet_DOC:=)" %12s$2\n" $1; $($1) $2 +quiet = @printf $(quiet_DOC)$(eval quiet_DOC:=)"$1 $@\n"; $($(shell echo $1 | sed -e s'/ .*//')) endif # The user has explicitly enabled quiet compilation. ifeq ($(V),0) -quiet = @printf " %12s $@\n" "$1 $2"; $($1) -quiet_args = @printf " %12s$2\n" $1; $($1) $2 +quiet = @printf "$1 $@\n"; $($(shell echo $1 | sed -e s'/ .*//')) endif # Otherwise, print the full command line. -quiet ?= $($1) -quiet_args ?= $($1) $2 - -quiet_mkdir = $(call quiet_args,MKDIR,$1) -quiet_install_bin = $(call quiet_args,INSTALL-BIN,$1) -quiet_install_data = $(call quiet_args,INSTALL-DATA,$1) -quiet_symlink = $(call quiet_args,SYMLINK,$1) +quiet ?= $($(shell echo $1 | sed -e s'/ .*//')) %.o: %.cc $(global_deps) - $(call quiet,CXX,$(CXXFLAGS)) -c $(FINAL_CXXFLAGS) $< -o $@ + $(call quiet,CXX $(CXXFLAGS)) -c $(FINAL_CXXFLAGS) $< -o $@ %.o: %.c $(global_deps) - $(call quiet,CC,$(CFLAGS)) -c $(FINAL_CFLAGS) $< -o $@ - -%.elc: %.el - $(call quiet,EMACS) --directory emacs -batch -f batch-byte-compile $< + $(call quiet,CC $(CFLAGS)) -c $(FINAL_CFLAGS) $< -o $@ .deps/%.d: %.c $(global_deps) @set -e; rm -f $@; mkdir -p $$(dirname $@) ; \ @@ -178,6 +187,11 @@ DEPS := $(DEPS:%.cc=.deps/%.d) clean: rm -f $(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 + notmuch_client_srcs = \ $(notmuch_compat_srcs) \ debugger.c \ @@ -202,49 +216,35 @@ notmuch_client_srcs = \ notmuch_client_modules = $(notmuch_client_srcs:.c=.o) notmuch: $(notmuch_client_modules) lib/libnotmuch.a - $(call quiet,CC,$(LDFLAGS)) $^ $(FINAL_LDFLAGS) -o $@ + $(call quiet,CC $(CFLAGS)) $^ $(FINAL_LIBNOTMUCH_LDFLAGS) -o $@ notmuch-shared: $(notmuch_client_modules) lib/libnotmuch.so - $(call quiet,CC,$(LDFLAGS)) -Llib -lnotmuch $(notmuch_client_modules) $(FINAL_LDFLAGS) -o $@ + $(call quiet,CC $(CFLAGS)) $(notmuch_client_modules) $(FINAL_NOTMUCH_LDFLAGS) -o $@ notmuch.1.gz: notmuch.1 - $(call quiet,gzip) --stdout $^ > $@ + gzip --stdout $^ > $@ .PHONY: install install: all notmuch.1.gz - $(call quiet_mkdir, $(DESTDIR)$(prefix)/bin/) - $(call quiet_mkdir, $(DESTDIR)$(libdir)/) - $(call quiet_mkdir, $(DESTDIR)$(prefix)/include/) - $(call quiet_mkdir, $(DESTDIR)$(prefix)/share/man/man1) - $(call quiet_install_bin, notmuch-shared $(DESTDIR)$(prefix)/bin/notmuch) - $(call quiet_install_data, notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/) + mkdir -p $(DESTDIR)$(mandir)/man1 + install -m0644 notmuch.1.gz $(DESTDIR)$(mandir)/man1/ + mkdir -p $(DESTDIR)$(prefix)/bin/ + install notmuch-shared $(DESTDIR)$(prefix)/bin/notmuch ifeq ($(MAKECMDGOALS), install) @echo "" - @echo "Notmuch is now installed." + @echo "Notmuch is now installed to $(DESTDIR)$(prefix)" @echo "" - @echo "You may now want to install additional components to support using notmuch" - @echo "together with other software packages:" + @echo "To run notmuch from emacs, each user should add the following line to ~/.emacs:" @echo "" - @echo " make install-emacs" - @echo " make install-bash" - @echo " make install-zsh" + @echo " (require 'notmuch)" @echo "" + @echo "And should then run \"M-x notmuch\" from within emacs or run \"emacs -f notmuch\"" endif .PHONY: install-desktop install-desktop: - $(call quiet,MKDIR) $(DESTDIR)$(desktop_dir) + mkdir -p $(DESTDIR)$(desktop_dir) desktop-file-install --mode 0644 --dir $(DESTDIR)$(desktop_dir) notmuch.desktop -.PHONY: install-bash -install-bash: - $(call quiet-mkdir, $(DESTDIR)$(bash_completion_dir)) - $(call quiet_install_data, contrib/notmuch-completion.bash $(DESTDIR)$(bash_completion_dir)/notmuch) - -.PHONY: install-zsh -install-zsh: - $(call quiet_mkdir, $(DESTDIR)$(zsh_completion_dir)) - $(call quiet_install_data, contrib/notmuch-completion.zsh $(DESTDIR)$(zsh_completion_dir)/notmuch) - SRCS := $(SRCS) $(notmuch_client_srcs) CLEAN := $(CLEAN) notmuch notmuch-shared $(notmuch_client_modules) notmuch.elc notmuch.1.gz