lib: Switch to a 3-part version number for the library interface.

[notmuch] / Makefile.local

diff --git a/Makefile.local b/Makefile.local
index 03e3237117e1a78f39787234d5caed8afecc79f7..32b8f4a8ec09dc3d61278087bb631541ab30b071 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -38,21 +38,21 @@ endif
 # 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_args = @printf $(quiet_DOC)$(eval quiet_DOC:=)"  $1              $2\n"; $($1) $2
+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 $2       $@\n"; $($1)
-quiet_args = @printf "  $1             $2\n"; $($1) $2
+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,INSTBIN,$1)
-quiet_install_data = $(call quiet_args,INSTDATA,$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)
@@ -107,7 +107,7 @@ notmuch_client_srcs =               \
 
 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 $@
+       $(call quiet,CC,$(LDFLAGS)) -Llib -lnotmuch $(notmuch_client_modules) $(FINAL_LDFLAGS) -o $@
 
 notmuch.1.gz: notmuch.1
        $(call quiet,gzip) --stdout $^ > $@