* [PATCH v2 3/5] gitweb/Makefile: conditionally include ../GIT-VERSION-FILE
@ 2020-12-07 0:34 Ramsay Jones
2020-12-07 3:26 ` Felipe Contreras
0 siblings, 1 reply; 2+ messages in thread
From: Ramsay Jones @ 2020-12-07 0:34 UTC (permalink / raw)
To: Junio C Hamano; +Cc: GIT Mailing-list
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 (on 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, so this 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>
---
gitweb/Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/gitweb/Makefile b/gitweb/Makefile
index cd194d057f..f13e23c4de 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
--
2.29.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2 3/5] gitweb/Makefile: conditionally include ../GIT-VERSION-FILE
2020-12-07 0:34 [PATCH v2 3/5] gitweb/Makefile: conditionally include ../GIT-VERSION-FILE Ramsay Jones
@ 2020-12-07 3:26 ` Felipe Contreras
0 siblings, 0 replies; 2+ messages in thread
From: Felipe Contreras @ 2020-12-07 3:26 UTC (permalink / raw)
To: Ramsay Jones; +Cc: Junio C Hamano, GIT Mailing-list
On Sun, Dec 6, 2020 at 6:37 PM Ramsay Jones <ramsay@ramsayjones.plus.com> wrote:
> 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, so this is wasted effort.
Same goes here.
--
Felipe Contreras
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-12-07 3:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-07 0:34 [PATCH v2 3/5] gitweb/Makefile: conditionally include ../GIT-VERSION-FILE Ramsay Jones
2020-12-07 3:26 ` Felipe Contreras
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).