From: Keith Packard <keithp@keithp.com>
Date: Fri, 27 Aug 2010 18:00:31 +0000 (-0700)
Subject: Merge remote branch 'origin/master' into new-packet-format
X-Git-Tag: debian/0.6+373+gcf65c6b~2
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=5f2f6a8f9ba56be867888758848bc7f152ccbd47;hp=--cc

Merge remote branch 'origin/master' into new-packet-format
---

5f2f6a8f9ba56be867888758848bc7f152ccbd47
diff --cc ao-tools/altosui/Makefile
index 1273e7d4,bae42c9a..d3ecb889
--- a/ao-tools/altosui/Makefile
+++ b/ao-tools/altosui/Makefile
@@@ -1,32 -1,16 +1,32 @@@
  .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 \
 +	AltosCSVUI.class \
 +	AltosDebug.class \
 +	AltosEepromDownload.class \
  	AltosEepromMonitor.class \
 +	AltosEepromReader.class \
 +	AltosEepromRecord.class \
  	AltosFile.class \
 +	AltosFlash.class \
 +	AltosFlashUI.class \
 +	AltosFlightInfoTableModel.class \
 +	AltosFlightStatusTableModel.class \
  	AltosGPS.class \
  	AltosGreatCircle.class \
 +	AltosHexfile.class \
  	AltosLog.class \
 +	AltosLogfileChooser.class \
  	AltosParse.class \
  	AltosPreferences.class \
 +	AltosRecord.class \
  	AltosSerialMonitor.class \
  	AltosSerial.class \
  	AltosState.class \
@@@ -35,22 -18,21 +35,23 @@@
  	AltosUI.class \
  	AltosDevice.class \
  	AltosDeviceDialog.class \
 +	AltosRomconfig.class \
 +	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
 +JAVAFLAGS=-Xlint:unchecked -Xlint:deprecation
  
  OS:=$(shell uname)