X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=doc%2FMakefile;h=e6fb95abc5c8deed5459df5916c8f5a05fc8eaa8;hp=04402c88f09e72ae09023af45eac8467d04b1cbe;hb=45084fd04326b979f349870f09ff9af1b3155cbe;hpb=14ad137fd14707bc7b45a3512a4a6f81915ca1c1

diff --git a/doc/Makefile b/doc/Makefile
index 04402c88..e6fb95ab 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -3,26 +3,31 @@
 #
 
 RELNOTES_INC=\
-	release-notes-0.7.1.inc \
-	release-notes-0.8.inc \
-	release-notes-0.9.inc \
-	release-notes-0.9.2.inc \
-	release-notes-1.0.1.inc \
-	release-notes-1.1.inc \
-	release-notes-1.1.1.inc \
-	release-notes-1.2.inc \
-	release-notes-1.2.1.inc \
-	release-notes-1.3.inc \
-	release-notes-1.3.1.inc \
-	release-notes-1.3.2.inc \
-	release-notes-1.4.inc \
-	release-notes-1.4.1.inc \
-	release-notes-1.4.2.inc \
-	release-notes-1.5.inc \
+	release-notes-1.6.8.inc \
+	release-notes-1.6.5.inc \
+	release-notes-1.6.4.inc \
+	release-notes-1.6.3.inc \
+	release-notes-1.6.2.inc \
+	release-notes-1.6.1.inc \
 	release-notes-1.6.inc \
-	release-notes-1.6.1.inc
+	release-notes-1.5.inc \
+	release-notes-1.4.2.inc \
+	release-notes-1.4.1.inc \
+	release-notes-1.4.inc \
+	release-notes-1.3.2.inc \
+	release-notes-1.3.1.inc \
+	release-notes-1.3.inc \
+	release-notes-1.2.1.inc \
+	release-notes-1.2.inc \
+	release-notes-1.1.1.inc \
+	release-notes-1.1.inc \
+	release-notes-1.0.1.inc \
+	release-notes-0.9.2.inc \
+	release-notes-0.9.inc \
+	release-notes-0.8.inc \
+	release-notes-0.7.1.inc
 
-PICTURES=\
+IMAGES=\
 	altosui.png \
 	ascent.png \
 	configure-altimeter.png \
@@ -31,12 +36,17 @@ PICTURES=\
 	configure-pyro.png \
 	descent.png \
 	device-selection.png \
+	easymega.svg \
+	easymega-v1.0-bottom.jpg \
+	easymega-v1.0-top.jpg \
+	easymini.svg \
 	easymini-top.jpg \
 	fire-igniter.png \
 	graph-configure.png \
 	graph-map.png \
 	graph.png \
 	graph-stats.png \
+	ignitor.png \
 	landed.png \
 	launch-pad.png \
 	load-maps.png \
@@ -47,6 +57,7 @@ PICTURES=\
 	micropeak-download.png \
 	micropeak-graph-configure.png \
 	micropeak-graph.png \
+	micropeak-nofont.svg \
 	micropeak-preferences.png \
 	micropeak-raw-data.png \
 	micropeak-save-dialog.png \
@@ -57,13 +68,39 @@ PICTURES=\
 	scan-channels.png \
 	site-map.png \
 	table.png \
+	telegps-configure.png \
+	telegps-graph-configure.png \
+	telegps-graph-graph.png \
+	telegps-graph-map.png \
+	telegps-graph-stats.png \
+	telegps-info.png \
+	telegps-location.png \
+	telegps-map.png \
+	telegps-preferences.png \
+	telegps-scan.png \
+	telegps-status.png \
+	telegps-table.png \
+	telegps-v1.0-top.jpg \
+	telemega.svg \
 	telemega-v1.0-top.jpg \
+	telemetrum.svg \
 	telemetrum-v1.1-thside.jpg \
+	telemetrum-v2.0-th.jpg \
+	telemini.svg \
 	telemini-v1-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 \
@@ -71,8 +108,7 @@ INC_FILES=\
 	usage.inc \
 	telemetrum.inc \
 	telemini-v1.0.inc \
-	telemini-v2.0.inc \
-	easymini.inc \
+	easymini-device.inc \
 	telemega.inc \
 	easymega.inc \
 	installation.inc \
@@ -83,23 +119,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
@@ -113,6 +149,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 \
@@ -134,71 +178,113 @@ SVG=\
 RELNOTES_PDF=$(RELNOTES_INC:.inc=.pdf)
 RELNOTES_HTML=$(RELNOTES_INC:.inc=.html)
 
-ALTOS_TXT_FILES=\
-	altos.txt
+ONEFILE_TXT_FILES=\
+	altos.txt \
+	companion.txt \
+	telemetry.txt
+
+ONEFILE_RAW_FILES=$(ONEFILE_TXT_FILES:.txt=.raw)
+ONEFILE_PDF_FILES=$(ONEFILE_TXT_FILES:.txt=.pdf)
+
+AM_HTML=am.html
 
-ALTOS_RAW_FILES=$(ALTOS_TXT_FILES:.txt=.raw)
-ALTOS_PDF_FILES=$(ALTOS_TXT_FILES:.txt=.pdf)
+HTML=altusmetrum.html micropeak.html telegps.html easymini.html $(RELNOTES_HTML) $(ONEFILE_HTML_FILES)
 
-HTML=altusmetrum.html altos.html telemetry.html companion.html micropeak.html telegps.html $(RELNOTES_HTML)
+HTML_REVHISTORY=\
+	altusmetrum-revhistory.html \
+	micropeak-revhistory.html \
+	telegps-revhistory.html \
+	easymini-revhistory.html
 
-PDF=altusmetrum.pdf $(RELNOTES_PDF) $(ALTOS_PDF_FILES) telemetry.pdf companion.pdf micropeak.pdf telegps.pdf \
+PDF=altusmetrum.pdf micropeak.pdf telegps.pdf easymini.pdf $(RELNOTES_PDF) $(ONEFILE_PDF_FILES) \
 	$(OUTLINE_PDF_FILES)
 
-FOSTYLE=am-fo.xsl
+FOP_STYLE=am-fo.xsl
+HTML_STYLE=am-html.xsl
+COMMON_STYLE=common.xsl
+FOP_XCONF=fop.xconf
+STYLESHEET=am.css
+
+FONTS=\
+	fonts/DejaVuSansMono-BoldOblique.ttf \
+	fonts/DejaVuSansMono-Bold.ttf \
+	fonts/DejaVuSansMono-Oblique.ttf \
+	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
 
 TEMPLATES_TMPL=titlepage.templates.tmpl
 
 TEMPLATES_XSL=$(TEMPLATES_TMPL:.tmpl=.xsl)
 
-IMAGES=$(PICTURES) $(SVG)
+PDF_CONFIG_FILES=$(FOP_STYLE) $(COMMON_STYLE) $(FOP_XCONF) $(TEMPLATES_XSL)
+HTML_CONFIG_FILES=$(HTML_STYLE) $(COMMON_STYLE) $(TEMPLATES_XSL)
 
-DOC=$(HTML) $(PDF) $(IMAGES)
+DOC=$(HTML) $(HTML_REVHISTORY) $(PDF) $(IMAGES) $(STYLESHEET)
 
 .SUFFIXES: .tmpl .xsl .inc .txt .raw .pdf .html
 
-XSLTFLAGS=--stringparam section.autolabel 1 --xinclude
-
 .txt.raw:
-	sed -e 's/@@VERSION@@/$(VERSION)/' -e 's/@@DATE@@/$(DATE)/' -e 's/^[ 	]*//' -e 's/^\\//' $*.txt > $@
+	sed -e 's/^[ 	]*//' -e 's/^\\//' $*.txt > $@
 
 .inc.raw:
-	sed -e 's/@@VERSION@@/$(VERSION)/' -e 's/@@DATE@@/$(DATE)/' -e 's/^[ 	]*//' -e 's/^\\//' $*.inc > $@
+	sed -e 's/^[ 	]*//' -e 's/^\\//' $*.inc > $@
 
 .raw.pdf:
-	a2x --verbose -a docinfo -f pdf --xsltproc-opts "--stringparam toc.section.depth 2" --xsl-file am-fo.xsl --fop --fop-opts="-c fop.xconf" $*.raw
+	a2x --verbose -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 docinfo -f xhtml --xsltproc-opts "--stringparam toc.section.depth 2" --xsl-file $(HTML_STYLE) --stylesheet=$(STYLESHEET) $*.raw
 
-.raw.html:
-	a2x --verbose -a docinfo -f xhtml --xsltproc-opts "--stringparam toc.section.depth 2" --stylesheet=am.css $*.raw
+.pdf.html:
+	@touch $@
 
 .tmpl.xsl:
 	xsltproc --output $@ /usr/share/xml/docbook/stylesheet/docbook-xsl/template/titlepage.xsl $*.tmpl
 
 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)
+altusmetrum.pdf altusmetrum.html: altusmetrum-docinfo.xml $(RAW_FILES) $(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)
+publish:	$(DOC) $(FONTS)
 	cp $(DOC) /home/bdale/web/altusmetrum/AltOS/doc/
+	mkdir -p /home/bdale/web/altusmetrum/AltOS/doc/fonts/
+	cp $(FONTS) /home/bdale/web/altusmetrum/AltOS/doc/fonts/
 	(cd /home/bdale/web/altusmetrum ; \
 	 git add /home/bdale/web/altusmetrum/AltOS/doc/* ; \
+	 git add /home/bdale/web/altusmetrum/AltOS/doc/fonts/* ; \
 	 echo "update docs" | \
-	 git commit -F - /home/bdale/web/altusmetrum/AltOS/doc/* ; \
+	 git commit -F - /home/bdale/web/altusmetrum/AltOS/doc/* /home/bdale/web/altusmetrum/AltOS/doc/fonts/* ; \
 	 git push)
 
+publish-keithp:	am.html $(DOC) $(FONTS)
+	scp -p am.html $(DOC) keithp.com:~keithp/public_html/altos
+	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 am.html $(HTML) $(HTML_REVHISTORY) $(PDF) $(TEMPLATES_XSL) $(RAW_FILES) $(TELEGPS_RAW_FILES) $(MICROPEAK_RAW_FILES)
 
 distclean: clean
 	rm -f $(HTML) $(PDF)
 
-$(PDF): $(FOSTYLE) $(TEMPLATES_XSL)
-$(HTML): $(TEMPLATES_XSL)
+$(PDF): $(PDF_CONFIG_FILES)
+$(HTML): $(HTML_CONFIG_FILES)
+
+am.html: Makefile make-am-html $(HTML)
+	sh ./make-am-html $(HTML) > $@