X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=doc%2FMakefile;h=f8fdb5e8de8907b35321b1fd3d0eb8f3fa0ef4f4;hb=6260ee1419ba5c122939b28e3e8fc6f8ecf48928;hp=d3c88b3774961d7824bec361ffcece7945e40926;hpb=edcb80f25875200a73269045db71c1579b0c2c82;p=fw%2Faltos

diff --git a/doc/Makefile b/doc/Makefile
index d3c88b37..f8fdb5e8 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -83,10 +83,20 @@ IMAGES=\
 	telemetrum-v2.0-th.jpg \
 	telemini.svg \
 	telemini-v1-top.jpg \
-	telemini-v2-top.jpg
+	telemini-v2-top.jpg \
+	altusmetrum-oneline.svg \
+	telegps-oneline.svg \
+	micropeak-oneline.svg
 
 TXT_FILES=altusmetrum.txt
 
+COMMON_INC_FILES=\
+	config-device.inc \
+	config-ui.inc \
+	load-maps.inc \
+	aprs-operation.inc \
+	handling.inc
+
 INC_FILES=\
 	dedication.inc \
 	intro.inc \
@@ -106,23 +116,23 @@ INC_FILES=\
 	system-operation.inc \
 	pyro-channels.inc \
 	flight-data-recording.inc \
-	handling.inc \
 	specs.inc \
+	$(COMMON_INC_FILES) \
 	release-notes.inc \
 	$(RELNOTES_INC)
 
 RAW_FILES=$(TXT_FILES:.txt=.raw) $(INC_FILES:.inc=.raw)
 
 TELEGPS_INC_FILES=\
-	dedication.inc \
+	telegps-dedication.inc \
 	telegps-quick-start.inc \
 	telegps-using.inc \
 	telegps-system-operation.inc \
 	telegps-application.inc \
-	handling.inc \
 	telegps-specs.inc \
 	telegps-updating-firmware.inc \
-	telegps-release-notes.inc
+	telegps-release-notes.inc \
+	$(COMMON_INC_FILES)
 
 TELEGPS_TXT_FILES=\
 	telegps.txt
@@ -177,6 +187,7 @@ PDF=altusmetrum.pdf micropeak.pdf telegps.pdf $(RELNOTES_PDF) $(ONEFILE_PDF_FILE
 
 FOP_STYLE=am-fo.xsl
 HTML_STYLE=am-html.xsl
+COMMON_STYLE=common.xsl
 FOP_XCONF=fop.xconf
 STYLESHEET=am.css
 
@@ -187,6 +198,8 @@ FONTS=\
 	fonts/DejaVuSansMono.ttf \
 	fonts/OpenSans-Light.ttf \
 	fonts/OpenSans-LightItalic.ttf \
+	fonts/OpenSans-Regular.ttf \
+	fonts/OpenSans-Italic.ttf \
 	fonts/OpenSans-Semibold.ttf \
 	fonts/OpenSans-SemiboldItalic.ttf
 
@@ -194,8 +207,8 @@ TEMPLATES_TMPL=titlepage.templates.tmpl
 
 TEMPLATES_XSL=$(TEMPLATES_TMPL:.tmpl=.xsl)
 
-PDF_CONFIG_FILES=$(FOP_STYLE) $(FOP_XCONF) $(TEMPLATES_XSL)
-HTML_CONFIG_FILES=$(TEMPLATES_XSL)
+PDF_CONFIG_FILES=$(FOP_STYLE) $(COMMON_STYLE) $(FOP_XCONF) $(TEMPLATES_XSL)
+HTML_CONFIG_FILES=$(HTML_STYLE) $(COMMON_STYLE) $(TEMPLATES_XSL)
 
 DOC=$(HTML) $(HTML_REVHISTORY) $(PDF) $(IMAGES) $(STYLESHEET)
 
@@ -208,10 +221,10 @@ DOC=$(HTML) $(HTML_REVHISTORY) $(PDF) $(IMAGES) $(STYLESHEET)
 	sed -e 's/^[ 	]*//' -e 's/^\\//' $*.inc > $@
 
 .raw.pdf:
-	a2x -a docinfo -f pdf --xsltproc-opts "--stringparam toc.section.depth 2" --xsl-file $(FOP_STYLE) --fop --fop-opts="-c $(FOP_XCONF)" $*.raw
+	a2x --verbose -a icons -a docinfo -f pdf --xsltproc-opts "--stringparam toc.section.depth 2" --xsl-file $(FOP_STYLE) --fop --fop-opts="-c $(FOP_XCONF)" $*.raw
 
 .raw.html:
-	a2x -a docinfo -f xhtml --xsltproc-opts "--stringparam toc.section.depth 2" --xsl-file $(HTML_STYLE) --stylesheet=$(STYLESHEET) $*.raw
+	a2x --verbose -a icons -a docinfo -f xhtml --xsltproc-opts "--stringparam toc.section.depth 2" --xsl-file $(HTML_STYLE) --stylesheet=$(STYLESHEET) $*.raw
 
 .tmpl.xsl:
 	xsltproc --output $@ /usr/share/xml/docbook/stylesheet/docbook-xsl/template/titlepage.xsl $*.tmpl