Skip to content

Commit 56550ea

Browse files
szedergitster
authored andcommitted
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 709df95 (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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 48bf2fa commit 56550ea

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2186,13 +2186,13 @@ $(BUILT_INS): git$X
21862186

21872187
config-list.h: generate-configlist.sh
21882188

2189-
config-list.h:
2189+
config-list.h: Documentation/*config.txt Documentation/config/*.txt
21902190
$(QUIET_GEN)$(SHELL_PATH) ./generate-configlist.sh \
21912191
>$@+ && mv $@+ $@
21922192

21932193
command-list.h: generate-cmdlist.sh command-list.txt
21942194

2195-
command-list.h: $(wildcard Documentation/git*.txt) Documentation/*config.txt Documentation/config/*.txt
2195+
command-list.h: $(wildcard Documentation/git*.txt)
21962196
$(QUIET_GEN)$(SHELL_PATH) ./generate-cmdlist.sh \
21972197
$(patsubst %,--exclude-program %,$(EXCLUDED_PROGRAMS)) \
21982198
command-list.txt >$@+ && mv $@+ $@

0 commit comments

Comments
 (0)