X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FMakefile.am;h=d436c6a04ecce80283227c6911be7d4b2df4393f;hb=cf1e95810559584705d0b8a787375938c68e07c6;hp=bab8f816f7812ed53705380ad3aef6a859f909e3;hpb=5aa3e49f794ba5ed2680016f3dca47d67ae99836;p=fw%2Faltos

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index bab8f816..d436c6a0 100644
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -20,11 +20,14 @@ altosui_JAVA = \
 	GrabNDrag.java \
 	AltosAscent.java \
 	AltosChannelMenu.java \
+	AltosCompanionInfo.java \
 	AltosConfig.java \
 	AltosConfigData.java \
 	AltosConfigFreqUI.java \
 	AltosConfigUI.java \
 	AltosConfigureUI.java \
+	AltosConfigTD.java \
+	AltosConfigTDUI.java \
 	AltosConvert.java \
 	AltosCRCException.java \
 	AltosCSV.java \
@@ -44,6 +47,7 @@ altosui_JAVA = \
 	AltosEepromMonitor.java \
 	AltosEepromIterable.java \
 	AltosEepromRecord.java \
+	AltosEepromTeleScience.java \
 	AltosEepromSelect.java \
 	AltosFile.java \
 	AltosFlash.java \
@@ -54,7 +58,9 @@ altosui_JAVA = \
 	AltosFlightStats.java \
 	AltosFlightStatsTable.java \
 	AltosFlightStatus.java \
+	AltosFlightStatusUpdate.java \
 	AltosFlightUI.java \
+	AltosFontListener.java \
 	AltosFrequency.java \
 	AltosFreqList.java \
 	AltosGPS.java \
@@ -65,6 +71,8 @@ altosui_JAVA = \
 	AltosIdleMonitorUI.java \
 	AltosIgnite.java \
 	AltosIgniteUI.java \
+	AltosLaunch.java \
+	AltosLaunchUI.java \
 	AltosInfoTable.java \
 	AltosKML.java \
 	AltosLanded.java \
@@ -77,15 +85,16 @@ altosui_JAVA = \
 	AltosPreferences.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 \
@@ -103,6 +112,9 @@ altosui_JAVA = \
 	AltosTelemetry.java \
 	AltosTelemetryIterable.java \
 	AltosUI.java \
+	AltosUIListener.java \
+	AltosFrame.java \
+	AltosDialog.java \
 	AltosWriter.java \
 	AltosDataPointReader.java \
 	AltosDataPoint.java \
@@ -111,7 +123,8 @@ altosui_JAVA = \
 	AltosGraphUI.java \
 	AltosDataChooser.java \
 	AltosVersion.java \
-	AltosVoice.java
+	AltosVoice.java \
+	$(altosui_BT)
 
 JFREECHART_CLASS= \
     jfreechart.jar
@@ -160,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)
@@ -187,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
 
@@ -278,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)"/"$@" .