X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FMakefile.am;h=0300513e1ddd29fb3fa064ddb8d6976eebb65d16;hb=23708b4760250f55e8e3b1a0141df9a9ee17a936;hp=add46825942505c5cc729694fcef2f6f960d3df6;hpb=71715337eb532a1fbe1a753240e7417d5223489f;p=fw%2Faltos

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index add46825..0300513e 100644
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -21,7 +21,6 @@ altosui_JAVA = \
 	AltosConfigTD.java \
 	AltosConfigTDUI.java \
 	AltosDescent.java \
-	AltosFlightStatsTable.java \
 	AltosFlightStatus.java \
 	AltosFlightStatusUpdate.java \
 	AltosFlightUI.java \
@@ -35,9 +34,6 @@ altosui_JAVA = \
 	AltosPad.java \
 	AltosUIPreferencesBackend.java \
 	AltosUI.java \
-	AltosGraph.java \
-	AltosGraphDataPoint.java \
-	AltosGraphDataSet.java \
 	AltosGraphUI.java
 
 JFREECHART_CLASS= \
@@ -95,6 +91,7 @@ ICONJAR= -C $(ICONDIR) altus-metrum-16.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
@@ -144,7 +141,7 @@ 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)
@@ -324,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