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 57c889b8d37c3d1c335221791289b65178d2bdc5..1c49ba1161d5b05c422cd6a47ae1bb81a7e0cc6e 100644 (file)
--- a/ao-tools/altosui/Makefile
+++ b/ao-tools/altosui/Makefile
@@ -1,6 +1,6 @@
 .SUFFIXES: .java .class
 
-CLASSPATH=..:/usr/share/java/*:/home/keithp/src/freetts/freetts-1.2.2
+CLASSPATH=..:../libaltos:/usr/share/java/*:/home/keithp/src/freetts/freetts-1.2.2
 CLASSFILES=\
        AltosConvert.class \
        AltosFile.class \
@@ -15,24 +15,18 @@ CLASSFILES=\
        AltosTelemetry.class \
        AltosUI.class \
        AltosDevice.class \
-       AltosDeviceLinux.class \
        AltosDeviceDialog.class \
        AltosVoice.class
 
 JAVAFLAGS=-Xlint:unchecked
 
-all: $(CLASSFILES) altosui altosui.jar
+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
-       cd .. && jar cfm altosui/$@ altosui/Manifest.txt altosui/*.class
+       jar cfm $@ altosui/Manifest.txt altosui/*.class libaltosJNI/*.class
 
 clean:
        rm -f *.class