windows installer: Create file associations for Windows.

[fw/altos] / telegps / Makefile.am

diff --git a/telegps/Makefile.am b/telegps/Makefile.am
index f140512dd86a125c6efb1d6a10a21880b5a145fd..8868c72385fcfa2079f1a9b8fa6c9dd1e252fdc6 100644 (file)
--- a/telegps/Makefile.am
+++ b/telegps/Makefile.am
@@ -16,10 +16,12 @@ telegps_JAVA= \
        TeleGPSStatus.java \
        TeleGPSStatusUpdate.java \
        TeleGPSInfo.java \
+       TeleGPSState.java \
        TeleGPSConfig.java \
        TeleGPSConfigUI.java \
        TeleGPSPreferences.java \
-       TeleGPSGraphUI.java
+       TeleGPSGraphUI.java \
+       TeleGPSDisplayThread.java
 
 JFREECHART_CLASS= \
     jfreechart.jar
@@ -71,7 +73,8 @@ ICONJAR= -C $(ICONDIR) telegps-16.png \
        -C $(ICONDIR) telegps-128.png \
        -C $(ICONDIR) telegps-256.png
 
-WINDOWS_ICON=$(ICONDIR)/telegps.ico
+WINDOWS_ICON=$(ICONDIR)/telegps.ico $(ICONDIR)/telegps.exe
+MACOSX_ICON=$(ICONDIR)/TeleGPS.icns
 
 # Firmware
 FIRMWARE_TD_0_2=$(top_srcdir)/src/teledongle-v0.2/teledongle-v0.2-$(VERSION).ihx
@@ -80,8 +83,8 @@ FIRMWARE_TD=$(FIRMWARE_TD_0_2)
 FIRMWARE_TBT_1_0=$(top_srcdir)/src/telebt-v1.0/telebt-v1.0-$(VERSION).ihx
 FIRMWARE_TBT=$(FIRMWARE_TBT_1_0)
 
-#FIRMWARE_TG_1_0=$(top_srcdir)/src/telegps-v1.0/telegps-v1.0-$(VERSION).ihx
-#FIRMWARE_TG=$(FIRMWARE_TG_1_0)
+FIRMWARE_TG_1_0=$(top_srcdir)/src/telegps-v1.0/telegps-v1.0-$(VERSION).ihx
+FIRMWARE_TG=$(FIRMWARE_TG_1_0)
 
 FIRMWARE=$(FIRMWARE_TG) $(FIRMWARE_TD) $(FIRMWARE_TBT)
 
@@ -122,10 +125,10 @@ LINUX_EXTRA=telegps-fat telegps.desktop.in
 
 MACOSX_INFO_PLIST=Info.plist
 MACOSX_README=ReadMe-Mac.rtf
-MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_README) $(DOC)
+MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_README) $(DOC) $(MACOSX_ICON)
 MACOSX_EXTRA=$(FIRMWARE)
 
-WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/telemetrum.inf $(DOC) $(WINDOWS_ICON)
+WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/altusmetrum.inf $(top_srcdir)/altusmetrum.cat $(DOC) $(WINDOWS_ICON)
 
 if FATINSTALL
 
@@ -262,9 +265,11 @@ $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA) Makefile
        mkdir macosx
        cp -a TeleGPS.app macosx/
        cp -a $(MACOSX_README) macosx/ReadMe.rtf
-       cp -a $(DOC) macosx
+       mkdir -p macosx/Doc
+       cp -a $(DOC) macosx/Doc
        cp -p Info.plist macosx/TeleGPS.app/Contents
        mkdir -p macosx/AltOS-$(VERSION) macosx/TeleGPS.app/Contents/Resources/Java
+       cp -p $(MACOSX_ICON) macosx/TeleGPS.app/Contents/Resources
        cp -p $(FATJAR) macosx/TeleGPS.app/Contents/Resources/Java/telegps.jar
        cp -p libaltos.dylib macosx/TeleGPS.app/Contents/Resources/Java
        cp -p $(ALTOSLIB_CLASS) macosx/TeleGPS.app/Contents/Resources/Java
@@ -277,7 +282,7 @@ $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA) Makefile
 
 $(WINDOWS_DIST): $(WINDOWS_FILES) telegps-windows.nsi
        -rm -f $@
-       makensis -Otelegps-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" telegps-windows.nsi || cat telegps-windows.log && exit 1
+       makensis -Otelegps-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" telegps-windows.nsi || (cat telegps-windows.log && exit 1)
 
 Manifest.txt: Makefile
        echo 'Main-Class: org.altusmetrum.telegps.TeleGPS' > $@