X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=ao-tools%2Faltosui%2FMakefile;h=39d1a70c74067c20b4d9e31ceb64c9ecbd369302;hb=554a97ef455c801dcab825815f44520f96f4c3f3;hp=b9f025dab5359b4ecf00a3b203a9b9567719e66c;hpb=97f4874d19ec05c81a04a3ecd06abffcf7fbfafc;p=fw%2Faltos

diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile
index b9f025da..39d1a70c 100644
--- a/ao-tools/altosui/Makefile
+++ b/ao-tools/altosui/Makefile
@@ -1,6 +1,6 @@
 .SUFFIXES: .java .class
 
-CLASSPATH=..:/usr/share/java/*
+CLASSPATH=..:../libaltos:/usr/share/java/*:/Users/keithp/freetts-1.2.2/lib/*
 CLASSFILES=\
 	AltosConvert.class \
 	AltosFile.class \
@@ -15,23 +15,18 @@ CLASSFILES=\
 	AltosTelemetry.class \
 	AltosUI.class \
 	AltosDevice.class \
-	AltosDeviceLinux.class \
-	AltosDeviceDialog.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 $@
+	javac -encoding UTF8 -classpath "$(CLASSPATH)" $(JAVAFLAGS) $*.java
 
 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