X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FMakefile.am;h=add46825942505c5cc729694fcef2f6f960d3df6;hp=9bc107403654f689fba369edb097d7dd2f3825c6;hb=71715337eb532a1fbe1a753240e7417d5223489f;hpb=06ffd8022ff5ac74274c9839d42c0c47274cb8b9

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 9bc10740..add46825 100644
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -1,6 +1,6 @@
 
 JAVAROOT=classes
-AM_JAVACFLAGS=-target 1.6 -encoding UTF-8 -Xlint:deprecation -source 6
+AM_JAVACFLAGS=-target 1.6 -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked -source 6
 
 man_MANS=altosui.1
 
@@ -10,71 +10,35 @@ CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH="$(JAVAROOT):../altoslib/*:../alto
 
 bin_SCRIPTS=altosui
 
-altosui_BT = \
-	AltosBTDevice.java \
-	AltosBTDeviceIterator.java \
-	AltosBTManage.java \
-	AltosBTKnown.java
-
 altosui_JAVA = \
-	GrabNDrag.java \
 	AltosAscent.java \
 	AltosChannelMenu.java \
 	AltosCompanionInfo.java \
 	AltosConfig.java \
-	AltosConfigFreqUI.java \
 	AltosConfigUI.java \
 	AltosConfigPyroUI.java \
 	AltosConfigureUI.java \
 	AltosConfigTD.java \
 	AltosConfigTDUI.java \
-	AltosCSV.java \
-	AltosCSVUI.java \
 	AltosDescent.java \
-	AltosDeviceUIDialog.java \
-	AltosDisplayThread.java \
-	AltosEepromDelete.java \
-	AltosEepromManage.java \
-	AltosEepromMonitorUI.java \
-	AltosEepromSelect.java \
-	AltosFlashUI.java \
-	AltosFlightDisplay.java \
-	AltosFlightInfoTableModel.java \
-	AltosFlightStats.java \
 	AltosFlightStatsTable.java \
 	AltosFlightStatus.java \
 	AltosFlightStatusUpdate.java \
 	AltosFlightUI.java \
-	AltosFreqList.java \
 	Altos.java \
 	AltosIdleMonitorUI.java \
 	AltosIgniteUI.java \
+	AltosIgnitor.java \
 	AltosLaunch.java \
 	AltosLaunchUI.java \
-	AltosInfoTable.java \
-	AltosKML.java \
 	AltosLanded.java \
-	AltosLed.java \
-	AltosLights.java \
 	AltosPad.java \
 	AltosUIPreferencesBackend.java \
-	AltosRomconfigUI.java \
-	AltosScanUI.java \
-	AltosSerial.java \
-	AltosSerialInUseException.java \
-	AltosSiteMap.java \
-	AltosSiteMapPreload.java \
-	AltosSiteMapCache.java \
-	AltosSiteMapTile.java \
 	AltosUI.java \
-	AltosWriter.java \
 	AltosGraph.java \
 	AltosGraphDataPoint.java \
 	AltosGraphDataSet.java \
-	AltosGraphUI.java \
-	AltosDataChooser.java \
-	AltosVoice.java \
-	$(altosui_BT)
+	AltosGraphUI.java
 
 JFREECHART_CLASS= \
     jfreechart.jar
@@ -103,6 +67,10 @@ LIBALTOS= \
 	libaltos.dylib \
 	altos.dll
 
+desktopdir = $(datadir)/applications
+desktop_file = altos.desktop
+desktop_SCRIPTS = $(desktop_file)
+
 JAR=altosui.jar
 
 FATJAR=altosui-fat.jar
@@ -118,20 +86,13 @@ JAVA_ICONS=\
 	$(ICONDIR)/altus-metrum-128.png \
 	$(ICONDIR)/altus-metrum-256.png
 
-ICONS=	$(ICONDIR)/redled.png $(ICONDIR)/redoff.png \
-	$(ICONDIR)/greenled.png $(ICONDIR)/greenoff.png \
-	$(ICONDIR)/grayled.png $(ICONDIR)/grayoff.png
-
 # icon base names for jar
 ICONJAR= -C $(ICONDIR) altus-metrum-16.png \
 	-C $(ICONDIR) altus-metrum-32.png \
 	-C $(ICONDIR) altus-metrum-48.png \
 	-C $(ICONDIR) altus-metrum-64.png \
 	-C $(ICONDIR) altus-metrum-128.png \
-	-C $(ICONDIR) altus-metrum-256.png \
-	-C $(ICONDIR) redled.png -C $(ICONDIR) redoff.png \
-	-C $(ICONDIR) greenled.png -C $(ICONDIR) greenoff.png \
-	-C $(ICONDIR) grayon.png -C $(ICONDIR) grayled.png
+	-C $(ICONDIR) altus-metrum-256.png
 
 WINDOWS_ICON=$(ICONDIR)/altus-metrum.ico
 
@@ -165,12 +126,13 @@ TEMPLATE_DOC=\
 	$(top_srcdir)/doc/telemetrum-outline.pdf \
 	$(top_srcdir)/doc/easymini-outline.pdf \
 	$(top_srcdir)/doc/telemega-outline.pdf \
-	$(top_srcdir)/doc/easymini-outline.pdf
+	$(top_srcdir)/doc/telemini.pdf
 
 DOC=$(ALTUSMETRUM_DOC) $(ALTOS_DOC) $(TELEMETRY_DOC) $(TEMPLATE_DOC)
 
 # Distribution targets
 LINUX_DIST=Altos-Linux-$(VERSION).tar.bz2
+LINUX_SH=Altos-Linux-$(VERSION).sh
 MACOSX_DIST=Altos-Mac-$(VERSION).dmg
 WINDOWS_DIST=Altos-Windows-$(VERSION_DASH).exe
 
@@ -178,7 +140,7 @@ FAT_FILES=$(FATJAR) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) $(JFR
 
 LINUX_LIBS=libaltos32.so libaltos64.so
 
-LINUX_FILES=$(FAT_FILES) $(LINUX_LIBS) $(FIRMWARE) $(DOC)
+LINUX_FILES=$(FAT_FILES) $(LINUX_LIBS) $(FIRMWARE) $(DOC) altos.desktop.in ../icon/altusmetrum.svg
 LINUX_EXTRA=altosui-fat
 
 MACOSX_INFO_PLIST=Info.plist
@@ -191,24 +153,35 @@ all-local: classes/altosui $(JAR) altosui altosui-test altosui-jdb
 
 clean-local:
 	-rm -rf classes $(JAR) $(FATJAR) \
-		$(LINUX_DIST) $(MACOSX_DIST) windows $(WINDOWS_DIST) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) \
+		$(LINUX_DIST) $(LINUX_SH) $(MACOSX_DIST) windows $(WINDOWS_DIST) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) \
 		$(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log altos-windows.nsi \
 		altosui altosui-test altosui-jdb macosx linux
 
+EXTRA_DIST = $(desktop_file).in
+
+$(desktop_file): $(desktop_file).in
+	sed -e 's#%bindir%#@bindir@#' -e 's#%icondir%#$(datadir)/icons/hicolor/scalable/apps#' ${srcdir}/altos.desktop.in > $@
+	chmod +x $@
+
 if FATINSTALL
 
 FATTARGET=$(FATDIR)/$(VERSION)
 
 LINUX_DIST_TARGET=$(FATTARGET)/$(LINUX_DIST)
+LINUX_SH_TARGET=$(FATTARGET)/$(LINUX_SH)
 MACOSX_DIST_TARGET=$(FATTARGET)/$(MACOSX_DIST)
 WINDOWS_DIST_TARGET=$(FATTARGET)/$(WINDOWS_DIST)
 
-fat: $(LINUX_DIST_TARGET) $(MACOSX_DIST_TARGET) $(WINDOWS_DIST_TARGET)
+fat: $(LINUX_DIST_TARGET) $(LINUX_SH_TARGET) $(MACOSX_DIST_TARGET) $(WINDOWS_DIST_TARGET)
 
 $(LINUX_DIST_TARGET): $(LINUX_DIST)
 	mkdir -p $(FATTARGET)
 	cp -p $< $@
 
+$(LINUX_SH_TARGET): $(LINUX_SH)
+	mkdir -p $(FATTARGET)
+	cp -p $< $@
+
 $(MACOSX_DIST_TARGET): $(MACOSX_DIST)
 	mkdir -p $(FATTARGET)
 	cp -p $< $@
@@ -218,7 +191,7 @@ $(WINDOWS_DIST_TARGET): $(WINDOWS_DIST)
 	cp -p $< $@
 
 else
-fat: $(LINUX_DIST) $(MACOSX_DIST) $(WINDOWS_DIST)
+fat: $(LINUX_DIST) $(LINUX_SH) $(MACOSX_DIST) $(WINDOWS_DIST)
 endif
 
 
@@ -259,8 +232,12 @@ altosui: Makefile
 	chmod +x $@
 
 altosui-test: Makefile
-	echo "#!/bin/sh" > $@
-	echo 'exec java -Djava.library.path="../libaltos/.libs" -jar altosui.jar "$$@"' >> $@
+	echo '#!/bin/sh' > $@
+	echo 'dir="$$(dirname $$0)"' >> $@
+	echo 'cd "$$dir"' >> $@
+	echo 'altosui="$$(pwd -P)"' >> $@
+	echo 'altos="$$(dirname $$altosui)"' >> $@
+	echo 'exec java -Djava.library.path="$$altos/libaltos/.libs" -jar "$$altosui/altosui.jar" "$$@"' >> $@
 	chmod +x $@
 
 altosui-jdb: Makefile
@@ -333,6 +310,10 @@ $(LINUX_DIST): $(LINUX_FILES) $(LINUX_EXTRA)
 	chmod +x linux/AltOS/altosui
 	tar cjf $@ -C linux AltOS
 
+$(LINUX_SH): $(LINUX_DIST) linux-install.sh
+	cat linux-install.sh $(LINUX_DIST) > $@
+	chmod +x $@
+
 $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA) Makefile
 	-rm -f $@
 	-rm -rf macosx
@@ -356,4 +337,3 @@ $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA) Makefile
 $(WINDOWS_DIST): $(WINDOWS_FILES) altos-windows.nsi
 	-rm -f $@
 	makensis -Oaltos-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" altos-windows.nsi
-