X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=micropeak%2FMakefile.am;h=06eb3115a0b00dadcf18dde14135f8431ff54184;hp=ea7385a7c05dd38c950a2ee93a64c30b63037c4f;hb=ce3c9e6be6fde51fb02d692f1ef1222fb5ada8c9;hpb=0c9eecfae02e8499e7c3d53a4386f026c54b04cd

diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am
index ea7385a7..06eb3115 100644
--- a/micropeak/Makefile.am
+++ b/micropeak/Makefile.am
@@ -1,6 +1,8 @@
 JAVAROOT=classes
 AM_JAVACFLAGS=-encoding UTF-8 -Xlint:deprecation
 
+altoslibdir=$(libdir)/altos
+
 CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../altoslib/*:../altosuilib/*:../libaltos:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar"
 
 bin_SCRIPTS=micropeak
@@ -13,6 +15,7 @@ micropeak_JAVA= \
 	MicroDataPoint.java \
 	MicroDownload.java \
 	MicroExport.java \
+	MicroFile.java \
 	MicroFrame.java \
 	MicroGraph.java \
 	MicroRaw.java \
@@ -86,10 +89,22 @@ FAT_FILES=$(FATJAR) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) $(JFR
 LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) $(DOC)
 LINUX_EXTRA=micropeak-fat
 
+MACOSX_DRIVER_URL=http://www.ftdichip.com/Drivers/VCP/MacOSX/FTDIUSBSerialDriver_v2_2_18.dmg
+MACOSX_DRIVER=FTDIUSBSerialDriver_v2_2_18.dmg
 MACOSX_INFO_PLIST=Info.plist
-MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST)
+MACOSX_README=ReadMe-Mac.rtf
+MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_DRIVER) $(MACOSX_README)
+
+$(MACOSX_DRIVER):
+	wget $(MACOSX_DRIVER_URL)
+
+WINDOWS_DRIVER_URL=http://www.ftdichip.com/Drivers/CDM/CDM20824_Setup.exe
+WINDOWS_DRIVER=CDM20824_Setup.exe
 
-WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON)
+$(WINDOWS_DRIVER):
+	wget $(WINDOWS_DRIVER_URL)
+
+WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON) $(WINDOWS_DRIVER)
 
 if FATINSTALL
 
@@ -119,7 +134,7 @@ endif
 
 micropeak: Makefile
 	echo "#!/bin/sh" > $@
-	echo 'exec java  -cp "$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar" -Djava.library.path="$(altoslibdir)" -jar "$(micropeakdir)/micropeak.jar" "$$@"' >> $@
+	echo 'exec java  -Djava.library.path="$(altoslibdir)" -jar "$(micropeakdir)/micropeak.jar" "$$@"' >> $@
 	chmod +x $@
 
 micropeak-jdb: Makefile
@@ -150,6 +165,8 @@ $(FATJAR): classmicropeak.stamp Manifest-fat.txt $(ALTOSLIB_CLASS) $(ALTOSUILIB_
 		-C classes org \
 		-C ../libaltos libaltosJNI
 
+classaltosui.stamp: $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS)
+
 libaltos.so: build-libaltos
 	-rm -f "$@"
 	$(LN_S) ../libaltos/.libs/"$@" .
@@ -210,7 +227,9 @@ $(MACOSX_DIST): $(MACOSX_FILES)
 	-rm -rf macosx
 	mkdir macosx
 	cp -a MicroPeak.app macosx/
+	cp -a $(MACOSX_README) macosx/ReadMe.rtf
 	cp -p Info.plist macosx/MicroPeak.app/Contents
+	cp -p $(MACOSX_DRIVER) macosx
 	mkdir -p macosx/MicroPeak.app/Contents/Resources/Java
 	cp -p $(FATJAR) macosx/MicroPeak.app/Contents/Resources/Java/micropeak.jar
 	cp -p libaltos.dylib macosx/MicroPeak.app/Contents/Resources/Java