altosui: Remove ability to graph data in .csv files

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

diff --git a/ao-tools/altosui/Makefile.am b/ao-tools/altosui/Makefile.am
index ab8ca7d4a80163b4ed385a64ac65c12702a136b8..58c1517fdbe4ad307f2039843fb7b73ae6822fac 100644 (file)
--- a/ao-tools/altosui/Makefile.am
+++ b/ao-tools/altosui/Makefile.am
@@ -5,7 +5,7 @@ man_MANS=altosui.1
 
 altoslibdir=$(libdir)/altos
 
-CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../libaltos:$(JFREECHART)/*:$(FREETTS)/*:/usr/share/java/*"
+CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../libaltos:$(FREETTS)/*:/usr/share/java/*"
 
 bin_SCRIPTS=altosui
 
@@ -35,6 +35,7 @@ altosui_JAVA = \
        AltosHexfile.java \
        Altos.java \
        AltosInfoTable.java \
+       AltosKML.java \
        AltosLine.java \
        AltosLogfileChooser.java \
        AltosLog.java \
@@ -53,12 +54,13 @@ altosui_JAVA = \
        AltosTelemetry.java \
        AltosTelemetryIterable.java \
        AltosUI.java \
-    AltosCsvReader.java \
-    AltosDataPoint.java \
-    AltosGraph.java \
-    AltosGraphTime.java \
-    AltosGraphUI.java \
-    AltosGraphDataChooser.java \
+       AltosWriter.java \
+       AltosDataPointReader.java \
+       AltosDataPoint.java \
+       AltosGraph.java \
+       AltosGraphTime.java \
+       AltosGraphUI.java \
+       AltosGraphDataChooser.java \
        AltosVoice.java
 
 JFREECHART_CLASS= \
@@ -108,13 +110,13 @@ MACOSX_EXTRA=$(FIRMWARE)
 
 WINDOWS_FILES=$(FAT_FILES) altos.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON)
 
-all-local: classes/altosui $(JAR) altosui altosui-test
+all-local: classes/altosui $(JAR) altosui altosui-test altosui-jdb
 
 clean-local:
        -rm -rf classes $(JAR) $(FATJAR) \
                $(LINUX_DIST) $(MACOSX_DIST) windows $(WINDOWS_DIST) $(FREETTS_CLASS) \
                $(JFREECHART_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log \
-               altosui altosui-test macosx linux
+               altosui altosui-test altosui-jdb macosx linux
 
 if FATINSTALL
 
@@ -168,7 +170,7 @@ $(FATJAR): classaltosui.stamp Manifest-fat.txt $(FREETTS_CLASS) $(JFREECHART_CLA
 
 Manifest.txt: Makefile
        echo 'Main-Class: altosui.AltosUI' > $@
-       echo "Class-Path: $(FREETTS)/freetts.jar $(JFREECHART)/jfreechart.jar $(JFREECHAR)/jcommon.jar $(JFREECHART)/csv.jar" >> $@
+       echo "Class-Path: $(FREETTS)/freetts.jar $(FREETTS)/jfreechart.jar $(FREETTS)/jcommon.jar $(FREETTS)/csv.jar" >> $@
 
 Manifest-fat.txt:
        echo 'Main-Class: altosui.AltosUI' > $@
@@ -184,6 +186,11 @@ altosui-test: Makefile
        echo 'exec java -cp "$(FREETTS)/*" -Djava.library.path="../libaltos/.libs" -jar altosui.jar "$$@"' >> $@
        chmod +x $@
 
+altosui-jdb: Makefile
+       echo "#!/bin/sh" > $@
+       echo 'exec jdb -classpath "classes:../libaltos:$(FREETTS)/*" -Djava.library.path="../libaltos/.libs" altosui/AltosUI "$$@"' >> $@
+       chmod +x $@
+
 libaltos.so:
        -rm -f "$@"
        $(LN_S) ../libaltos/.libs/"$@" .