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

diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile
index 3b88e1c1..63359fbb 100644
--- a/ao-tools/altosui/Makefile
+++ b/ao-tools/altosui/Makefile
@@ -1,10 +1,17 @@
 .SUFFIXES: .java .class
 
-CLASSPATH=classes:./*
+CLASSPATH=classes:./*:/usr/share/java/*
 CLASSFILES=\
+	Altos.class \
+	AltosChannelMenu.class \
+	AltosConfig.class \
+	AltosConfigUI.class \
 	AltosConvert.class \
-	AltosEeprom.class \
+	AltosCSV.class \
+	AltosEepromDownload.class \
 	AltosEepromMonitor.class \
+	AltosEepromReader.class \
+	AltosEepromRecord.class \
 	AltosFile.class \
 	AltosFlightInfoTableModel.class \
 	AltosFlightStatusTableModel.class \
@@ -13,27 +20,30 @@ CLASSFILES=\
 	AltosLog.class \
 	AltosParse.class \
 	AltosPreferences.class \
+	AltosRecord.class \
 	AltosSerialMonitor.class \
 	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)
 
@@ -57,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
@@ -83,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