altosui: Move telemetry reader &c to altoslib

[fw/altos] / altosui / altoslib / Makefile.am

diff --git a/altosui/altoslib/Makefile.am b/altosui/altoslib/Makefile.am
index cbf716b0daf1b69cba8f1af4248a70c3c4fa54e5..2ddd24e6099d97d0826a43207f2c871393674a85 100644 (file)
--- a/altosui/altoslib/Makefile.am
+++ b/altosui/altoslib/Makefile.am
@@ -14,19 +14,31 @@ AltosLib_JAVA = \
        $(SRC)/AltosConfigData.java \
        $(SRC)/AltosConvert.java \
        $(SRC)/AltosCRCException.java \
+       $(SRC)/AltosEepromChunk.java \
+       $(SRC)/AltosEepromIterable.java \
+       $(SRC)/AltosEepromLog.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)/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 \
@@ -44,13 +56,11 @@ all-local: $(JAR)
 clean-local:
        -rm -rf bin $(JAR)
 
-altosuidir=$(datadir)/java
-
-install-altosuiJAVA: $(JAR)
+install-AltosLibJAVA: $(JAR)
        @$(NORMAL_INSTALL)
-       test -z "$(altosuidir)" || $(MKDIR_P) "$(DESTDIR)$(altosuidir)"
-       echo " $(INSTALL_DATA)" "$<" "'$(DESTDIR)$(altosuidir)/$(JAR)"; \
-       $(INSTALL_DATA) "$<" "$(DESTDIR)$(altosuidir)"
+       test -z "$(AltosLibdir)" || $(MKDIR_P) "$(DESTDIR)$(AltosLibdir)"
+       echo " $(INSTALL_DATA)" "$<" "'$(DESTDIR)$(AltosLibdir)/$(JAR)"; \
+       $(INSTALL_DATA) "$<" "$(DESTDIR)$(AltosLibdir)"
 
 bin:
        mkdir -p bin