From: Keith Packard <keithp@keithp.com>
Date: Wed, 28 Jul 2010 20:29:51 +0000 (-0700)
Subject: Merge remote branch 'keithp/macos'
X-Git-Tag: debian/0.6+268+gd0fd53b~7
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=8a6040e143ecc7830cc1c0114de85f3b72c067eb

Merge remote branch 'keithp/macos'
---

8a6040e143ecc7830cc1c0114de85f3b72c067eb
diff --cc ao-tools/altosui/Makefile
index cd123023,39d1a70c..0613a494
--- a/ao-tools/altosui/Makefile
+++ b/ao-tools/altosui/Makefile
@@@ -18,42 -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 -cp "$(CLASSPATH)" $(JAVAFLAGS) $*.java
+ 	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