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

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 3bc68cdb..f626d3fa 100644
--- 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 \
@@ -77,6 +79,7 @@ altosui_JAVA = \
 	AltosPreferences.java \
 	AltosReader.java \
 	AltosRecord.java \
+	AltosRecordCompanion.java \
 	AltosRecordIterable.java \
 	AltosTelemetryReader.java \
 	AltosTelemetryRecord.java \
@@ -86,6 +89,7 @@ altosui_JAVA = \
 	AltosTelemetryRecordConfiguration.java \
 	AltosTelemetryRecordLocation.java \
 	AltosTelemetryRecordSatellite.java \
+	AltosTelemetryRecordCompanion.java \
 	AltosTelemetryRecordLegacy.java \
 	AltosTelemetryMap.java \
 	AltosReplayReader.java \
@@ -169,9 +173,10 @@ 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
@@ -186,7 +191,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
 
@@ -277,10 +282,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)"/"$@" .