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

diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile
index b9f025da..a2d70c18 100644
--- a/ao-tools/altosui/Makefile
+++ b/ao-tools/altosui/Makefile
@@ -1,8 +1,10 @@
 .SUFFIXES: .java .class
 
-CLASSPATH=..:/usr/share/java/*
+CLASSPATH=classes:./*
 CLASSFILES=\
 	AltosConvert.class \
+	AltosEeprom.class \
+	AltosEepromMonitor.class \
 	AltosFile.class \
 	AltosGPS.class \
 	AltosGreatCircle.class \
@@ -15,23 +17,43 @@ CLASSFILES=\
 	AltosTelemetry.class \
 	AltosUI.class \
 	AltosDevice.class \
-	AltosDeviceLinux.class \
-	AltosDeviceDialog.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
 
 JAVAFLAGS=-Xlint:unchecked
 
-all: $(CLASSFILES) altosui altosui.jar
+all: altosui.jar
+
+$(CLASSFILES):
 
 .java.class:
-	javac -cp "$(CLASSPATH)" $(JAVAFLAGS) $*.java
+	javac -encoding UTF8 -classpath "$(CLASSPATH)" $(JAVAFLAGS) $*.java
+
+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
 
-altosui: Makefile
-	(echo '#!/bin/sh'; \
-	echo exec java -cp '"$(CLASSPATH)"' altosui/AltosUI) > $@
-	chmod +x $@
+classes/libaltosJNI:
+	mkdir -p classes
+	ln -s ../../libaltos/libaltosJNI classes/libaltosJNI
 
-altosui.jar: $(CLASSFILES) Manifest.txt
-	cd .. && jar cfm altosui/$@ altosui/Manifest.txt altosui/*.class
+$(FREETTSJAR):
+	ln -s $(FREETTSLIB)/$@ .
 
 clean:
-	rm -f *.class
+	rm -f *.class $(FREETTSJAR) altosui.jar
+	rm -rf classes