projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: When log-format is missing, use product
[fw/altos]
/
altosui
/
Makefile.am
diff --git
a/altosui/Makefile.am
b/altosui/Makefile.am
index 20b234ab967cab803c99fb603df10c574815a07b..0440b4afb479eae8a6ad55a591fa0359ac2095d8 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
@@
-17,7
+17,6
@@
altosui_BT = \
AltosBTKnown.java
altosui_JAVA = \
AltosBTKnown.java
altosui_JAVA = \
- GrabNDrag.java \
AltosAscent.java \
AltosChannelMenu.java \
AltosCompanionInfo.java \
AltosAscent.java \
AltosChannelMenu.java \
AltosCompanionInfo.java \
@@
-28,31
+27,26
@@
altosui_JAVA = \
AltosConfigureUI.java \
AltosConfigTD.java \
AltosConfigTDUI.java \
AltosConfigureUI.java \
AltosConfigTD.java \
AltosConfigTDUI.java \
- AltosCSV.java \
AltosCSVUI.java \
AltosDescent.java \
AltosDeviceUIDialog.java \
AltosCSVUI.java \
AltosDescent.java \
AltosDeviceUIDialog.java \
- AltosDisplayThread.java \
AltosEepromDelete.java \
AltosEepromManage.java \
AltosEepromMonitorUI.java \
AltosEepromSelect.java \
AltosFlashUI.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 \
AltosLed.java \
AltosLights.java \
AltosLanded.java \
AltosLed.java \
AltosLights.java \
@@
-62,18
+56,12
@@
altosui_JAVA = \
AltosScanUI.java \
AltosSerial.java \
AltosSerialInUseException.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 \
AltosDataChooser.java \
AltosGraph.java \
AltosGraphDataPoint.java \
AltosGraphDataSet.java \
AltosGraphUI.java \
AltosDataChooser.java \
- AltosVoice.java \
$(altosui_BT)
JFREECHART_CLASS= \
$(altosui_BT)
JFREECHART_CLASS= \
@@
-103,6
+91,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
+171,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
+188,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)
@@
-335,8
+333,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