altosui: Split out UI-specific preferences

[fw/altos] / altosui / Makefile.am

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 7cd383ac2c74584b84078862f44f551898c4b283..c3fd6bb644061f89ade2704a907b3be99800d55b 100644 (file)
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=libaltos
+SUBDIRS=libaltos altoslib
 JAVAROOT=classes
 AM_JAVACFLAGS=-encoding UTF-8 -Xlint:deprecation
 
@@ -26,6 +26,8 @@ altosui_JAVA = \
        AltosConfigFreqUI.java \
        AltosConfigUI.java \
        AltosConfigureUI.java \
+       AltosConfigTD.java \
+       AltosConfigTDUI.java \
        AltosConvert.java \
        AltosCRCException.java \
        AltosCSV.java \
@@ -46,6 +48,11 @@ altosui_JAVA = \
        AltosEepromIterable.java \
        AltosEepromRecord.java \
        AltosEepromTeleScience.java \
+       AltosEepromMega.java \
+       AltosEepromMegaIterable.java \
+       AltosMs5607.java \
+       AltosIMU.java \
+       AltosMag.java \
        AltosEepromSelect.java \
        AltosFile.java \
        AltosFlash.java \
@@ -56,6 +63,7 @@ altosui_JAVA = \
        AltosFlightStats.java \
        AltosFlightStatsTable.java \
        AltosFlightStatus.java \
+       AltosFlightStatusUpdate.java \
        AltosFlightUI.java \
        AltosFontListener.java \
        AltosFrequency.java \
@@ -79,14 +87,15 @@ altosui_JAVA = \
        AltosLog.java \
        AltosPad.java \
        AltosParse.java \
+       AltosUIPreferences.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 \
@@ -171,7 +180,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)