altosui: tile site maps

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

diff --git a/ao-tools/altosui/Makefile.am b/ao-tools/altosui/Makefile.am
index ccb88ed11cb020181bd966d093f0fd37deab5bb4..b6b2e572c205f0655d9d4fc307cb8863262442b5 100644 (file)
--- a/ao-tools/altosui/Makefile.am
+++ b/ao-tools/altosui/Makefile.am
@@ -10,14 +10,17 @@ CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../libaltos:$(FREETTS)/
 bin_SCRIPTS=altosui
 
 altosui_JAVA = \
+       AltosAscent.java \
        AltosChannelMenu.java \
        AltosConfig.java \
        AltosConfigUI.java \
+       AltosConfigureUI.java \
        AltosConvert.java \
        AltosCRCException.java \
        AltosCSV.java \
        AltosCSVUI.java \
        AltosDebug.java \
+       AltosDescent.java \
        AltosDeviceDialog.java \
        AltosDevice.java \
        AltosDisplayThread.java \
@@ -31,7 +34,7 @@ altosui_JAVA = \
        AltosFlightDisplay.java \
        AltosFlightInfoTableModel.java \
        AltosFlightReader.java \
-       AltosFlightStatusTableModel.java \
+       AltosFlightStatus.java \
        AltosFlightUI.java \
        AltosGPS.java \
        AltosGreatCircle.java \
@@ -39,9 +42,13 @@ altosui_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 \
@@ -52,9 +59,11 @@ altosui_JAVA = \
        AltosRomconfig.java \
        AltosRomconfigUI.java \
        AltosSerial.java \
+       AltosSerialInUseException.java \
        AltosSerialMonitor.java \
+       AltosSiteMap.java \
+       AltosSiteMapTile.java \
        AltosState.java \
-       AltosStatusTable.java \
        AltosTelemetry.java \
        AltosTelemetryIterable.java \
        AltosUI.java \
@@ -92,8 +101,21 @@ JAR=altosui.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
@@ -163,13 +185,13 @@ classes/altosui:
 
 $(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) $(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