Switch AltosUI to libaltos for device access

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

diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile
index 090911ef06f26f35c445bb2b4e136aa065fde984..1c49ba1161d5b05c422cd6a47ae1bb81a7e0cc6e 100644 (file)
--- a/ao-tools/altosui/Makefile
+++ b/ao-tools/altosui/Makefile
@@ -1,18 +1,32 @@
 .SUFFIXES: .java .class
 
-CLASSPATH=..:/usr/share/java/*
-CLASSFILES=AltosSerialMonitor.class AltosSerial.class AltosTelemetry.class AltosUI.class
+CLASSPATH=..:../libaltos:/usr/share/java/*:/home/keithp/src/freetts/freetts-1.2.2
+CLASSFILES=\
+       AltosConvert.class \
+       AltosFile.class \
+       AltosGPS.class \
+       AltosGreatCircle.class \
+       AltosLog.class \
+       AltosParse.class \
+       AltosPreferences.class \
+       AltosSerialMonitor.class \
+       AltosSerial.class \
+       AltosState.class \
+       AltosTelemetry.class \
+       AltosUI.class \
+       AltosDevice.class \
+       AltosDeviceDialog.class \
+       AltosVoice.class
+
 JAVAFLAGS=-Xlint:unchecked
 
-all: $(CLASSFILES) altosui
+all: $(CLASSFILES) altosui.jar
 
 .java.class:
        javac -cp "$(CLASSPATH)" $(JAVAFLAGS) $*.java
 
-altosui: Makefile
-       (echo '#!/bin/sh'; \
-       echo exec java -cp '"$(CLASSPATH)"' altosui/AltosUI) > $@
-       chmod +x $@
+altosui.jar: $(CLASSFILES) Manifest.txt
+       jar cfm $@ altosui/Manifest.txt altosui/*.class libaltosJNI/*.class
 
 clean:
-       rm -f *.class
\ No newline at end of file
+       rm -f *.class