X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FMakefile.am;h=d59e308248000cf98c3c16d358f7770337710463;hp=b97222de1c44d70671d9fcc2480e851f8792f28a;hb=106d212ff5920c39d95751ef6249dc141970412c;hpb=dc404bee7163a369eb1d95e0942b676bd3f95574

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index b97222de..d59e3082 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="$(JAVAROOT):./*:../libaltos:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar:$(FREETTS)/freetts.jar"
+CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH="$(JAVAROOT):../altoslib/*:../altosuilib/*:../libaltos:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar:$(FREETTS)/freetts.jar"
 
 bin_SCRIPTS=altosui
 
@@ -30,10 +30,8 @@ altosui_JAVA = \
 	AltosConfigTDUI.java \
 	AltosCSV.java \
 	AltosCSVUI.java \
-	AltosDebug.java \
 	AltosDescent.java \
 	AltosDeviceUIDialog.java \
-	AltosUSBDevice.java \
 	AltosDisplayThread.java \
 	AltosEepromDelete.java \
 	AltosEepromDownload.java \
@@ -41,7 +39,6 @@ altosui_JAVA = \
 	AltosEepromManage.java \
 	AltosEepromMonitor.java \
 	AltosEepromSelect.java \
-	AltosFlash.java \
 	AltosFlashUI.java \
 	AltosFlightDisplay.java \
 	AltosFlightInfoTableModel.java \
@@ -51,7 +48,6 @@ altosui_JAVA = \
 	AltosFlightStatusUpdate.java \
 	AltosFlightUI.java \
 	AltosFreqList.java \
-	AltosHexfile.java \
 	Altos.java \
 	AltosIdleMonitorUI.java \
 	AltosIgniteUI.java \
@@ -63,9 +59,7 @@ altosui_JAVA = \
 	AltosLed.java \
 	AltosLights.java \
 	AltosPad.java \
-	AltosUIPreferences.java \
 	AltosUIPreferencesBackend.java \
-	AltosRomconfig.java \
 	AltosRomconfigUI.java \
 	AltosScanUI.java \
 	AltosSerial.java \
@@ -76,10 +70,9 @@ altosui_JAVA = \
 	AltosSiteMapTile.java \
 	AltosUI.java \
 	AltosWriter.java \
-	AltosDataPointReader.java \
-	AltosDataPoint.java \
 	AltosGraph.java \
-	AltosGraphTime.java \
+	AltosGraphDataPoint.java \
+	AltosGraphDataSet.java \
 	AltosGraphUI.java \
 	AltosDataChooser.java \
 	AltosVoice.java \
@@ -101,10 +94,10 @@ FREETTS_CLASS= \
 	freetts.jar
 
 ALTOSLIB_CLASS=\
-	AltosLib.jar
+	altoslib_$(ALTOSLIB_VERSION).jar
 
 ALTOSUILIB_CLASS=\
-	altosuilib.jar
+	altosuilib_$(ALTOSUILIB_VERSION).jar
 
 LIBALTOS= \
 	libaltos.so \
@@ -160,13 +153,13 @@ 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 $(top_srcdir)/doc/megametrum-outline.pdf
+TEMPLATE_DOC=$(top_srcdir)/doc/telemetrum-outline.pdf $(top_srcdir)/doc/telemega-outline.pdf
 
 DOC=$(ALTUSMETRUM_DOC) $(ALTOS_DOC) $(TELEMETRY_DOC) $(TEMPLATE_DOC)
 
 # Distribution targets
 LINUX_DIST=Altos-Linux-$(VERSION).tar.bz2
-MACOSX_DIST=Altos-Mac-$(VERSION).zip
+MACOSX_DIST=Altos-Mac-$(VERSION).dmg
 WINDOWS_DIST=Altos-Windows-$(VERSION_DASH).exe
 
 FAT_FILES=$(FATJAR) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS)
@@ -175,7 +168,7 @@ LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) $(DOC)
 LINUX_EXTRA=altosui-fat
 
 MACOSX_INFO_PLIST=Info.plist
-MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST)
+MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) ReadMe-Mac.rtf
 MACOSX_EXTRA=$(FIRMWARE)
 
 WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON)
@@ -185,7 +178,7 @@ all-local: classes/altosui $(JAR) altosui altosui-test altosui-jdb
 clean-local:
 	-rm -rf classes $(JAR) $(FATJAR) \
 		$(LINUX_DIST) $(MACOSX_DIST) windows $(WINDOWS_DIST) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) \
-		$(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log \
+		$(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log altos-windows.nsi \
 		altosui altosui-test altosui-jdb macosx linux
 
 if FATINSTALL
@@ -320,13 +313,14 @@ $(LINUX_DIST): $(LINUX_FILES) $(LINUX_EXTRA)
 	chmod +x linux/AltOS/altosui
 	tar cjf $@ -C linux AltOS
 
-$(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA)
+$(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA) Makefile
 	-rm -f $@
 	-rm -rf macosx
 	mkdir macosx
 	cp -a AltosUI.app macosx/
+	cp -a ReadMe-Mac.rtf macosx/ReadMe.rtf
 	cp -p Info.plist macosx/AltosUI.app/Contents
-	mkdir -p macosx/AltOS macosx/AltosUI.app/Contents/Resources/Java
+	mkdir -p macosx/AltOS-$(VERSION) 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
 	cp -p $(ALTOSLIB_CLASS) macosx/AltosUI.app/Contents/Resources/Java
@@ -334,8 +328,8 @@ $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA)
 	cp -p $(FREETTS_CLASS) macosx/AltosUI.app/Contents/Resources/Java
 	cp -p $(JFREECHART_CLASS) macosx/AltosUI.app/Contents/Resources/Java
 	cp -p $(JCOMMON_CLASS) macosx/AltosUI.app/Contents/Resources/Java
-	cp -p $(MACOSX_EXTRA) macosx/AltOS
-	cd macosx && zip -r ../$@ AltosUI.app AltOS
+	cp -p $(MACOSX_EXTRA) macosx/AltOS-$(VERSION)
+	genisoimage -D -V AltOS-$(VERSION) -no-pad -r -apple -o $@ macosx
 
 $(WINDOWS_DIST): $(WINDOWS_FILES) altos-windows.nsi
 	-rm -f $@