From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Emily Shaffer" <emilyshaffer@google.com>,
"Jeff Hostetler" <jeffhost@microsoft.com>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Felipe Contreras" <felipe.contreras@gmail.com>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"René Scharfe" <l.s.r@web.de>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH v2 2/3] Makefile: stop hardcoding {command,config}-list.h
Date: Tue, 29 Jun 2021 21:03:32 +0200 [thread overview]
Message-ID: <patch-2.3-983d072d52-20210629T190137Z-avarab@gmail.com> (raw)
In-Reply-To: <cover-0.3-0000000000-20210629T190137Z-avarab@gmail.com>
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 029bac01a8 (Makefile: add {program,xdiff,test,git,fuzz}-objs
& objects targets, 2021-02-23).
A follow-up commit (not part of this series) 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.
I have not tested the Windows-specific change in config.mak.uname
being made here, but we use other variables from the Makefile in the
same block, and the GENERATED_H is fully defined before we include
config.mak.uname.
Hardcoding command-list.h there seems to have been a case of
copy/paste programming in 976aaedca0 (msvc: add a Makefile target to
pre-generate the Visual Studio solution, 2019-07-29). The
config-list.h was added later in 709df95b78 (help: move
list_config_help to builtin/help, 2020-04-16).
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
Makefile | 6 ++++--
compat/vcbuild/README | 2 +-
config.mak.uname | 6 +++---
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index 7f984bce50..66f5ded3a4 100644
--- a/Makefile
+++ b/Makefile
@@ -817,6 +817,8 @@ XDIFF_LIB = xdiff/lib.a
GENERATED_H += command-list.h
GENERATED_H += config-list.h
+.PHONY: generated-hdrs
+generated-hdrs: $(GENERATED_H)
LIB_H := $(sort $(patsubst ./%,%,$(shell git ls-files '*.h' ':!t/' ':!Documentation/' 2>/dev/null || \
$(FIND) . \
@@ -2888,7 +2890,7 @@ $(SP_OBJ): %.sp: %.c GIT-CFLAGS FORCE
.PHONY: sparse $(SP_OBJ)
sparse: $(SP_OBJ)
-EXCEPT_HDRS := command-list.h config-list.h unicode-width.h compat/% xdiff/%
+EXCEPT_HDRS := $(GENERATED_H) unicode-width.h compat/% xdiff/%
ifndef GCRYPT_SHA256
EXCEPT_HDRS += sha256/gcrypt.h
endif
@@ -2911,7 +2913,7 @@ style:
git clang-format --style file --diff --extensions c,h
.PHONY: check
-check: config-list.h command-list.h
+check: $(GENERATED_H)
@if sparse; \
then \
echo >&2 "Use 'make sparse' instead"; \
diff --git a/compat/vcbuild/README b/compat/vcbuild/README
index 51fb083dbb..29ec1d0f10 100644
--- a/compat/vcbuild/README
+++ b/compat/vcbuild/README
@@ -92,7 +92,7 @@ The Steps of Build Git with VS2008
the git operations.
3. Inside Git's directory run the command:
- make command-list.h config-list.h
+ make generated-hdrs
to generate the header file needed to compile git.
4. Then either build Git with the GNU Make Makefile in the Git projects
diff --git a/config.mak.uname b/config.mak.uname
index cb443b4e02..af4c5c540e 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -722,9 +722,9 @@ vcxproj:
echo '</Project>') >git-remote-http/LinkOrCopyRemoteHttp.targets
git add -f git/LinkOrCopyBuiltins.targets git-remote-http/LinkOrCopyRemoteHttp.targets
- # Add command-list.h and config-list.h
- $(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 config-list.h command-list.h
- git add -f config-list.h command-list.h
+ # Add generated headers
+ $(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 $(GENERATED_H)
+ git add -f $(GENERATED_H)
# Add scripts
rm -f perl/perl.mak
--
2.32.0.615.g90fb4d7369
next prev parent reply other threads:[~2021-06-29 19:03 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-17 10:01 [PATCH 0/3] Makefile: misc trivial fixes Ævar Arnfjörð Bjarmason
2021-06-17 10:01 ` [PATCH 1/3] Makefile: mark "check" target as .PHONY Ævar Arnfjörð Bjarmason
2021-06-17 20:04 ` Felipe Contreras
2021-06-17 10:01 ` [PATCH 2/3] Makefile: stop hardcoding {command,config}-list.h Ævar Arnfjörð Bjarmason
2021-06-17 20:14 ` Felipe Contreras
2021-06-17 20:58 ` Ævar Arnfjörð Bjarmason
2021-06-17 21:58 ` Felipe Contreras
2021-06-18 8:05 ` Ævar Arnfjörð Bjarmason
2021-06-17 10:01 ` [PATCH 3/3] Makefile: remove an out-of-date comment Ævar Arnfjörð Bjarmason
2021-06-17 20:55 ` Felipe Contreras
2021-06-29 19:03 ` [PATCH v2 0/3] Makefile: misc trivial fixes Ævar Arnfjörð Bjarmason
2021-06-29 19:03 ` [PATCH v2 1/3] Makefile: mark "check" target as .PHONY Ævar Arnfjörð Bjarmason
2021-06-29 19:03 ` Ævar Arnfjörð Bjarmason [this message]
2021-06-29 19:03 ` [PATCH v2 3/3] Makefile: remove an out-of-date comment Ævar Arnfjörð Bjarmason
2021-06-29 19:25 ` [PATCH v2 0/3] Makefile: misc trivial fixes Felipe Contreras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=patch-2.3-983d072d52-20210629T190137Z-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=emilyshaffer@google.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jeffhost@microsoft.com \
--cc=l.s.r@web.de \
--cc=sunshine@sunshineco.com \
--cc=szeder.dev@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).