altosui: Report error message back from libaltos

[fw/altos] / altosui / Makefile.am

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 8351035272f0fe3e49dc1e610e060cb9a08ad701..c4d1e611ff41ce5f6d2d81f3389735d37b9fd6c1 100644 (file)
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -45,6 +45,7 @@ altosui_JAVA = \
        AltosEepromMonitor.java \
        AltosEepromIterable.java \
        AltosEepromRecord.java \
+       AltosEepromTeleScience.java \
        AltosEepromSelect.java \
        AltosFile.java \
        AltosFlash.java \
@@ -56,6 +57,7 @@ altosui_JAVA = \
        AltosFlightStatsTable.java \
        AltosFlightStatus.java \
        AltosFlightUI.java \
+       AltosFontListener.java \
        AltosFrequency.java \
        AltosFreqList.java \
        AltosGPS.java \
@@ -66,6 +68,8 @@ altosui_JAVA = \
        AltosIdleMonitorUI.java \
        AltosIgnite.java \
        AltosIgniteUI.java \
+       AltosLaunch.java \
+       AltosLaunchUI.java \
        AltosInfoTable.java \
        AltosKML.java \
        AltosLanded.java \
@@ -114,7 +118,8 @@ altosui_JAVA = \
        AltosGraphUI.java \
        AltosDataChooser.java \
        AltosVersion.java \
-       AltosVoice.java
+       AltosVoice.java \
+       $(altosui_BT)
 
 JFREECHART_CLASS= \
     jfreechart.jar
@@ -190,7 +195,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
 
@@ -281,10 +286,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)"/"$@" .