projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: avr-gcc appears to find the loader scripts without help now
[fw/altos]
/
altosui
/
Makefile.am
diff --git
a/altosui/Makefile.am
b/altosui/Makefile.am
index f5b83ce7c7ede2ff85c0a28a990dd73f49206ed9..78e29cd8242fc33d1dd525b6341cfdddd399cf15 100644
(file)
--- a/
altosui/Makefile.am
+++ b/
altosui/Makefile.am
@@
-30,7
+30,6
@@
altosui_JAVA = \
AltosConfigTDUI.java \
AltosCSV.java \
AltosCSVUI.java \
AltosConfigTDUI.java \
AltosCSV.java \
AltosCSVUI.java \
- AltosDebug.java \
AltosDescent.java \
AltosDeviceUIDialog.java \
AltosDisplayThread.java \
AltosDescent.java \
AltosDeviceUIDialog.java \
AltosDisplayThread.java \
@@
-40,7
+39,6
@@
altosui_JAVA = \
AltosEepromManage.java \
AltosEepromMonitor.java \
AltosEepromSelect.java \
AltosEepromManage.java \
AltosEepromMonitor.java \
AltosEepromSelect.java \
- AltosFlash.java \
AltosFlashUI.java \
AltosFlightDisplay.java \
AltosFlightInfoTableModel.java \
AltosFlashUI.java \
AltosFlightDisplay.java \
AltosFlightInfoTableModel.java \
@@
-50,7
+48,6
@@
altosui_JAVA = \
AltosFlightStatusUpdate.java \
AltosFlightUI.java \
AltosFreqList.java \
AltosFlightStatusUpdate.java \
AltosFlightUI.java \
AltosFreqList.java \
- AltosHexfile.java \
Altos.java \
AltosIdleMonitorUI.java \
AltosIgniteUI.java \
Altos.java \
AltosIdleMonitorUI.java \
AltosIgniteUI.java \
@@
-63,7
+60,6
@@
altosui_JAVA = \
AltosLights.java \
AltosPad.java \
AltosUIPreferencesBackend.java \
AltosLights.java \
AltosPad.java \
AltosUIPreferencesBackend.java \
- AltosRomconfig.java \
AltosRomconfigUI.java \
AltosScanUI.java \
AltosSerial.java \
AltosRomconfigUI.java \
AltosScanUI.java \
AltosSerial.java \
@@
-74,10
+70,9
@@
altosui_JAVA = \
AltosSiteMapTile.java \
AltosUI.java \
AltosWriter.java \
AltosSiteMapTile.java \
AltosUI.java \
AltosWriter.java \
- AltosDataPointReader.java \
- AltosDataPoint.java \
AltosGraph.java \
AltosGraph.java \
- AltosGraphTime.java \
+ AltosGraphDataPoint.java \
+ AltosGraphDataSet.java \
AltosGraphUI.java \
AltosDataChooser.java \
AltosVoice.java \
AltosGraphUI.java \
AltosDataChooser.java \
AltosVoice.java \
@@
-99,10
+94,10
@@
FREETTS_CLASS= \
freetts.jar
ALTOSLIB_CLASS=\
freetts.jar
ALTOSLIB_CLASS=\
-
AltosLib
.jar
+
altoslib_$(ALTOSLIB_VERSION)
.jar
ALTOSUILIB_CLASS=\
ALTOSUILIB_CLASS=\
- altosuilib.jar
+ altosuilib
_$(ALTOSUILIB_VERSION)
.jar
LIBALTOS= \
libaltos.so \
LIBALTOS= \
libaltos.so \
@@
-153,12
+148,15
@@
FIRMWARE_TM=$(FIRMWARE_TM_1_0) $(FIRMWARE_TM_1_1) $(FIRMWARE_TM_1_2)
FIRMWARE_TELEMINI_1_0=$(top_srcdir)/src/telemini-v1.0-$(VERSION).ihx
FIRMWARE_TELEMINI=$(FIRMWARE_TELEMINI_1_0)
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)
+FIRMWARE_TBT_1_0=$(top_srcdir)/src/telebt-v1.0-$(VERSION).ihx
+FIRMWARE_TBT=$(FIRMWARE_TBT_1_0)
+
+FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TELEMINI) $(FIRMWARE_TD) $(FIRMWARE_TBT)
ALTUSMETRUM_DOC=$(top_srcdir)/doc/altusmetrum.pdf
ALTOS_DOC=$(top_srcdir)/doc/altos.pdf
TELEMETRY_DOC=$(top_srcdir)/doc/telemetry.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 $(top_srcdir)/doc/
megametrum
-outline.pdf
+TEMPLATE_DOC=$(top_srcdir)/doc/telemetrum-outline.pdf $(top_srcdir)/doc/
telemega
-outline.pdf
DOC=$(ALTUSMETRUM_DOC) $(ALTOS_DOC) $(TELEMETRY_DOC) $(TEMPLATE_DOC)
DOC=$(ALTUSMETRUM_DOC) $(ALTOS_DOC) $(TELEMETRY_DOC) $(TEMPLATE_DOC)
@@
-183,7
+181,7
@@
all-local: classes/altosui $(JAR) altosui altosui-test altosui-jdb
clean-local:
-rm -rf classes $(JAR) $(FATJAR) \
$(LINUX_DIST) $(MACOSX_DIST) windows $(WINDOWS_DIST) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) \
clean-local:
-rm -rf classes $(JAR) $(FATJAR) \
$(LINUX_DIST) $(MACOSX_DIST) windows $(WINDOWS_DIST) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) \
- $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log \
+ $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log
altos-windows.nsi
\
altosui altosui-test altosui-jdb macosx linux
if FATINSTALL
altosui altosui-test altosui-jdb macosx linux
if FATINSTALL