X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-tools%2Faltosui%2FMakefile.am;h=267bae63b85ae8c7153b0e84fe84ba794800db42;hb=1f3e091efdfb2fe6f06a066cac60f5d267b94856;hp=ccb88ed11cb020181bd966d093f0fd37deab5bb4;hpb=eb77e806ded99532dc7eaa39c1893f075b028af6;p=fw%2Faltos

diff --git a/ao-tools/altosui/Makefile.am b/ao-tools/altosui/Makefile.am
index ccb88ed1..267bae63 100644
--- a/ao-tools/altosui/Makefile.am
+++ b/ao-tools/altosui/Makefile.am
@@ -10,6 +10,7 @@ CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../libaltos:$(FREETTS)/
 bin_SCRIPTS=altosui
 
 altosui_JAVA = \
+	AltosAscent.java \
 	AltosChannelMenu.java \
 	AltosConfig.java \
 	AltosConfigUI.java \
@@ -18,6 +19,7 @@ altosui_JAVA = \
 	AltosCSV.java \
 	AltosCSVUI.java \
 	AltosDebug.java \
+	AltosDescent.java \
 	AltosDeviceDialog.java \
 	AltosDevice.java \
 	AltosDisplayThread.java \
@@ -39,9 +41,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 \
@@ -92,8 +98,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 +182,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