Merge remote branch 'keithp/macos'

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

diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile
index 39d1a70c74067c20b4d9e31ceb64c9ecbd369302..0613a494d82a8b7915142f85006e344ddb55bce1 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):
 
 .java.class:
        javac -encoding UTF8 -classpath "$(CLASSPATH)" $(JAVAFLAGS) $*.java
 
-altosui.jar: $(CLASSFILES) Manifest.txt
-       jar cfm $@ altosui/Manifest.txt altosui/*.class libaltosJNI/*.class
+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
+       rm -f *.class $(FREETTSJAR) altosui.jar
+       rm -rf classes