summaryrefslogtreecommitdiff
path: root/gitweb/Makefile
diff options
context:
space:
mode:
authorRamsay Jones <ramsay@ramsayjones.plus.com>2020-12-08 22:34:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-12-09 00:56:56 (GMT)
commite3a9237e8433351b8f9a45fa749b6aad3ce5164b (patch)
treec250ee2d2fd208a6be52a0944f043f10ae6a6322 /gitweb/Makefile
parent7a9272a836547d1b8e71e41e450027799fcfada0 (diff)
downloadgit-e3a9237e8433351b8f9a45fa749b6aad3ce5164b.zip
git-e3a9237e8433351b8f9a45fa749b6aad3ce5164b.tar.gz
git-e3a9237e8433351b8f9a45fa749b6aad3ce5164b.tar.bz2
gitweb/Makefile: conditionally include ../GIT-VERSION-FILE
The 'clean' target is still noticeably slow on cygwin, despite the improvements made by previous patches. For example, the second invocation of 'make clean' below: $ make clean >/dev/null 2>&1 $ make clean ... make[1]: Entering directory '/home/ramsay/git/gitweb' make[2]: Entering directory '/home/ramsay/git' make[2]: 'GIT-VERSION-FILE' is up to date. make[2]: Leaving directory '/home/ramsay/git' ... $ has been timed at 10.361s on my laptop (an old core i5-4200M @ 2.50GHz, 8GB RAM, 1TB HDD). Notice that the 'clean' target is making a nested call to the parent Makefile to ensure that the GIT-VERSION-FILE is up-to-date. This is to ensure that the $(GIT_VERSION) make variable is set, once that file had been included. However, the 'clean' target does not use the $(GIT_VERSION) variable, directly or indirectly, so it does not have any affect on what the target removes. Therefore, the time spent on ensuring an up to date GIT-VERSION-FILE is wasted effort. In order to eliminate such wasted effort, use the value of the internal $(MAKECMDGOALS) variable to only '-include ../GIT-VERSION-FILE' when the target is not 'clean'. (This drops the time down to 8.430s, on my laptop, giving an improvement of 18.64%). Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'gitweb/Makefile')
-rw-r--r--gitweb/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/gitweb/Makefile b/gitweb/Makefile
index cd194d0..f13e23c 100644
--- a/gitweb/Makefile
+++ b/gitweb/Makefile
@@ -48,7 +48,9 @@ HIGHLIGHT_BIN = highlight
../GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
$(QUIET_SUBDIR0)../ $(QUIET_SUBDIR1) GIT-VERSION-FILE
+ifneq ($(MAKECMDGOALS),clean)
-include ../GIT-VERSION-FILE
+endif
### Build rules