X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=telegps%2FMakefile.am;h=3484b951f97d49553e83f3c58eb0daf6cfae0e51;hp=3f53b949bb94eb55a540d971c2e214c77e8e8c83;hb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;hpb=602d6a2424a5c16e22febf6b4e6b3816022261c7

diff --git a/telegps/Makefile.am b/telegps/Makefile.am
index 3f53b949..3484b951 100644
--- a/telegps/Makefile.am
+++ b/telegps/Makefile.am
@@ -42,8 +42,14 @@ JAR=telegps.jar
 
 FATJAR=telegps-fat.jar
 
+if MULTI_ARCH
+LIBALTOS_LINUX=libaltos32.so libaltos64.so
+else
+LIBALTOS_LINUX=libaltos.so
+endif
+
 LIBALTOS= \
-	libaltos.so \
+	$(LIBALTOS_LINUX) \
 	libaltos.dylib \
 	altos64.dll \
 	altos.dll
@@ -87,12 +93,22 @@ MACOSX_ICONS	=\
 	../icon/application-vnd.altusmetrum.eeprom.icns \
 	../icon/application-vnd.altusmetrum.telemetry.icns
 
+LINUX_ICONS	=\
+	$(ICONDIR)/altusmetrum-altosui.svg \
+	$(ICONDIR)/application-vnd.altusmetrum.eeprom.svg \
+	$(ICONDIR)/application-vnd.altusmetrum.telemetry.svg
+
+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=$(FIRMWARE_TD_0_2)
+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_TBT_1_0=$(top_srcdir)/src/telebt-v1.0/telebt-v1.0-$(VERSION).ihx
-FIRMWARE_TBT=$(FIRMWARE_TBT_1_0)
+FIRMWARE_TBT_3_0=$(top_srcdir)/src/telebt-v3.0/telebt-v3.0-$(VERSION).ihx
+FIRMWARE_TBT=$(FIRMWARE_TBT_1_0) $(FIRMWARE_TBT_3_0)
 
 FIRMWARE_TG_1_0=$(top_srcdir)/src/telegps-v1.0/telegps-v1.0-$(VERSION).ihx
 FIRMWARE_TG=$(FIRMWARE_TG_1_0)
@@ -108,11 +124,10 @@ all-local: telegps-test telegps-jdb $(JAR)
 clean-local:
 	-rm -rf classes $(JAR) $(FATJAR) \
 		TeleGPS-Linux-*.tar.bz2 TeleGPS-Mac-*.dmg TeleGPS-Windows-*.exe \
-		$(ALTOSLIB_CLASS) \
-		$(ALTOSUILIB_CLASS) \
-		$(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt \
+		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
+		telegps-windows.nsi *.desktop
 
 EXTRA_DIST = $(desktop_file).in
 
@@ -131,7 +146,7 @@ DOC=$(TELEGPS_DOC)
 
 FAT_FILES=$(FATJAR) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS)
 
-LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) $(DOC) $(desktop_file).in ../icon/altusmetrum-telegps.svg
+LINUX_FILES=$(FAT_FILES) $(LIBALTOS_LINUX) $(FIRMWARE) $(DOC) $(desktop_file).in $(LINUX_ICONS) $(LINUX_MIMETYPE)
 LINUX_EXTRA=telegps-fat $(desktop_file).in
 
 MACOSX_INFO_PLIST=Info.plist
@@ -209,6 +224,14 @@ libaltos.so: build-libaltos
 	-rm -f "$@"
 	$(LN_S) ../libaltos/.libs/"$@" .
 
+libaltos32.so: build-libaltos
+	-rm -f "$@"
+	$(LN_S) ../libaltos/.libs/"$@" .
+
+libaltos64.so: build-libaltos
+	-rm -f "$@"
+	$(LN_S) ../libaltos/.libs/"$@" .
+
 libaltos.dylib:
 	-rm -f "$@"
 	$(LN_S) ../libaltos/"$@" .
@@ -221,6 +244,10 @@ altos64.dll: ../libaltos/altos64.dll
 	-rm -f "$@"
 	$(LN_S) ../libaltos/"$@" .
 
+../libaltos/.libs/libaltos64.so: ../libaltos/.libs/libaltos32.so
+
+../libaltos/.libs/libaltos32.so: build-libaltos
+
 ../libaltos/.libs/libaltos.so: build-libaltos
 
 ../libaltos/altos.dll: build-altos-dll