windows: Rename telemetrum.inf to altusmetrum.inf

[fw/altos] / altosui / Makefile.am

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index cd6af84b9929b01cc533a7035335a097cb2c2e26..ddeb8ea33d9f208c801b1586b242e10f29590c3f 100644 (file)
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -20,15 +20,7 @@ altosui_JAVA = \
        AltosConfigureUI.java \
        AltosConfigTD.java \
        AltosConfigTDUI.java \
-       AltosCSVUI.java \
        AltosDescent.java \
-       AltosEepromDelete.java \
-       AltosEepromManage.java \
-       AltosEepromMonitorUI.java \
-       AltosEepromSelect.java \
-       AltosFlashUI.java \
-       AltosFlightInfoTableModel.java \
-       AltosFlightStatsTable.java \
        AltosFlightStatus.java \
        AltosFlightStatusUpdate.java \
        AltosFlightUI.java \
@@ -38,19 +30,11 @@ altosui_JAVA = \
        AltosIgnitor.java \
        AltosLaunch.java \
        AltosLaunchUI.java \
-       AltosInfoTable.java \
        AltosLanded.java \
-       AltosLed.java \
-       AltosLights.java \
        AltosPad.java \
        AltosUIPreferencesBackend.java \
-       AltosRomconfigUI.java \
        AltosUI.java \
-       AltosGraph.java \
-       AltosGraphDataPoint.java \
-       AltosGraphDataSet.java \
-       AltosGraphUI.java \
-       AltosDataChooser.java
+       AltosGraphUI.java
 
 JFREECHART_CLASS= \
     jfreechart.jar
@@ -98,22 +82,16 @@ JAVA_ICONS=\
        $(ICONDIR)/altus-metrum-128.png \
        $(ICONDIR)/altus-metrum-256.png
 
-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-16.png \
        -C $(ICONDIR) altus-metrum-32.png \
        -C $(ICONDIR) altus-metrum-48.png \
        -C $(ICONDIR) altus-metrum-64.png \
        -C $(ICONDIR) altus-metrum-128.png \
-       -C $(ICONDIR) altus-metrum-256.png \
-       -C $(ICONDIR) redled.png -C $(ICONDIR) redoff.png \
-       -C $(ICONDIR) greenled.png -C $(ICONDIR) greenoff.png \
-       -C $(ICONDIR) grayon.png -C $(ICONDIR) grayled.png
+       -C $(ICONDIR) altus-metrum-256.png
 
 WINDOWS_ICON=$(ICONDIR)/altus-metrum.ico
+MACOSX_ICON=$(ICONDIR)/AltosUIIcon.icns
 
 # Firmware
 FIRMWARE_TD_0_2=$(top_srcdir)/src/teledongle-v0.2/teledongle-v0.2-$(VERSION).ihx
@@ -163,10 +141,10 @@ LINUX_FILES=$(FAT_FILES) $(LINUX_LIBS) $(FIRMWARE) $(DOC) altos.desktop.in ../ic
 LINUX_EXTRA=altosui-fat
 
 MACOSX_INFO_PLIST=Info.plist
-MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(DOC) ReadMe-Mac.rtf
+MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(DOC) ReadMe-Mac.rtf $(MACOSX_ICON)
 MACOSX_EXTRA=$(FIRMWARE)
 
-WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON)
+WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/altusmetrum.inf $(WINDOWS_ICON)
 
 all-local: classes/altosui $(JAR) altosui altosui-test altosui-jdb
 
@@ -343,6 +321,7 @@ $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA) Makefile
        cp -a $(DOC) macosx/Doc
        cp -p Info.plist macosx/AltosUI.app/Contents
        mkdir -p macosx/AltOS-$(VERSION) macosx/AltosUI.app/Contents/Resources/Java
+       cp -p $(MACOSX_ICON) macosx/AltosUI.app/Contents/Resources
        cp -p $(FATJAR) macosx/AltosUI.app/Contents/Resources/Java/altosui.jar
        cp -p libaltos.dylib macosx/AltosUI.app/Contents/Resources/Java
        cp -p $(ALTOSLIB_CLASS) macosx/AltosUI.app/Contents/Resources/Java