X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FMakefile.am;h=6f491d7d84d92ca94c201ab9385c06de8232bdb3;hp=03c1cfc917e002203f35eceec4b0014fd60e1896;hb=9b3516419981967a1c6ab956269139977ac368ca;hpb=948a614a62754fd4fffd9b84ad83fd444e4f0437

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 03c1cfc9..6f491d7d 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,14 +10,7 @@ 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 \
@@ -28,31 +21,25 @@ altosui_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 \
@@ -60,21 +47,12 @@ altosui_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)
+	AltosDataChooser.java
 
 JFREECHART_CLASS= \
     jfreechart.jar
@@ -105,7 +83,7 @@ LIBALTOS= \
 
 desktopdir = $(datadir)/applications
 desktop_file = altos.desktop
-desktop_DATA = $(desktop_file)
+desktop_SCRIPTS = $(desktop_file)
 
 JAR=altosui.jar
 
@@ -204,6 +182,7 @@ 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
 
@@ -274,8 +253,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
@@ -375,4 +358,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
-