altosui: Output recorded clock tick in CSV files

[fw/altos] / altosui / Makefile.am

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 8351035272f0fe3e49dc1e610e060cb9a08ad701..d436c6a04ecce80283227c6911be7d4b2df4393f 100644 (file)
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -26,6 +26,8 @@ altosui_JAVA = \
        AltosConfigFreqUI.java \
        AltosConfigUI.java \
        AltosConfigureUI.java \
+       AltosConfigTD.java \
+       AltosConfigTDUI.java \
        AltosConvert.java \
        AltosCRCException.java \
        AltosCSV.java \
@@ -45,6 +47,7 @@ altosui_JAVA = \
        AltosEepromMonitor.java \
        AltosEepromIterable.java \
        AltosEepromRecord.java \
+       AltosEepromTeleScience.java \
        AltosEepromSelect.java \
        AltosFile.java \
        AltosFlash.java \
@@ -55,7 +58,9 @@ altosui_JAVA = \
        AltosFlightStats.java \
        AltosFlightStatsTable.java \
        AltosFlightStatus.java \
+       AltosFlightStatusUpdate.java \
        AltosFlightUI.java \
+       AltosFontListener.java \
        AltosFrequency.java \
        AltosFreqList.java \
        AltosGPS.java \
@@ -66,6 +71,8 @@ altosui_JAVA = \
        AltosIdleMonitorUI.java \
        AltosIgnite.java \
        AltosIgniteUI.java \
+       AltosLaunch.java \
+       AltosLaunchUI.java \
        AltosInfoTable.java \
        AltosKML.java \
        AltosLanded.java \
@@ -82,7 +89,6 @@ altosui_JAVA = \
        AltosRecordIterable.java \
        AltosTelemetryReader.java \
        AltosTelemetryRecord.java \
-       AltosTelemetryRecordGeneral.java \
        AltosTelemetryRecordRaw.java \
        AltosTelemetryRecordSensor.java \
        AltosTelemetryRecordConfiguration.java \
@@ -106,6 +112,9 @@ altosui_JAVA = \
        AltosTelemetry.java \
        AltosTelemetryIterable.java \
        AltosUI.java \
+       AltosUIListener.java \
+       AltosFrame.java \
+       AltosDialog.java \
        AltosWriter.java \
        AltosDataPointReader.java \
        AltosDataPoint.java \
@@ -114,7 +123,8 @@ altosui_JAVA = \
        AltosGraphUI.java \
        AltosDataChooser.java \
        AltosVersion.java \
-       AltosVoice.java
+       AltosVoice.java \
+       $(altosui_BT)
 
 JFREECHART_CLASS= \
     jfreechart.jar
@@ -163,7 +173,8 @@ FIRMWARE_TD=$(FIRMWARE_TD_0_2)
 
 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)
@@ -190,7 +201,7 @@ LINUX_EXTRA=altosui-fat
 MACOSX_FILES=$(FAT_FILES) libaltos.dylib
 MACOSX_EXTRA=$(FIRMWARE)
 
-WINDOWS_FILES=$(FAT_FILES) altos.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON)
+WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON)
 
 all-local: classes/altosui $(JAR) altosui altosui-test altosui-jdb
 
@@ -281,10 +292,24 @@ libaltos.dylib:
        -rm -f "$@"
        $(LN_S) libaltos/"$@" .
 
-altos.dll:
+altos.dll: libaltos/altos.dll
        -rm -f "$@"
        $(LN_S) libaltos/"$@" .
 
+altos64.dll: libaltos/altos64.dll
+       -rm -f "$@"
+       $(LN_S) libaltos/"$@" .
+
+libaltos/altos.dll: build-altos-dll
+
+libaltos/altos64.dll: build-altos64-dll
+
+build-altos-dll:
+       +cd libaltos && make altos.dll
+
+build-altos64-dll:
+       +cd libaltos && make altos64.dll
+
 $(FREETTS_CLASS):
        -rm -f "$@"
        $(LN_S) "$(FREETTS)"/"$@" .