X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=doc%2FMakefile;h=6a04a591dd57e458d2e62a7e6838df52b13c26ac;hp=2aecc23029980e0d2eea28880842827578d402dc;hb=6a00f186a06f22638882f43f49fa0c03ea387eac;hpb=c877ecce7b67272eb6dcba50a58b59cd1cbfa5ab

diff --git a/doc/Makefile b/doc/Makefile
index 2aecc230..6a04a591 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -3,24 +3,25 @@
 #
 
 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.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 \
@@ -83,10 +84,19 @@ IMAGES=\
 	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 \
@@ -94,8 +104,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 \
@@ -106,23 +115,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 +145,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,18 +182,22 @@ 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)
+AM_HTML=am.html
+
+HTML=altusmetrum.html micropeak.html telegps.html easymini.html $(RELNOTES_HTML) $(ONEFILE_HTML_FILES)
 
 HTML_REVHISTORY=\
 	altusmetrum-revhistory.html \
 	micropeak-revhistory.html \
-	telegps-revhistory.html
+	telegps-revhistory.html \
+	easymini-revhistory.html
 
-PDF=altusmetrum.pdf micropeak.pdf telegps.pdf $(RELNOTES_PDF) $(ONEFILE_PDF_FILES) \
+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
 
@@ -187,6 +208,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 +217,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)
 
@@ -209,29 +232,30 @@ DOC=$(HTML) $(HTML_REVHISTORY) $(PDF) $(IMAGES) $(STYLESHEET)
 
 .raw.pdf:
 	a2x --verbose -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 --verbose -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)
 
 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)
@@ -245,15 +269,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) > $@