X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FMakefile.am;h=b7d30051f87d351da8c061e129a6b6a9a9e4e2d4;hb=76c5e6bf7ecc30ae77a9744a4af26dca3dc46254;hp=fa0e8c1b346e683f815a6ad77eea25e6f01851c4;hpb=f26cfe417c6977cf1e7e75a4f050e25f64d41859;p=fw%2Faltos

diff --git a/altoslib/Makefile.am b/altoslib/Makefile.am
index fa0e8c1b..b7d30051 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,8 @@ altoslib_JAVA = \
 	AltosEepromRecordMini.java \
 	AltosEepromRecordGps.java \
 	AltosEepromRecordFireTwo.java \
+	AltosEepromRecordMicroPeak2.java \
 	AltosEepromRecordSet.java \
-	AltosEeprom.java \
 	AltosEepromChunk.java \
 	AltosEepromDownload.java \
 	AltosEepromMonitor.java \
@@ -54,6 +57,7 @@ altoslib_JAVA = \
 	AltosEepromList.java \
 	AltosEepromLog.java \
 	AltosFile.java \
+	AltosFilterListener.java \
 	AltosFlash.java \
 	AltosFlashListener.java \
 	AltosDataListener.java \
@@ -66,6 +70,7 @@ altoslib_JAVA = \
 	AltosGPS.java \
 	AltosGPSTimeValue.java \
 	AltosGPSSat.java \
+	AltosGauss.java \
 	AltosGreatCircle.java \
 	AltosHexfile.java \
 	AltosHexsym.java \
@@ -92,10 +97,12 @@ altoslib_JAVA = \
 	AltosPreferences.java \
 	AltosPreferencesBackend.java \
 	AltosProgrammer.java \
+	AltosPyroName.java \
 	AltosReplayReader.java \
 	AltosRomconfig.java \
 	AltosSavedState.java \
 	AltosSelfFlash.java \
+	AltosUsbId.java \
 	AltosSensorMM.java \
 	AltosSensorEMini.java \
 	AltosSensorTM.java \
@@ -103,9 +110,11 @@ altoslib_JAVA = \
 	AltosSensorTMini3.java \
 	AltosSensorMega.java \
 	AltosSensorMetrum.java \
-	AltosSensorTGPS.java \
+	AltosSensorTGPS1.java \
+	AltosSensorTGPS2.java \
 	AltosState.java \
 	AltosStateName.java \
+	AltosStringInputStream.java \
 	AltosTelemetry.java \
 	AltosTelemetryConfiguration.java \
 	AltosTelemetryCompanion.java \
@@ -178,7 +187,9 @@ altoslib_JAVA = \
 	AltosMapLoader.java \
 	AltosMapTypeListener.java \
 	AltosJson.java \
-	AltosVersion.java
+	AltosVersion.java \
+	AltosUnitInfo.java \
+	AltosUnitInfoListener.java
 
 JAR=altoslib_$(ALTOSLIB_VERSION).jar
 
@@ -198,3 +209,6 @@ bin:
 
 $(JAR): classaltoslib.stamp
 	jar cf $@ -C bin org
+if STRIP_NONDETERMINISM
+	$(STRIP_NONDETERMINISM) $@
+endif