X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FMakefile.am;h=d18006b584bc0a6797c1d9603848f61a243b1470;hp=0cd2aaea5eb36d027a828ef3f0bac905ae870fc3;hb=0d966b74f756e88e5dffa92400b105f540429262;hpb=2120d362cefceba69e75996b6391d9558978c01d

diff --git a/altosuilib/Makefile.am b/altosuilib/Makefile.am
index 0cd2aaea..d18006b5 100644
--- 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,9 +9,9 @@ SRC=.
 altosuilibdir = $(datadir)/java
 
 altosuilib_JAVA = \
+	GrabNDrag.java \
 	AltosDevice.java \
 	AltosDeviceDialog.java \
-	AltosFontListener.java \
 	AltosPositionListener.java \
 	AltosUIConfigure.java \
 	AltosUIAxis.java \
@@ -29,15 +29,64 @@ altosuilib_JAVA = \
 	AltosUIPreferencesBackend.java \
 	AltosUIPreferences.java \
 	AltosUISeries.java \
-	AltosUIVersion.java \
-	AltosUSBDevice.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
+
+# 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)
@@ -48,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) .