From: Anthony Towns <aj@erisian.com.au>
Date: Tue, 24 Aug 2010 06:02:31 +0000 (-0600)
Subject: Merge branch 'master' of git://git.gag.com/fw/altos
X-Git-Tag: debian/0.7.1+28+gd8a2f4c~15
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=afea6c264c5ebf12f1d629bd4bc724da86d11b7a

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

afea6c264c5ebf12f1d629bd4bc724da86d11b7a
diff --cc ao-tools/altosui/Makefile
index 541b89e3,bae42c9a..63359fbb
--- a/ao-tools/altosui/Makefile
+++ b/ao-tools/altosui/Makefile
@@@ -1,20 -1,11 +1,20 @@@
  .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 \
@@@ -31,18 -20,19 +31,19 @@@
  	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)