altos: Clean up serial initialization

[fw/altos] / altosui / Makefile.am

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 196d70327ac340640b55fec2a5234ad074c1381c..01fe50c8560924d0efab5546892351c15a64b02f 100644 (file)
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS=libaltos
 JAVAROOT=classes
-AM_JAVACFLAGS=-encoding UTF-8
+AM_JAVACFLAGS=-encoding UTF-8 -Xlint:deprecation
 
 man_MANS=altosui.1
 
@@ -27,7 +27,7 @@ altosui_JAVA = \
        AltosDeviceDialog.java \
        AltosDevice.java \
        AltosDisplayThread.java \
-       AltosEepromBlock.java \
+       AltosEepromChunk.java \
        AltosEepromDelete.java \
        AltosEepromDownload.java \
        AltosEepromList.java \
@@ -65,6 +65,7 @@ altosui_JAVA = \
        AltosRecord.java \
        AltosRecordIterable.java \
        AltosTelemetryReader.java \
+       AltosTelemetryMap.java \
        AltosReplayReader.java \
        AltosRomconfig.java \
        AltosRomconfigUI.java \
@@ -85,6 +86,7 @@ altosui_JAVA = \
        AltosGraphTime.java \
        AltosGraphUI.java \
        AltosDataChooser.java \
+       AltosVersion.java \
        AltosVoice.java
 
 JFREECHART_CLASS= \
@@ -129,10 +131,21 @@ ICONJAR= -C $(ICONDIR) altus-metrum-16x16.jpg \
 WINDOWS_ICON=$(ICONDIR)/altus-metrum.ico
 
 # Firmware
-FIRMWARE_TD=$(top_srcdir)/src/teledongle-v0.2-$(VERSION).ihx
-FIRMWARE_TM=$(top_srcdir)/src/telemetrum-v1.0-$(VERSION).ihx
+FIRMWARE_TD_0_2=$(top_srcdir)/src/teledongle-v0.2-$(VERSION).ihx
+FIRMWARE_TD=$(FIRMWARE_TD_0_2)
+
+FIRMWARE_TM_1_0=$(top_srcdir)/src/telemetrum-v1.0-$(VERSION).ihx
+FIRMWARE_TM_1_1=$(top_srcdir)/src/telemetrum-v1.1-$(VERSION).ihx
+FIRMWARE_TM=$(FIRMWARE_TM_1_0) $(FIRMWARE_TM_1_1)
+
 FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TD)
 
+ALTUSMETRUM_DOC=$(top_srcdir)/doc/altusmetrum.pdf
+ALTOS_DOC=$(top_srcdir)/doc/altos.pdf
+TEMPLATE_DOC=$(top_srcdir)/doc/telemetrum-outline.pdf
+
+DOC=$(ALTUSMETRUM_DOC) $(ALTOS_DOC) $(TEMPLATE_DOC)
+
 # Distribution targets
 LINUX_DIST=Altos-Linux-$(VERSION).tar.bz2
 MACOSX_DIST=Altos-Mac-$(VERSION).zip
@@ -140,7 +153,7 @@ WINDOWS_DIST=Altos-Windows-$(VERSION_DASH).exe
 
 FAT_FILES=$(FATJAR) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS)
 
-LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE)
+LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) $(DOC)
 LINUX_EXTRA=altosui-fat
 
 MACOSX_FILES=$(FAT_FILES) libaltos.dylib
@@ -271,6 +284,7 @@ $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA)
        cp -p $(FATJAR) macosx/AltosUI.app/Contents/Resources/Java/altosui.jar
        cp -p $(FREETTS_CLASS) libaltos.dylib macosx/AltosUI.app/Contents/Resources/Java
        cp -p $(JFREECHART_CLASS) libaltos.dylib macosx/AltosUI.app/Contents/Resources/Java
+       cp -p $(JCOMMON_CLASS) libaltos.dylib macosx/AltosUI.app/Contents/Resources/Java
        cp -p $(MACOSX_EXTRA) macosx/AltOS
        cd macosx && zip -r ../$@ AltosUI.app AltOS