java: Add -target 1.6 to all java compiles

[fw/altos] / altoslib / Makefile.am

diff --git a/altoslib/Makefile.am b/altoslib/Makefile.am
index ac97c9cb83452894347f379e374be401c3ef0eb5..6d396635905ab2e6bbacb0d48485442940797290 100644 (file)
--- a/altoslib/Makefile.am
+++ b/altoslib/Makefile.am
@@ -1,78 +1,135 @@
-AM_JAVACFLAGS=-encoding UTF-8 -Xlint:deprecation
+AM_JAVACFLAGS=-target 1.6 -encoding UTF-8 -Xlint:deprecation -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)/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)/AltosGPSSat.java \
-       $(SRC)/AltosGreatCircle.java \
-       $(SRC)/AltosLine.java \
-       $(SRC)/AltosLink.java \
-       $(SRC)/AltosLog.java \
-       $(SRC)/AltosParse.java \
-       $(SRC)/AltosPreferences.java \
-       $(SRC)/AltosRecordCompanion.java \
-       $(SRC)/AltosRecordIterable.java \
-       $(SRC)/AltosRecord.java \
-       $(SRC)/AltosRecordTM.java \
-       $(SRC)/AltosRecordMM.java \
-       $(SRC)/AltosReplayReader.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)/AltosMs5607.java \
-       $(SRC)/AltosIMU.java \
-       $(SRC)/AltosMag.java
+altoslib_JAVA = \
+       AltosLib.java \
+       AltosCompanion.java \
+       AltosConfigData.java \
+       AltosConfigValues.java \
+       AltosConvert.java \
+       AltosCRCException.java \
+       AltosDebug.java \
+       AltosEeprom.java \
+       AltosEepromChunk.java \
+       AltosEepromDownload.java \
+       AltosEepromFile.java \
+       AltosEepromTM.java \
+       AltosEepromTm.java \
+       AltosEepromHeader.java \
+       AltosEepromIterable.java \
+       AltosEepromList.java \
+       AltosEepromLog.java \
+       AltosEepromMega.java \
+       AltosEepromMetrum2.java \
+       AltosEepromMini.java \
+       AltosEepromMonitor.java \
+       AltosFile.java \
+       AltosFlash.java \
+       AltosFlashListener.java \
+       AltosFlightReader.java \
+       AltosFrequency.java \
+       AltosGPS.java \
+       AltosGPSSat.java \
+       AltosGreatCircle.java \
+       AltosHexfile.java \
+       AltosHexsym.java \
+       AltosIdle.java \
+       AltosIdleFetch.java \
+       AltosIdleMonitor.java \
+       AltosIdleMonitorListener.java \
+       AltosIgnite.java \
+       AltosIMU.java \
+       AltosLine.java \
+       AltosLink.java \
+       AltosListenerState.java \
+       AltosLog.java \
+       AltosMag.java \
+       AltosMma655x.java \
+       AltosMs5607.java \
+       AltosNoSymbol.java \
+       AltosParse.java \
+       AltosPreferences.java \
+       AltosPreferencesBackend.java \
+       AltosProgrammer.java \
+       AltosReplayReader.java \
+       AltosRomconfig.java \
+       AltosSelfFlash.java \
+       AltosSensorMM.java \
+       AltosSensorEMini.java \
+       AltosSensorTM.java \
+       AltosSensorTMini.java \
+       AltosSensorMega.java \
+       AltosSensorMetrum.java \
+       AltosState.java \
+       AltosStateIterable.java \
+       AltosStateUpdate.java \
+       AltosTelemetry.java \
+       AltosTelemetryConfiguration.java \
+       AltosTelemetryFile.java \
+       AltosTelemetryIterable.java \
+       AltosTelemetryLegacy.java \
+       AltosTelemetryLocation.java \
+       AltosTelemetryMap.java \
+       AltosTelemetryMegaSensor.java \
+       AltosTelemetryMegaData.java \
+       AltosTelemetryMini.java \
+       AltosTelemetryMetrumSensor.java \
+       AltosTelemetryMetrumData.java \
+       AltosTelemetryReader.java \
+       AltosTelemetryRaw.java \
+       AltosTelemetrySensor.java \
+       AltosTelemetrySatellite.java \
+       AltosTelemetryStandard.java \
+       AltosUnitsListener.java \
+       AltosMs5607.java \
+       AltosIMU.java \
+       AltosMag.java \
+       AltosUnits.java \
+       AltosDistance.java \
+       AltosHeight.java \
+       AltosSpeed.java \
+       AltosTemperature.java \
+       AltosAccel.java \
+       AltosPyro.java
 
-JAR=AltosLib.jar
+JAR=altoslib_$(ALTOSLIB_VERSION).jar
 
 all-local: $(JAR)
 
 clean-local:
        -rm -rf bin $(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