X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FMakefile;h=d3ecb889d909b3f83afd2df15d6a8ba1c15d2641;hp=affbac39485e4d0ce2c7a2f4a1addeb7c606a526;hb=c443f43f8dee6e0fcbcecf9d09e948fd928b7af4;hpb=ebeb13688a9a5442c838641ede6ba0dc92c9a1a4

diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile
index affbac39..d3ecb889 100644
--- a/ao-tools/altosui/Makefile
+++ b/ao-tools/altosui/Makefile
@@ -1,6 +1,6 @@
 .SUFFIXES: .java .class
 
-CLASSPATH=classes:./*
+CLASSPATH=classes:./*:/usr/share/java/*
 CLASSFILES=\
 	Altos.class \
 	AltosChannelMenu.class \
@@ -8,6 +8,7 @@ CLASSFILES=\
 	AltosConfigUI.class \
 	AltosConvert.class \
 	AltosCSV.class \
+	AltosCSVUI.class \
 	AltosDebug.class \
 	AltosEepromDownload.class \
 	AltosEepromMonitor.class \
@@ -22,6 +23,7 @@ CLASSFILES=\
 	AltosGreatCircle.class \
 	AltosHexfile.class \
 	AltosLog.class \
+	AltosLogfileChooser.class \
 	AltosParse.class \
 	AltosPreferences.class \
 	AltosRecord.class \
@@ -37,16 +39,17 @@ CLASSFILES=\
 	AltosRomconfigUI.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
+#FREETTSSRC=/home/keithp/src/freetts/freetts-1.2.2
+#FREETTSLIB=$(FREETTSSRC)/lib
+#FREETTSJAR=/usr/share/java/freetts.jar
+#FREETTSJAR= \
+#	cmudict04.jar \
+#	cmulex.jar \
+#	cmu_time_awb.jar \
+#	cmutimelex.jar \
+#	cmu_us_kal.jar \
+#	en_us.jar \
+#	freetts.jar
 
 JAVAFLAGS=-Xlint:unchecked -Xlint:deprecation
 
@@ -72,14 +75,14 @@ altosui.jar: classes/altosui classes/libaltosJNI $(FREETTSJAR) $(CLASSFILES) Man
 
 classes/altosui:
 	mkdir -p classes
-	ln -s .. classes/altosui
+	ln -sf .. classes/altosui
 
 classes/libaltosJNI:
 	mkdir -p classes
-	ln -s ../../libaltos/libaltosJNI classes/libaltosJNI
+	ln -sf ../../libaltos/libaltosJNI classes/libaltosJNI
 
-$(FREETTSJAR):
-	ln -s $(FREETTSLIB)/$@ .
+#$(FREETTSJAR):
+#	ln -s $(FREETTSLIB)/$@ .
 
 ifeq ($(OS),Darwin)
 RESOURCES=altosui.jar $(FREETTSJAR) ../libaltos/libaltos.dylib
@@ -98,6 +101,6 @@ altosui:
 endif
 
 clean:
-	rm -f *.class $(FREETTSJAR) altosui.jar
+	rm -f *.class altosui.jar
 	rm -f AltosUI.app/Contents/Resources/Java/*
 	rm -rf classes