X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FMakefile;h=63359fbbf4be82e3c01b970f3baf4c6370ebb203;hp=3f55db0b81da40192bf3c35c25863c82e76709ac;hb=2007288da8a83e3aa925e11cc196f1c65aab2e5c;hpb=d8bf05f7ad55964c9bce0551e58f4ef6c9f721ad

diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile
index 3f55db0b..63359fbb 100644
--- a/ao-tools/altosui/Makefile
+++ b/ao-tools/altosui/Makefile
@@ -1,9 +1,13 @@
 .SUFFIXES: .java .class
 
-CLASSPATH=classes:./*
+CLASSPATH=classes:./*:/usr/share/java/*
 CLASSFILES=\
 	Altos.class \
+	AltosChannelMenu.class \
+	AltosConfig.class \
+	AltosConfigUI.class \
 	AltosConvert.class \
+	AltosCSV.class \
 	AltosEepromDownload.class \
 	AltosEepromMonitor.class \
 	AltosEepromReader.class \
@@ -21,23 +25,25 @@ CLASSFILES=\
 	AltosSerial.class \
 	AltosState.class \
 	AltosTelemetry.class \
+	AltosTelemetryReader.class \
 	AltosUI.class \
 	AltosDevice.class \
 	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
+#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
+JAVAFLAGS=-Xlint:unchecked -Xlint:deprecation
 
 OS:=$(shell uname)
 
@@ -61,14 +67,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
@@ -87,6 +93,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