altosui: Split out UI-specific preferences

[fw/altos] / altosui / Makefile.am

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index ba1c830c6c72c42c16281a9768a2175d489eb3f6..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 \
@@ -68,6 +76,8 @@ altosui_JAVA = \
        AltosIdleMonitorUI.java \
        AltosIgnite.java \
        AltosIgniteUI.java \
+       AltosLaunch.java \
+       AltosLaunchUI.java \
        AltosInfoTable.java \
        AltosKML.java \
        AltosLanded.java \
@@ -77,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 \
@@ -108,6 +119,9 @@ altosui_JAVA = \
        AltosTelemetry.java \
        AltosTelemetryIterable.java \
        AltosUI.java \
+       AltosUIListener.java \
+       AltosFrame.java \
+       AltosDialog.java \
        AltosWriter.java \
        AltosDataPointReader.java \
        AltosDataPoint.java \
@@ -116,7 +130,8 @@ altosui_JAVA = \
        AltosGraphUI.java \
        AltosDataChooser.java \
        AltosVersion.java \
-       AltosVoice.java
+       AltosVoice.java \
+       $(altosui_BT)
 
 JFREECHART_CLASS= \
     jfreechart.jar
@@ -165,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)