X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FMakefile;h=cd1230238a1cd199fb3e2a5156248cf67ead5e9f;hp=090911ef06f26f35c445bb2b4e136aa065fde984;hb=734cd15ccff691f851359518ce6118f29dc9f88d;hpb=02f2be90879b682b6e648cf2debc83223d127b9d

diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile
index 090911ef..cd123023 100644
--- a/ao-tools/altosui/Makefile
+++ b/ao-tools/altosui/Makefile
@@ -1,18 +1,59 @@
 .SUFFIXES: .java .class
 
-CLASSPATH=..:/usr/share/java/*
-CLASSFILES=AltosSerialMonitor.class AltosSerial.class AltosTelemetry.class AltosUI.class
+CLASSPATH=classes:./*
+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
+
+FREETTSSRC=/home/keithp/src/freetts/freetts-1.2.2
+FREETTSLIB=$(FREETTSSRC)/lib
+FREETTSJAR= \
+	cmudict04.jar \
+	cmulex.jar \
+	cmu_time_awb.jar \
+	cmutimelex.jar \
+	cmu_us_kal.jar \
+	en_us.jar \
+	freetts.jar \
+	freetts-jsapi10.jar \
+	jsapi.jar
+
 JAVAFLAGS=-Xlint:unchecked
 
-all: $(CLASSFILES) altosui
+all: altosui.jar
+
+$(CLASSFILES):
 
 .java.class:
 	javac -cp "$(CLASSPATH)" $(JAVAFLAGS) $*.java
 
-altosui: Makefile
-	(echo '#!/bin/sh'; \
-	echo exec java -cp '"$(CLASSPATH)"' altosui/AltosUI) > $@
-	chmod +x $@
+altosui.jar: classes/altosui classes/libaltosJNI $(FREETTSJAR) $(CLASSFILES) Manifest.txt
+	cd ./classes && jar cfm ../$@ altosui/Manifest.txt altosui/*.class libaltosJNI/*.class
+
+classes/altosui:
+	mkdir -p classes
+	ln -s .. classes/altosui
+
+classes/libaltosJNI:
+	mkdir -p classes
+	ln -s ../../libaltos/libaltosJNI classes/libaltosJNI
+
+$(FREETTSJAR):
+	ln -s $(FREETTSLIB)/$@ .
 
 clean:
-	rm -f *.class
\ No newline at end of file
+	rm -f *.class $(FREETTSJAR) altosui.jar
+	rm -rf classes