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

diff --git a/doc/Makefile b/doc/Makefile
index 7a4e0fa3..0d01279f 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -3,24 +3,30 @@
 #
 
 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.7.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
 
 IMAGES=\
 	altosui.png \
@@ -81,9 +87,11 @@ IMAGES=\
 	telemetrum.svg \
 	telemetrum-v1.1-thside.jpg \
 	telemetrum-v2.0-th.jpg \
-	telemini.svg \
+	telemini-v1.svg \
 	telemini-v1-top.jpg \
-	telemini-v2-top.jpg \
+	telemini-v3.svg \
+	telemini-v3.0-top.jpg \
+	telemini-v3.0-bottom.jpg \
 	altusmetrum-oneline.svg \
 	telegps-oneline.svg \
 	micropeak-oneline.svg
@@ -103,8 +111,7 @@ INC_FILES=\
 	getting-started.inc \
 	usage.inc \
 	telemetrum.inc \
-	telemini-v1.0.inc \
-	telemini-v2.0.inc \
+	telemini.inc \
 	easymini-device.inc \
 	telemega.inc \
 	easymega.inc \
@@ -159,7 +166,8 @@ OUTLINE_TXT_FILES=\
 	easymini-outline.txt \
 	telemega-outline.txt \
 	telemetrum-outline.txt \
-	telemini-outline.txt
+	telemini-v1-outline.txt \
+	telemini-v3-outline.txt
 
 OUTLINE_RAW_FILES=$(OUTLINE_TXT_FILES:.txt=.raw)
 
@@ -169,7 +177,8 @@ SVG=\
 	easymini.svg \
 	telemega.svg \
 	telemetrum.svg \
-	telemini.svg \
+	telemini-v1.svg \
+	telemini-v3.svg \
 	easymega.svg
 
 RELNOTES_PDF=$(RELNOTES_INC:.inc=.pdf)
@@ -183,6 +192,8 @@ ONEFILE_TXT_FILES=\
 ONEFILE_RAW_FILES=$(ONEFILE_TXT_FILES:.txt=.raw)
 ONEFILE_PDF_FILES=$(ONEFILE_TXT_FILES:.txt=.pdf)
 
+AM_HTML=am.html
+
 HTML=altusmetrum.html micropeak.html telegps.html easymini.html $(RELNOTES_HTML) $(ONEFILE_HTML_FILES)
 
 HTML_REVHISTORY=\
@@ -230,25 +241,25 @@ DOC=$(HTML) $(HTML_REVHISTORY) $(PDF) $(IMAGES) $(STYLESHEET)
 	sed -e 's/^[ 	]*//' -e 's/^\\//' $*.inc > $@
 
 .raw.pdf:
-	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
+	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
+	case $* in release-notes*) ./fix-html $*.html ;; esac
 
-.raw.html:
-	a2x --verbose -a icons -a docinfo -f xhtml --xsltproc-opts "--stringparam toc.section.depth 2" --xsl-file $(HTML_STYLE) --stylesheet=$(STYLESHEET) $*.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)
 
@@ -256,6 +267,10 @@ micropeak.pdf micropeak.html: micropeak-docinfo.xml $(MICROPEAK_RAW_FILES) $(IMA
 
 easymini.pdf easymini.html: easymini-docinfo.xml $(EASYMINI_RAW_FILES) $(IMAGES)
 
+telemini-v1-outline.pdf: telemini-v1-outline.txt telemini-v1.svg
+
+telemini-v3-outline.pdf: telemini-v3-outline.txt telemini-v3.svg
+
 install:	all
 
 publish:	$(DOC) $(FONTS)
@@ -269,15 +284,18 @@ publish:	$(DOC) $(FONTS)
 	 git commit -F - /home/bdale/web/altusmetrum/AltOS/doc/* /home/bdale/web/altusmetrum/AltOS/doc/fonts/* ; \
 	 git push)
 
-publish-keithp:	$(DOC) $(FONTS)
-	scp -p $(DOC) keithp.com:~keithp/public_html/altos
+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) $(HTML_REVHISTORY) $(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): $(PDF_CONFIG_FILES)
 $(HTML): $(HTML_CONFIG_FILES)
+
+am.html: Makefile make-am-html $(HTML)
+	sh ./make-am-html $(HTML) > $@