altosuilib: Rewrite map GUI bits

[fw/altos] / altosuilib / Makefile.am

diff --git a/altosuilib/Makefile.am b/altosuilib/Makefile.am
index b7d624e2e4843b0c4778b0b683bbeb3fb498911a..466cfd999e1449054af5407d599bf82833d735bd 100644 (file)
--- a/altosuilib/Makefile.am
+++ b/altosuilib/Makefile.am
@@ -33,16 +33,65 @@ altosuilib_JAVA = \
        AltosUISeries.java \
        AltosUIVersion.java \
        AltosUSBDevice.java \
-       AltosSiteMap.java \
-       AltosSiteMapCache.java \
-       AltosSiteMapPreload.java \
-       AltosSiteMapTile.java \
        AltosVoice.java \
        AltosDisplayThread.java \
-       AltosFreqList.java
+       AltosDeviceUIDialog.java \
+       AltosFreqList.java \
+       AltosSerial.java \
+       AltosSerialInUseException.java \
+       AltosConfigFreqUI.java \
+       AltosScanUI.java \
+       AltosEepromDelete.java \
+       AltosEepromManage.java \
+       AltosEepromMonitorUI.java \
+       AltosEepromSelect.java \
+       AltosCSVUI.java \
+       AltosDataChooser.java \
+       AltosLights.java \
+       AltosLed.java \
+       AltosFlashUI.java \
+       AltosRomconfigUI.java \
+       AltosInfoTable.java \
+       AltosFlightInfoTableModel.java \
+       AltosFlightStatsTable.java \
+       AltosGraph.java \
+       AltosGraphDataPoint.java \
+       AltosGraphDataSet.java \
+       AltosBTDevice.java \
+       AltosBTDeviceIterator.java \
+       AltosBTManage.java \
+       AltosBTKnown.java \
+       AltosUIMap.java \
+       AltosUIMapView.java \
+       AltosUIMapLine.java \
+       AltosUIMapMark.java \
+       AltosUIMapPath.java \
+       AltosUIMapTile.java \
+       AltosUIMapCache.java \
+       AltosUIMapImage.java \
+       AltosUIMapTransform.java \
+       AltosUIMapRectangle.java \
+       AltosUIMapZoomListener.java \
+       AltosUIMapTileListener.java \
+       AltosUIMapPreload.java \
+       AltosUIMapStore.java \
+       AltosUIMapStoreListener.java \
+       AltosUILatLon.java
 
 JAR=altosuilib_$(ALTOSUILIB_VERSION).jar
 
+# Icons
+ICONDIR=$(top_srcdir)/icon
+
+ICONS= $(ICONDIR)/redled.png $(ICONDIR)/redoff.png \
+       $(ICONDIR)/greenled.png $(ICONDIR)/greenoff.png \
+       $(ICONDIR)/grayon.png $(ICONDIR)/grayled.png
+
+# icon base names for jar
+ICONJAR= -C $(ICONDIR) redled.png -C $(ICONDIR) redoff.png \
+       -C $(ICONDIR) greenled.png -C $(ICONDIR) greenoff.png \
+       -C $(ICONDIR) grayon.png -C $(ICONDIR) grayled.png
+
 all-local: $(JAR)
 
 clean-local:
@@ -57,5 +106,5 @@ install-altosuilibJAVA: $(JAR)
 $(JAVAROOT):
        mkdir -p $(JAVAROOT)
 
-$(JAR): classaltosuilib.stamp
-       jar cf $@ -C $(JAVAROOT) .
+$(JAR): classaltosuilib.stamp $(ICONS)
+       jar cf $@ $(ICONJAR) -C $(JAVAROOT) .