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

diff --git a/altoslib/Makefile.am b/altoslib/Makefile.am
index 1e26b724..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=.
 
@@ -26,6 +26,9 @@ record_files = \
 
 altoslib_JAVA = \
 	AltosLib.java \
+	AltosAccelCal.java \
+	AltosAccelCalListener.java \
+	AltosAdxl375.java \
 	AltosCalData.java \
 	AltosCompanion.java \
 	AltosConfigData.java \
@@ -35,7 +38,7 @@ altoslib_JAVA = \
 	AltosCRCException.java \
 	AltosCSV.java \
 	AltosDebug.java \
-	AltosEepromNew.java \
+	AltosEeprom.java \
 	AltosRecordSet.java \
 	AltosEepromRecord.java \
 	AltosEepromRecordFull.java \
@@ -45,8 +48,9 @@ altoslib_JAVA = \
 	AltosEepromRecordMini.java \
 	AltosEepromRecordGps.java \
 	AltosEepromRecordFireTwo.java \
+	AltosEepromRecordMicroPeak2.java \
+	AltosEepromRecordMotor.java \
 	AltosEepromRecordSet.java \
-	AltosEeprom.java \
 	AltosEepromChunk.java \
 	AltosEepromDownload.java \
 	AltosEepromMonitor.java \
@@ -54,6 +58,7 @@ altoslib_JAVA = \
 	AltosEepromList.java \
 	AltosEepromLog.java \
 	AltosFile.java \
+	AltosFilterListener.java \
 	AltosFlash.java \
 	AltosFlashListener.java \
 	AltosDataListener.java \
@@ -66,6 +71,7 @@ altoslib_JAVA = \
 	AltosGPS.java \
 	AltosGPSTimeValue.java \
 	AltosGPSSat.java \
+	AltosGauss.java \
 	AltosGreatCircle.java \
 	AltosHexfile.java \
 	AltosHexsym.java \
@@ -97,14 +103,18 @@ altoslib_JAVA = \
 	AltosRomconfig.java \
 	AltosSavedState.java \
 	AltosSelfFlash.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 \
@@ -117,6 +127,7 @@ altoslib_JAVA = \
 	AltosTelemetryLocation.java \
 	AltosTelemetryMap.java \
 	AltosTelemetryMegaSensor.java \
+	AltosTelemetryMegaNorm.java \
 	AltosTelemetryMegaData.java \
 	AltosTelemetryMini2.java \
 	AltosTelemetryMini3.java \
@@ -180,7 +191,9 @@ altoslib_JAVA = \
 	AltosMapLoader.java \
 	AltosMapTypeListener.java \
 	AltosJson.java \
-	AltosVersion.java
+	AltosVersion.java \
+	AltosUnitInfo.java \
+	AltosUnitInfoListener.java
 
 JAR=altoslib_$(ALTOSLIB_VERSION).jar
 
@@ -200,3 +213,6 @@ bin:
 
 $(JAR): classaltoslib.stamp
 	jar cf $@ -C bin org
+if STRIP_NONDETERMINISM
+	$(STRIP_NONDETERMINISM) $@
+endif