X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FMakefile.am;h=39e287fa457f4c2a1473cc64448f5bfd99bce54e;hp=2f4e5959e2bd978991e7c8e100ed440b8a0ca1ef;hb=db950e97caefdd3257c1a2de3547ab88a2bd2344;hpb=0686a7b8aec524d81bda4c572549a3a068ce0eed

diff --git a/altoslib/Makefile.am b/altoslib/Makefile.am
index 2f4e5959..39e287fa 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); CLASSPATH=bin
 
 SRC=.
 
@@ -48,6 +48,8 @@ altoslib_JAVA = \
 	AltosEepromRecordMini.java \
 	AltosEepromRecordGps.java \
 	AltosEepromRecordFireTwo.java \
+	AltosEepromRecordMicroPeak2.java \
+	AltosEepromRecordMotor.java \
 	AltosEepromRecordSet.java \
 	AltosEepromChunk.java \
 	AltosEepromDownload.java \
@@ -69,6 +71,7 @@ altoslib_JAVA = \
 	AltosGPS.java \
 	AltosGPSTimeValue.java \
 	AltosGPSSat.java \
+	AltosGauss.java \
 	AltosGreatCircle.java \
 	AltosHexfile.java \
 	AltosHexsym.java \
@@ -103,12 +106,15 @@ altoslib_JAVA = \
 	AltosUsbId.java \
 	AltosSensorMM.java \
 	AltosSensorEMini.java \
+	AltosSensorEasyTimer1.java \
 	AltosSensorTM.java \
 	AltosSensorTMini2.java \
 	AltosSensorTMini3.java \
 	AltosSensorMega.java \
 	AltosSensorMetrum.java \
-	AltosSensorTGPS.java \
+	AltosSensorTGPS1.java \
+	AltosSensorTGPS2.java \
+	AltosSensorEasyMotor2.java \
 	AltosState.java \
 	AltosStateName.java \
 	AltosStringInputStream.java \
@@ -121,6 +127,7 @@ altoslib_JAVA = \
 	AltosTelemetryLocation.java \
 	AltosTelemetryMap.java \
 	AltosTelemetryMegaSensor.java \
+	AltosTelemetryMegaNorm.java \
 	AltosTelemetryMegaData.java \
 	AltosTelemetryMini2.java \
 	AltosTelemetryMini3.java \
@@ -206,3 +213,6 @@ bin:
 
 $(JAR): classaltoslib.stamp
 	jar cf $@ -C bin org
+if STRIP_NONDETERMINISM
+	$(STRIP_NONDETERMINISM) $@
+endif