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 bab8f816f7812ed53705380ad3aef6a859f909e3..ba1c830c6c72c42c16281a9768a2175d489eb3f6 100644 (file)
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -20,6 +20,7 @@ altosui_JAVA = \
        GrabNDrag.java \
        AltosAscent.java \
        AltosChannelMenu.java \
+       AltosCompanionInfo.java \
        AltosConfig.java \
        AltosConfigData.java \
        AltosConfigFreqUI.java \
@@ -44,6 +45,7 @@ altosui_JAVA = \
        AltosEepromMonitor.java \
        AltosEepromIterable.java \
        AltosEepromRecord.java \
+       AltosEepromTeleScience.java \
        AltosEepromSelect.java \
        AltosFile.java \
        AltosFlash.java \
@@ -55,6 +57,7 @@ altosui_JAVA = \
        AltosFlightStatsTable.java \
        AltosFlightStatus.java \
        AltosFlightUI.java \
+       AltosFontListener.java \
        AltosFrequency.java \
        AltosFreqList.java \
        AltosGPS.java \
@@ -77,6 +80,7 @@ altosui_JAVA = \
        AltosPreferences.java \
        AltosReader.java \
        AltosRecord.java \
+       AltosRecordCompanion.java \
        AltosRecordIterable.java \
        AltosTelemetryReader.java \
        AltosTelemetryRecord.java \
@@ -86,6 +90,7 @@ altosui_JAVA = \
        AltosTelemetryRecordConfiguration.java \
        AltosTelemetryRecordLocation.java \
        AltosTelemetryRecordSatellite.java \
+       AltosTelemetryRecordCompanion.java \
        AltosTelemetryRecordLegacy.java \
        AltosTelemetryMap.java \
        AltosReplayReader.java \
@@ -187,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
 
@@ -278,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)"/"$@" .