-SUBDIRS=libaltos
+SUBDIRS=libaltos altoslib
JAVAROOT=classes
AM_JAVACFLAGS=-encoding UTF-8 -Xlint:deprecation
altoslibdir=$(libdir)/altos
-CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:libaltos:$(FREETTS)/*:/usr/share/java/*"
+CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:altoslib/bin:libaltos:$(FREETTS)/*:/usr/share/java/*"
bin_SCRIPTS=altosui
AltosChannelMenu.java \
AltosCompanionInfo.java \
AltosConfig.java \
- AltosConfigData.java \
AltosConfigFreqUI.java \
AltosConfigUI.java \
AltosConfigureUI.java \
+ AltosConfigTD.java \
+ AltosConfigTDUI.java \
AltosConvert.java \
AltosCRCException.java \
AltosCSV.java \
AltosEepromIterable.java \
AltosEepromRecord.java \
AltosEepromTeleScience.java \
+ AltosEepromMega.java \
+ AltosEepromMegaIterable.java \
+ AltosMs5607.java \
+ AltosIMU.java \
+ AltosMag.java \
AltosEepromSelect.java \
AltosFile.java \
AltosFlash.java \
AltosFlightStats.java \
AltosFlightStatsTable.java \
AltosFlightStatus.java \
+ AltosFlightStatusUpdate.java \
AltosFlightUI.java \
AltosFontListener.java \
- AltosFrequency.java \
AltosFreqList.java \
- AltosGPS.java \
- AltosGPSSat.java \
AltosGreatCircle.java \
AltosHexfile.java \
Altos.java \
AltosLanded.java \
AltosLed.java \
AltosLights.java \
- AltosLine.java \
AltosLog.java \
AltosPad.java \
- AltosParse.java \
- AltosPreferences.java \
+ AltosUIPreferences.java \
AltosReader.java \
- AltosRecord.java \
- AltosRecordCompanion.java \
- AltosRecordIterable.java \
AltosTelemetryReader.java \
- AltosTelemetryRecord.java \
- AltosTelemetryRecordGeneral.java \
- AltosTelemetryRecordRaw.java \
- AltosTelemetryRecordSensor.java \
- AltosTelemetryRecordConfiguration.java \
- AltosTelemetryRecordLocation.java \
- AltosTelemetryRecordSatellite.java \
- AltosTelemetryRecordCompanion.java \
- AltosTelemetryRecordLegacy.java \
- AltosTelemetryMap.java \
AltosReplayReader.java \
AltosRomconfig.java \
AltosRomconfigUI.java \
AltosSiteMapCache.java \
AltosSiteMapTile.java \
AltosState.java \
- AltosTelemetry.java \
- AltosTelemetryIterable.java \
+ AltosTelemetryReader.java \
AltosUI.java \
+ AltosUIListener.java \
+ AltosFrame.java \
+ AltosDialog.java \
AltosWriter.java \
AltosDataPointReader.java \
AltosDataPoint.java \
en_us.jar \
freetts.jar
+ALTOSLIB_CLASS=\
+ AltosLib.jar
+
LIBALTOS= \
libaltos.so \
libaltos.dylib \
FIRMWARE_TM_1_0=$(top_srcdir)/src/telemetrum-v1.0-$(VERSION).ihx
FIRMWARE_TM_1_1=$(top_srcdir)/src/telemetrum-v1.1-$(VERSION).ihx
-FIRMWARE_TM=$(FIRMWARE_TM_1_0) $(FIRMWARE_TM_1_1)
+FIRMWARE_TM_1_2=$(top_srcdir)/src/telemetrum-v1.2-$(VERSION).ihx
+FIRMWARE_TM=$(FIRMWARE_TM_1_0) $(FIRMWARE_TM_1_1) $(FIRMWARE_TM_1_2)
FIRMWARE_TELEMINI_1_0=$(top_srcdir)/src/telemini-v1.0-$(VERSION).ihx
FIRMWARE_TELEMINI=$(FIRMWARE_TELEMINI_1_0)
MACOSX_DIST=Altos-Mac-$(VERSION).zip
WINDOWS_DIST=Altos-Windows-$(VERSION_DASH).exe
-FAT_FILES=$(FATJAR) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS)
+FAT_FILES=$(FATJAR) $(ALTOSLIB_CLASS) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS)
LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) $(DOC)
LINUX_EXTRA=altosui-fat
clean-local:
-rm -rf classes $(JAR) $(FATJAR) \
- $(LINUX_DIST) $(MACOSX_DIST) windows $(WINDOWS_DIST) $(FREETTS_CLASS) \
+ $(LINUX_DIST) $(MACOSX_DIST) windows $(WINDOWS_DIST) $(ALTOSLIB_CLASS) $(FREETTS_CLASS) \
$(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log \
altosui altosui-test altosui-jdb macosx linux
classes/altosui:
mkdir -p classes/altosui
-$(JAR): classaltosui.stamp Manifest.txt $(JAVA_ICON)
+$(JAR): classaltosui.stamp Manifest.txt $(JAVA_ICON) $(ALTOSLIB_CLASS)
jar cfm $@ Manifest.txt \
$(ICONJAR) \
-C classes altosui \
-C libaltos libaltosJNI
-$(FATJAR): classaltosui.stamp Manifest-fat.txt $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) $(JAVA_ICON)
+$(FATJAR): classaltosui.stamp Manifest-fat.txt $(ALTOSLIB_CLASS) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) $(JAVA_ICON)
jar cfm $@ Manifest-fat.txt \
$(ICONJAR) \
-C classes altosui \
Manifest.txt: Makefile
echo 'Main-Class: altosui.AltosUI' > $@
- echo "Class-Path: $(FREETTS)/freetts.jar $(JFREECHART)/jfreechart.jar $(JCOMMON)/jcommon.jar" >> $@
+ echo "Class-Path: altoslib.jar $(FREETTS)/freetts.jar $(JFREECHART)/jfreechart.jar $(JCOMMON)/jcommon.jar" >> $@
Manifest-fat.txt:
echo 'Main-Class: altosui.AltosUI' > $@
- echo "Class-Path: freetts.jar jfreechart.jar jcommon.jar" >> $@
+ echo "Class-Path: altoslib.jar freetts.jar jfreechart.jar jcommon.jar" >> $@
altosui: Makefile
echo "#!/bin/sh" > $@
altosui-test: Makefile
echo "#!/bin/sh" > $@
- echo 'exec java -cp "$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="libaltos/.libs" -jar altosui.jar "$$@"' >> $@
+ echo 'exec java -cp ":altoslib/*:$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="libaltos/.libs" -jar altosui.jar "$$@"' >> $@
chmod +x $@
altosui-jdb: Makefile
build-altos64-dll:
+cd libaltos && make altos64.dll
+$(ALTOSLIB_CLASS):
+ -rm -f "$@"
+ $(LN_S) altoslib/"$@" .
+
$(FREETTS_CLASS):
-rm -f "$@"
$(LN_S) "$(FREETTS)"/"$@" .
cp -a AltosUI.app macosx/
mkdir -p macosx/AltOS macosx/AltosUI.app/Contents/Resources/Java
cp -p $(FATJAR) macosx/AltosUI.app/Contents/Resources/Java/altosui.jar
- cp -p $(FREETTS_CLASS) libaltos.dylib macosx/AltosUI.app/Contents/Resources/Java
- cp -p $(JFREECHART_CLASS) libaltos.dylib macosx/AltosUI.app/Contents/Resources/Java
- cp -p $(JCOMMON_CLASS) libaltos.dylib macosx/AltosUI.app/Contents/Resources/Java
+ 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