X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FMakefile.am;h=3bc68cdb6cf68845caedeb4032512b450e8efbcf;hp=196d70327ac340640b55fec2a5234ad074c1381c;hb=6ac604d11de44cd824f09e4b467264a2b74be7bd;hpb=8801b8c1947bd39f7c985b91a2ba8dbc81bcc91a

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 196d7032..3bc68cdb 100644
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS=libaltos
 JAVAROOT=classes
-AM_JAVACFLAGS=-encoding UTF-8
+AM_JAVACFLAGS=-encoding UTF-8 -Xlint:deprecation
 
 man_MANS=altosui.1
 
@@ -10,12 +10,19 @@ CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:libaltos:$(FREETTS)/*:/
 
 bin_SCRIPTS=altosui
 
+altosui_BT = \
+	AltosBTDevice.java \
+	AltosBTDeviceIterator.java \
+	AltosBTManage.java \
+	AltosBTKnown.java
+
 altosui_JAVA = \
 	GrabNDrag.java \
 	AltosAscent.java \
 	AltosChannelMenu.java \
 	AltosConfig.java \
 	AltosConfigData.java \
+	AltosConfigFreqUI.java \
 	AltosConfigUI.java \
 	AltosConfigureUI.java \
 	AltosConvert.java \
@@ -26,8 +33,9 @@ altosui_JAVA = \
 	AltosDescent.java \
 	AltosDeviceDialog.java \
 	AltosDevice.java \
+	AltosUSBDevice.java \
 	AltosDisplayThread.java \
-	AltosEepromBlock.java \
+	AltosEepromChunk.java \
 	AltosEepromDelete.java \
 	AltosEepromDownload.java \
 	AltosEepromList.java \
@@ -43,12 +51,18 @@ altosui_JAVA = \
 	AltosFlightDisplay.java \
 	AltosFlightInfoTableModel.java \
 	AltosFlightReader.java \
+	AltosFlightStats.java \
+	AltosFlightStatsTable.java \
 	AltosFlightStatus.java \
 	AltosFlightUI.java \
+	AltosFrequency.java \
+	AltosFreqList.java \
 	AltosGPS.java \
+	AltosGPSSat.java \
 	AltosGreatCircle.java \
 	AltosHexfile.java \
 	Altos.java \
+	AltosIdleMonitorUI.java \
 	AltosIgnite.java \
 	AltosIgniteUI.java \
 	AltosInfoTable.java \
@@ -65,13 +79,24 @@ altosui_JAVA = \
 	AltosRecord.java \
 	AltosRecordIterable.java \
 	AltosTelemetryReader.java \
+	AltosTelemetryRecord.java \
+	AltosTelemetryRecordGeneral.java \
+	AltosTelemetryRecordRaw.java \
+	AltosTelemetryRecordSensor.java \
+	AltosTelemetryRecordConfiguration.java \
+	AltosTelemetryRecordLocation.java \
+	AltosTelemetryRecordSatellite.java \
+	AltosTelemetryRecordLegacy.java \
+	AltosTelemetryMap.java \
 	AltosReplayReader.java \
 	AltosRomconfig.java \
 	AltosRomconfigUI.java \
+	AltosScanUI.java \
 	AltosSerial.java \
 	AltosSerialInUseException.java \
 	AltosSerialMonitor.java \
 	AltosSiteMap.java \
+	AltosSiteMapPreload.java \
 	AltosSiteMapCache.java \
 	AltosSiteMapTile.java \
 	AltosState.java \
@@ -85,6 +110,7 @@ altosui_JAVA = \
 	AltosGraphTime.java \
 	AltosGraphUI.java \
 	AltosDataChooser.java \
+	AltosVersion.java \
 	AltosVoice.java
 
 JFREECHART_CLASS= \
@@ -129,9 +155,23 @@ ICONJAR= -C $(ICONDIR) altus-metrum-16x16.jpg \
 WINDOWS_ICON=$(ICONDIR)/altus-metrum.ico
 
 # Firmware
-FIRMWARE_TD=$(top_srcdir)/src/teledongle-v0.2-$(VERSION).ihx
-FIRMWARE_TM=$(top_srcdir)/src/telemetrum-v1.0-$(VERSION).ihx
-FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TD)
+FIRMWARE_TD_0_2=$(top_srcdir)/src/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=$(FIRMWARE_TM_1_0) $(FIRMWARE_TM_1_1)
+
+FIRMWARE_TELEMINI_1_0=$(top_srcdir)/src/telemini-v1.0-$(VERSION).ihx
+FIRMWARE_TELEMINI=$(FIRMWARE_TELEMINI_1_0)
+
+FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TELEMINI) $(FIRMWARE_TD) 
+
+ALTUSMETRUM_DOC=$(top_srcdir)/doc/altusmetrum.pdf
+ALTOS_DOC=$(top_srcdir)/doc/altos.pdf
+TEMPLATE_DOC=$(top_srcdir)/doc/telemetrum-outline.pdf
+
+DOC=$(ALTUSMETRUM_DOC) $(ALTOS_DOC) $(TEMPLATE_DOC)
 
 # Distribution targets
 LINUX_DIST=Altos-Linux-$(VERSION).tar.bz2
@@ -140,7 +180,7 @@ WINDOWS_DIST=Altos-Windows-$(VERSION_DASH).exe
 
 FAT_FILES=$(FATJAR) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS)
 
-LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE)
+LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) $(DOC)
 LINUX_EXTRA=altosui-fat
 
 MACOSX_FILES=$(FAT_FILES) libaltos.dylib
@@ -271,9 +311,13 @@ $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA)
 	cp -p $(FATJAR) macosx/AltosUI.app/Contents/Resources/Java/altosui.jar
 	cp -p $(FREETTS_CLASS) libaltos.dylib macosx/AltosUI.app/Contents/Resources/Java
 	cp -p $(JFREECHART_CLASS) libaltos.dylib macosx/AltosUI.app/Contents/Resources/Java
+	cp -p $(JCOMMON_CLASS) libaltos.dylib macosx/AltosUI.app/Contents/Resources/Java
 	cp -p $(MACOSX_EXTRA) macosx/AltOS
 	cd macosx && zip -r ../$@ AltosUI.app AltOS
 
 $(WINDOWS_DIST): $(WINDOWS_FILES) altos-windows.nsi
 	-rm -f $@
 	makensis -Oaltos-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" altos-windows.nsi
+
+publish:
+	scp launch-sites.txt gag.com:public_html
\ No newline at end of file