telegps: Don't try to ship TeleGPS firmware yet
authorKeith Packard <keithp@keithp.com>
Thu, 29 May 2014 05:06:43 +0000 (22:06 -0700)
committerKeith Packard <keithp@keithp.com>
Thu, 29 May 2014 05:06:43 +0000 (22:06 -0700)
It's not quite ready. Instead, ship TBT and TD firmware.

Signed-off-by: Keith Packard <keithp@keithp.com>
telegps/Makefile.am

index f8e2e63cee73420e64e250a8c5064dca3c6e2855..f064a488a408e94743cb914282edb7e3a563b89f 100644 (file)
@@ -76,10 +76,13 @@ WINDOWS_ICON=$(ICONDIR)/telegps.ico
 FIRMWARE_TD_0_2=$(top_srcdir)/src/teledongle-v0.2/teledongle-v0.2-$(VERSION).ihx
 FIRMWARE_TD=$(FIRMWARE_TD_0_2)
 
 FIRMWARE_TD_0_2=$(top_srcdir)/src/teledongle-v0.2/teledongle-v0.2-$(VERSION).ihx
 FIRMWARE_TD=$(FIRMWARE_TD_0_2)
 
-FIRMWARE_TG_1_0=$(top_srcdir)/src/telegps-v1.0/telegps-v1.0-$(VERSION).ihx
-FIRMWARE_TG=$(FIRMWARE_TG_1_0)
+FIRMWARE_TBT_1_0=$(top_srcdir)/src/telebt-v1.0/telebt-v1.0-$(VERSION).ihx
+FIRMWARE_TBT=$(FIRMWARE_TBT_1_0)
 
 
-FIRMWARE=$(FIRMWARE_TG)
+#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)
 
 desktopdir = $(datadir)/applications
 desktop_file = telegps.desktop
 
 desktopdir = $(datadir)/applications
 desktop_file = telegps.desktop
@@ -260,7 +263,7 @@ $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA) Makefile
        cp -a $(MACOSX_README) macosx/ReadMe.rtf
        cp -a $(DOC) macosx
        cp -p Info.plist macosx/TeleGPS.app/Contents
        cp -a $(MACOSX_README) macosx/ReadMe.rtf
        cp -a $(DOC) macosx
        cp -p Info.plist macosx/TeleGPS.app/Contents
-       mkdir -p macosx/TeleGPS.app/Contents/Resources/Java
+       mkdir -p macosx/AltOS-$(VERSION) macosx/TeleGPS.app/Contents/Resources/Java
        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
        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