X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FMakefile.am;h=b75f9439d46084c90523f31015feaa3aaaf93086;hb=b8560bd91d603e4697f0cddc095952f923366d30;hp=2f4e5959e2bd978991e7c8e100ed440b8a0ca1ef;hpb=1e4b8674d874a190eca1a98a397aaf0a9d15bda1;p=fw%2Faltos

diff --git a/altoslib/Makefile.am b/altoslib/Makefile.am
index 2f4e5959..b75f9439 100644
--- 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); "
 
 SRC=.
 
@@ -48,6 +48,7 @@ altoslib_JAVA = \
 	AltosEepromRecordMini.java \
 	AltosEepromRecordGps.java \
 	AltosEepromRecordFireTwo.java \
+	AltosEepromRecordMicroPeak2.java \
 	AltosEepromRecordSet.java \
 	AltosEepromChunk.java \
 	AltosEepromDownload.java \
@@ -108,7 +109,8 @@ altoslib_JAVA = \
 	AltosSensorTMini3.java \
 	AltosSensorMega.java \
 	AltosSensorMetrum.java \
-	AltosSensorTGPS.java \
+	AltosSensorTGPS1.java \
+	AltosSensorTGPS2.java \
 	AltosState.java \
 	AltosStateName.java \
 	AltosStringInputStream.java \
@@ -206,3 +208,6 @@ bin:
 
 $(JAR): classaltoslib.stamp
 	jar cf $@ -C bin org
+if STRIP_NONDETERMINISM
+	$(STRIP_NONDETERMINISM) $@
+endif