altosui: Catch I/O errors on telemetry device, report to user

[fw/altos] / ao-tools / altosui / Makefile

diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile
index d3b6970f986fc7499bc79d4e1ee5b587a409d024..cc9a440db1a63f05607bdbbf6fb95ffc9d2b4a17 100644 (file)
--- a/ao-tools/altosui/Makefile
+++ b/ao-tools/altosui/Makefile
@@ -7,6 +7,7 @@ CLASSFILES=\
        AltosConfig.class \
        AltosConfigUI.class \
        AltosConvert.class \
+       AltosCRCException.class \
        AltosCSV.class \
        AltosCSVUI.class \
        AltosDebug.class \
@@ -22,10 +23,12 @@ CLASSFILES=\
        AltosGPS.class \
        AltosGreatCircle.class \
        AltosHexfile.class \
+       AltosLine.class \
        AltosLog.class \
        AltosLogfileChooser.class \
        AltosParse.class \
        AltosPreferences.class \
+       AltosReader.class \
        AltosRecord.class \
        AltosSerialMonitor.class \
        AltosSerial.class \
@@ -76,7 +79,8 @@ WINDOWS_ZIP=Altos-Windows.zip
 
 LINUX_TGZ=Altos-Linux.tgz
 
-all: altosui altosui.jar $(LINUX_APP) $(DARWIN_ZIP) $(WINDOWS_ZIP) $(LINUX_TGZ)
+all: altosui.jar $(LINUX_APP)
+fat: altosui.jar $(LINUX_APP) $(DARWIN_ZIP) $(WINDOWS_ZIP) $(LINUX_TGZ)
 
 $(CLASSFILES):
 
@@ -122,9 +126,9 @@ fat/classes/Manifest.txt: $(CLASSFILES) Makefile
        echo "Class-Path: freetts.jar" >> $@
 
 install: altosui.jar altosui
-       /usr/bin/install -m 0644 altosui.jar $(DESTDIR)/usr/share/java/altosui.jar
-       /usr/bin/install -m 0644 altosui.1 $(DESTDIR)/usr/share/man/man1/altosui.1
-       /usr/bin/install altosui $(DESTDIR)/usr/bin/altosui
+       install -m 0644 altosui.jar $(DESTDIR)/usr/share/java/altosui.jar
+       install -m 0644 altosui.1 $(DESTDIR)/usr/share/man/man1/altosui.1
+       install altosui $(DESTDIR)/usr/bin/altosui
 
 clean:
        rm -f *.class altosui.jar
@@ -132,6 +136,10 @@ clean:
        rm -rf classes
        rm -rf windows linux
 
+distclean:     clean
+       rm -f $(DARWIN_ZIP) $(WINDOWS_ZIP) $(LINUX_TGZ)
+       rm -rf darwin fat
+
 FAT_FILES=$(FATJAR) $(FREETTSJAR) $(HEXFILES)
 
 LINUX_FILES=$(FAT_FILES) ../libaltos/libaltos.so fat/altosui
@@ -153,7 +161,7 @@ $(DARWIN_ZIP): $(DARWIN_FILES)
        cp $(DARWIN_RESOURCES) darwin/AltosUI.app/Contents/Resources/Java
        mkdir -p darwin/AltOS
        cp $(DARWIN_EXTRA) darwin/AltOS
-       cd darwin && zip -j -r ../$@ AltosUI.app AltOS
+       cd darwin && zip -r ../$@ AltosUI.app AltOS
 
 WINDOWS_FILES = $(FAT_FILES) ../libaltos/altos.dll ../../telemetrum.inf