X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-tools%2Faltosui%2FMakefile.am;h=93a43b12ca7cf58234700f55d6681f1a8a94a772;hb=a08b2a6363c194195db92029743f6612676373ce;hp=2322b93f109335fbbdc0b5210e7297e214632363;hpb=16916be51d746b1e1057b3219e5bec8f8814259e;p=fw%2Faltos

diff --git a/ao-tools/altosui/Makefile.am b/ao-tools/altosui/Makefile.am
index 2322b93f..93a43b12 100644
--- a/ao-tools/altosui/Makefile.am
+++ b/ao-tools/altosui/Makefile.am
@@ -10,14 +10,18 @@ CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../libaltos:$(FREETTS)/
 bin_SCRIPTS=altosui
 
 altosui_JAVA = \
+	GrabNDrag.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 \
@@ -28,19 +32,25 @@ altosui_JAVA = \
 	AltosFile.java \
 	AltosFlash.java \
 	AltosFlashUI.java \
+	AltosFlightDisplay.java \
 	AltosFlightInfoTableModel.java \
 	AltosFlightReader.java \
-	AltosFlightStatusTableModel.java \
+	AltosFlightStatus.java \
 	AltosFlightUI.java \
 	AltosGPS.java \
 	AltosGreatCircle.java \
 	AltosHexfile.java \
 	Altos.java \
+	AltosIgnite.java \
+	AltosIgniteUI.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 \
@@ -51,9 +61,12 @@ altosui_JAVA = \
 	AltosRomconfig.java \
 	AltosRomconfigUI.java \
 	AltosSerial.java \
+	AltosSerialInUseException.java \
 	AltosSerialMonitor.java \
+	AltosSiteMap.java \
+	AltosSiteMapCache.java \
+	AltosSiteMapTile.java \
 	AltosState.java \
-	AltosStatusTable.java \
 	AltosTelemetry.java \
 	AltosTelemetryIterable.java \
 	AltosUI.java \
@@ -63,7 +76,7 @@ altosui_JAVA = \
 	AltosGraph.java \
 	AltosGraphTime.java \
 	AltosGraphUI.java \
-	AltosGraphDataChooser.java \
+	AltosDataChooser.java \
 	AltosVoice.java
 
 JFREECHART_CLASS= \
@@ -91,8 +104,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
@@ -162,13 +188,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