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

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 0440b4af..6f491d7d 100644
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -10,12 +10,6 @@ CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH="$(JAVAROOT):../altoslib/*:../alto
 
 bin_SCRIPTS=altosui
 
-altosui_BT = \
-	AltosBTDevice.java \
-	AltosBTDeviceIterator.java \
-	AltosBTManage.java \
-	AltosBTKnown.java
-
 altosui_JAVA = \
 	AltosAscent.java \
 	AltosChannelMenu.java \
@@ -29,7 +23,6 @@ altosui_JAVA = \
 	AltosConfigTDUI.java \
 	AltosCSVUI.java \
 	AltosDescent.java \
-	AltosDeviceUIDialog.java \
 	AltosEepromDelete.java \
 	AltosEepromManage.java \
 	AltosEepromMonitorUI.java \
@@ -54,15 +47,12 @@ altosui_JAVA = \
 	AltosUIPreferencesBackend.java \
 	AltosRomconfigUI.java \
 	AltosScanUI.java \
-	AltosSerial.java \
-	AltosSerialInUseException.java \
 	AltosUI.java \
 	AltosGraph.java \
 	AltosGraphDataPoint.java \
 	AltosGraphDataSet.java \
 	AltosGraphUI.java \
-	AltosDataChooser.java \
-	$(altosui_BT)
+	AltosDataChooser.java
 
 JFREECHART_CLASS= \
     jfreechart.jar
@@ -263,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
@@ -364,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
-