projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ao-tools: don't do 'm 0' after 'E 0' since EasyMotor doesn't support it
[fw/altos]
/
altosuilib
/
Makefile.am
diff --git
a/altosuilib/Makefile.am
b/altosuilib/Makefile.am
index a00e4a12f1fdc78a0e9b5dc927a3993e7ad3b627..10a5b494d3883477f3030aaeeaaebab22cb491d8 100644
(file)
--- a/
altosuilib/Makefile.am
+++ b/
altosuilib/Makefile.am
@@
-1,4
+1,4
@@
-AM_JAVACFLAGS=
-target 1.6 -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked -source 6
+AM_JAVACFLAGS=
$(JAVAC_VERSION_FLAGS) -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked
JAVAROOT=bin
JAVAROOT=bin
@@
-9,16
+9,15
@@
SRC=.
altosuilibdir = $(datadir)/java
altosuilib_JAVA = \
altosuilibdir = $(datadir)/java
altosuilib_JAVA = \
- GrabNDrag.java \
AltosDevice.java \
AltosDeviceDialog.java \
AltosPositionListener.java \
AltosDevice.java \
AltosDeviceDialog.java \
AltosPositionListener.java \
+ AltosUIAccelCal.java \
AltosUIConfigure.java \
AltosUIAxis.java \
AltosUIDataMissing.java \
AltosUIDataPoint.java \
AltosUIDataSet.java \
AltosUIConfigure.java \
AltosUIAxis.java \
AltosUIDataMissing.java \
AltosUIDataPoint.java \
AltosUIDataSet.java \
- AltosUIGraph.java \
AltosUIGrapher.java \
AltosUIDialog.java \
AltosUIEnable.java \
AltosUIGrapher.java \
AltosUIDialog.java \
AltosUIEnable.java \
@@
-28,7
+27,10
@@
altosuilib_JAVA = \
AltosUIMarker.java \
AltosUIPreferencesBackend.java \
AltosUIPreferences.java \
AltosUIMarker.java \
AltosUIPreferencesBackend.java \
AltosUIPreferences.java \
- AltosUISeries.java \
+ AltosUIFlightSeries.java \
+ AltosUIGraph.java \
+ AltosGraph.java \
+ AltosShapeListener.java \
AltosUSBDevice.java \
AltosVoice.java \
AltosDisplayThread.java \
AltosUSBDevice.java \
AltosVoice.java \
AltosDisplayThread.java \
@@
-38,6
+40,7
@@
altosuilib_JAVA = \
AltosConfigFreqUI.java \
AltosScanUI.java \
AltosEepromDelete.java \
AltosConfigFreqUI.java \
AltosScanUI.java \
AltosEepromDelete.java \
+ AltosEepromGrapher.java \
AltosEepromManage.java \
AltosEepromMonitorUI.java \
AltosEepromSelect.java \
AltosEepromManage.java \
AltosEepromMonitorUI.java \
AltosEepromSelect.java \
@@
-50,15
+53,13
@@
altosuilib_JAVA = \
AltosInfoTable.java \
AltosFlightInfoTableModel.java \
AltosFlightStatsTable.java \
AltosInfoTable.java \
AltosFlightInfoTableModel.java \
AltosFlightStatsTable.java \
- AltosGraph.java \
- AltosGraphDataPoint.java \
- AltosGraphDataSet.java \
AltosBTDevice.java \
AltosBTDeviceIterator.java \
AltosBTManage.java \
AltosBTKnown.java \
AltosBTDevice.java \
AltosBTDeviceIterator.java \
AltosBTManage.java \
AltosBTKnown.java \
- AltosUIMapNew.java \
- AltosUIMapPreloadNew.java \
+ AltosUILineStyle.java \
+ AltosUIMap.java \
+ AltosUIMapPreload.java \
AltosUIFlightTab.java \
AltosUIIndicator.java \
AltosUIUnitsIndicator.java \
AltosUIFlightTab.java \
AltosUIIndicator.java \
AltosUIUnitsIndicator.java \
@@
-67,6
+68,7
@@
altosuilib_JAVA = \
AltosUITelemetryList.java \
AltosUIRateList.java \
AltosUIImage.java \
AltosUITelemetryList.java \
AltosUIRateList.java \
AltosUIImage.java \
+ AltosUITimeSeries.java \
OSXAdapter.java
JAR=altosuilib_$(ALTOSUILIB_VERSION).jar
OSXAdapter.java
JAR=altosuilib_$(ALTOSUILIB_VERSION).jar
@@
-99,3
+101,6
@@
$(JAVAROOT):
$(JAR): classaltosuilib.stamp $(ICONS)
jar cf $@ $(ICONJAR) -C $(JAVAROOT) .
$(JAR): classaltosuilib.stamp $(ICONS)
jar cf $@ $(ICONJAR) -C $(JAVAROOT) .
+if STRIP_NONDETERMINISM
+ $(STRIP_NONDETERMINISM) $@
+endif