projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/easymotor-v2: Increase default flight log size
[fw/altos]
/
altoslib
/
Makefile.am
diff --git
a/altoslib/Makefile.am
b/altoslib/Makefile.am
index 1b37215c736b053fadcd0c99c956466c430f43b7..9c8c66910c4f86c511399fd0497abc93ec7b3613 100644
(file)
--- a/
altoslib/Makefile.am
+++ b/
altoslib/Makefile.am
@@
-1,10
+1,10
@@
-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
VERSION=1
JAVAROOT=bin
VERSION=1
-CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=
"bin:$(FREETTS)/*:/usr/share/java/*"
+CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=
bin
SRC=.
SRC=.
@@
-26,6
+26,10
@@
record_files = \
altoslib_JAVA = \
AltosLib.java \
altoslib_JAVA = \
AltosLib.java \
+ AltosAccelCal.java \
+ AltosAccelCalListener.java \
+ AltosAdxl375.java \
+ AltosCalData.java \
AltosCompanion.java \
AltosConfigData.java \
AltosConfigDataException.java \
AltosCompanion.java \
AltosConfigData.java \
AltosConfigDataException.java \
@@
-34,7
+38,7
@@
altoslib_JAVA = \
AltosCRCException.java \
AltosCSV.java \
AltosDebug.java \
AltosCRCException.java \
AltosCSV.java \
AltosDebug.java \
- AltosEeprom
New
.java \
+ AltosEeprom.java \
AltosRecordSet.java \
AltosEepromRecord.java \
AltosEepromRecordFull.java \
AltosRecordSet.java \
AltosEepromRecord.java \
AltosEepromRecordFull.java \
@@
-44,8
+48,9
@@
altoslib_JAVA = \
AltosEepromRecordMini.java \
AltosEepromRecordGps.java \
AltosEepromRecordFireTwo.java \
AltosEepromRecordMini.java \
AltosEepromRecordGps.java \
AltosEepromRecordFireTwo.java \
+ AltosEepromRecordMicroPeak2.java \
+ AltosEepromRecordMotor.java \
AltosEepromRecordSet.java \
AltosEepromRecordSet.java \
- AltosEeprom.java \
AltosEepromChunk.java \
AltosEepromDownload.java \
AltosEepromMonitor.java \
AltosEepromChunk.java \
AltosEepromDownload.java \
AltosEepromMonitor.java \
@@
-53,16
+58,20
@@
altoslib_JAVA = \
AltosEepromList.java \
AltosEepromLog.java \
AltosFile.java \
AltosEepromList.java \
AltosEepromLog.java \
AltosFile.java \
+ AltosFilterListener.java \
AltosFlash.java \
AltosFlashListener.java \
AltosFlash.java \
AltosFlashListener.java \
- AltosFlightListener.java \
+ AltosDataListener.java \
+ AltosDataProvider.java \
AltosFlightSeries.java \
AltosFlightReader.java \
AltosFlightStats.java \
AltosForce.java \
AltosFrequency.java \
AltosGPS.java \
AltosFlightSeries.java \
AltosFlightReader.java \
AltosFlightStats.java \
AltosForce.java \
AltosFrequency.java \
AltosGPS.java \
+ AltosGPSTimeValue.java \
AltosGPSSat.java \
AltosGPSSat.java \
+ AltosGauss.java \
AltosGreatCircle.java \
AltosHexfile.java \
AltosHexsym.java \
AltosGreatCircle.java \
AltosHexfile.java \
AltosHexsym.java \
@@
-85,24
+94,30
@@
altoslib_JAVA = \
AltosOrient.java \
AltosParse.java \
AltosPressure.java \
AltosOrient.java \
AltosParse.java \
AltosPressure.java \
+ AltosPresTemp.java \
AltosPreferences.java \
AltosPreferencesBackend.java \
AltosProgrammer.java \
AltosPreferences.java \
AltosPreferencesBackend.java \
AltosProgrammer.java \
+ AltosPyroName.java \
AltosReplayReader.java \
AltosRomconfig.java \
AltosSavedState.java \
AltosSelfFlash.java \
AltosReplayReader.java \
AltosRomconfig.java \
AltosSavedState.java \
AltosSelfFlash.java \
+ AltosUsbId.java \
AltosSensorMM.java \
AltosSensorEMini.java \
AltosSensorMM.java \
AltosSensorEMini.java \
+ AltosSensorEasyTimer1.java \
AltosSensorTM.java \
AltosSensorTMini2.java \
AltosSensorTMini3.java \
AltosSensorMega.java \
AltosSensorMetrum.java \
AltosSensorTM.java \
AltosSensorTMini2.java \
AltosSensorTMini3.java \
AltosSensorMega.java \
AltosSensorMetrum.java \
- AltosSensorTGPS.java \
+ AltosSensorTGPS1.java \
+ AltosSensorTGPS2.java \
+ AltosSensorEasyMotor2.java \
AltosState.java \
AltosState.java \
- AltosState
Iterabl
e.java \
- AltosSt
ateUpdate
.java \
+ AltosState
Nam
e.java \
+ AltosSt
ringInputStream
.java \
AltosTelemetry.java \
AltosTelemetryConfiguration.java \
AltosTelemetryCompanion.java \
AltosTelemetry.java \
AltosTelemetryConfiguration.java \
AltosTelemetryCompanion.java \
@@
-175,7
+190,9
@@
altoslib_JAVA = \
AltosMapLoader.java \
AltosMapTypeListener.java \
AltosJson.java \
AltosMapLoader.java \
AltosMapTypeListener.java \
AltosJson.java \
- AltosVersion.java
+ AltosVersion.java \
+ AltosUnitInfo.java \
+ AltosUnitInfoListener.java
JAR=altoslib_$(ALTOSLIB_VERSION).jar
JAR=altoslib_$(ALTOSLIB_VERSION).jar
@@
-195,3
+212,6
@@
bin:
$(JAR): classaltoslib.stamp
jar cf $@ -C bin org
$(JAR): classaltoslib.stamp
jar cf $@ -C bin org
+if STRIP_NONDETERMINISM
+ $(STRIP_NONDETERMINISM) $@
+endif