altoslib: Fix setting of CLASSPATH

[fw/altos] / altoslib / Makefile.am

diff --git a/altoslib/Makefile.am b/altoslib/Makefile.am
index 447830e547f242175702bd16c7612e5d0202431c..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=.
 
@@ -48,6 +48,7 @@ altoslib_JAVA = \
        AltosEepromRecordMini.java \
        AltosEepromRecordGps.java \
        AltosEepromRecordFireTwo.java \
+       AltosEepromRecordMicroPeak2.java \
        AltosEepromRecordSet.java \
        AltosEepromChunk.java \
        AltosEepromDownload.java \
@@ -207,3 +208,6 @@ bin:
 
 $(JAR): classaltoslib.stamp
        jar cf $@ -C bin org
+if STRIP_NONDETERMINISM
+       $(STRIP_NONDETERMINISM) $@
+endif