altosuilib: Rename AltosUIMap*New.java to AltosUIMap*.java

[fw/altos] / altosuilib / Makefile.am

diff --git a/altosuilib/Makefile.am b/altosuilib/Makefile.am
index fe0c3ec71f26e5a150b1b564a6c54e81f5e9d8b6..d18006b584bc0a6797c1d9603848f61a243b1470 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 \
@@ -31,31 +29,64 @@ altosuilib_JAVA = \
        AltosUIPreferencesBackend.java \
        AltosUIPreferences.java \
        AltosUISeries.java \
-       AltosUIVersion.java \
        AltosUSBDevice.java \
-       AltosSiteMap.java \
-       AltosSiteMapCache.java \
-       AltosSiteMapPreload.java \
-       AltosSiteMapTile.java \
-       AltosSiteMapImage.java \
        AltosVoice.java \
        AltosDisplayThread.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
-
+       AltosBTKnown.java \
+       AltosUIMap.java \
+       AltosUIMapPreload.java \
+       AltosUIFlightTab.java \
+       AltosUIIndicator.java \
+       AltosUIUnitsIndicator.java \
+       AltosUIVoltageIndicator.java \
+       AltosUIFreqList.java \
+       AltosUITelemetryList.java \
+       AltosUIRateList.java \
+       AltosUIImage.java \
+       OSXAdapter.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:
-       -rm -rf $(JAVAROOT) $(JAR)
+       -rm -rf $(JAVAROOT) altosuilib_*.jar
 
 install-altosuilibJAVA: $(JAR)
        @$(NORMAL_INSTALL)
@@ -66,5 +97,5 @@ install-altosuilibJAVA: $(JAR)
 $(JAVAROOT):
        mkdir -p $(JAVAROOT)
 
-$(JAR): classaltosuilib.stamp
-       jar cf $@ -C $(JAVAROOT) .
+$(JAR): classaltosuilib.stamp $(ICONS)
+       jar cf $@ $(ICONJAR) -C $(JAVAROOT) .