X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=telegps%2FMakefile.am;h=3443b288142d9b28ee407a94440aaee2e8fae301;hb=684741765117611b7d666efbdfafd87c6199752c;hp=a1c4a0a17dd56fc48b0ba228e7dbc1a6bec39a33;hpb=43e2275250d9c91560a770942f3c06a8f74ed501;p=fw%2Faltos

diff --git a/telegps/Makefile.am b/telegps/Makefile.am
index a1c4a0a1..3443b288 100644
--- a/telegps/Makefile.am
+++ b/telegps/Makefile.am
@@ -102,17 +102,16 @@ LINUX_MIMETYPE	=\
 	$(ICONDIR)/org-altusmetrum-mimetypes.xml
 
 # Firmware
-FIRMWARE_TD_0_2=$(top_srcdir)/src/teledongle-v0.2/teledongle-v0.2-$(VERSION).ihx
 FIRMWARE_TD_3_0=$(top_srcdir)/src/teledongle-v3.0/teledongle-v3.0-$(VERSION).ihx
-FIRMWARE_TD=$(FIRMWARE_TD_0_2) $(FIRMWARE_TD_3_0)
+FIRMWARE_TD=$(FIRMWARE_TD_3_0)
 
-FIRMWARE_TBT_1_0=$(top_srcdir)/src/telebt-v1.0/telebt-v1.0-$(VERSION).ihx
 FIRMWARE_TBT_3_0=$(top_srcdir)/src/telebt-v3.0/telebt-v3.0-$(VERSION).ihx
 FIRMWARE_TBT_4_0=$(top_srcdir)/src/telebt-v4.0/telebt-v4.0-$(VERSION).ihx
-FIRMWARE_TBT=$(FIRMWARE_TBT_1_0) $(FIRMWARE_TBT_3_0) $(FIRMWARE_TBT_4_0)
+FIRMWARE_TBT=$(FIRMWARE_TBT_3_0) $(FIRMWARE_TBT_4_0)
 
 FIRMWARE_TG_1_0=$(top_srcdir)/src/telegps-v1.0/telegps-v1.0-$(VERSION).ihx
-FIRMWARE_TG=$(FIRMWARE_TG_1_0)
+FIRMWARE_TG_2_0=$(top_srcdir)/src/telegps-v2.0/telegps-v2.0-$(VERSION).ihx
+FIRMWARE_TG=$(FIRMWARE_TG_1_0) $(FIRMWARE_TG_2_0)
 
 FIRMWARE=$(FIRMWARE_TG) $(FIRMWARE_TD) $(FIRMWARE_TBT)
 
@@ -128,7 +127,7 @@ clean-local:
 		altoslib_*.jar altosuilib_*.jar \
 		$(JFREECHART_CLASS) $(JCOMMON_CLASS) $(FREETTS_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt \
 		telegps telegps-test telegps-jdb macosx linux windows telegps-windows.log \
-		telegps-windows.nsi *.desktop $(MDWN)
+		telegps-windows.nsi *.desktop *.mdwn
 
 EXTRA_DIST = $(desktop_file).in
 
@@ -154,7 +153,8 @@ LINUX_EXTRA=telegps-fat $(desktop_file).in
 
 MACOSX_INFO_PLIST=Info.plist
 MACOSX_README=ReadMe-Mac.rtf
-MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_README) $(DOC) $(MACOSX_ICONS)
+MACOSX_INSTALL=../altosui/install-macosx
+MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_README) $(DOC) $(MACOSX_ICONS) $(MACOSX_INSTALL)
 MACOSX_EXTRA=$(FIRMWARE)
 
 WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/altusmetrum.inf $(top_srcdir)/altusmetrum.cat $(DOC) $(WINDOWS_ICONS)
@@ -314,7 +314,8 @@ $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA) Makefile
 	-rm -rf macosx
 	mkdir macosx
 	cp -a TeleGPS.app macosx/
-	cp -a $(MACOSX_README) macosx/ReadMe.rtf
+	cp -a $(MACOSX_README) macosx/ReadMe-TeleGPS.rtf
+	cp -a $(MACOSX_INSTALL) macosx
 	mkdir -p macosx/Doc
 	cp -a $(DOC) macosx/Doc
 	cp -p Info.plist macosx/TeleGPS.app/Contents