X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FMakefile.am;h=9c8c66910c4f86c511399fd0497abc93ec7b3613;hp=7c5d767d7916d34ac1fad9f32e7c1560c67c9a0f;hb=3ed101d634968666cd3ee2d8c49737970caf406b;hpb=b95db5819885da89504d5e11decfda98cfac37aa diff --git a/altoslib/Makefile.am b/altoslib/Makefile.am index 7c5d767d..9c8c6691 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=. @@ -28,6 +28,7 @@ altoslib_JAVA = \ AltosLib.java \ AltosAccelCal.java \ AltosAccelCalListener.java \ + AltosAdxl375.java \ AltosCalData.java \ AltosCompanion.java \ AltosConfigData.java \ @@ -47,6 +48,8 @@ altoslib_JAVA = \ AltosEepromRecordMini.java \ AltosEepromRecordGps.java \ AltosEepromRecordFireTwo.java \ + AltosEepromRecordMicroPeak2.java \ + AltosEepromRecordMotor.java \ AltosEepromRecordSet.java \ AltosEepromChunk.java \ AltosEepromDownload.java \ @@ -68,6 +71,7 @@ altoslib_JAVA = \ AltosGPS.java \ AltosGPSTimeValue.java \ AltosGPSSat.java \ + AltosGauss.java \ AltosGreatCircle.java \ AltosHexfile.java \ AltosHexsym.java \ @@ -102,12 +106,15 @@ altoslib_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 \ @@ -183,7 +190,9 @@ altoslib_JAVA = \ AltosMapLoader.java \ AltosMapTypeListener.java \ AltosJson.java \ - AltosVersion.java + AltosVersion.java \ + AltosUnitInfo.java \ + AltosUnitInfoListener.java JAR=altoslib_$(ALTOSLIB_VERSION).jar @@ -203,3 +212,6 @@ bin: $(JAR): classaltoslib.stamp jar cf $@ -C bin org +if STRIP_NONDETERMINISM + $(STRIP_NONDETERMINISM) $@ +endif