зеркало из https://github.com/microsoft/git.git
Makefile: add missing dependencies of 'config-list.h'
We auto-generate the list of supported configuration variables from
'Documentation/config/*.txt', and that list used to be created by the
'generate-cmdlist.sh' helper script and stored in the 'command-list.h'
header. Commit 709df95b78
(help: move list_config_help to
builtin/help, 2020-04-16) extracted this into a dedicated
'generate-configlist.sh' script and 'config-list.h' header, and added
a new target in the 'Makefile' as well, but while doing so it forgot
to extract the dependencies of the latter. Consequently, since then
'config-list.h' is not re-generated when 'Documentation/config/*.txt'
is updated, while 'command-list.h' is re-generated unnecessarily:
$ touch Documentation/config/log.txt
$ make -j4
GEN command-list.h
CC help.o
AR libgit.a
Fix this and list all config-related documentation files as
dependencies of 'config-list.h' and remove them from the dependencies
of 'command-list.h'.
$ touch Documentation/config/log.txt
$ make
GEN config-list.h
CC builtin/help.o
LINK git
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
48bf2fa8ba
Коммит
56550ea718
4
Makefile
4
Makefile
|
@ -2186,13 +2186,13 @@ $(BUILT_INS): git$X
|
||||||
|
|
||||||
config-list.h: generate-configlist.sh
|
config-list.h: generate-configlist.sh
|
||||||
|
|
||||||
config-list.h:
|
config-list.h: Documentation/*config.txt Documentation/config/*.txt
|
||||||
$(QUIET_GEN)$(SHELL_PATH) ./generate-configlist.sh \
|
$(QUIET_GEN)$(SHELL_PATH) ./generate-configlist.sh \
|
||||||
>$@+ && mv $@+ $@
|
>$@+ && mv $@+ $@
|
||||||
|
|
||||||
command-list.h: generate-cmdlist.sh command-list.txt
|
command-list.h: generate-cmdlist.sh command-list.txt
|
||||||
|
|
||||||
command-list.h: $(wildcard Documentation/git*.txt) Documentation/*config.txt Documentation/config/*.txt
|
command-list.h: $(wildcard Documentation/git*.txt)
|
||||||
$(QUIET_GEN)$(SHELL_PATH) ./generate-cmdlist.sh \
|
$(QUIET_GEN)$(SHELL_PATH) ./generate-cmdlist.sh \
|
||||||
$(patsubst %,--exclude-program %,$(EXCLUDED_PROGRAMS)) \
|
$(patsubst %,--exclude-program %,$(EXCLUDED_PROGRAMS)) \
|
||||||
command-list.txt >$@+ && mv $@+ $@
|
command-list.txt >$@+ && mv $@+ $@
|
||||||
|
|
Загрузка…
Ссылка в новой задаче