Skip to content

Commit 7c3c0a9

Browse files
avargitster
authored andcommitted
Makefile: stop hardcoding {command,config}-list.h
Change various places that hardcode the names of these two files to refer to either $(GENERATED_H), or to a new generated-hdrs target. That target is consistent with the *-objs targets I recently added in 029bac0 (Makefile: add {program,xdiff,test,git,fuzz}-objs & objects targets, 2021-02-23). A subsequent commit will add a new generated hook-list.h. By doing this refactoring we'll only need to add the new file to the GENERATED_H variable, not EXCEPT_HDRS, the vcbuild/README etc. Hardcoding command-list.h there seems to have been a case of copy/paste programming in 976aaed (msvc: add a Makefile target to pre-generate the Visual Studio solution, 2019-07-29). The config-list.h was added later in 709df95 (help: move list_config_help to builtin/help, 2020-04-16). Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent ea47e59 commit 7c3c0a9

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -817,6 +817,8 @@ XDIFF_LIB = xdiff/lib.a
817817

818818
GENERATED_H += command-list.h
819819
GENERATED_H += config-list.h
820+
.PHONY: generated-hdrs
821+
generated-hdrs: $(GENERATED_H)
820822

821823
LIB_H := $(sort $(patsubst ./%,%,$(shell git ls-files '*.h' ':!t/' ':!Documentation/' 2>/dev/null || \
822824
$(FIND) . \
@@ -2903,7 +2905,7 @@ $(SP_OBJ): %.sp: %.c GIT-CFLAGS FORCE
29032905
.PHONY: sparse $(SP_OBJ)
29042906
sparse: $(SP_OBJ)
29052907

2906-
EXCEPT_HDRS := command-list.h config-list.h unicode-width.h compat/% xdiff/%
2908+
EXCEPT_HDRS := $(GENERATED_H) unicode-width.h compat/% xdiff/%
29072909
ifndef GCRYPT_SHA256
29082910
EXCEPT_HDRS += sha256/gcrypt.h
29092911
endif
@@ -2926,7 +2928,7 @@ style:
29262928
git clang-format --style file --diff --extensions c,h
29272929

29282930
.PHONY: check
2929-
check: config-list.h command-list.h
2931+
check: $(GENERATED_H)
29302932
@if sparse; \
29312933
then \
29322934
echo >&2 "Use 'make sparse' instead"; \

compat/vcbuild/README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ The Steps of Build Git with VS2008
9292
the git operations.
9393

9494
3. Inside Git's directory run the command:
95-
make command-list.h config-list.h
95+
make generated-hdrs
9696
to generate the header file needed to compile git.
9797

9898
4. Then either build Git with the GNU Make Makefile in the Git projects

config.mak.uname

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -735,9 +735,9 @@ vcxproj:
735735
echo '</Project>') >git-remote-http/LinkOrCopyRemoteHttp.targets
736736
git add -f git/LinkOrCopyBuiltins.targets git-remote-http/LinkOrCopyRemoteHttp.targets
737737

738-
# Add command-list.h and config-list.h
739-
$(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 config-list.h command-list.h
740-
git add -f config-list.h command-list.h
738+
# Add generated headers
739+
$(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 $(GENERATED_H)
740+
git add -f $(GENERATED_H)
741741

742742
# Add scripts
743743
rm -f perl/perl.mak

0 commit comments

Comments
 (0)