Skip to contentSkip to conversation

Documentation: Fix git.7 dependencies.

PATCH In review Santi Béjar 2 participants 5 messages Jun 15, 2016 Documentation

lore
Share & tools
lore

Santi Béjar

author
#0 lore raw

PATCH 1/1 Documentation: Fix git.7 dependencies.

Signed-off-by Santi Béjar <[email protected]>
---
 Documentation/Makefile |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Documentation/Makefile +2 -2
index 96755ad..c258d09 100644
@@ -78,10 +78,10 @@ cmds_txt = cmds-ancillaryinterrogators.txt \
 	cmds-plumbingmanipulators.txt \
 	cmds-synchingrepositories.txt
 
-$(cmds_txt): cmd-list.perl $(MAN1_TXT) $(MAN7_TXT)
+$(cmds_txt): cmd-list.perl $(MAN1_TXT)
 	perl ./cmd-list.perl
 
-git.7 git.html: git.txt core-intro.txt
+git.7 git.html: git.txt core-intro.txt $(cmds_txt)
 
 clean:
 	rm -f *.xml *.html *.1 *.7 howto-index.txt howto/*.html doc.dep
Signature · 1 line
1.5.0.rc1.g4b66a
#1 lore raw
Quoted 4 lines · Santi Béjar
Signed-off-by Santi Béjar <[email protected]>
---
 Documentation/Makefile |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Thanks.

Documentation/Makefile cmds_txt = cmds-ancillaryinterrogators.txt \ · line 82

Quoted 11 lines
Documentation/Makefile +1 -1
index 96755ad..c258d09 100644
@@ -78,10 +78,10 @@ cmds_txt = cmds-ancillaryinterrogators.txt \
 	cmds-plumbingmanipulators.txt \
 	cmds-synchingrepositories.txt
 
-$(cmds_txt): cmd-list.perl $(MAN1_TXT) $(MAN7_TXT)
+$(cmds_txt): cmd-list.perl $(MAN1_TXT)
 	perl ./cmd-list.perl

I think this is correct, as mine creates a circular dependency between git.txt -> cmds-*.txt -> git.txt.

Documentation/Makefile cmds_txt = cmds-ancillaryinterrogators.txt \ · line 84

Quoted 2 lines
Documentation/Makefile +1 -1
-git.7 git.html: git.txt core-intro.txt
+git.7 git.html: git.txt core-intro.txt $(cmds_txt)

I do not think this is needed; doesn't doc.dep catch cmds_txt as well?

author
#2 lore raw
Quoted 5 lines · Junio C Hamano

Documentation/Makefile cmds_txt = cmds-ancillaryinterrogators.txt \ · line 84

Quoted 2 lines
Documentation/Makefile +1 -1
-git.7 git.html: git.txt core-intro.txt
+git.7 git.html: git.txt core-intro.txt $(cmds_txt)

I do not think this is needed; doesn't doc.dep catch cmds_txt as well?

It's not needed. I didn't see the doc.dep.

Santi

#3 lore raw
Quoted 8 lines · Santi Béjar
Quoted 5 lines · Junio C Hamano

Documentation/Makefile cmds_txt = cmds-ancillaryinterrogators.txt \ · line 84

Quoted 2 lines
Documentation/Makefile +1 -1
-git.7 git.html: git.txt core-intro.txt
+git.7 git.html: git.txt core-intro.txt $(cmds_txt)

I do not think this is needed; doesn't doc.dep catch cmds_txt as well?

It's not needed. I didn't see the doc.dep.

Thanks for sanity-checking.

The reason for the first hunk I gave in my previous message was wrong, by the way; there is no circular dependency. The first hunk is a good change nevertheless, because what will be in cmds-*.txt command list does not depend on what is in git.txt.

author
#4 lore raw
Quoted 9 lines · Junio C Hamano
Quoted 7 lines · Santi Béjar
Quoted 5 lines · Junio C Hamano

Documentation/Makefile cmds_txt = cmds-ancillaryinterrogators.txt \ · line 84

Quoted 2 lines
Documentation/Makefile +1 -1
-git.7 git.html: git.txt core-intro.txt
+git.7 git.html: git.txt core-intro.txt $(cmds_txt)

I do not think this is needed; doesn't doc.dep catch cmds_txt as well?

Quoted 8 lines
Quoted 1 line

It's not needed. I didn't see the doc.dep.

Thanks for sanity-checking.

The reason for the first hunk I gave in my previous message was wrong, by the way; there is no circular dependency. The first hunk is a good change nevertheless, because what will be in cmds-*.txt command list does not depend on what is in git.txt.

I can not reproduce it, but I got a circular depencency. This was my motivation for the patch. Anyway, at least there is a usefull hunk in my patch :)

Santi