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

[fw/altos] / altosuilib / Makefile.am

diff --git a/altosuilib/Makefile.am b/altosuilib/Makefile.am
index da5fb848225d822925b2b7d5785ce32580cee663..d18006b584bc0a6797c1d9603848f61a243b1470 100644 (file)
--- a/altosuilib/Makefile.am
+++ b/altosuilib/Makefile.am
@@ -1,4 +1,4 @@
-AM_JAVACFLAGS=-encoding UTF-8 -Xlint:deprecation
+AM_JAVACFLAGS=-target 1.6 -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked -source 6
 
 JAVAROOT=bin
 
@@ -9,26 +9,84 @@ SRC=.
 altosuilibdir = $(datadir)/java
 
 altosuilib_JAVA = \
-       AltosUIConfigure.java \
+       GrabNDrag.java \
        AltosDevice.java \
        AltosDeviceDialog.java \
-       AltosUSBDevice.java \
-       AltosFontListener.java \
+       AltosPositionListener.java \
+       AltosUIConfigure.java \
+       AltosUIAxis.java \
+       AltosUIDataMissing.java \
+       AltosUIDataPoint.java \
+       AltosUIDataSet.java \
+       AltosUIGraph.java \
+       AltosUIGrapher.java \
        AltosUIDialog.java \
+       AltosUIEnable.java \
        AltosUIFrame.java \
        AltosUILib.java \
        AltosUIListener.java \
+       AltosUIMarker.java \
        AltosUIPreferencesBackend.java \
        AltosUIPreferences.java \
-       AltosUIVersion.java \
-       AltosUnitsListener.java
+       AltosUISeries.java \
+       AltosUSBDevice.java \
+       AltosVoice.java \
+       AltosDisplayThread.java \
+       AltosDeviceUIDialog.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 \
+       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
 
-JAR=altosuilib.jar
+# 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)
@@ -39,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) .