From: Bdale Garbee <bdale@gag.com>
Date: Tue, 24 Aug 2010 05:11:22 +0000 (-0600)
Subject: Merge branch 'new-packet-format' of ssh://git.gag.com/scm/git/fw/altos into new-packa... 
X-Git-Tag: debian/0.6+373+gcf65c6b~1^2~11
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=295043112ccde35092945c286596f9045ee6fa05;hp=-c

Merge branch 'new-packet-format' of ssh://git.gag.com/scm/git/fw/altos into new-package-format
---

295043112ccde35092945c286596f9045ee6fa05
diff --combined ao-tools/altosui/Makefile
index 63359fbb,affbac39..d4d3ee7a
--- a/ao-tools/altosui/Makefile
+++ b/ao-tools/altosui/Makefile
@@@ -1,6 -1,6 +1,6 @@@
  .SUFFIXES: .java .class
  
 -CLASSPATH=classes:./*
 +CLASSPATH=classes:./*:/usr/share/java/*
  CLASSFILES=\
  	Altos.class \
  	AltosChannelMenu.class \
@@@ -8,15 -8,19 +8,19 @@@
  	AltosConfigUI.class \
  	AltosConvert.class \
  	AltosCSV.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 \
  	AltosParse.class \
  	AltosPreferences.class \
@@@ -29,19 -33,20 +33,21 @@@
  	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 -Xlint:deprecation
  
@@@ -67,14 -72,14 +73,14 @@@ altosui.jar: classes/altosui classes/li
  
  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
@@@ -93,6 -98,6 +99,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