Merge remote branch 'keithp/macos'

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

diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile
index aa0278a824d24183a12765eec6d5a3f7325362a5..0613a494d82a8b7915142f85006e344ddb55bce1 100644 (file)
--- a/ao-tools/altosui/Makefile
+++ b/ao-tools/altosui/Makefile
@@ -35,12 +35,12 @@ JAVAFLAGS=-Xlint:unchecked
 
 all: altosui.jar
 
-$(CLASSFILES): classes/altosui classes/libaltosJNI $(FREETTSJAR)
+$(CLASSFILES):
 
 .java.class:
-       javac -cp "$(CLASSPATH)" $(JAVAFLAGS) $*.java
+       javac -encoding UTF8 -classpath "$(CLASSPATH)" $(JAVAFLAGS) $*.java
 
-altosui.jar: $(CLASSFILES) Manifest.txt
+altosui.jar: classes/altosui classes/libaltosJNI $(FREETTSJAR) $(CLASSFILES) Manifest.txt
        cd ./classes && jar cfm ../$@ altosui/Manifest.txt altosui/*.class libaltosJNI/*.class
 
 classes/altosui: