X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=doc%2FMakefile;h=7a4e0fa3abbc354683264bbd480db99e0c600a9c;hp=0b66a1d18a23dc9adc846ba4402d133528bda252;hb=992c0eab6275cec7d5035b99952537fd7ece2ed4;hpb=f2816b305fc9e18a1190e392d43ff489936f10f0

diff --git a/doc/Makefile b/doc/Makefile
index 0b66a1d1..7a4e0fa3 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 \
@@ -95,7 +105,7 @@ INC_FILES=\
 	telemetrum.inc \
 	telemini-v1.0.inc \
 	telemini-v2.0.inc \
-	easymini.inc \
+	easymini-device.inc \
 	telemega.inc \
 	easymega.inc \
 	installation.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
@@ -136,6 +146,14 @@ MICROPEAK_INC_FILES=
 
 MICROPEAK_RAW_FILES=$(MICROPEAK_TXT_FILES:.txt=.raw) $(MICROPEAK_INC_FILES:.inc=.raw)
 
+EASYMINI_TXT_FILES=\
+	easymini.txt
+
+EASYMINI_INC_FILES=$(INC_FILES) easymini-release-notes.inc
+
+
+EASYMINI_RAW_FILES=$(EASYMINI_TXT_FILES:.txt=.raw) $(EASYMINI_INC_FILES:.inc=.raw)
+
 OUTLINE_TXT_FILES=\
 	easymega-outline.txt \
 	easymini-outline.txt \
@@ -165,12 +183,20 @@ ONEFILE_TXT_FILES=\
 ONEFILE_RAW_FILES=$(ONEFILE_TXT_FILES:.txt=.raw)
 ONEFILE_PDF_FILES=$(ONEFILE_TXT_FILES:.txt=.pdf)
 
-HTML=altusmetrum.html micropeak.html telegps.html $(RELNOTES_HTML) $(ONEFILE_HTML_FILES)
+HTML=altusmetrum.html micropeak.html telegps.html easymini.html $(RELNOTES_HTML) $(ONEFILE_HTML_FILES)
 
-PDF=altusmetrum.pdf micropeak.pdf telegps.pdf $(RELNOTES_PDF) $(ONEFILE_PDF_FILES) \
+HTML_REVHISTORY=\
+	altusmetrum-revhistory.html \
+	micropeak-revhistory.html \
+	telegps-revhistory.html \
+	easymini-revhistory.html
+
+PDF=altusmetrum.pdf micropeak.pdf telegps.pdf easymini.pdf $(RELNOTES_PDF) $(ONEFILE_PDF_FILES) \
 	$(OUTLINE_PDF_FILES)
 
 FOP_STYLE=am-fo.xsl
+HTML_STYLE=am-html.xsl
+COMMON_STYLE=common.xsl
 FOP_XCONF=fop.xconf
 STYLESHEET=am.css
 
@@ -181,6 +207,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
 
@@ -188,10 +216,10 @@ 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) $(STYLESHEET)
+PDF_CONFIG_FILES=$(FOP_STYLE) $(COMMON_STYLE) $(FOP_XCONF) $(TEMPLATES_XSL)
+HTML_CONFIG_FILES=$(HTML_STYLE) $(COMMON_STYLE) $(TEMPLATES_XSL)
 
-DOC=$(HTML) $(PDF) $(IMAGES) $(STYLESHEET)
+DOC=$(HTML) $(HTML_REVHISTORY) $(PDF) $(IMAGES) $(STYLESHEET)
 
 .SUFFIXES: .tmpl .xsl .inc .txt .raw .pdf .html
 
@@ -202,10 +230,10 @@ DOC=$(HTML) $(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" --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
@@ -214,12 +242,20 @@ all:	$(HTML) $(PDF)
 
 $(HTML): $(PDF)
 
+altusmetrum-revhistory.html: altusmetrum.html
+
+micropeak-revhistory.html: micropeak.html
+
+telegps-revhistory.html: telegps.html
+
 altusmetrum.pdf altusmetrum.html: altusmetrum-docinfo.xml $(RAW_FILES) $(RAW_INC) $(IMAGES)
 
 telegps.html telegps.pdf: telegps-docinfo.xml $(TELEGPS_RAW_FILES) $(IMAGES)
 
 micropeak.pdf micropeak.html: micropeak-docinfo.xml $(MICROPEAK_RAW_FILES) $(IMAGES)
 
+easymini.pdf easymini.html: easymini-docinfo.xml $(EASYMINI_RAW_FILES) $(IMAGES)
+
 install:	all
 
 publish:	$(DOC) $(FONTS)
@@ -238,7 +274,7 @@ publish-keithp:	$(DOC) $(FONTS)
 	scp -p $(FONTS) keithp.com:~keithp/public_html/altos/fonts
 
 clean:
-	rm -f $(HTML) $(PDF) $(TEMPLATES_XSL) $(RAW_FILES) $(TELEGPS_RAW_FILES) $(MICROPEAK_RAW_FILES)
+	rm -f $(HTML) $(HTML_REVHISTORY) $(PDF) $(TEMPLATES_XSL) $(RAW_FILES) $(TELEGPS_RAW_FILES) $(MICROPEAK_RAW_FILES)
 
 distclean: clean
 	rm -f $(HTML) $(PDF)