X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile.local;h=32b8f4a8ec09dc3d61278087bb631541ab30b071;hp=135d26e8daa816d766c3fdf015cbd87e45a493bd;hb=c0961e6a827a8abcf1532a7671f09048e390648c;hpb=7b52b2c318e449c73146bd48c7f32145f158f3f5

diff --git a/Makefile.local b/Makefile.local
index 135d26e8..32b8f4a8 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -38,14 +38,22 @@ 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 = @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 $@
@@ -99,19 +107,18 @@ 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 $^ > $@
 
 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 -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 $(DESTDIR)$(prefix)/bin/)
+	$(call quiet_install_data, notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/)
 ifeq ($(MAKECMDGOALS), install)
 	@echo ""
 	@echo "Notmuch is now installed."
@@ -126,18 +133,16 @@ ifeq ($(MAKECMDGOALS), install)
 endif
 
 install-desktop:
-	install -d $(DESTDIR)$(desktop_dir)
+	$(call quiet,MKDIR) $(DESTDIR)$(desktop_dir)
 	desktop-file-install --mode 0644 --dir $(DESTDIR)$(desktop_dir) notmuch.desktop
 
 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)
 
 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