Increment version to 0.1.1

[notmuch] / Makefile.local

diff --git a/Makefile.local b/Makefile.local
index c7f4719a7e110e74891b3bf8834dd47e8a209cb8..b35cbdd8fe7513c72488c16ffad0d242e7a374d7 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -1,3 +1,17 @@
+# -*- makefile -*-
+
+# Here's the (hopefully simple) versioning scheme.
+#
+# Releases of notmuch have a two-digit version (0.1, 0.2, etc.). We
+# increment the second digit for each release and increment the first
+# 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.
+NOTMUCH_VERSION=0.1.1
+
 # Get settings from the output of configure by running it to generate
 # Makefile.config if it doesn't exist yet. And add Makefile.config to
 # our global dependency list.
@@ -18,12 +32,15 @@ extra_cflags :=
 extra_cxxflags :=
 
 # Smash together user's values with our extra values
-FINAL_CFLAGS = $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags)
+FINAL_CFLAGS = -DNOTMUCH_VERSION=$(NOTMUCH_VERSION) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags)
 FINAL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags)
 FINAL_LDFLAGS = $(LDFLAGS) $(CONFIGURE_LDFLAGS)
 
+.PHONY: all
 all: notmuch notmuch-shared notmuch.1.gz
 ifeq ($(MAKECMDGOALS),)
+ifeq ($(shell cat .first-build-message),)
+       @NOTMUCH_FIRST_BUILD=1 $(MAKE) --no-print-directory all
        @echo ""
        @echo "Compilation of notmuch is now complete. You can install notmuch with:"
        @echo ""
@@ -32,8 +49,15 @@ ifeq ($(MAKECMDGOALS),)
        @echo "Note that depending on the prefix to which you are installing"
        @echo "you may need root permission (such as \"sudo make install\")."
        @echo "See \"./configure --help\" for help on setting an alternate prefix."
+       @echo Printed > .first-build-message
+endif
 endif
 
+.PHONY: dist
+dist:
+       git archive --format=tar --prefix=notmuch-$(NOTMUCH_VERSION)/ HEAD | gzip > notmuch-$(NOTMUCH_VERSION).tar.gz
+       @echo "Source is ready for release in notmuch-$(NOTMUCH_VERSION).tar.gz"
+
 # The user has not set any verbosity, default to quiet mode and inform the
 # user how to enable verbose compiles.
 ifeq ($(V),)
@@ -62,7 +86,7 @@ quiet_symlink = $(call quiet_args,SYMLINK,$1)
        $(call quiet,CC,$(CFLAGS)) -c $(FINAL_CFLAGS) $< -o $@
 
 %.elc: %.el
-       $(call quiet,EMACS) -batch -f batch-byte-compile $<
+       $(call quiet,EMACS) --directory emacs -batch -f batch-byte-compile $<
 
 .deps/%.d: %.c $(global_deps)
        @set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
@@ -116,6 +140,7 @@ notmuch-shared: $(notmuch_client_modules) lib/libnotmuch.so
 notmuch.1.gz: notmuch.1
        $(call quiet,gzip) --stdout $^ > $@
 
+.PHONY: install
 install: all notmuch.1.gz
        $(call quiet_mkdir, $(DESTDIR)$(prefix)/bin/)
        $(call quiet_mkdir, $(DESTDIR)$(libdir)/)
@@ -136,14 +161,17 @@ ifeq ($(MAKECMDGOALS), install)
        @echo ""
 endif
 
+.PHONY: install-desktop
 install-desktop:
        $(call quiet,MKDIR) $(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)