X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=micropeak%2FMakefile.am;h=52b62358db92d70868013838e2a6bb7ef8a41ee1;hp=158656068c963d2f7675cb0621eeee9806a96785;hb=cb1e757d4d486d04af0219b3f36ad17ee8095110;hpb=ec7ceb607f5ba7e1ed5cfd32b7a452a5f364b095

diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am
index 15865606..52b62358 100644
--- a/micropeak/Makefile.am
+++ b/micropeak/Makefile.am
@@ -14,18 +14,14 @@ micropeakdir=$(datadir)/java
 micropeak_JAVA= \
 	MicroPeak.java \
 	MicroData.java \
-	MicroDataPoint.java \
 	MicroDownload.java \
 	MicroExport.java \
 	MicroFile.java \
 	MicroFrame.java \
-	MicroGraph.java \
 	MicroRaw.java \
 	MicroSave.java \
 	MicroSerial.java \
 	MicroSerialLog.java \
-	MicroStats.java \
-	MicroStatsTable.java \
 	MicroFileChooser.java \
 	MicroDeviceDialog.java \
 	MicroUSB.java
@@ -40,8 +36,14 @@ JAR=micropeak.jar
 
 FATJAR=micropeak-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
@@ -98,8 +100,7 @@ all-local: micropeak-test micropeak-jdb $(JAR)
 clean-local:
 	-rm -rf classes $(JAR) $(FATJAR) \
 		MicroPeak-Linux-*.tar.bz2 MicroPeak-Mac-*.dmg MicroPeak-Windows-*.exe \
-		$(ALTOSLIB_CLASS) \
-		$(ALTOSUILIB_CLASS) \
+		altoslib_*.jar altosuilib_*.jar \
 		$(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt \
 		micropeak micropeak-test micropeak-jdb macosx linux windows micropeak-windows.log \
 		micropeak-windows.nsi *.desktop
@@ -121,23 +122,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 $(LINUX_ICONS) $(LINUX_MIMETYPE)
+LINUX_FILES=$(FAT_FILES) $(LIBALTOS_LINUX) $(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):
-	wget $(MACOSX_DRIVER_URL)
+$(MACOSX_DRIVER_0):
+	wget -O $@ $(MACOSX_DRIVER_0_URL)
 
-WINDOWS_DRIVER_URL=http://www.ftdichip.com/Drivers/CDM/CDM20824_Setup.exe
-WINDOWS_DRIVER=CDM20824_Setup.exe
+$(MACOSX_DRIVER_1):
+	wget -O $@ $(MACOSX_DRIVER_1_URL)
+
+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)
 
@@ -211,6 +221,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/"$@" .
@@ -223,6 +241,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
@@ -274,7 +296,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