projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix up the wrapper's path to the jar file
[fw/altos]
/
ao-tools
/
altosui
/
Makefile
diff --git
a/ao-tools/altosui/Makefile
b/ao-tools/altosui/Makefile
index affbac39485e4d0ce2c7a2f4a1addeb7c606a526..73bc230da6238cc70fd4c40eb57751dc15bc3256 100644
(file)
--- a/
ao-tools/altosui/Makefile
+++ b/
ao-tools/altosui/Makefile
@@
-1,6
+1,6
@@
.SUFFIXES: .java .class
.SUFFIXES: .java .class
-CLASSPATH=classes:./*
+CLASSPATH=classes:./*
:/usr/share/java/*
CLASSFILES=\
Altos.class \
AltosChannelMenu.class \
CLASSFILES=\
Altos.class \
AltosChannelMenu.class \
@@
-8,6
+8,7
@@
CLASSFILES=\
AltosConfigUI.class \
AltosConvert.class \
AltosCSV.class \
AltosConfigUI.class \
AltosConvert.class \
AltosCSV.class \
+ AltosCSVUI.class \
AltosDebug.class \
AltosEepromDownload.class \
AltosEepromMonitor.class \
AltosDebug.class \
AltosEepromDownload.class \
AltosEepromMonitor.class \
@@
-22,6
+23,7
@@
CLASSFILES=\
AltosGreatCircle.class \
AltosHexfile.class \
AltosLog.class \
AltosGreatCircle.class \
AltosHexfile.class \
AltosLog.class \
+ AltosLogfileChooser.class \
AltosParse.class \
AltosPreferences.class \
AltosRecord.class \
AltosParse.class \
AltosPreferences.class \
AltosRecord.class \
@@
-37,16
+39,17
@@
CLASSFILES=\
AltosRomconfigUI.class \
AltosVoice.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
JAVAFLAGS=-Xlint:unchecked -Xlint:deprecation
@@
-72,14
+75,14
@@
altosui.jar: classes/altosui classes/libaltosJNI $(FREETTSJAR) $(CLASSFILES) Man
classes/altosui:
mkdir -p classes
classes/altosui:
mkdir -p classes
- ln -s .. classes/altosui
+ ln -s
f
.. classes/altosui
classes/libaltosJNI:
mkdir -p classes
classes/libaltosJNI:
mkdir -p classes
- ln -s ../../libaltos/libaltosJNI classes/libaltosJNI
+ ln -s
f
../../libaltos/libaltosJNI classes/libaltosJNI
-$(FREETTSJAR):
-
ln -s $(FREETTSLIB)/$@ .
+
#
$(FREETTSJAR):
+
#
ln -s $(FREETTSLIB)/$@ .
ifeq ($(OS),Darwin)
RESOURCES=altosui.jar $(FREETTSJAR) ../libaltos/libaltos.dylib
ifeq ($(OS),Darwin)
RESOURCES=altosui.jar $(FREETTSJAR) ../libaltos/libaltos.dylib
@@
-93,11
+96,16
@@
endif
ifeq ($(OS),Linux)
altosui:
echo "#!/bin/sh" > $@
ifeq ($(OS),Linux)
altosui:
echo "#!/bin/sh" > $@
- echo "exec java -Djava.library.path=
../libaltos -jar
altosui.jar" >> $@
+ echo "exec java -Djava.library.path=
/usr/lib/altos/libaltos -jar /usr/share/java/
altosui.jar" >> $@
chmod +x ./altosui
chmod +x ./altosui
+
+install: altosui.jar altosui
+ /usr/bin/install -c altosui.jar $(DESTDIR)/usr/share/java/altosui.jar
+ /usr/bin/install -c altosui $(DESTDIR)/usr/bin/altosui
+
endif
clean:
endif
clean:
- rm -f *.class
$(FREETTSJAR)
altosui.jar
+ rm -f *.class altosui.jar
rm -f AltosUI.app/Contents/Resources/Java/*
rm -rf classes
rm -f AltosUI.app/Contents/Resources/Java/*
rm -rf classes