X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FMakefile.am;h=9f75d5e38dd2decb1f1841deda959e7f6bbde2b2;hp=1ec45c5f8c1f56d971c34fbb2dd59c4e5f2be7f4;hb=95268d681c9a6652d84db383f55a4fe8a4ac5173;hpb=bb5b5312a0c6102b12f3d4710ef213f0f6c67412

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 1ec45c5f..9f75d5e3 100644
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -6,7 +6,7 @@ man_MANS=altosui.1
 
 altoslibdir=$(libdir)/altos
 
-CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../altoslib/*:libaltos:$(FREETTS)/*:/usr/share/java/*"
+CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../altoslib/*:libaltos::$(JFREECHART)/jfreechart.jar:$(FREETTS)/freetts.jar"
 
 bin_SCRIPTS=altosui
 
@@ -27,8 +27,6 @@ altosui_JAVA = \
 	AltosConfigureUI.java \
 	AltosConfigTD.java \
 	AltosConfigTDUI.java \
-	AltosConvert.java \
-	AltosCRCException.java \
 	AltosCSV.java \
 	AltosCSVUI.java \
 	AltosDebug.java \
@@ -42,12 +40,6 @@ altosui_JAVA = \
 	AltosEepromList.java \
 	AltosEepromManage.java \
 	AltosEepromMonitor.java \
-	AltosEepromTeleScience.java \
-	AltosEepromMega.java \
-	AltosEepromMegaIterable.java \
-	AltosMs5607.java \
-	AltosIMU.java \
-	AltosMag.java \
 	AltosEepromSelect.java \
 	AltosFlash.java \
 	AltosFlashUI.java \
@@ -63,7 +55,6 @@ altosui_JAVA = \
 	AltosHexfile.java \
 	Altos.java \
 	AltosIdleMonitorUI.java \
-	AltosIgnite.java \
 	AltosIgniteUI.java \
 	AltosLaunch.java \
 	AltosLaunchUI.java \
@@ -159,7 +150,7 @@ FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TELEMINI) $(FIRMWARE_TD)
 ALTUSMETRUM_DOC=$(top_srcdir)/doc/altusmetrum.pdf
 ALTOS_DOC=$(top_srcdir)/doc/altos.pdf
 TELEMETRY_DOC=$(top_srcdir)/doc/telemetry.pdf
-TEMPLATE_DOC=$(top_srcdir)/doc/telemetrum-outline.pdf
+TEMPLATE_DOC=$(top_srcdir)/doc/telemetrum-outline.pdf $(top_srcdir)/doc/megametrum-outline.pdf
 
 DOC=$(ALTUSMETRUM_DOC) $(ALTOS_DOC) $(TELEMETRY_DOC) $(TEMPLATE_DOC)
 
@@ -173,7 +164,8 @@ FAT_FILES=$(FATJAR) $(ALTOSLIB_CLASS) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCO
 LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) $(DOC)
 LINUX_EXTRA=altosui-fat
 
-MACOSX_FILES=$(FAT_FILES) libaltos.dylib
+MACOSX_INFO_PLIST=Info.plist
+MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST)
 MACOSX_EXTRA=$(FIRMWARE)
 
 WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON)
@@ -319,6 +311,7 @@ $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA)
 	-rm -rf macosx
 	mkdir macosx
 	cp -a AltosUI.app macosx/
+	cp -p Info.plist macosx/AltosUI.app/Contents
 	mkdir -p macosx/AltOS macosx/AltosUI.app/Contents/Resources/Java
 	cp -p $(FATJAR) macosx/AltosUI.app/Contents/Resources/Java/altosui.jar
 	cp -p libaltos.dylib macosx/AltosUI.app/Contents/Resources/Java