X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FMakefile.am;h=ce934b4f097fe1028c201399b6da67a27b469f85;hp=1b03c92557d4bd4dc3d83e979272e3cead0693a8;hb=0e586ab3604bb695c36ae86c95f533197522fc65;hpb=1ed6b13e87c1cc2d6618b6ba3a293ea6e3b5752e

diff --git a/altoslib/Makefile.am b/altoslib/Makefile.am
index 1b03c925..ce934b4f 100644
--- a/altoslib/Makefile.am
+++ b/altoslib/Makefile.am
@@ -1,100 +1,201 @@
-AM_JAVACFLAGS=-encoding UTF-8 -Xlint:deprecation
+AM_JAVACFLAGS=-target 1.6 -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked -source 6
 
 JAVAROOT=bin
 
+VERSION=1
+
 CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH="bin:$(FREETTS)/*:/usr/share/java/*"
 
 SRC=.
-BIN=bin/org/altusmetrum/AltosLib
 
-AltosLibdir = $(datadir)/java
+altoslibdir = $(datadir)/java
+record_files = \
+	AltosEepromRecord.java \
+	AltosEepromTeleScience.java \
+	AltosRecordCompanion.java \
+	AltosRecordIterable.java \
+	AltosOrderedRecord.java \
+	AltosOrderedMegaRecord.java \
+	AltosOrderedMiniRecord.java \
+	AltosRecord.java \
+	AltosRecordNone.java \
+	AltosRecordTM.java \
+	AltosRecordMM.java \
+	AltosRecordMini.java
+
 
-AltosLib_JAVA = \
-	$(SRC)/AltosLib.java \
-	$(SRC)/AltosConfigData.java \
-	$(SRC)/AltosConfigValues.java \
-	$(SRC)/AltosConvert.java \
-	$(SRC)/AltosCRCException.java \
-	$(SRC)/AltosEepromChunk.java \
-	$(SRC)/AltosEepromIterable.java \
-	$(SRC)/AltosEepromLog.java \
-	$(SRC)/AltosEepromMega.java \
-	$(SRC)/AltosEepromMegaIterable.java \
-	$(SRC)/AltosEepromRecord.java \
-	$(SRC)/AltosEepromTeleScience.java \
-	$(SRC)/AltosFile.java \
-	$(SRC)/AltosFlightReader.java \
-	$(SRC)/AltosFrequency.java \
-	$(SRC)/AltosGPS.java \
-	$(SRC)/AltosGPSQuery.java \
-	$(SRC)/AltosGPSSat.java \
-	$(SRC)/AltosGreatCircle.java \
-	$(SRC)/AltosIdleMonitor.java \
-	$(SRC)/AltosIdleMonitorListener.java \
-	$(SRC)/AltosIgnite.java \
-	$(SRC)/AltosIMU.java \
-	$(SRC)/AltosIMUQuery.java \
-	$(SRC)/AltosLine.java \
-	$(SRC)/AltosLink.java \
-	$(SRC)/AltosLog.java \
-	$(SRC)/AltosMs5607.java \
-	$(SRC)/AltosMs5607Query.java \
-	$(SRC)/AltosOrderedRecord.java \
-	$(SRC)/AltosOrderedMegaRecord.java \
-	$(SRC)/AltosParse.java \
-	$(SRC)/AltosPreferences.java \
-	$(SRC)/AltosPreferencesBackend.java \
-	$(SRC)/AltosRecordCompanion.java \
-	$(SRC)/AltosRecordIterable.java \
-	$(SRC)/AltosRecord.java \
-	$(SRC)/AltosRecordNone.java \
-	$(SRC)/AltosRecordTM.java \
-	$(SRC)/AltosRecordMM.java \
-	$(SRC)/AltosReplayReader.java \
-	$(SRC)/AltosSensorMM.java \
-	$(SRC)/AltosSensorTM.java \
-	$(SRC)/AltosState.java \
-	$(SRC)/AltosTelemetry.java \
-	$(SRC)/AltosTelemetryIterable.java \
-	$(SRC)/AltosTelemetryMap.java \
-	$(SRC)/AltosTelemetryReader.java \
-	$(SRC)/AltosTelemetryRecordCompanion.java \
-	$(SRC)/AltosTelemetryRecordConfiguration.java \
-	$(SRC)/AltosTelemetryRecordGeneral.java \
-	$(SRC)/AltosTelemetryRecord.java \
-	$(SRC)/AltosTelemetryRecordLegacy.java \
-	$(SRC)/AltosTelemetryRecordLocation.java \
-	$(SRC)/AltosTelemetryRecordRaw.java \
-	$(SRC)/AltosTelemetryRecordSatellite.java \
-	$(SRC)/AltosTelemetryRecordSensor.java \
-	$(SRC)/AltosTelemetryRecordMegaSensor.java \
-	$(SRC)/AltosTelemetryRecordMegaData.java \
-	$(SRC)/AltosUnitsListener.java \
-	$(SRC)/AltosMs5607.java \
-	$(SRC)/AltosIMU.java \
-	$(SRC)/AltosMag.java \
-	$(SRC)/AltosUnits.java \
-	$(SRC)/AltosDistance.java \
-	$(SRC)/AltosHeight.java \
-	$(SRC)/AltosSpeed.java \
-	$(SRC)/AltosAccel.java \
-	$(SRC)/AltosPyro.java
+altoslib_JAVA = \
+	AltosLib.java \
+	AltosCalData.java \
+	AltosCompanion.java \
+	AltosConfigData.java \
+	AltosConfigDataException.java \
+	AltosConfigValues.java \
+	AltosConvert.java \
+	AltosCRCException.java \
+	AltosCSV.java \
+	AltosDebug.java \
+	AltosEepromNew.java \
+	AltosRecordSet.java \
+	AltosEepromRecord.java \
+	AltosEepromRecordFull.java \
+	AltosEepromRecordTiny.java \
+	AltosEepromRecordMega.java \
+	AltosEepromRecordMetrum.java \
+	AltosEepromRecordMini.java \
+	AltosEepromRecordGps.java \
+	AltosEepromRecordFireTwo.java \
+	AltosEepromRecordSet.java \
+	AltosEepromChunk.java \
+	AltosEepromDownload.java \
+	AltosEepromMonitor.java \
+	AltosEepromFile.java \
+	AltosEepromList.java \
+	AltosEepromLog.java \
+	AltosFile.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 \
+	AltosGreatCircle.java \
+	AltosHexfile.java \
+	AltosHexsym.java \
+	AltosIdle.java \
+	AltosIdleFetch.java \
+	AltosIdleMonitor.java \
+	AltosIdleMonitorListener.java \
+	AltosIdleReader.java \
+	AltosIgnite.java \
+	AltosIMU.java \
+	AltosKML.java \
+	AltosLine.java \
+	AltosLink.java \
+	AltosListenerState.java \
+	AltosLog.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 \
+	AltosSensorMM.java \
+	AltosSensorEMini.java \
+	AltosSensorTM.java \
+	AltosSensorTMini2.java \
+	AltosSensorTMini3.java \
+	AltosSensorMega.java \
+	AltosSensorMetrum.java \
+	AltosSensorTGPS.java \
+	AltosState.java \
+	AltosStateName.java \
+	AltosStringInputStream.java \
+	AltosTelemetry.java \
+	AltosTelemetryConfiguration.java \
+	AltosTelemetryCompanion.java \
+	AltosTelemetryFile.java \
+	AltosTelemetryIterable.java \
+	AltosTelemetryLegacy.java \
+	AltosTelemetryLocation.java \
+	AltosTelemetryMap.java \
+	AltosTelemetryMegaSensor.java \
+	AltosTelemetryMegaData.java \
+	AltosTelemetryMini2.java \
+	AltosTelemetryMini3.java \
+	AltosTelemetryMetrumSensor.java \
+	AltosTelemetryMetrumData.java \
+	AltosTelemetryReader.java \
+	AltosTelemetryRaw.java \
+	AltosTelemetrySensor.java \
+	AltosTelemetrySatellite.java \
+	AltosTelemetryStandard.java \
+	AltosTime.java \
+	AltosTimeSeries.java \
+	AltosTimeValue.java \
+	AltosUnitsListener.java \
+	AltosUnknownProduct.java \
+	AltosMs5607.java \
+	AltosIMU.java \
+	AltosMag.java \
+	AltosUnits.java \
+	AltosUnitsRange.java \
+	AltosDistance.java \
+	AltosHeight.java \
+	AltosSpeed.java \
+	AltosTemperature.java \
+	AltosAccel.java \
+	AltosVoltage.java \
+	AltosLocation.java \
+	AltosLatitude.java \
+	AltosLongitude.java \
+	AltosRotationRate.java \
+	AltosPyro.java \
+	AltosWriter.java \
+	AltosQuaternion.java \
+	AltosRotation.java \
+	AltosImage.java \
+	AltosLatLon.java \
+	AltosMap.java \
+	AltosMapCache.java \
+	AltosMapCacheListener.java \
+	AltosMapInterface.java \
+	AltosMapLine.java \
+	AltosMapMark.java \
+	AltosMapPath.java \
+	AltosMapPathPoint.java \
+	AltosMapRectangle.java \
+	AltosMapStore.java \
+	AltosMapStoreListener.java \
+	AltosMapTile.java \
+	AltosMapTileListener.java \
+	AltosMapTransform.java \
+	AltosMapZoomListener.java \
+	AltosPointDouble.java \
+	AltosPointInt.java \
+	AltosRectangle.java \
+	AltosFlightDisplay.java \
+	AltosFontListener.java \
+	AltosLaunchSite.java \
+	AltosLaunchSiteListener.java \
+	AltosLaunchSites.java \
+	AltosMapLoaderListener.java \
+	AltosMapLoader.java \
+	AltosMapTypeListener.java \
+	AltosJson.java \
+	AltosVersion.java
 
-JAR=AltosLib.jar
+JAR=altoslib_$(ALTOSLIB_VERSION).jar
 
 all-local: $(JAR)
 
 clean-local:
-	-rm -rf bin $(JAR)
+	-rm -rf $(JAVAROOT) altoslib_*.jar
 
-install-AltosLibJAVA: $(JAR)
+install-altoslibJAVA: $(JAR)
 	@$(NORMAL_INSTALL)
-	test -z "$(AltosLibdir)" || $(MKDIR_P) "$(DESTDIR)$(AltosLibdir)"
-	echo " $(INSTALL_DATA)" "$<" "'$(DESTDIR)$(AltosLibdir)/$(JAR)"; \
-	$(INSTALL_DATA) "$<" "$(DESTDIR)$(AltosLibdir)"
+	test -z "$(altoslibdir)" || $(MKDIR_P) "$(DESTDIR)$(altoslibdir)"
+	echo " $(INSTALL_DATA)" "$<" "'$(DESTDIR)$(altoslibdir)/$(JAR)"; \
+	$(INSTALL_DATA) "$<" "$(DESTDIR)$(altoslibdir)"
 
 bin:
 	mkdir -p bin
 
-$(JAR): classAltosLib.stamp
+$(JAR): classaltoslib.stamp
 	jar cf $@ -C bin org