git-gui: Make 'make' quieter by default

To fit nicely into the output of the git.git project's own quieter
Makefile, we want to make the git-gui Makefile nice and quiet too.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/Makefile b/Makefile
index 66538ba1adb9d50b80288f9ae3c0df77758059aa..e486e8f9843ed48f06e667cfa5659e51e5a0e4d1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,8 @@
 all::
 
 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
 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
 
        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
 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' \
        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
        mv $@+ $@
 
 CREDITS-FILE: CREDITS-GEN .FORCE-CREDITS-FILE

-       $(SHELL_PATH) ./CREDITS-GEN
+       $(QUIET_GEN)$(SHELL_PATH) ./CREDITS-GEN

 
 $(GITGUI_BUILT_INS): git-gui
 
 $(GITGUI_BUILT_INS): git-gui

-       rm -f $@ && ln git-gui $@
+       $(QUIET_BUILT_IN)rm -f $@ && ln git-gui $@

 
 all:: $(ALL_PROGRAMS)
 
 
 all:: $(ALL_PROGRAMS)