X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FMakefile.am;h=ba1c830c6c72c42c16281a9768a2175d489eb3f6;hp=58d237872a9b0d6ee25d193f6b9e86cd77f2633a;hb=c3314dae2d3df82e188daf6ba8520cce833592c6;hpb=440d52e34364fdeeddc76a2d744cc6d1c934364f

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 58d23787..ba1c830c 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,20 @@ 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 \
+	AltosCompanionInfo.java \
 	AltosConfig.java \
 	AltosConfigData.java \
+	AltosConfigFreqUI.java \
 	AltosConfigUI.java \
 	AltosConfigureUI.java \
 	AltosConvert.java \
@@ -26,26 +34,38 @@ altosui_JAVA = \
 	AltosDescent.java \
 	AltosDeviceDialog.java \
 	AltosDevice.java \
+	AltosUSBDevice.java \
 	AltosDisplayThread.java \
-	AltosEepromBlock.java \
+	AltosEepromChunk.java \
+	AltosEepromDelete.java \
 	AltosEepromDownload.java \
 	AltosEepromList.java \
 	AltosEepromLog.java \
+	AltosEepromManage.java \
 	AltosEepromMonitor.java \
 	AltosEepromIterable.java \
 	AltosEepromRecord.java \
+	AltosEepromTeleScience.java \
+	AltosEepromSelect.java \
 	AltosFile.java \
 	AltosFlash.java \
 	AltosFlashUI.java \
 	AltosFlightDisplay.java \
 	AltosFlightInfoTableModel.java \
 	AltosFlightReader.java \
+	AltosFlightStats.java \
+	AltosFlightStatsTable.java \
 	AltosFlightStatus.java \
 	AltosFlightUI.java \
+	AltosFontListener.java \
+	AltosFrequency.java \
+	AltosFreqList.java \
 	AltosGPS.java \
+	AltosGPSSat.java \
 	AltosGreatCircle.java \
 	AltosHexfile.java \
 	Altos.java \
+	AltosIdleMonitorUI.java \
 	AltosIgnite.java \
 	AltosIgniteUI.java \
 	AltosInfoTable.java \
@@ -60,15 +80,28 @@ 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 \
 	AltosRomconfig.java \
 	AltosRomconfigUI.java \
+	AltosScanUI.java \
 	AltosSerial.java \
 	AltosSerialInUseException.java \
 	AltosSerialMonitor.java \
 	AltosSiteMap.java \
+	AltosSiteMapPreload.java \
 	AltosSiteMapCache.java \
 	AltosSiteMapTile.java \
 	AltosState.java \
@@ -82,6 +115,7 @@ altosui_JAVA = \
 	AltosGraphTime.java \
 	AltosGraphUI.java \
 	AltosDataChooser.java \
+	AltosVersion.java \
 	AltosVoice.java
 
 JFREECHART_CLASS= \
@@ -126,9 +160,24 @@ 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
+TELEMETRY_DOC=$(top_srcdir)/doc/telemetry.pdf
+TEMPLATE_DOC=$(top_srcdir)/doc/telemetrum-outline.pdf
+
+DOC=$(ALTUSMETRUM_DOC) $(ALTOS_DOC) $(TELEMETRY_DOC) $(TEMPLATE_DOC)
 
 # Distribution targets
 LINUX_DIST=Altos-Linux-$(VERSION).tar.bz2
@@ -137,13 +186,13 @@ 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
 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
 
@@ -234,10 +283,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)"/"$@" .
@@ -268,9 +331,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