From: Bdale Garbee <bdale@gag.com>
Date: Fri, 27 Aug 2010 09:08:53 +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~10
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=c443f43f8dee6e0fcbcecf9d09e948fd928b7af4;hp=-c

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

c443f43f8dee6e0fcbcecf9d09e948fd928b7af4
diff --combined ao-tools/altosui/Makefile
index d4d3ee7a,1273e7d4..d3ecb889
--- 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,6 -8,7 +8,7 @@@
  	AltosConfigUI.class \
  	AltosConvert.class \
  	AltosCSV.class \
+ 	AltosCSVUI.class \
  	AltosDebug.class \
  	AltosEepromDownload.class \
  	AltosEepromMonitor.class \
@@@ -22,6 -23,7 +23,7 @@@
  	AltosGreatCircle.class \
  	AltosHexfile.class \
  	AltosLog.class \
+ 	AltosLogfileChooser.class \
  	AltosParse.class \
  	AltosPreferences.class \
  	AltosRecord.class \
@@@ -37,17 -39,16 +39,17 @@@
  	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
  
@@@ -73,14 -74,14 +75,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
@@@ -99,6 -100,6 +101,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