X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FMakefile.am;h=3b2e49d448094556e2010ff4a88a7475cfcaa1b6;hp=b7d624e2e4843b0c4778b0b683bbeb3fb498911a;hb=eaf2ee0f498b519d64e1664a2b8c66c52ac1497c;hpb=0a6c76fc0525d6588a1d88127f0085f13a02f1af

diff --git a/altosuilib/Makefile.am b/altosuilib/Makefile.am
index b7d624e2..3b2e49d4 100644
--- a/altosuilib/Makefile.am
+++ b/altosuilib/Makefile.am
@@ -9,18 +9,15 @@ SRC=.
 altosuilibdir = $(datadir)/java
 
 altosuilib_JAVA = \
-	GrabNDrag.java \
 	AltosDevice.java \
 	AltosDeviceDialog.java \
-	AltosFlightDisplay.java \
-	AltosFontListener.java \
 	AltosPositionListener.java \
+	AltosUIAccelCal.java \
 	AltosUIConfigure.java \
 	AltosUIAxis.java \
 	AltosUIDataMissing.java \
 	AltosUIDataPoint.java \
 	AltosUIDataSet.java \
-	AltosUIGraph.java \
 	AltosUIGrapher.java \
 	AltosUIDialog.java \
 	AltosUIEnable.java \
@@ -30,23 +27,68 @@ altosuilib_JAVA = \
 	AltosUIMarker.java \
 	AltosUIPreferencesBackend.java \
 	AltosUIPreferences.java \
-	AltosUISeries.java \
-	AltosUIVersion.java \
+	AltosUIFlightSeries.java \
+	AltosUIGraph.java \
+	AltosGraph.java \
+	AltosShapeListener.java \
 	AltosUSBDevice.java \
-	AltosSiteMap.java \
-	AltosSiteMapCache.java \
-	AltosSiteMapPreload.java \
-	AltosSiteMapTile.java \
 	AltosVoice.java \
 	AltosDisplayThread.java \
-	AltosFreqList.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_$(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)
@@ -57,5 +99,8 @@ install-altosuilibJAVA: $(JAR)
 $(JAVAROOT):
 	mkdir -p $(JAVAROOT)
 
-$(JAR): classaltosuilib.stamp
-	jar cf $@ -C $(JAVAROOT) .
+$(JAR): classaltosuilib.stamp $(ICONS)
+	jar cf $@ $(ICONJAR) -C $(JAVAROOT) .
+if STRIP_NONDETERMINISM
+	$(STRIP_NONDETERMINISM) $@
+endif