From: Junio C Hamano <junkio@cox.net>
Date: Tue, 13 Mar 2007 06:14:07 +0000 (-0700)
Subject: Merge branch 'master' of git://repo.or.cz/git-gui
X-Git-Tag: v1.5.1-rc1~41
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=27ebd6e0443bdd795869f598ecebc9eadd64a26c;p=git.git

Merge branch 'master' of git://repo.or.cz/git-gui

* 'master' of git://repo.or.cz/git-gui:
  git-gui: Support of "make -s" in: do not output anything of the build itself
---

27ebd6e0443bdd795869f598ecebc9eadd64a26c
diff --cc git-gui/Makefile
index d74fca287,000000000..b82789ead
mode 100644,000000..100644
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
@@@ -1,64 -1,0 +1,69 @@@
 +all::
 +
 +# Define V=1 to have a more verbose compile.
 +#
 +
 +GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
 +	@$(SHELL_PATH) ./GIT-VERSION-GEN
 +-include GIT-VERSION-FILE
 +
 +SCRIPT_SH = git-gui.sh
 +GITGUI_BUILT_INS = git-citool
 +ALL_PROGRAMS = $(GITGUI_BUILT_INS) $(patsubst %.sh,%,$(SCRIPT_SH))
 +
 +ifndef SHELL_PATH
 +	SHELL_PATH = /bin/sh
 +endif
 +
 +ifndef gitexecdir
 +	gitexecdir := $(shell git --exec-path)
 +endif
 +
 +ifndef INSTALL
 +	INSTALL = install
 +endif
 +
 +ifndef V
 +	QUIET_GEN      = @echo '   ' GEN $@;
 +	QUIET_BUILT_IN = @echo '   ' BUILTIN $@;
 +endif
 +
++ifeq ($(findstring $(MAKEFLAGS),s),s)
++QUIET_GEN =
++QUIET_BUILT_IN =
++endif
++
 +DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
 +gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
 +SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
 +
 +$(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
 +	$(QUIET_GEN)rm -f $@ $@+ && \
 +	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
 +		-e 's/@@GITGUI_VERSION@@/$(GITGUI_VERSION)/g' \
 +		$@.sh >$@+ && \
 +	chmod +x $@+ && \
 +	mv $@+ $@
 +
 +$(GITGUI_BUILT_INS): git-gui
 +	$(QUIET_BUILT_IN)rm -f $@ && ln git-gui $@
 +
 +# These can record GITGUI_VERSION
 +$(patsubst %.sh,%,$(SCRIPT_SH)): GIT-VERSION-FILE
 +
 +all:: $(ALL_PROGRAMS)
 +
 +install: all
 +	$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'
 +	$(INSTALL) git-gui '$(DESTDIR_SQ)$(gitexecdir_SQ)'
 +	$(foreach p,$(GITGUI_BUILT_INS), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git-gui' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
 +
 +dist-version:
 +	@mkdir -p $(TARDIR)
 +	@echo $(GITGUI_VERSION) > $(TARDIR)/version
 +
 +clean::
 +	rm -f $(ALL_PROGRAMS) GIT-VERSION-FILE
 +
 +.PHONY: all install dist-version clean
 +.PHONY: .FORCE-GIT-VERSION-FILE