projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
telegps: Hook up data download dialog
[fw/altos]
/
altosui
/
Makefile.am
diff --git
a/altosui/Makefile.am
b/altosui/Makefile.am
index 20b234ab967cab803c99fb603df10c574815a07b..c834646d499e4335c1305b9c6827ea82c3ef05b3 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,43
@@
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 \
AltosCSVUI.java \
AltosDescent.java \
- AltosDeviceUIDialog.java \
- AltosDisplayThread.java \
- AltosEepromDelete.java \
- AltosEepromManage.java \
- AltosEepromMonitorUI.java \
- AltosEepromSelect.java \
AltosFlashUI.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 \
AltosLed.java \
AltosLights.java \
AltosPad.java \
AltosUIPreferencesBackend.java \
AltosRomconfigUI.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 \
AltosUI.java \
- AltosWriter.java \
AltosGraph.java \
AltosGraphDataPoint.java \
AltosGraphDataSet.java \
AltosGraphUI.java \
AltosGraph.java \
AltosGraphDataPoint.java \
AltosGraphDataSet.java \
AltosGraphUI.java \
- AltosDataChooser.java \
- AltosVoice.java \
- $(altosui_BT)
+ AltosDataChooser.java
JFREECHART_CLASS= \
jfreechart.jar
JFREECHART_CLASS= \
jfreechart.jar
@@
-103,6
+75,10
@@
LIBALTOS= \
libaltos.dylib \
altos.dll
libaltos.dylib \
altos.dll
+desktopdir = $(datadir)/applications
+desktop_file = altos.desktop
+desktop_SCRIPTS = $(desktop_file)
+
JAR=altosui.jar
FATJAR=altosui-fat.jar
JAR=altosui.jar
FATJAR=altosui-fat.jar
@@
-179,8
+155,8
@@
FAT_FILES=$(FATJAR) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) $(JFR
LINUX_LIBS=libaltos32.so libaltos64.so
LINUX_LIBS=libaltos32.so libaltos64.so
-LINUX_FILES=$(FAT_FILES) $(LINUX_LIBS) $(FIRMWARE) $(DOC)
-LINUX_EXTRA=altosui-fat
../debian/altos.desktop ../debian/altusmetrum.xpm
+LINUX_FILES=$(FAT_FILES) $(LINUX_LIBS) $(FIRMWARE) $(DOC)
altos.desktop.in ../icon/altusmetrum.svg
+LINUX_EXTRA=altosui-fat
MACOSX_INFO_PLIST=Info.plist
MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(DOC) ReadMe-Mac.rtf
MACOSX_INFO_PLIST=Info.plist
MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(DOC) ReadMe-Mac.rtf
@@
-196,6
+172,12
@@
clean-local:
$(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log altos-windows.nsi \
altosui altosui-test altosui-jdb macosx linux
$(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)
if FATINSTALL
FATTARGET=$(FATDIR)/$(VERSION)
@@
-265,8
+247,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
@@
-335,8
+321,6
@@
$(LINUX_DIST): $(LINUX_FILES) $(LINUX_EXTRA)
-rm -rf linux
mkdir -p linux/AltOS
cp -p $(LINUX_FILES) linux/AltOS
-rm -rf linux
mkdir -p linux/AltOS
cp -p $(LINUX_FILES) linux/AltOS
- sed -e 's;/usr/bin;%BIN%;' -e 's;/usr/share/pixmaps;%BIN%;' $(srcdir)/../debian/altos.desktop > linux/AltOS/altos.desktop.in
- cp -p $(srcdir)/../debian/altusmetrum.xpm linux/AltOS/altusmetrum.xpm
cp -p altosui-fat linux/AltOS/altosui
chmod +x linux/AltOS/altosui
tar cjf $@ -C linux AltOS
cp -p altosui-fat linux/AltOS/altosui
chmod +x linux/AltOS/altosui
tar cjf $@ -C linux AltOS
@@
-368,4
+352,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
-