X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=telegps%2FMakefile.am;h=8868c72385fcfa2079f1a9b8fa6c9dd1e252fdc6;hp=e0d596e798e42fdbfc00775e31abc12ddaaa5b13;hb=5871225a0c442cf5afa41a444ff8bfb8f4002721;hpb=ae1174317fc476e39077f7dc257ec08709c6b301

diff --git a/telegps/Makefile.am b/telegps/Makefile.am
index e0d596e7..8868c723 100644
--- a/telegps/Makefile.am
+++ b/telegps/Makefile.am
@@ -16,6 +16,7 @@ telegps_JAVA= \
 	TeleGPSStatus.java \
 	TeleGPSStatusUpdate.java \
 	TeleGPSInfo.java \
+	TeleGPSState.java \
 	TeleGPSConfig.java \
 	TeleGPSConfigUI.java \
 	TeleGPSPreferences.java \
@@ -72,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
@@ -81,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)
 
@@ -123,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
 
@@ -263,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