X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile.local;h=f9fca0fa26680a18b1c846383ae9581af2ebed8d;hp=aa822f6aae26d8d8fbadc3e7465644f11d03a9e6;hb=04e816416fb9f5b6447896ccdb153a6f93c3e949;hpb=ab95219a2fe3b7e3a019b98651e7cd7f36e411b3

diff --git a/Makefile.local b/Makefile.local
index aa822f6a..f9fca0fa 100644
--- 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
+
 # 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)
 
-all: notmuch notmuch.1.gz
+.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,20 +49,35 @@ 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),)
 quiet_DOC := "Use \"$(MAKE) V=1\" to see the verbose compile lines.\n"
-quiet = @printf $(quiet_DOC)$(eval quiet_DOC:=)"  $1 $2	$@\n"; $($1)
+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
 endif
 # The user has explicitly enabled quiet compilation.
 ifeq ($(V),0)
-quiet = @printf "  $1	$@\n"; $($1)
+quiet = @printf "  %12s $@\n" "$1 $2"; $($1)
+quiet_args = @printf "  %12s$2\n" $1; $($1) $2
 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)
 
 %.o: %.cc $(global_deps)
 	$(call quiet,CXX,$(CXXFLAGS)) -c $(FINAL_CXXFLAGS) $< -o $@
@@ -54,7 +86,7 @@ quiet ?= $($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 $@) ; \
@@ -98,25 +130,24 @@ notmuch_client_srcs =		\
 	json.c
 
 notmuch_client_modules = $(notmuch_client_srcs:.c=.o)
-notmuch: $(notmuch_client_modules) lib/libnotmuch.so
-	$(call quiet,CC,$(LDFLAGS)) -Llib -lnotmuch $(filter-out lib/libnotmuch.so,$^) $(FINAL_LDFLAGS) -o $@
+
+notmuch: $(notmuch_client_modules) lib/libnotmuch.a
+	$(call quiet,CC,$(LDFLAGS)) $^ $(FINAL_LDFLAGS) -o $@
+
+notmuch-shared: $(notmuch_client_modules) lib/libnotmuch.so
+	$(call quiet,CC,$(LDFLAGS)) -Llib -lnotmuch $(notmuch_client_modules) $(FINAL_LDFLAGS) -o $@
 
 notmuch.1.gz: notmuch.1
 	$(call quiet,gzip) --stdout $^ > $@
 
-SONAME = libnotmuch.so.1
-
+.PHONY: install
 install: all notmuch.1.gz
-	for d in $(DESTDIR)$(prefix)/bin/ $(DESTDIR)$(libdir)/ \
-		$(DESTDIR)$(prefix)/include/ $(DESTDIR)$(prefix)/share/man/man1 ; \
-	do \
-		install -d $$d ; \
-	done ;
-	install notmuch $(DESTDIR)$(prefix)/bin/
-	install lib/$(SONAME) $(DESTDIR)$(libdir)/
-	install lib/notmuch.h $(DESTDIR)$(prefix)/include/
-	ln -sf $(SONAME) $(DESTDIR)$(libdir)/libnotmuch.so
-	install -m0644 notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/
+	$(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/)
 ifeq ($(MAKECMDGOALS), install)
 	@echo ""
 	@echo "Notmuch is now installed."
@@ -130,19 +161,20 @@ ifeq ($(MAKECMDGOALS), install)
 	@echo ""
 endif
 
+.PHONY: install-desktop
 install-desktop:
-	install -d $(DESTDIR)$(desktop_dir)
+	$(call quiet,MKDIR) $(DESTDIR)$(desktop_dir)
 	desktop-file-install --mode 0644 --dir $(DESTDIR)$(desktop_dir) notmuch.desktop
 
+.PHONY: install-bash
 install-bash:
-	install -d $(DESTDIR)$(bash_completion_dir)
-	install -m0644 contrib/notmuch-completion.bash \
-		$(DESTDIR)$(bash_completion_dir)/notmuch
+	$(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:
-	install -d $(DESTDIR)$(zsh_completion_dir)
-	install -m0644 contrib/notmuch-completion.zsh \
-		$(DESTDIR)$(zsh_completion_dir)/notmuch
+	$(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_client_modules) notmuch.elc notmuch.1.gz
+CLEAN := $(CLEAN) notmuch notmuch-shared $(notmuch_client_modules) notmuch.elc notmuch.1.gz