bin_SCRIPTS=altosui
altosui_JAVA = \
+ AltosAscent.java \
AltosChannelMenu.java \
AltosConfig.java \
AltosConfigUI.java \
AltosCSV.java \
AltosCSVUI.java \
AltosDebug.java \
+ AltosDescent.java \
AltosDeviceDialog.java \
AltosDevice.java \
AltosDisplayThread.java \
AltosFile.java \
AltosFlash.java \
AltosFlashUI.java \
+ AltosFlightDisplay.java \
AltosFlightInfoTableModel.java \
+ AltosFlightReader.java \
AltosFlightStatusTableModel.java \
+ AltosFlightUI.java \
AltosGPS.java \
AltosGreatCircle.java \
AltosHexfile.java \
Altos.java \
AltosInfoTable.java \
AltosKML.java \
+ AltosLanded.java \
+ AltosLed.java \
+ AltosLights.java \
AltosLine.java \
AltosLogfileChooser.java \
AltosLog.java \
+ AltosPad.java \
AltosParse.java \
AltosPreferences.java \
AltosReader.java \
AltosRecord.java \
AltosRecordIterable.java \
- AltosReplayThread.java \
+ AltosTelemetryReader.java \
+ AltosReplayReader.java \
AltosRomconfig.java \
AltosRomconfigUI.java \
AltosSerial.java \
AltosSerialMonitor.java \
+ AltosSiteMap.java \
AltosState.java \
AltosStatusTable.java \
AltosTelemetry.java \
AltosUI.java \
AltosWriter.java \
AltosDataPointReader.java \
- AltosCsvReader.java \
AltosDataPoint.java \
AltosGraph.java \
AltosGraphTime.java \
AltosVoice.java
JFREECHART_CLASS= \
- jfreechart.jar \
- jcommon.jar \
- csv.jar
+ jfreechart.jar
+
+JCOMMON_CLASS=\
+ jcommon.jar
FREETTS_CLASS= \
cmudict04.jar \
FATJAR=altosui-fat.jar
# Icons
-JAVA_ICON=$(top_srcdir)/icon/altus-metrum-16x16.jpg
-WINDOWS_ICON=$(top_srcdir)/icon/altus-metrum.ico
+ICONDIR=$(top_srcdir)/icon
+
+JAVA_ICON=$(ICONDIR)/altus-metrum-16x16.jpg
+
+ICONS= $(ICONDIR)/redled.png $(ICONDIR)/redoff.png \
+ $(ICONDIR)/greenled.png $(ICONDIR)/greenoff.png \
+ $(ICONDIR)/grayled.png $(ICONDIR)/grayoff.png
+
+# icon base names for jar
+ICONJAR= -C $(ICONDIR) altus-metrum-16x16.jpg \
+ -C $(ICONDIR) redled.png -C $(ICONDIR) redoff.png \
+ -C $(ICONDIR) greenled.png -C $(ICONDIR) greenoff.png \
+ -C $(ICONDIR) grayon.png -C $(ICONDIR) grayled.png
+
+WINDOWS_ICON=$(ICONDIR)/altus-metrum.ico
# Firmware
FIRMWARE_TD=$(top_srcdir)/src/teledongle-v0.2-$(VERSION).ihx
MACOSX_DIST=Altos-Mac-$(VERSION).zip
WINDOWS_DIST=Altos-Windows-$(VERSION_DASH).exe
-FAT_FILES=$(FATJAR) $(FREETTS_CLASS) $(JFREECHART_CLASS)
+FAT_FILES=$(FATJAR) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS)
LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE)
LINUX_EXTRA=altosui-fat
clean-local:
-rm -rf classes $(JAR) $(FATJAR) \
$(LINUX_DIST) $(MACOSX_DIST) windows $(WINDOWS_DIST) $(FREETTS_CLASS) \
- $(JFREECHART_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log \
+ $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log \
altosui altosui-test altosui-jdb macosx linux
if FATINSTALL
$(JAR): classaltosui.stamp Manifest.txt $(JAVA_ICON)
jar cfm $@ Manifest.txt \
- -C $(top_srcdir)/icon altus-metrum-16x16.jpg \
+ $(ICONJAR) \
-C classes altosui \
-C ../libaltos libaltosJNI
-$(FATJAR): classaltosui.stamp Manifest-fat.txt $(FREETTS_CLASS) $(JFREECHART_CLASS) $(LIBALTOS) $(JAVA_ICON)
+$(FATJAR): classaltosui.stamp Manifest-fat.txt $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) $(JAVA_ICON)
jar cfm $@ Manifest-fat.txt \
- -C $(top_srcdir)/icon altus-metrum-16x16.jpg \
+ $(ICONJAR) \
-C classes altosui \
-C ../libaltos libaltosJNI
Manifest.txt: Makefile
echo 'Main-Class: altosui.AltosUI' > $@
- echo "Class-Path: $(FREETTS)/freetts.jar $(FREETTS)/jfreechart.jar $(FREETTS)/jcommon.jar $(FREETTS)/csv.jar" >> $@
+ echo "Class-Path: $(FREETTS)/freetts.jar $(JFREECHART)/jfreechart.jar $(JCOMMON)/jcommon.jar" >> $@
Manifest-fat.txt:
echo 'Main-Class: altosui.AltosUI' > $@
- echo "Class-Path: freetts.jar jfreechart.jar jcommon.jar csv.jar" >> $@
+ echo "Class-Path: freetts.jar jfreechart.jar jcommon.jar" >> $@
altosui: Makefile
echo "#!/bin/sh" > $@
- echo 'exec java -cp "$(FREETTS)/*" -Djava.library.path="$(altoslibdir)" -jar "$(altosuidir)/altosui.jar" "$$@"' >> $@
+ echo 'exec java -cp "$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="$(altoslibdir)" -jar "$(altosuidir)/altosui.jar" "$$@"' >> $@
chmod +x $@
altosui-test: Makefile
echo "#!/bin/sh" > $@
- echo 'exec java -cp "$(FREETTS)/*" -Djava.library.path="../libaltos/.libs" -jar altosui.jar "$$@"' >> $@
+ echo 'exec java -cp "$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="../libaltos/.libs" -jar altosui.jar "$$@"' >> $@
chmod +x $@
altosui-jdb: Makefile
echo "#!/bin/sh" > $@
- echo 'exec jdb -classpath "classes:../libaltos:$(FREETTS)/*" -Djava.library.path="../libaltos/.libs" altosui/AltosUI "$$@"' >> $@
+ echo 'exec jdb -classpath "classes:../libaltos:$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="../libaltos/.libs" altosui/AltosUI "$$@"' >> $@
chmod +x $@
libaltos.so:
-rm -f "$@"
$(LN_S) "$(FREETTS)"/"$@" .
+$(JFREECHART_CLASS):
+ -rm -f "$@"
+ $(LN_S) "$(JFREECHART)"/"$@" .
+
+$(JCOMMON_CLASS):
+ -rm -f "$@"
+ $(LN_S) "$(JCOMMON)"/"$@" .
+
$(LINUX_DIST): $(LINUX_FILES) $(LINUX_EXTRA)
-rm -f $@
-rm -rf linux
mkdir -p macosx/AltOS macosx/AltosUI.app/Contents/Resources/Java
cp -p $(FATJAR) macosx/AltosUI.app/Contents/Resources/Java/altosui.jar
cp -p $(FREETTS_CLASS) libaltos.dylib macosx/AltosUI.app/Contents/Resources/Java
+ cp -p $(JFREECHART_CLASS) libaltos.dylib macosx/AltosUI.app/Contents/Resources/Java
cp -p $(MACOSX_EXTRA) macosx/AltOS
cd macosx && zip -r ../$@ AltosUI.app AltOS