diff options
| author | Keith Packard <keithp@keithp.com> | 2010-07-27 01:22:56 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-07-27 01:22:56 -0700 |
| commit | 809feb75e2155e84aebfcc431867edcfd9054670 (patch) | |
| tree | babaf777ebd935c18a629baa28acf113a126b71c | |
| parent | 3784578a40dcc61f447435cfdf22e13c409cb9c0 (diff) | |
Clean up altosui build a bit
| -rw-r--r-- | ao-tools/Makefile.am | 2 | ||||
| -rw-r--r-- | ao-tools/altosui/Makefile | 35 | ||||
| -rw-r--r-- | ao-tools/altosui/Manifest.txt | 2 | ||||
| -rw-r--r-- | ao-tools/altosui/voices.txt | 1 |
4 files changed, 33 insertions, 7 deletions
diff --git a/ao-tools/Makefile.am b/ao-tools/Makefile.am index 2850e909..54dc777a 100644 --- a/ao-tools/Makefile.am +++ b/ao-tools/Makefile.am @@ -1 +1 @@ -SUBDIRS=lib ao-rawload ao-dbg ao-dumplog ao-bitbang ao-eeprom ao-list ao-load ao-postflight ao-view +SUBDIRS=lib ao-rawload ao-dbg ao-dumplog ao-bitbang ao-eeprom ao-list ao-load ao-postflight ao-view libaltos altosui diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile index 4068eebe..aa0278a8 100644 --- a/ao-tools/altosui/Makefile +++ b/ao-tools/altosui/Makefile @@ -1,6 +1,6 @@ .SUFFIXES: .java .class -CLASSPATH=..:../libaltos:/usr/share/java/*:/Users/keithp/freetts-1.2.2/lib/* +CLASSPATH=classes:./* CLASSFILES=\ AltosConvert.class \ AltosFile.class \ @@ -18,15 +18,42 @@ CLASSFILES=\ 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 \ + freetts-jsapi10.jar \ + jsapi.jar + JAVAFLAGS=-Xlint:unchecked -all: $(CLASSFILES) altosui.jar +all: altosui.jar + +$(CLASSFILES): classes/altosui classes/libaltosJNI $(FREETTSJAR) .java.class: javac -cp "$(CLASSPATH)" $(JAVAFLAGS) $*.java altosui.jar: $(CLASSFILES) Manifest.txt - jar cfm $@ altosui/Manifest.txt altosui/*.class libaltosJNI/*.class + cd ./classes && jar cfm ../$@ altosui/Manifest.txt altosui/*.class libaltosJNI/*.class + +classes/altosui: + mkdir -p classes + ln -s .. classes/altosui + +classes/libaltosJNI: + mkdir -p classes + ln -s ../../libaltos/libaltosJNI classes/libaltosJNI + +$(FREETTSJAR): + ln -s $(FREETTSLIB)/$@ . clean: - rm -f *.class + rm -f *.class $(FREETTSJAR) altosui.jar + rm -rf classes diff --git a/ao-tools/altosui/Manifest.txt b/ao-tools/altosui/Manifest.txt index 7dbaafff..251ce2a0 100644 --- a/ao-tools/altosui/Manifest.txt +++ b/ao-tools/altosui/Manifest.txt @@ -1,2 +1,2 @@ Main-Class: altosui.AltosUI -Class-Path: /home/keithp/src/freetts/freetts-1.2.2/lib/freetts.jar +Class-Path: freetts.jar diff --git a/ao-tools/altosui/voices.txt b/ao-tools/altosui/voices.txt deleted file mode 100644 index e8825fc3..00000000 --- a/ao-tools/altosui/voices.txt +++ /dev/null @@ -1 +0,0 @@ -com.sun.speech.freetts.en.us.cmu_us_kal.KevinVoiceDirectory |