altosuilib: Remove GrabNDrag.java

[fw/altos] / altosuilib / Makefile.am

diff --git a/altosuilib/Makefile.am b/altosuilib/Makefile.am
index 26aee7c4de68f5b3cc396e5809e3f914d84a6859..c00144f8cfb9ef99b745669ec315699aac0b7aaa 100644 (file)
--- a/altosuilib/Makefile.am
+++ b/altosuilib/Makefile.am
@@ -1,41 +1,103 @@
-AM_JAVACFLAGS=-encoding UTF-8 -Xlint:deprecation
+AM_JAVACFLAGS=-target 1.6 -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked -source 6
 
 JAVAROOT=bin
 
-CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH="bin:../altoslib/*:../libaltos:$(FREETTS)/*:/usr/share/java/*"
+CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH="$(JAVAROOT):../altoslib/*:../libaltos:/usr/share/java/*"
 
 SRC=.
-BIN=bin/org/altusmetrum/AltosUILib
 
-AltosUILibdir = $(datadir)/java
+altosuilibdir = $(datadir)/java
 
-AltosUILib_JAVA = \
-       AltosConfigureUI.java \
-       AltosFontListener.java \
+altosuilib_JAVA = \
+       AltosDevice.java \
+       AltosDeviceDialog.java \
+       AltosPositionListener.java \
+       AltosUIAccelCal.java \
+       AltosUIConfigure.java \
+       AltosUIAxis.java \
+       AltosUIDataMissing.java \
+       AltosUIDataPoint.java \
+       AltosUIDataSet.java \
+       AltosUIGrapher.java \
        AltosUIDialog.java \
+       AltosUIEnable.java \
        AltosUIFrame.java \
        AltosUILib.java \
        AltosUIListener.java \
+       AltosUIMarker.java \
        AltosUIPreferencesBackend.java \
        AltosUIPreferences.java \
-       AltosUIVersion.java \
-       AltosUnitsListener.java
+       AltosUIFlightSeries.java \
+       AltosUIGraph.java \
+       AltosGraph.java \
+       AltosShapeListener.java \
+       AltosUSBDevice.java \
+       AltosVoice.java \
+       AltosDisplayThread.java \
+       AltosDeviceUIDialog.java \
+       AltosSerial.java \
+       AltosSerialInUseException.java \
+       AltosConfigFreqUI.java \
+       AltosScanUI.java \
+       AltosEepromDelete.java \
+       AltosEepromGrapher.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 \
+       AltosBTDevice.java \
+       AltosBTDeviceIterator.java \
+       AltosBTManage.java \
+       AltosBTKnown.java \
+       AltosUILineStyle.java \
+       AltosUIMap.java \
+       AltosUIMapPreload.java \
+       AltosUIFlightTab.java \
+       AltosUIIndicator.java \
+       AltosUIUnitsIndicator.java \
+       AltosUIVoltageIndicator.java \
+       AltosUIFreqList.java \
+       AltosUITelemetryList.java \
+       AltosUIRateList.java \
+       AltosUIImage.java \
+       AltosUITimeSeries.java \
+       OSXAdapter.java
 
-JAR=AltosUILib.jar
+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 bin $(JAR)
+       -rm -rf $(JAVAROOT) altosuilib_*.jar
 
-install-AltosUILibJAVA: $(JAR)
+install-altosuilibJAVA: $(JAR)
        @$(NORMAL_INSTALL)
-       test -z "$(AltosUILibdir)" || $(MKDIR_P) "$(DESTDIR)$(AltosUILibdir)"
-       echo " $(INSTALL_DATA)" "$<" "'$(DESTDIR)$(AltosUILibdir)/$(JAR)"; \
-       $(INSTALL_DATA) "$<" "$(DESTDIR)$(AltosUILibdir)"
+       test -z "$(altosuilibdir)" || $(MKDIR_P) "$(DESTDIR)$(altosuilibdir)"
+       echo " $(INSTALL_DATA)" "$(JAR)" "'$(DESTDIR)$(altosuilibdir)/$(JAR)"; \
+       $(INSTALL_DATA) "$(JAR)" "$(DESTDIR)$(altosuilibdir)"
 
-bin:
-       mkdir -p bin
+$(JAVAROOT):
+       mkdir -p $(JAVAROOT)
 
-$(JAR): classAltosUILib.stamp
-       jar cf $@ -C bin org
+$(JAR): classaltosuilib.stamp $(ICONS)
+       jar cf $@ $(ICONJAR) -C $(JAVAROOT) .