[PATCH v2 0/3] Makefile: misc trivial fixes
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Jun 29, 2021, 19:03 UTC
- Message-ID
- <cover-0.3-0000000000-20210629T190137Z-avarab@gmail.com>
- In-Reply-To
- <cover-0.3-0000000000-20210617T095827Z-avarab@gmail.com>
A base topic for some larger changes. See the v1 CL for a summary: http://lore.kernel.org/git/cover-0.3-0000000000-20210617T095827Z-avarab@gmail.com
The only changes since v1 are to commit message issues pointed out by Felipe and a trivial whitespace change. I also updated the commit message of 2/3 as he suggested to point out why the change is being made.
Ævar Arnfjörð Bjarmason (3):
Makefile: mark "check" target as .PHONY
Makefile: stop hardcoding {command,config}-list.h
Makefile: remove an out-of-date commentMakefile | 14 +++++--------- compat/vcbuild/README | 2 +- config.mak.uname | 6 +++--- 3 files changed, 9 insertions(+), 13 deletions(-)
Range-diff against v1:
-: ---------- > 1: 27c94247f8 Makefile: mark "check" target as .PHONY
1: 6e164edb0b ! 2: 983d072d52 Makefile: stop hardcoding {command,config}-list.h
@@ Commit message
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 dce7d29551 (msvc: support building Git using
- MS Visual C++, 2019-06-25). The config-list.h was added later in
- 709df95b78 (help: move list_config_help to builtin/help, 2020-04-16).
+ 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>
2: ddae86802e ! 3: 44a4781218 Makefile: remove an out-of-date comment
@@ Commit message
The rest of it was also somewhere between inaccurate and outdated,
since as of b8ba629264 (Makefile: fold MISC_H into LIB_H, 2012-06-20)
it's not followed by a list of header files, that got moved earlier in
- the file into LIB_H in b8ba629264 (Makefile: fold MISC_H into LIB_H,
- 2012-06-20).
+ the file into LIB_H in 60d24dd255 (Makefile: fold XDIFF_H and VCSSVN_H
+ into LIB_H, 2012-07-06).
Let's just remove it entirely, to the extent that we have anything
useful to say here the comment on the
@@ Makefile: ifneq ($(dep_files_present),)
-# Dependencies on automatically generated headers such as command-list.h
-# should _not_ be included here, since they are necessary even when
-# building an object for the first time.
-
+-
$(OBJECTS): $(LIB_H) $(GENERATED_H)
endif
+ -- 2.32.0.615.g90fb4d7369