Merge branch 'master' of git://git.gag.com/fw/altos

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

diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile
index 790aecdabefcb570065df7516e9af59f4e1440e0..63359fbbf4be82e3c01b970f3baf4c6370ebb203 100644 (file)
--- a/ao-tools/altosui/Makefile
+++ b/ao-tools/altosui/Makefile
@@ -1,37 +1,49 @@
 .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 \
        AltosGPS.class \
        AltosGreatCircle.class \
        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)
 
@@ -55,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
@@ -81,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