jenkins.sh: make -j 4 can fail, fix for altosui-test

[fw/altos] / altosui / Makefile.am

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 4e527bda74d0ed36efc555928bff999958716e9e..df9fe5d158cb0380b6965b22bad773537c6243da 100644 (file)
--- 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
 
@@ -17,7 +17,6 @@ altosui_BT = \
        AltosBTKnown.java
 
 altosui_JAVA = \
-       GrabNDrag.java \
        AltosAscent.java \
        AltosChannelMenu.java \
        AltosCompanionInfo.java \
@@ -28,31 +27,26 @@ 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 \
@@ -62,18 +56,12 @@ altosui_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)
 
 JFREECHART_CLASS= \
@@ -105,7 +93,7 @@ LIBALTOS= \
 
 desktopdir = $(datadir)/applications
 desktop_file = altos.desktop
-desktop_DATA = $(desktop_file)
+desktop_SCRIPTS = $(desktop_file)
 
 JAR=altosui.jar
 
@@ -275,8 +263,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
@@ -376,4 +368,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
-