X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FMakefile;h=d3ecb889d909b3f83afd2df15d6a8ba1c15d2641;hp=cb422df8c1955f046c13047bac28069b155c5261;hb=5f2f6a8f9ba56be867888758848bc7f152ccbd47;hpb=7f233369e32c3254165ee251df0a3dbc21ea5a29

diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile
index cb422df8..d3ecb889 100644
--- a/ao-tools/altosui/Makefile
+++ b/ao-tools/altosui/Makefile
@@ -1,13 +1,106 @@
 .SUFFIXES: .java .class
 
-CLASSPATH=..
-CLASSFILES=AltosSerialMonitor.class AltosSerial.class AltosUI.class
-JAVAFLAGS=-Xlint:unchecked
+CLASSPATH=classes:./*:/usr/share/java/*
+CLASSFILES=\
+	Altos.class \
+	AltosChannelMenu.class \
+	AltosConfig.class \
+	AltosConfigUI.class \
+	AltosConvert.class \
+	AltosCSV.class \
+	AltosCSVUI.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 \
+	AltosLogfileChooser.class \
+	AltosParse.class \
+	AltosPreferences.class \
+	AltosRecord.class \
+	AltosSerialMonitor.class \
+	AltosSerial.class \
+	AltosState.class \
+	AltosTelemetry.class \
+	AltosTelemetryReader.class \
+	AltosUI.class \
+	AltosDevice.class \
+	AltosDeviceDialog.class \
+	AltosRomconfig.class \
+	AltosRomconfigUI.class \
+	AltosVoice.class
 
-all: $(CLASSFILES)
+#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
+
+OS:=$(shell uname)
+
+ifeq ($(OS),Linux)
+ALTOSUI_APP=altosui
+endif
+
+ifeq ($(OS),Darwin)
+ALTOSUI_APP=AltosUI.app/Contents/Resources/Java/altosui.jar
+endif
+
+all: altosui.jar $(ALTOSUI_APP)
+
+$(CLASSFILES):
 
 .java.class:
-	javac -cp $(CLASSPATH) $(JAVAFLAGS) $*.java
+	javac -encoding UTF8 -classpath "$(CLASSPATH)" $(JAVAFLAGS) $*.java
+
+altosui.jar: classes/altosui classes/libaltosJNI $(FREETTSJAR) $(CLASSFILES) Manifest.txt
+	cd ./classes && jar cfm ../$@ altosui/Manifest.txt altosui/*.class libaltosJNI/*.class
+
+classes/altosui:
+	mkdir -p classes
+	ln -sf .. classes/altosui
+
+classes/libaltosJNI:
+	mkdir -p classes
+	ln -sf ../../libaltos/libaltosJNI classes/libaltosJNI
+
+#$(FREETTSJAR):
+#	ln -s $(FREETTSLIB)/$@ .
+
+ifeq ($(OS),Darwin)
+RESOURCES=altosui.jar $(FREETTSJAR) ../libaltos/libaltos.dylib
+
+$(ALTOSUI_APP): $(RESOURCES)
+	mkdir -p AltosUI.app/Contents/Resources/Java
+	cp $(RESOURCES) AltosUI.app/Contents/Resources/Java
+
+endif
+
+ifeq ($(OS),Linux)
+altosui:
+	echo "#!/bin/sh" > $@
+	echo "exec java -Djava.library.path=../libaltos -jar altosui.jar" >> $@
+	chmod +x ./altosui
+endif
 
 clean:
-	rm -f *.class
\ No newline at end of file
+	rm -f *.class altosui.jar
+	rm -f AltosUI.app/Contents/Resources/Java/*
+	rm -rf classes