diff options
| author | Keith Packard <keithp@keithp.com> | 2010-08-27 11:00:31 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-08-27 11:00:31 -0700 |
| commit | 5f2f6a8f9ba56be867888758848bc7f152ccbd47 (patch) | |
| tree | a7293f303438ef7230174f039453e613ac499eb4 /ao-tools | |
| parent | 63bd34cd1b5a411489e8c3ab377f0fe0eec11f67 (diff) | |
| parent | 9d1b27fa147fc8b765d5be165ebef7ee0f85bd37 (diff) | |
Merge remote branch 'origin/master' into new-packet-format
Diffstat (limited to 'ao-tools')
| -rw-r--r-- | ao-tools/altosui/Makefile | 33 | ||||
| -rw-r--r-- | ao-tools/altosui/Manifest.txt | 2 |
2 files changed, 18 insertions, 17 deletions
diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile index 1273e7d4..d3ecb889 100644 --- a/ao-tools/altosui/Makefile +++ b/ao-tools/altosui/Makefile @@ -1,6 +1,6 @@ .SUFFIXES: .java .class -CLASSPATH=classes:./* +CLASSPATH=classes:./*:/usr/share/java/* CLASSFILES=\ Altos.class \ AltosChannelMenu.class \ @@ -39,16 +39,17 @@ CLASSFILES=\ 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 @@ -74,14 +75,14 @@ altosui.jar: classes/altosui classes/libaltosJNI $(FREETTSJAR) $(CLASSFILES) Man 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 @@ -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 diff --git a/ao-tools/altosui/Manifest.txt b/ao-tools/altosui/Manifest.txt index 251ce2a0..504d0de3 100644 --- a/ao-tools/altosui/Manifest.txt +++ b/ao-tools/altosui/Manifest.txt @@ -1,2 +1,2 @@ Main-Class: altosui.AltosUI -Class-Path: freetts.jar +Class-Path: /usr/share/java/freetts.jar |