diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-03-06 08:39:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-06 08:39:52 (GMT) |
| commit | eec102524fda2df7d2846e865805ca213119bf10 (patch) | |
| tree | e60b88fc33ec9f10f175e7f6a55197fefbd103f2 /git-gui/Makefile | |
| parent | c93d88a574220c00954e3694bd78181b8b95249a (diff) | |
| parent | 0b5ea163d21163343579cd6eb9274ccc2190a0fe (diff) | |
| download | git-eec102524fda2df7d2846e865805ca213119bf10.zip git-eec102524fda2df7d2846e865805ca213119bf10.tar.gz git-eec102524fda2df7d2846e865805ca213119bf10.tar.bz2 | |
Merge branch 'master' of git://repo.or.cz/git-gui into maint
* 'master' of git://repo.or.cz/git-gui:
git-gui: Make 'make' quieter by default
git-gui: Remove unnecessary /dev/null redirection.
git-gui: Don't create empty (same tree as parent) commits.
git-gui: Add Reset to the Branch menu.
git-gui: Relocate the menu/transport menu code.
Diffstat (limited to 'git-gui/Makefile')
| -rw-r--r-- | git-gui/Makefile | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/git-gui/Makefile b/git-gui/Makefile index 66538ba..e486e8f 100644 --- a/git-gui/Makefile +++ b/git-gui/Makefile @@ -1,5 +1,8 @@ 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 @@ -19,27 +22,32 @@ ifndef INSTALL INSTALL = install endif +ifndef V + QUIET_GEN = @echo ' ' GEN $@; + QUIET_BUILT_IN = @echo ' ' BUILTIN $@; +endif + DESTDIR_SQ = $(subst ','\'',$(DESTDIR)) gitexecdir_SQ = $(subst ','\'',$(gitexecdir)) SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH)) git-gui: git-gui.sh GIT-VERSION-FILE CREDITS-FILE - rm -f $@ $@+ + $(QUIET_GEN)rm -f $@ $@+ && \ sed -n \ -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ -e 's/@@GITGUI_VERSION@@/$(GITGUI_VERSION)/g' \ -e '1,/^set gitgui_credits /p' \ - $@.sh >$@+ - cat CREDITS-FILE >>$@+ - sed -e '1,/^set gitgui_credits /d' $@.sh >>$@+ - chmod +x $@+ + $@.sh >$@+ && \ + cat CREDITS-FILE >>$@+ && \ + sed -e '1,/^set gitgui_credits /d' $@.sh >>$@+ && \ + chmod +x $@+ && \ mv $@+ $@ CREDITS-FILE: CREDITS-GEN .FORCE-CREDITS-FILE - $(SHELL_PATH) ./CREDITS-GEN + $(QUIET_GEN)$(SHELL_PATH) ./CREDITS-GEN $(GITGUI_BUILT_INS): git-gui - rm -f $@ && ln git-gui $@ + $(QUIET_BUILT_IN)rm -f $@ && ln git-gui $@ all:: $(ALL_PROGRAMS) |