altosui: discard invalid lines while reading Eeprom flight data

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

diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile
index de78b76506558a06df091dc5bf61a9f7656dd53d..770abcf33cae87954bafd303730360e44e423a1c 100644 (file)
--- a/ao-tools/altosui/Makefile
+++ b/ao-tools/altosui/Makefile
@@ -1,6 +1,6 @@
 .SUFFIXES: .java .class
 
-CLASSPATH=classes:./*
+CLASSPATH=classes:./*:/usr/share/java/*
 CLASSFILES=\
        Altos.class \
        AltosChannelMenu.class \
@@ -8,6 +8,7 @@ CLASSFILES=\
        AltosConfigUI.class \
        AltosConvert.class \
        AltosCSV.class \
+       AltosCSVUI.class \
        AltosDebug.class \
        AltosEepromDownload.class \
        AltosEepromMonitor.class \
@@ -38,16 +39,17 @@ CLASSFILES=\
        AltosRomconfigUI.class \
        AltosVoice.class
 
-FREETTSSRC=/home/keithp/src/freetts/freetts-1.2.2
-FREETTSLIB=$(FREETTSSRC)/lib
-FREETTSJAR= \
-       cmudict04.jar \
-       cmulex.jar \
-       cmu_time_awb.jar \
-       cmutimelex.jar \
-       cmu_us_kal.jar \
-       en_us.jar \
-       freetts.jar
+#FREETTSSRC=/home/keithp/src/freetts/freetts-1.2.2
+#FREETTSLIB=$(FREETTSSRC)/lib
+#FREETTSJAR=/usr/share/java/freetts.jar
+#FREETTSJAR= \
+#      cmudict04.jar \
+#      cmulex.jar \
+#      cmu_time_awb.jar \
+#      cmutimelex.jar \
+#      cmu_us_kal.jar \
+#      en_us.jar \
+#      freetts.jar
 
 JAVAFLAGS=-Xlint:unchecked -Xlint:deprecation
 
@@ -73,14 +75,14 @@ altosui.jar: classes/altosui classes/libaltosJNI $(FREETTSJAR) $(CLASSFILES) Man
 
 classes/altosui:
        mkdir -p classes
-       ln -s .. classes/altosui
+       ln -sf .. classes/altosui
 
 classes/libaltosJNI:
        mkdir -p classes
-       ln -s ../../libaltos/libaltosJNI classes/libaltosJNI
+       ln -sf ../../libaltos/libaltosJNI classes/libaltosJNI
 
-$(FREETTSJAR):
-       ln -s $(FREETTSLIB)/$@ .
+#$(FREETTSJAR):
+#      ln -s $(FREETTSLIB)/$@ .
 
 ifeq ($(OS),Darwin)
 RESOURCES=altosui.jar $(FREETTSJAR) ../libaltos/libaltos.dylib
@@ -94,11 +96,17 @@ endif
 ifeq ($(OS),Linux)
 altosui:
        echo "#!/bin/sh" > $@
-       echo "exec java -Djava.library.path=../libaltos -jar altosui.jar" >> $@
+       echo "exec java -Djava.library.path=/usr/lib/altos -jar /usr/share/java/altosui.jar" >> $@
        chmod +x ./altosui
+
+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
+       
 endif
 
 clean:
-       rm -f *.class $(FREETTSJAR) altosui.jar
+       rm -f *.class altosui.jar
        rm -f AltosUI.app/Contents/Resources/Java/*
        rm -rf classes