altoslib: Fix setting of CLASSPATH

[fw/altos] / altoslib / Makefile.am

diff --git a/altoslib/Makefile.am b/altoslib/Makefile.am
index 2a1cb8e4763810847382f799f32f5a17486a2144..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
 
-CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH="bin:$(FREETTS)/*:/usr/share/java/*"
+CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=bin
 
 SRC=.
 
@@ -28,6 +28,7 @@ altoslib_JAVA = \
        AltosLib.java \
        AltosAccelCal.java \
        AltosAccelCalListener.java \
+       AltosAdxl375.java \
        AltosCalData.java \
        AltosCompanion.java \
        AltosConfigData.java \
@@ -47,6 +48,7 @@ altoslib_JAVA = \
        AltosEepromRecordMini.java \
        AltosEepromRecordGps.java \
        AltosEepromRecordFireTwo.java \
+       AltosEepromRecordMicroPeak2.java \
        AltosEepromRecordSet.java \
        AltosEepromChunk.java \
        AltosEepromDownload.java \
@@ -99,6 +101,7 @@ altoslib_JAVA = \
        AltosRomconfig.java \
        AltosSavedState.java \
        AltosSelfFlash.java \
+       AltosUsbId.java \
        AltosSensorMM.java \
        AltosSensorEMini.java \
        AltosSensorTM.java \
@@ -106,7 +109,8 @@ altoslib_JAVA = \
        AltosSensorTMini3.java \
        AltosSensorMega.java \
        AltosSensorMetrum.java \
-       AltosSensorTGPS.java \
+       AltosSensorTGPS1.java \
+       AltosSensorTGPS2.java \
        AltosState.java \
        AltosStateName.java \
        AltosStringInputStream.java \
@@ -182,7 +186,9 @@ altoslib_JAVA = \
        AltosMapLoader.java \
        AltosMapTypeListener.java \
        AltosJson.java \
-       AltosVersion.java
+       AltosVersion.java \
+       AltosUnitInfo.java \
+       AltosUnitInfoListener.java
 
 JAR=altoslib_$(ALTOSLIB_VERSION).jar
 
@@ -202,3 +208,6 @@ bin:
 
 $(JAR): classaltoslib.stamp
        jar cf $@ -C bin org
+if STRIP_NONDETERMINISM
+       $(STRIP_NONDETERMINISM) $@
+endif