projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
telegps: Add flash device functionality
[fw/altos]
/
altosui
/
Makefile.am
diff --git
a/altosui/Makefile.am
b/altosui/Makefile.am
index 7829a24c3befb2062686bc6531db867c848a8716..686b596773d2053fabb8cb2d331d8eeae68347ad 100644
(file)
--- a/
altosui/Makefile.am
+++ b/
altosui/Makefile.am
@@
-1,6
+1,6
@@
JAVAROOT=classes
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
man_MANS=altosui.1
@@
-10,71
+10,37
@@
CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH="$(JAVAROOT):../altoslib/*:../alto
bin_SCRIPTS=altosui
bin_SCRIPTS=altosui
-altosui_BT = \
- AltosBTDevice.java \
- AltosBTDeviceIterator.java \
- AltosBTManage.java \
- AltosBTKnown.java
-
altosui_JAVA = \
altosui_JAVA = \
- GrabNDrag.java \
AltosAscent.java \
AltosChannelMenu.java \
AltosCompanionInfo.java \
AltosConfig.java \
AltosAscent.java \
AltosChannelMenu.java \
AltosCompanionInfo.java \
AltosConfig.java \
- AltosConfigFreqUI.java \
AltosConfigUI.java \
AltosConfigPyroUI.java \
AltosConfigureUI.java \
AltosConfigTD.java \
AltosConfigTDUI.java \
AltosConfigUI.java \
AltosConfigPyroUI.java \
AltosConfigureUI.java \
AltosConfigTD.java \
AltosConfigTDUI.java \
- AltosCSV.java \
- AltosCSVUI.java \
AltosDescent.java \
AltosDescent.java \
- AltosDeviceUIDialog.java \
- AltosDisplayThread.java \
- AltosEepromDelete.java \
- AltosEepromManage.java \
- AltosEepromMonitorUI.java \
- AltosEepromSelect.java \
- AltosFlashUI.java \
- AltosFlightDisplay.java \
AltosFlightInfoTableModel.java \
AltosFlightInfoTableModel.java \
- AltosFlightStats.java \
AltosFlightStatsTable.java \
AltosFlightStatus.java \
AltosFlightStatusUpdate.java \
AltosFlightUI.java \
AltosFlightStatsTable.java \
AltosFlightStatus.java \
AltosFlightStatusUpdate.java \
AltosFlightUI.java \
- AltosFreqList.java \
Altos.java \
AltosIdleMonitorUI.java \
AltosIgniteUI.java \
Altos.java \
AltosIdleMonitorUI.java \
AltosIgniteUI.java \
+ AltosIgnitor.java \
AltosLaunch.java \
AltosLaunchUI.java \
AltosInfoTable.java \
AltosLaunch.java \
AltosLaunchUI.java \
AltosInfoTable.java \
- AltosKML.java \
AltosLanded.java \
AltosLanded.java \
- AltosLed.java \
- AltosLights.java \
AltosPad.java \
AltosUIPreferencesBackend.java \
AltosPad.java \
AltosUIPreferencesBackend.java \
- AltosRomconfigUI.java \
- AltosScanUI.java \
- AltosSerial.java \
- AltosSerialInUseException.java \
- AltosSiteMap.java \
- AltosSiteMapPreload.java \
- AltosSiteMapCache.java \
- AltosSiteMapTile.java \
AltosUI.java \
AltosUI.java \
- AltosWriter.java \
AltosGraph.java \
AltosGraphDataPoint.java \
AltosGraphDataSet.java \
AltosGraph.java \
AltosGraphDataPoint.java \
AltosGraphDataSet.java \
- AltosGraphUI.java \
- AltosDataChooser.java \
- AltosVoice.java \
- $(altosui_BT)
+ AltosGraphUI.java
JFREECHART_CLASS= \
jfreechart.jar
JFREECHART_CLASS= \
jfreechart.jar
@@
-122,20
+88,13
@@
JAVA_ICONS=\
$(ICONDIR)/altus-metrum-128.png \
$(ICONDIR)/altus-metrum-256.png
$(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 \
# 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
WINDOWS_ICON=$(ICONDIR)/altus-metrum.ico
@@
-275,8
+234,12
@@
altosui: Makefile
chmod +x $@
altosui-test: 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
chmod +x $@
altosui-jdb: Makefile
@@
-376,4
+339,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
$(WINDOWS_DIST): $(WINDOWS_FILES) altos-windows.nsi
-rm -f $@
makensis -Oaltos-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" altos-windows.nsi
-