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

diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am
index ea7385a7..95c95f40 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 \
@@ -87,7 +90,9 @@ LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) $(DOC)
 LINUX_EXTRA=micropeak-fat
 
 MACOSX_INFO_PLIST=Info.plist
-MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST)
+MACOSX_DRIVER=FTDI.tar.gz
+MACOSX_README=ReadMe-Mac.rtf
+MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_DRIVER) $(MACOSX_README)
 
 WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON)
 
@@ -119,7 +124,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
@@ -210,7 +215,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
+	tar xzf $(MACOSX_DRIVER) -C 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