X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile.local;h=361b2a021396cd8900161ae66a84e84ef475e19f;hp=9b7423edf524b9059a2b229c51031461b6859f07;hb=bb5211684654b7cf54f842990a733a64fe01d612;hpb=c20be126e5e52af9b8cdff5685124e4a867e375a

diff --git a/Makefile.local b/Makefile.local
index 9b7423ed..361b2a02 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,14 @@ 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
+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,6 +48,8 @@ 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
 
 # The user has not set any verbosity, default to quiet mode and inform the
@@ -62,7 +80,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 $@) ; \
@@ -106,8 +124,12 @@ 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 $^ > $@
@@ -117,7 +139,7 @@ install: all notmuch.1.gz
 	$(call quiet_mkdir, $(DESTDIR)$(libdir)/)
 	$(call quiet_mkdir, $(DESTDIR)$(prefix)/include/)
 	$(call quiet_mkdir, $(DESTDIR)$(prefix)/share/man/man1)
-	$(call quiet_install_bin, notmuch $(DESTDIR)$(prefix)/bin/)
+	$(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 ""
@@ -145,4 +167,4 @@ install-zsh:
 	$(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