altosui: Split status and info panels into separate files

[fw/altos] / ao-tools / altosui / Makefile

diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile
index 2c284aaa8d636ba3847e2264dcd6dcd3abf1964a..3b88e1c128467f7b8077867baefb176c42fc5a40 100644 (file)
--- a/ao-tools/altosui/Makefile
+++ b/ao-tools/altosui/Makefile
@@ -6,6 +6,8 @@ CLASSFILES=\
        AltosEeprom.class \
        AltosEepromMonitor.class \
        AltosFile.class \
+       AltosFlightInfoTableModel.class \
+       AltosFlightStatusTableModel.class \
        AltosGPS.class \
        AltosGreatCircle.class \
        AltosLog.class \
@@ -29,13 +31,21 @@ FREETTSJAR= \
        cmutimelex.jar \
        cmu_us_kal.jar \
        en_us.jar \
-       freetts.jar \
-       freetts-jsapi10.jar \
-       jsapi.jar
+       freetts.jar
 
 JAVAFLAGS=-Xlint:unchecked
 
-all: altosui.jar
+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):
 
@@ -56,6 +66,23 @@ 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 $(FREETTSJAR) altosui.jar
+       rm -f AltosUI.app/Contents/Resources/Java/*
        rm -rf classes