X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FMakefile.am;h=0c9392d18a667110fc50b33aee01adfa6907816a;hp=d4554df3bc0d8f62b85a6522d81131da54ca2a06;hb=HEAD;hpb=9287122edc0e2dec6b2542f4cc8cb9cf2900bb33

diff --git a/altoslib/Makefile.am b/altoslib/Makefile.am
index d4554df3..7cb2ef6f 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,10 @@ record_files = \
 
 altoslib_JAVA = \
 	AltosLib.java \
+	AltosAccelCal.java \
+	AltosAccelCalListener.java \
+	AltosAdxl375.java \
+	AltosCalData.java \
 	AltosCompanion.java \
 	AltosConfigData.java \
 	AltosConfigDataException.java \
@@ -35,28 +39,40 @@ altoslib_JAVA = \
 	AltosCSV.java \
 	AltosDebug.java \
 	AltosEeprom.java \
+	AltosRecordSet.java \
+	AltosEepromRecord.java \
+	AltosEepromRecordFull.java \
+	AltosEepromRecordTiny.java \
+	AltosEepromRecordMega.java \
+	AltosEepromRecordMetrum.java \
+	AltosEepromRecordMini.java \
+	AltosEepromRecordGps.java \
+	AltosEepromRecordFireTwo.java \
+	AltosEepromRecordMicroPeak2.java \
+	AltosEepromRecordMotor.java \
+	AltosEepromRecordSet.java \
+	AltosEepromRecordTimer.java \
 	AltosEepromChunk.java \
 	AltosEepromDownload.java \
+	AltosEepromMonitor.java \
 	AltosEepromFile.java \
-	AltosEepromTM.java \
-	AltosEepromTMini.java \
-	AltosEepromHeader.java \
-	AltosEepromIterable.java \
 	AltosEepromList.java \
 	AltosEepromLog.java \
-	AltosEepromMega.java \
-	AltosEepromMetrum2.java \
-	AltosEepromMini.java \
-	AltosEepromGPS.java \
-	AltosEepromMonitor.java \
 	AltosFile.java \
+	AltosFilterListener.java \
 	AltosFlash.java \
 	AltosFlashListener.java \
+	AltosDataListener.java \
+	AltosDataProvider.java \
+	AltosFlightSeries.java \
 	AltosFlightReader.java \
 	AltosFlightStats.java \
+	AltosForce.java \
 	AltosFrequency.java \
 	AltosGPS.java \
+	AltosGPSTimeValue.java \
 	AltosGPSSat.java \
+	AltosGauss.java \
 	AltosGreatCircle.java \
 	AltosHexfile.java \
 	AltosHexsym.java \
@@ -72,29 +88,40 @@ altoslib_JAVA = \
 	AltosLink.java \
 	AltosListenerState.java \
 	AltosLog.java \
+	AltosLogTrace.java \
 	AltosMag.java \
 	AltosMma655x.java \
 	AltosMs5607.java \
 	AltosNoSymbol.java \
 	AltosOrient.java \
 	AltosParse.java \
+	AltosPressure.java \
+	AltosPresTemp.java \
 	AltosPreferences.java \
 	AltosPreferencesBackend.java \
 	AltosProgrammer.java \
+	AltosPyroName.java \
 	AltosReplayReader.java \
 	AltosRomconfig.java \
 	AltosSavedState.java \
 	AltosSelfFlash.java \
+	AltosUsbId.java \
 	AltosSensorMM.java \
 	AltosSensorEMini.java \
+	AltosSensorEasyTimer1.java \
+	AltosSensorEasyTimer2.java \
 	AltosSensorTM.java \
-	AltosSensorTMini.java \
+	AltosSensorTMini2.java \
+	AltosSensorTMini3.java \
 	AltosSensorMega.java \
 	AltosSensorMetrum.java \
-	AltosSensorTGPS.java \
+	AltosSensorTGPS1.java \
+	AltosSensorTGPS2.java \
+	AltosSensorTGPS3.java \
+	AltosSensorEasyMotor2.java \
 	AltosState.java \
-	AltosStateIterable.java \
-	AltosStateUpdate.java \
+	AltosStateName.java \
+	AltosStringInputStream.java \
 	AltosTelemetry.java \
 	AltosTelemetryConfiguration.java \
 	AltosTelemetryCompanion.java \
@@ -104,8 +131,10 @@ altoslib_JAVA = \
 	AltosTelemetryLocation.java \
 	AltosTelemetryMap.java \
 	AltosTelemetryMegaSensor.java \
+	AltosTelemetryMegaNorm.java \
 	AltosTelemetryMegaData.java \
-	AltosTelemetryMini.java \
+	AltosTelemetryMini2.java \
+	AltosTelemetryMini3.java \
 	AltosTelemetryMetrumSensor.java \
 	AltosTelemetryMetrumData.java \
 	AltosTelemetryReader.java \
@@ -113,6 +142,9 @@ altoslib_JAVA = \
 	AltosTelemetrySensor.java \
 	AltosTelemetrySatellite.java \
 	AltosTelemetryStandard.java \
+	AltosTime.java \
+	AltosTimeSeries.java \
+	AltosTimeValue.java \
 	AltosUnitsListener.java \
 	AltosUnknownProduct.java \
 	AltosMs5607.java \
@@ -129,6 +161,7 @@ altoslib_JAVA = \
 	AltosLocation.java \
 	AltosLatitude.java \
 	AltosLongitude.java \
+	AltosRotationRate.java \
 	AltosPyro.java \
 	AltosWriter.java \
 	AltosQuaternion.java \
@@ -161,9 +194,10 @@ altoslib_JAVA = \
 	AltosMapLoaderListener.java \
 	AltosMapLoader.java \
 	AltosMapTypeListener.java \
-	AltosHashSet.java \
-	AltosHashable.java \
-	AltosVersion.java
+	AltosJson.java \
+	AltosVersion.java \
+	AltosUnitInfo.java \
+	AltosUnitInfoListener.java
 
 JAR=altoslib_$(ALTOSLIB_VERSION).jar
 
@@ -183,3 +217,6 @@ bin:
 
 $(JAR): classaltoslib.stamp
 	jar cf $@ -C bin org
+if STRIP_NONDETERMINISM
+	$(STRIP_NONDETERMINISM) $@
+endif