From 708c689312e75953db431f8838846996ff447789 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg42.2a@gmail.com>
Date: Mon, 10 Feb 2014 07:14:53 +0100
Subject: [doc] add Makefile for doc subtree

---
 doc/Makefile | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 doc/Makefile

(limited to 'doc/Makefile')

diff --git a/doc/Makefile b/doc/Makefile
new file mode 100644
index 0000000..1ef7243
--- /dev/null
+++ b/doc/Makefile
@@ -0,0 +1,46 @@
+NAME				= luaotfload
+DOCPDF			= $(NAME).pdf
+DOCDTX			= $(NAME).dtx
+
+SCRIPTNAME	= luaotfload-tool
+MANSOURCE		= $(SCRIPTNAME).rst
+MANPAGE			= $(SCRIPTNAME).1
+
+GRAPH				= filegraph
+DOTPDF			= $(GRAPH).pdf
+DOT					= $(GRAPH).dot
+
+DOCS				= $(DOTPDF) $(DOCPDF) $(MANPAGE)
+
+DO_LATEXMK	= @latexmk -e '$$max_repeat = 5' -pdf -lualatex -silent $< >/dev/null
+# latexmk does only one run on my machine, so we’re not going to rely on it
+DO_LATEX		= @lualatex -interaction=batchmode $< >/dev/null
+DO_GRAPHVIZ	= @dot -Tpdf -o $@ $< > /dev/null
+DO_DOCUTILS	= @rst2man $< >$@ 2>/dev/null
+
+doc: graph $(DOCPDF)
+all: manual doc
+graph: $(DOTPDF)
+manual: $(MANPAGE)
+
+$(DOCPDF): $(DOCDTX)
+	@echo "creating PDF documentation ($(DOCPDF))"
+	$(DO_LATEX)
+	$(DO_LATEX)
+
+$(MANPAGE): $(MANSOURCE)
+	@echo "creating man page ($(MANPAGE))"
+	$(DO_DOCUTILS)
+
+$(DOTPDF): $(DOT)
+	@echo "creating file graph ($(DOTPDF))"
+	$(DO_GRAPHVIZ)
+
+.PHONY: clean mrproper
+
+clean:
+	@$(RM) -- *.log *.aux *.toc *.idx *.ind *.ilg *.out
+
+mrproper: clean
+	@$(RM) -- $(DOCS)
+
-- 
cgit v1.2.3


From 06e79fac8810293b5f3e9d03a1c0f838aefb4784 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg42.2a@gmail.com>
Date: Mon, 10 Feb 2014 08:00:50 +0100
Subject: [doc,*] fix TDS install rules in Makefile

---
 doc/Makefile | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'doc/Makefile')

diff --git a/doc/Makefile b/doc/Makefile
index 1ef7243..2040f5a 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,20 +1,20 @@
-NAME				= luaotfload
-DOCPDF			= $(NAME).pdf
-DOCDTX			= $(NAME).dtx
+NAME		= luaotfload
+DOCPDF		= $(NAME).pdf
+DOCDTX		= $(NAME).dtx
 
 SCRIPTNAME	= luaotfload-tool
-MANSOURCE		= $(SCRIPTNAME).rst
-MANPAGE			= $(SCRIPTNAME).1
+MANSOURCE	= $(SCRIPTNAME).rst
+MANPAGE		= $(SCRIPTNAME).1
 
-GRAPH				= filegraph
-DOTPDF			= $(GRAPH).pdf
-DOT					= $(GRAPH).dot
+GRAPH		= filegraph
+DOTPDF		= $(GRAPH).pdf
+DOT		= $(GRAPH).dot
 
-DOCS				= $(DOTPDF) $(DOCPDF) $(MANPAGE)
+DOCS		= $(DOTPDF) $(DOCPDF) $(MANPAGE)
 
 DO_LATEXMK	= @latexmk -e '$$max_repeat = 5' -pdf -lualatex -silent $< >/dev/null
 # latexmk does only one run on my machine, so we’re not going to rely on it
-DO_LATEX		= @lualatex -interaction=batchmode $< >/dev/null
+DO_LATEX	= @lualatex -interaction=batchmode $< >/dev/null
 DO_GRAPHVIZ	= @dot -Tpdf -o $@ $< > /dev/null
 DO_DOCUTILS	= @rst2man $< >$@ 2>/dev/null
 
@@ -44,3 +44,4 @@ clean:
 mrproper: clean
 	@$(RM) -- $(DOCS)
 
+# vim:set noexpandtab:tabstop=8:shiftwidth=2
-- 
cgit v1.2.3


From bf21af737122e0c904f305b3213b91710bb93216 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg42.2a@gmail.com>
Date: Sat, 15 Feb 2014 15:51:10 +0100
Subject: [doc,*] adapt makefiles to new doc source

---
 doc/Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'doc/Makefile')

diff --git a/doc/Makefile b/doc/Makefile
index 2040f5a..9e2d591 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,6 +1,6 @@
 NAME		= luaotfload
 DOCPDF		= $(NAME).pdf
-DOCDTX		= $(NAME).dtx
+DOCSRC		= $(NAME)-latex.tex
 
 SCRIPTNAME	= luaotfload-tool
 MANSOURCE	= $(SCRIPTNAME).rst
@@ -23,10 +23,11 @@ all: manual doc
 graph: $(DOTPDF)
 manual: $(MANPAGE)
 
-$(DOCPDF): $(DOCDTX)
-	@echo "creating PDF documentation ($(DOCPDF))"
+$(DOCPDF): $(DOCSRC)
+	@echo "creating PDF documentation ($@)"
 	$(DO_LATEX)
 	$(DO_LATEX)
+	mv -f -- $(<:tex=pdf) $@
 
 $(MANPAGE): $(MANSOURCE)
 	@echo "creating man page ($(MANPAGE))"
@@ -44,4 +45,4 @@ clean:
 mrproper: clean
 	@$(RM) -- $(DOCS)
 
-# vim:set noexpandtab:tabstop=8:shiftwidth=2
+# vim:noexpandtab:tabstop=8:shiftwidth=2
-- 
cgit v1.2.3


From fdea22314cb51cf514f6f1004f75b9d6bacafe2d Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg42.2a@gmail.com>
Date: Mon, 9 Jun 2014 23:47:01 +0200
Subject: [*] add rules for building config man page to makefiles

---
 doc/Makefile | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'doc/Makefile')

diff --git a/doc/Makefile b/doc/Makefile
index 9e2d591..ed340a4 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -3,14 +3,20 @@ DOCPDF		= $(NAME).pdf
 DOCSRC		= $(NAME)-latex.tex
 
 SCRIPTNAME	= luaotfload-tool
-MANSOURCE	= $(SCRIPTNAME).rst
-MANPAGE		= $(SCRIPTNAME).1
+TOOLMANSRC	= $(SCRIPTNAME).rst
+TOOLMAN		= $(SCRIPTNAME).1
+
+CONFNAME	= luaotfload.conf
+CONFMANSRC	= $(CONFNAME).rst
+CONFMAN		= $(CONFNAME).5
+
+MANPAGES	= $(TOOLMAN) $(CONFMAN)
 
 GRAPH		= filegraph
 DOTPDF		= $(GRAPH).pdf
 DOT		= $(GRAPH).dot
 
-DOCS		= $(DOTPDF) $(DOCPDF) $(MANPAGE)
+DOCS		= $(DOTPDF) $(DOCPDF) $(MANPAGES)
 
 DO_LATEXMK	= @latexmk -e '$$max_repeat = 5' -pdf -lualatex -silent $< >/dev/null
 # latexmk does only one run on my machine, so we’re not going to rely on it
@@ -19,9 +25,9 @@ DO_GRAPHVIZ	= @dot -Tpdf -o $@ $< > /dev/null
 DO_DOCUTILS	= @rst2man $< >$@ 2>/dev/null
 
 doc: graph $(DOCPDF)
-all: manual doc
+all: manuals doc
 graph: $(DOTPDF)
-manual: $(MANPAGE)
+manuals: $(TOOLMAN) $(CONFMAN)
 
 $(DOCPDF): $(DOCSRC)
 	@echo "creating PDF documentation ($@)"
@@ -29,8 +35,12 @@ $(DOCPDF): $(DOCSRC)
 	$(DO_LATEX)
 	mv -f -- $(<:tex=pdf) $@
 
-$(MANPAGE): $(MANSOURCE)
-	@echo "creating man page ($(MANPAGE))"
+$(TOOLMAN): $(TOOLMANSRC)
+	@echo "creating man page ($(TOOLMAN))"
+	$(DO_DOCUTILS)
+
+$(CONFMAN): $(CONFMANSRC)
+	@echo "creating man page ($(CONFMAN))"
 	$(DO_DOCUTILS)
 
 $(DOTPDF): $(DOT)
-- 
cgit v1.2.3