X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FMakefile.am;h=65a8228a67dc430aa5adfe03f604198c7cba4206;hp=25d5722e39844b09bafe86e8221e4f9bbe1d56b5;hb=71715337eb532a1fbe1a753240e7417d5223489f;hpb=8d1d8d2a3c129cdbd55427bcda0f26715b02f1ee

diff --git a/altosuilib/Makefile.am b/altosuilib/Makefile.am
index 25d5722e..65a8228a 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,23 +9,75 @@ SRC=.
 altosuilibdir = $(datadir)/java
 
 altosuilib_JAVA = \
-	AltosUIConfigure.java \
+	GrabNDrag.java \
 	AltosDevice.java \
 	AltosDeviceDialog.java \
-	AltosUSBDevice.java \
+	AltosFlightDisplay.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 \
+	AltosUISeries.java \
 	AltosUIVersion.java \
-	AltosUnitsListener.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 \
+	AltosBTDevice.java \
+	AltosBTDeviceIterator.java \
+	AltosBTManage.java \
+	AltosBTKnown.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:
@@ -40,5 +92,5 @@ install-altosuilibJAVA: $(JAR)
 $(JAVAROOT):
 	mkdir -p $(JAVAROOT)
 
-$(JAR): classaltosuilib.stamp
-	jar cf $@ -C $(JAVAROOT) .
+$(JAR): classaltosuilib.stamp $(ICONS)
+	jar cf $@ $(ICONJAR) -C $(JAVAROOT) .