projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Add new telemetry packet format for TeleMega v4
[fw/altos]
/
altoslib
/
Makefile.am
diff --git
a/altoslib/Makefile.am
b/altoslib/Makefile.am
index 7c5d767d7916d34ac1fad9f32e7c1560c67c9a0f..59a3b2ca89ab3e09a39887108fecc74d2208b9b5 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=.
@@
-28,6
+28,7
@@
altoslib_JAVA = \
AltosLib.java \
AltosAccelCal.java \
AltosAccelCalListener.java \
AltosLib.java \
AltosAccelCal.java \
AltosAccelCalListener.java \
+ AltosAdxl375.java \
AltosCalData.java \
AltosCompanion.java \
AltosConfigData.java \
AltosCalData.java \
AltosCompanion.java \
AltosConfigData.java \
@@
-47,6
+48,7
@@
altoslib_JAVA = \
AltosEepromRecordMini.java \
AltosEepromRecordGps.java \
AltosEepromRecordFireTwo.java \
AltosEepromRecordMini.java \
AltosEepromRecordGps.java \
AltosEepromRecordFireTwo.java \
+ AltosEepromRecordMicroPeak2.java \
AltosEepromRecordSet.java \
AltosEepromChunk.java \
AltosEepromDownload.java \
AltosEepromRecordSet.java \
AltosEepromChunk.java \
AltosEepromDownload.java \
@@
-107,7
+109,8
@@
altoslib_JAVA = \
AltosSensorTMini3.java \
AltosSensorMega.java \
AltosSensorMetrum.java \
AltosSensorTMini3.java \
AltosSensorMega.java \
AltosSensorMetrum.java \
- AltosSensorTGPS.java \
+ AltosSensorTGPS1.java \
+ AltosSensorTGPS2.java \
AltosState.java \
AltosStateName.java \
AltosStringInputStream.java \
AltosState.java \
AltosStateName.java \
AltosStringInputStream.java \
@@
-183,7
+186,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
@@
-203,3
+208,6
@@
bin:
$(JAR): classaltoslib.stamp
jar cf $@ -C bin org
$(JAR): classaltoslib.stamp
jar cf $@ -C bin org
+if STRIP_NONDETERMINISM
+ $(STRIP_NONDETERMINISM) $@
+endif