X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2FMakefile;h=c1af22ce04f71fe2d4a49a908e10878f7b5e0bcf;hb=93872e07008510340eec951f0d037f7b3a0b8567;hp=bb9533ff03514b0523bd1695508e641cc5574042;hpb=93d69d86912c44206543f6670e93f9fc6f2f859f;p=git.git

diff --git a/Documentation/Makefile b/Documentation/Makefile
index bb9533ff..c1af22ce 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -1,14 +1,20 @@
-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))
 
 ARTICLES = tutorial
+ARTICLES += core-tutorial
 ARTICLES += cvs-migration
 ARTICLES += diffcore
 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
 
@@ -53,32 +59,32 @@ install: man
 #
 # Determine "include::" file references in asciidoc files.
 #
-TEXTFILES = $(wildcard *.txt)
-DEPFILES = $(TEXTFILES:%.txt=%.dep)
+doc.dep : $(wildcard *.txt) build-docdep.perl
+	rm -f $@+ $@
+	perl ./build-docdep.perl >$@+
+	mv $@+ $@
 
-%.dep : %.txt
-	@rm -f $@
-	@$(foreach dep, $(shell grep include:: $< | sed -e 's/include::/ /' -e 's/\[\]//'), \
-		echo $(<:%.txt=%.html) $(<:%.txt=%.1) : $(dep) >> $@; )
+-include doc.dep
 
--include $(DEPFILES)
+git.7: README
 
-git.7: ../README
+README: ../README
+	cp $< $@
 
 
 clean:
-	rm -f *.xml *.html *.1 *.7 howto-index.txt howto/*.html *.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 $<
 
 %.1 %.7 : %.xml
-	xmlto man $<
+	xmlto -m callouts.xsl man $<
 
 %.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 $< | \