X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-tools%2Faltosui%2FMakefile;h=4068eebe7d61fbe42079d3e15d2e539f5b5c25d0;hb=0a782026f6b19e84ffd44f1ae1b466363474bd30;hp=57c889b8d37c3d1c335221791289b65178d2bdc5;hpb=0c6cf621dfd8339b8bc3915750a3147235f1331b;p=fw%2Faltos

diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile
index 57c889b8..4068eebe 100644
--- 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/*:/Users/keithp/freetts-1.2.2/lib/*
 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