X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2FMakefile;h=f4cbf7e159be721bf17625b07c1d7b4f36c60f78;hb=cf1e6d1ec55264272be8b7f0c276a069d2aac69a;hp=a65fb1b66b8a313bec82ab361a156ed3842f570b;hpb=dcc6e28f70574bf3756752f114b5119c5cb43375;p=git.git diff --git a/Documentation/Makefile b/Documentation/Makefile index a65fb1b6..f4cbf7e1 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -1,4 +1,7 @@ -MAN1_TXT=$(wildcard git-*.txt) gitk.txt +MAN1_TXT= \ + $(filter-out $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \ + $(wildcard git-*.txt)) \ + gitk.txt MAN7_TXT=git.txt DOC_HTML=$(patsubst %.txt,%.html,$(MAN1_TXT) $(MAN7_TXT)) @@ -11,6 +14,7 @@ ARTICLES += howto-index ARTICLES += repository-layout ARTICLES += hooks ARTICLES += everyday +ARTICLES += git-tools # with their own formatting rules. SP_ARTICLES = glossary howto/revert-branch-rebase @@ -62,11 +66,14 @@ doc.dep : $(wildcard *.txt) build-docdep.perl -include doc.dep -git.7: ../README +git.7: README + +README: ../README + cp $< $@ clean: - rm -f *.xml *.html *.1 *.7 howto-index.txt howto/*.html doc.dep + rm -f *.xml *.html *.1 *.7 howto-index.txt howto/*.html doc.dep README %.html : %.txt asciidoc -b xhtml11 -d manpage -f asciidoc.conf $< @@ -77,7 +84,7 @@ clean: %.xml : %.txt asciidoc -b docbook -d manpage -f asciidoc.conf $< -git.html: git.txt ../README +git.html: git.txt README glossary.html : glossary.txt sort_glossary.pl cat $< | \