X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=micropeak%2FMakefile.am;h=a8834a66e6c0bd5b16384a888d6fa0e52b968939;hb=4fbe9d5a1f56178a737ede6b31e8d01a02a7543f;hp=6270fd746b3a41ab261a413250402720e39c97c8;hpb=1b0f56ddb2b85b68232c22a7a8b8744cb9ad76f9;p=fw%2Faltos

diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am
index 6270fd74..a8834a66 100644
--- a/micropeak/Makefile.am
+++ b/micropeak/Makefile.am
@@ -82,6 +82,13 @@ MACOSX_ICONS	=\
 	../icon/altusmetrum-micropeak.icns \
 	../icon/application-vnd.altusmetrum.micropeak.icns
 
+LINUX_ICONS	=\
+	$(ICONDIR)/altusmetrum-micropeak.svg \
+	$(ICONDIR)/application-vnd.altusmetrum.micropeak.svg
+
+LINUX_MIMETYPE	=\
+	$(ICONDIR)/org-altusmetrum-mimetypes.xml
+
 desktopdir = $(datadir)/applications
 desktop_file = altusmetrum-micropeak.desktop
 desktop_SCRIPTS = $(desktop_file)
@@ -95,7 +102,7 @@ clean-local:
 		$(ALTOSUILIB_CLASS) \
 		$(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt \
 		micropeak micropeak-test micropeak-jdb macosx linux windows micropeak-windows.log \
-		micropeak-windows.nsi
+		micropeak-windows.nsi *.desktop
 
 EXTRA_DIST = $(desktop_file).in
 
@@ -114,23 +121,32 @@ DOC=$(MICROPEAK_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-micropeak.svg
+LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) $(DOC) $(desktop_file).in $(LINUX_ICONS) $(LINUX_MIMETYPE)
 LINUX_EXTRA=micropeak-fat $(desktop_file).in
 
-MACOSX_DRIVER_URL=http://www.ftdichip.com/Drivers/VCP/MacOSX/FTDIUSBSerialDriver_v2_2_18.dmg
-MACOSX_DRIVER=FTDIUSBSerialDriver_v2_2_18.dmg
+MACOSX_DRIVER_0_URL=http://www.ftdichip.com/Drivers/VCP/MacOSX/FTDIUSBSerialDriver_v2_2_18.dmg
+MACOSX_DRIVER_0=FTDI_v2_2_18.dmg
+
+MACOSX_DRIVER_1_URL=http://www.ftdichip.com/Drivers/VCP/MacOSX/FTDIUSBSerialDriver_v2_3.dmg
+MACOSX_DRIVER_1=FTDI_v2_3.dmg
+
+MACOSX_DRIVERS=$(MACOSX_DRIVER_1) $(MACOSX_DRIVER_0)
+
 MACOSX_INFO_PLIST=Info.plist
 MACOSX_README=ReadMe-Mac.rtf
-MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_DRIVER) $(MACOSX_README) $(DOC) $(MACOSX_ICONS)
+MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_DRIVERS) $(MACOSX_README) $(DOC) $(MACOSX_ICONS)
+
+$(MACOSX_DRIVER_0):
+	wget -O $@ $(MACOSX_DRIVER_0_URL)
 
-$(MACOSX_DRIVER):
-	wget $(MACOSX_DRIVER_URL)
+$(MACOSX_DRIVER_1):
+	wget -O $@ $(MACOSX_DRIVER_1_URL)
 
-WINDOWS_DRIVER_URL=http://www.ftdichip.com/Drivers/CDM/CDM20824_Setup.exe
-WINDOWS_DRIVER=CDM20824_Setup.exe
+WINDOWS_DRIVER_URL=http://www.ftdichip.com/Drivers/CDM/CDM%20v2.12.00%20WHQL%20Certified.exe
+WINDOWS_DRIVER=CDM_v2.12.00_WHQL_Certified.exe
 
 $(WINDOWS_DRIVER):
-	wget $(WINDOWS_DRIVER_URL)
+	wget -O "$(WINDOWS_DRIVER)" "$(WINDOWS_DRIVER_URL)"
 
 WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(DOC) $(WINDOWS_ICONS) $(WINDOWS_DRIVER)
 
@@ -267,7 +283,7 @@ $(MACOSX_DIST): $(MACOSX_FILES)
 	cp -a $(MACOSX_README) macosx/ReadMe.rtf
 	cp -a $(DOC) macosx
 	cp -p Info.plist macosx/MicroPeak.app/Contents
-	cp -p $(MACOSX_DRIVER) macosx
+	cp -p $(MACOSX_DRIVERS) macosx
 	mkdir -p macosx/MicroPeak.app/Contents/Resources/Java
 	cp -p $(MACOSX_ICONS) macosx/MicroPeak.app/Contents/Resources
 	cp -p $(FATJAR) macosx/MicroPeak.app/Contents/Resources/Java/micropeak.jar