X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FMakefile.am;h=e415fc5b65773060a1dd5d7a81f286ad9d4775bd;hp=e2ff8cb5df679d4dc215eeec9ac140221554dfeb;hb=bf684a4c290573a3aa627fd8ddf6f6ebbe5fa057;hpb=d83587c3c66b730cc54ca153714eee520ee40b2c

diff --git a/altosuilib/Makefile.am b/altosuilib/Makefile.am
index e2ff8cb5..e415fc5b 100644
--- a/altosuilib/Makefile.am
+++ b/altosuilib/Makefile.am
@@ -1,44 +1,99 @@
-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 \
+altosuilib_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 \
+	AltosGraph.java \
+	AltosGraphDataPoint.java \
+	AltosGraphDataSet.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
 
-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 bin $(JAR)
+	-rm -rf $(JAVAROOT) $(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) .