altosuilib: Use new map code for map preload UI

[fw/altos] / altosuilib / Makefile.am

diff --git a/altosuilib/Makefile.am b/altosuilib/Makefile.am
index 157cd5e86d73a27c5757df994839ec5f3bfa6c93..7ec94ba057d02f071cf6b1450562b0d50bb2fc0c 100644 (file)
--- a/altosuilib/Makefile.am
+++ b/altosuilib/Makefile.am
@@ -12,8 +12,6 @@ altosuilib_JAVA = \
        GrabNDrag.java \
        AltosDevice.java \
        AltosDeviceDialog.java \
-       AltosFlightDisplay.java \
-       AltosFontListener.java \
        AltosPositionListener.java \
        AltosUIConfigure.java \
        AltosUIAxis.java \
@@ -36,7 +34,6 @@ altosuilib_JAVA = \
        AltosVoice.java \
        AltosDisplayThread.java \
        AltosDeviceUIDialog.java \
-       AltosFreqList.java \
        AltosSerial.java \
        AltosSerialInUseException.java \
        AltosConfigFreqUI.java \
@@ -62,12 +59,15 @@ altosuilib_JAVA = \
        AltosBTManage.java \
        AltosBTKnown.java \
        AltosUIMap.java \
+       AltosUIMapNew.java \
+       AltosUIMapPreloadNew.java \
        AltosUIMapView.java \
        AltosUIMapLine.java \
        AltosUIMapMark.java \
        AltosUIMapPath.java \
        AltosUIMapTile.java \
        AltosUIMapCache.java \
+       AltosUIMapCacheListener.java \
        AltosUIMapImage.java \
        AltosUIMapTransform.java \
        AltosUIMapRectangle.java \
@@ -81,7 +81,11 @@ altosuilib_JAVA = \
        AltosUIIndicator.java \
        AltosUIUnitsIndicator.java \
        AltosUIVoltageIndicator.java \
-       AltosUITelemetryMenu.java
+       AltosUIFreqList.java \
+       AltosUITelemetryList.java \
+       AltosUIRateList.java \
+       AltosUIImage.java \
+       OSXAdapter.java
 
 JAR=altosuilib_$(ALTOSUILIB_VERSION).jar
 
@@ -100,7 +104,7 @@ ICONJAR= -C $(ICONDIR) redled.png -C $(ICONDIR) redoff.png \
 all-local: $(JAR)
 
 clean-local:
-       -rm -rf $(JAVAROOT) $(JAR)
+       -rm -rf $(JAVAROOT) altosuilib_*.jar
 
 install-altosuilibJAVA: $(JAR)
        @$(NORMAL_INSTALL)