X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FMakefile;h=2c284aaa8d636ba3847e2264dcd6dcd3abf1964a;hp=57c889b8d37c3d1c335221791289b65178d2bdc5;hb=ce90f3fe2aa6e23695ccccb36a8e6e614a08ba31;hpb=563a9dcdfef42718370c49f16cc2271642b3e055

diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile
index 57c889b8..2c284aaa 100644
--- a/ao-tools/altosui/Makefile
+++ b/ao-tools/altosui/Makefile
@@ -1,8 +1,10 @@
 .SUFFIXES: .java .class
 
-CLASSPATH=..:/usr/share/java/*:/home/keithp/src/freetts/freetts-1.2.2
+CLASSPATH=classes:./*
 CLASSFILES=\
 	AltosConvert.class \
+	AltosEeprom.class \
+	AltosEepromMonitor.class \
 	AltosFile.class \
 	AltosGPS.class \
 	AltosGreatCircle.class \
@@ -15,24 +17,45 @@ CLASSFILES=\
 	AltosTelemetry.class \
 	AltosUI.class \
 	AltosDevice.class \
-	AltosDeviceLinux.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 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