projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Can't configure flight log max on TeleMini
[fw/altos]
/
altosui
/
Makefile.am
diff --git
a/altosui/Makefile.am
b/altosui/Makefile.am
index 713a02f4183c543d9b36bb097e186496dcdce2f9..f626d3fa2703a80a7bf6484da75887436c451167 100644
(file)
--- a/
altosui/Makefile.am
+++ b/
altosui/Makefile.am
@@
-20,6
+20,7
@@
altosui_JAVA = \
GrabNDrag.java \
AltosAscent.java \
AltosChannelMenu.java \
GrabNDrag.java \
AltosAscent.java \
AltosChannelMenu.java \
+ AltosCompanionInfo.java \
AltosConfig.java \
AltosConfigData.java \
AltosConfigFreqUI.java \
AltosConfig.java \
AltosConfigData.java \
AltosConfigFreqUI.java \
@@
-44,6
+45,7
@@
altosui_JAVA = \
AltosEepromMonitor.java \
AltosEepromIterable.java \
AltosEepromRecord.java \
AltosEepromMonitor.java \
AltosEepromIterable.java \
AltosEepromRecord.java \
+ AltosEepromTeleScience.java \
AltosEepromSelect.java \
AltosFile.java \
AltosFlash.java \
AltosEepromSelect.java \
AltosFile.java \
AltosFlash.java \
@@
-51,6
+53,8
@@
altosui_JAVA = \
AltosFlightDisplay.java \
AltosFlightInfoTableModel.java \
AltosFlightReader.java \
AltosFlightDisplay.java \
AltosFlightInfoTableModel.java \
AltosFlightReader.java \
+ AltosFlightStats.java \
+ AltosFlightStatsTable.java \
AltosFlightStatus.java \
AltosFlightUI.java \
AltosFrequency.java \
AltosFlightStatus.java \
AltosFlightUI.java \
AltosFrequency.java \
@@
-75,6
+79,7
@@
altosui_JAVA = \
AltosPreferences.java \
AltosReader.java \
AltosRecord.java \
AltosPreferences.java \
AltosReader.java \
AltosRecord.java \
+ AltosRecordCompanion.java \
AltosRecordIterable.java \
AltosTelemetryReader.java \
AltosTelemetryRecord.java \
AltosRecordIterable.java \
AltosTelemetryReader.java \
AltosTelemetryRecord.java \
@@
-84,6
+89,7
@@
altosui_JAVA = \
AltosTelemetryRecordConfiguration.java \
AltosTelemetryRecordLocation.java \
AltosTelemetryRecordSatellite.java \
AltosTelemetryRecordConfiguration.java \
AltosTelemetryRecordLocation.java \
AltosTelemetryRecordSatellite.java \
+ AltosTelemetryRecordCompanion.java \
AltosTelemetryRecordLegacy.java \
AltosTelemetryMap.java \
AltosReplayReader.java \
AltosTelemetryRecordLegacy.java \
AltosTelemetryMap.java \
AltosReplayReader.java \
@@
-160,13
+166,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_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
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
TEMPLATE_DOC=$(top_srcdir)/doc/telemetrum-outline.pdf
-DOC=$(ALTUSMETRUM_DOC) $(ALTOS_DOC) $(TEMPLATE_DOC)
+DOC=$(ALTUSMETRUM_DOC) $(ALTOS_DOC) $(TE
LEMETRY_DOC) $(TE
MPLATE_DOC)
# Distribution targets
LINUX_DIST=Altos-Linux-$(VERSION).tar.bz2
# Distribution targets
LINUX_DIST=Altos-Linux-$(VERSION).tar.bz2
@@
-181,7
+191,7
@@
LINUX_EXTRA=altosui-fat
MACOSX_FILES=$(FAT_FILES) libaltos.dylib
MACOSX_EXTRA=$(FIRMWARE)
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
all-local: classes/altosui $(JAR) altosui altosui-test altosui-jdb
@@
-272,10
+282,24
@@
libaltos.dylib:
-rm -f "$@"
$(LN_S) libaltos/"$@" .
-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/"$@" .
-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)"/"$@" .
$(FREETTS_CLASS):
-rm -f "$@"
$(LN_S) "$(FREETTS)"/"$@" .