Clean up altosui build a bit

diff --git a/ao-tools/Makefile.am b/ao-tools/Makefile.am
index 2850e909003cbe82e1171c8ff7be8f797a185306..54dc777af134dd8e80c4a3fbf1b5e04c6fe3779a 100644 (file)
--- a/ao-tools/Makefile.am
+++ b/ao-tools/Makefile.am
@@ -1 +1 @@
-SUBDIRS=lib ao-rawload ao-dbg ao-dumplog ao-bitbang ao-eeprom ao-list ao-load ao-postflight ao-view
+SUBDIRS=lib ao-rawload ao-dbg ao-dumplog ao-bitbang ao-eeprom ao-list ao-load ao-postflight ao-view libaltos altosui

diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile
index 4068eebe7d61fbe42079d3e15d2e539f5b5c25d0..aa0278a824d24183a12765eec6d5a3f7325362a5 100644 (file)
--- a/ao-tools/altosui/Makefile
+++ b/ao-tools/altosui/Makefile
@@ -1,6 +1,6 @@
 .SUFFIXES: .java .class
 
-CLASSPATH=..:../libaltos:/usr/share/java/*:/Users/keithp/freetts-1.2.2/lib/*
+CLASSPATH=classes:./*
 CLASSFILES=\
        AltosConvert.class \
        AltosFile.class \
@@ -18,15 +18,42 @@ CLASSFILES=\
        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.jar
+all: altosui.jar
+
+$(CLASSFILES): classes/altosui classes/libaltosJNI $(FREETTSJAR)
 
 .java.class:
        javac -cp "$(CLASSPATH)" $(JAVAFLAGS) $*.java
 
 altosui.jar: $(CLASSFILES) Manifest.txt
-       jar cfm $@ altosui/Manifest.txt altosui/*.class libaltosJNI/*.class
+       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
+       rm -f *.class $(FREETTSJAR) altosui.jar
+       rm -rf classes

diff --git a/ao-tools/altosui/Manifest.txt b/ao-tools/altosui/Manifest.txt
index 7dbaafffc7d9dc2572477d81ac5178c5e7dde521..251ce2a014363294990050744e2f61c607b202e8 100644 (file)
--- a/ao-tools/altosui/Manifest.txt
+++ b/ao-tools/altosui/Manifest.txt
@@ -1,2 +1,2 @@
 Main-Class: altosui.AltosUI
-Class-Path: /home/keithp/src/freetts/freetts-1.2.2/lib/freetts.jar
+Class-Path: freetts.jar

diff --git a/ao-tools/altosui/voices.txt b/ao-tools/altosui/voices.txt
deleted file mode 100644 (file)
index e8825fc..0000000
--- a/ao-tools/altosui/voices.txt
+++ /dev/null
@@ -1 +0,0 @@
-com.sun.speech.freetts.en.us.cmu_us_kal.KevinVoiceDirectory