use multimaint-merge to make Debian changelogs less ugly

[fw/altos] / altosui / Makefile.am

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index f4d84ad29648ee93fa98b030614106049ffa51aa..ba1c830c6c72c42c16281a9768a2175d489eb3f6 100644 (file)
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -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 \
@@ -27,10 +35,6 @@ altosui_JAVA = \
        AltosDeviceDialog.java \
        AltosDevice.java \
        AltosUSBDevice.java \
-       AltosBTDevice.java \
-       AltosBTDeviceIterator.java \
-       AltosBTManage.java \
-       AltosBTKnown.java \
        AltosDisplayThread.java \
        AltosEepromChunk.java \
        AltosEepromDelete.java \
@@ -41,6 +45,7 @@ altosui_JAVA = \
        AltosEepromMonitor.java \
        AltosEepromIterable.java \
        AltosEepromRecord.java \
+       AltosEepromTeleScience.java \
        AltosEepromSelect.java \
        AltosFile.java \
        AltosFlash.java \
@@ -48,12 +53,19 @@ altosui_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 \
@@ -68,16 +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 \
@@ -143,13 +167,17 @@ 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=$(FIRMWARE_TM) $(FIRMWARE_TD)
+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) $(TEMPLATE_DOC)
+DOC=$(ALTUSMETRUM_DOC) $(ALTOS_DOC) $(TELEMETRY_DOC) $(TEMPLATE_DOC)
 
 # Distribution targets
 LINUX_DIST=Altos-Linux-$(VERSION).tar.bz2
@@ -164,7 +192,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
 
@@ -255,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)"/"$@" .
@@ -296,3 +338,6 @@ $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA)
 $(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