X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FMakefile.am;h=e103d2896d00b09a63d58ce2e66fae0cd1681c36;hb=de2e812b02a99a2f6d85f15a9600265931f6f6b0;hp=96cf77f2a99c2efbbaafdff2006f66a99e03a646;hpb=760b1f02c178c600226f39b5e66d8cbadbf4a29b;p=fw%2Faltos

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 96cf77f2..e103d289 100644
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -1,6 +1,6 @@
 
 JAVAROOT=classes
-AM_JAVACFLAGS=-encoding UTF-8 -Xlint:deprecation
+AM_JAVACFLAGS=-encoding UTF-8 -Xlint:deprecation -source 6
 
 man_MANS=altosui.1
 
@@ -30,17 +30,13 @@ altosui_JAVA = \
 	AltosConfigTDUI.java \
 	AltosCSV.java \
 	AltosCSVUI.java \
-	AltosDebug.java \
 	AltosDescent.java \
 	AltosDeviceUIDialog.java \
 	AltosDisplayThread.java \
 	AltosEepromDelete.java \
-	AltosEepromDownload.java \
-	AltosEepromList.java \
 	AltosEepromManage.java \
-	AltosEepromMonitor.java \
+	AltosEepromMonitorUI.java \
 	AltosEepromSelect.java \
-	AltosFlash.java \
 	AltosFlashUI.java \
 	AltosFlightDisplay.java \
 	AltosFlightInfoTableModel.java \
@@ -50,7 +46,6 @@ altosui_JAVA = \
 	AltosFlightStatusUpdate.java \
 	AltosFlightUI.java \
 	AltosFreqList.java \
-	AltosHexfile.java \
 	Altos.java \
 	AltosIdleMonitorUI.java \
 	AltosIgniteUI.java \
@@ -63,7 +58,6 @@ altosui_JAVA = \
 	AltosLights.java \
 	AltosPad.java \
 	AltosUIPreferencesBackend.java \
-	AltosRomconfig.java \
 	AltosRomconfigUI.java \
 	AltosScanUI.java \
 	AltosSerial.java \
@@ -141,23 +135,29 @@ ICONJAR= -C $(ICONDIR) altus-metrum-16.png \
 WINDOWS_ICON=$(ICONDIR)/altus-metrum.ico
 
 # Firmware
-FIRMWARE_TD_0_2=$(top_srcdir)/src/teledongle-v0.2-$(VERSION).ihx
+FIRMWARE_TD_0_2=$(top_srcdir)/src/teledongle-v0.2/teledongle-v0.2-$(VERSION).ihx
 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_1_2=$(top_srcdir)/src/telemetrum-v1.2-$(VERSION).ihx
+FIRMWARE_TM_1_0=$(top_srcdir)/src/telemetrum-v1.0/telemetrum-v1.0-$(VERSION).ihx
+FIRMWARE_TM_1_1=$(top_srcdir)/src/telemetrum-v1.1/telemetrum-v1.1-$(VERSION).ihx
+FIRMWARE_TM_1_2=$(top_srcdir)/src/telemetrum-v1.2/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_1_0=$(top_srcdir)/src/telemini-v1.0/telemini-v1.0-$(VERSION).ihx
 FIRMWARE_TELEMINI=$(FIRMWARE_TELEMINI_1_0)
 
-FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TELEMINI) $(FIRMWARE_TD) 
+FIRMWARE_TBT_1_0=$(top_srcdir)/src/telebt-v1.0/telebt-v1.0-$(VERSION).ihx
+FIRMWARE_TBT=$(FIRMWARE_TBT_1_0)
+
+FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TELEMINI) $(FIRMWARE_TD) $(FIRMWARE_TBT)
 
 ALTUSMETRUM_DOC=$(top_srcdir)/doc/altusmetrum.pdf
 ALTOS_DOC=$(top_srcdir)/doc/altos.pdf
 TELEMETRY_DOC=$(top_srcdir)/doc/telemetry.pdf
-TEMPLATE_DOC=$(top_srcdir)/doc/telemetrum-outline.pdf $(top_srcdir)/doc/megametrum-outline.pdf
+TEMPLATE_DOC=\
+	$(top_srcdir)/doc/telemetrum-outline.pdf \
+	$(top_srcdir)/doc/easymini-outline.pdf \
+	$(top_srcdir)/doc/telemega-outline.pdf
 
 DOC=$(ALTUSMETRUM_DOC) $(ALTOS_DOC) $(TELEMETRY_DOC) $(TEMPLATE_DOC)