Fix an issue in my cfe853e66be (hook-list.h: add a generated list of hooks, like config-list.h, 2021-09-26), the builtin/help.c was inadvertently made to depend on hook-list.h, but it's used by builtin/bugreport.c.
The hook.c also does not depend on hook-list.h. It did in an earlier version of the greater series cfe853e66be was extracted from, but not anymore. We might end up needing that line again, but let's remove it for now.
Reported-by: Mike Hommey <mh@glandium.org> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> ---
As noted in [1] this is the first of smaller topics that split-up and replace the ab/make-dependency topic. Range-to the previous start of the series below. The v4 of the old series is at [2].
For this commit there were no changes or outstanding comments, except that in [3] it was suggested that this more isolated fix by split-up from the rest.
1. https://lore.kernel.org/git/211217.86a6h09km9.gmgdl@evledraar.gmail.com/ 2. https://lore.kernel.org/git/cover-v4-00.23-00000000000-20211117T101807Z-avarab@gmail.com/ 3. https://lore.kernel.org/git/0e3e3a4f-f6af-d8df-8973-255ed7b1b7ef@github.com/
Range-diff:
1: 1621ca72c1d < -: ----------- Makefile: don't invoke msgfmt with --statistics
2: b7c36c9fea0 < -: ----------- Makefile: don't set up "perl/build" rules under NO_PERL=Y
3: 29b000eb0f1 < -: ----------- Makefile: use "=" not ":=" for po/* and perl/*
4: daead5ec293 < -: ----------- Makefile: clean perl/build/ even with NO_PERL=Y
5: 3c987590740 < -: ----------- Makefile: remove "mv $@ $@+" dance redundant to .DELETE_ON_ERROR
6: b57f582ccd3 < -: ----------- Makefile: guard Perl-only variable assignments
7: fcdee92f64c < -: ----------- Makefile: change "ifndef NO_PERL" to "ifdef NO_PERL"
8: 1e25b532ca2 < -: ----------- Makefile: adjust Perl-related comments & whitespace
9: 77d9855bfcf < -: ----------- Makefile: correct "GIT-PERL-{DEFINES,HEADER}" dependency graph
10: 6004cdcd8d9 < -: ----------- Makefile: create a GIT-PYTHON-DEFINES, like "PERL"
11: 17b30e96057 < -: ----------- Makefile: stop needing @@GIT_VERSION@@ in *.perl scripts
12: 30ddf7da2c8 < -: ----------- Makefiles: add "shared.mak", move ".DELETE_ON_ERROR" to it
13: f378a7dc35e < -: ----------- Makefile: move $(comma), $(empty) and $(space) to shared.mak
14: 13cbb851d32 < -: ----------- Makefile: re-add and use the "shellquote" macros
15: 337953e4994 < -: ----------- Makefile: add a "TRACK_template" for GIT-*{FLAGS,DEFINES,...}
16: 5bb597c1993 < -: ----------- Makefile: add "$(QUIET)" boilerplate to shared.mak
17: 3c4d0589667 < -: ----------- Makefile: use $(wspfx) for $(QUIET...) in shared.mak
18: be5882b2c99 < -: ----------- Makefiles: add and use wildcard "mkdir -p" template
19: 2710f8af6cd = 1: 1fafa6c643b Makefile: correct the dependency graph of hook-list.h
20: 59f22a0269a < -: ----------- Makefile: use $(file) I/O instead of "FORCE" when possible
21: dd569a59c74 < -: ----------- Makefile: disable GNU make built-in wildcard rules
22: 4168a7e3b30 < -: ----------- Makefile: define $(LIB_H) in terms of $(FIND_SOURCE_FILES)
23: 48a3927d972 < -: ----------- Makefile: move ".SUFFIXES" rule to shared.makMakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Show changes to Makefile +2 −2
diff --git a/Makefile b/Makefile index 9c00a793e47..710e7db89bf 100644 --- a/Makefile +++ b/Makefile @@ -2222,9 +2222,9 @@ git$X: git.o GIT-LDFLAGS $(BUILTIN_OBJS) $(GITLIBS) $(filter %.o,$^) $(LIBS) help.sp help.s help.o: command-list.h -hook.sp hook.s hook.o: hook-list.h +builtin/bugreport.sp builtin/bugreport.s builtin/bugreport.o: hook-list.h -builtin/help.sp builtin/help.s builtin/help.o: config-list.h hook-list.h GIT-PREFIX +builtin/help.sp builtin/help.s builtin/help.o: config-list.h GIT-PREFIX builtin/help.sp builtin/help.s builtin/help.o: EXTRA_CPPFLAGS = \ '-DGIT_HTML_PATH="$(htmldir_relative_SQ)"' \ '-DGIT_MAN_PATH="$(mandir_relative_SQ)"' \
-- 2.34.1.1119.g7a3fc8778ee