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
AltosDebug.java \
AltosDescent.java \
AltosDeviceUIDialog.java \
- AltosUSBDevice.java \
AltosDisplayThread.java \
AltosEepromDelete.java \
AltosEepromDownload.java \
AltosFlightStatus.java \
AltosFlightStatusUpdate.java \
AltosFlightUI.java \
- AltosFontListener.java \
AltosFreqList.java \
AltosHexfile.java \
Altos.java \
AltosLed.java \
AltosLights.java \
AltosPad.java \
- AltosUIPreferences.java \
AltosUIPreferencesBackend.java \
AltosRomconfig.java \
AltosRomconfigUI.java \
AltosSiteMapCache.java \
AltosSiteMapTile.java \
AltosUI.java \
- AltosUIListener.java \
- AltosFrame.java \
- AltosDialog.java \
AltosWriter.java \
- AltosDataPointReader.java \
- AltosDataPoint.java \
AltosGraph.java \
- AltosGraphTime.java \
+ AltosGraphDataPoint.java \
+ AltosGraphDataSet.java \
AltosGraphUI.java \
AltosDataChooser.java \
AltosVoice.java \
freetts.jar
ALTOSLIB_CLASS=\
- AltosLib.jar
+ altoslib_$(ALTOSLIB_VERSION).jar
ALTOSUILIB_CLASS=\
- altosuilib.jar
+ altosuilib_$(ALTOSUILIB_VERSION).jar
LIBALTOS= \
libaltos.so \
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)
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)
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
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
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 $@