Clean up altosui build a bit

[fw/altos] / ao-tools / altosui / Makefile

diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile
index cb422df8c1955f046c13047bac28069b155c5261..aa0278a824d24183a12765eec6d5a3f7325362a5 100644 (file)
--- a/ao-tools/altosui/Makefile
+++ b/ao-tools/altosui/Makefile
@@ -1,13 +1,59 @@
 .SUFFIXES: .java .class
 
-CLASSPATH=..
-CLASSFILES=AltosSerialMonitor.class AltosSerial.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)
+all: altosui.jar
+
+$(CLASSFILES): classes/altosui classes/libaltosJNI $(FREETTSJAR)
 
 .java.class:
-       javac -cp $(CLASSPATH) $(JAVAFLAGS) $*.java
+       javac -cp "$(CLASSPATH)" $(JAVAFLAGS) $*.java
+
+altosui.jar: $(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