projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Move balloon flight code to core
[fw/altos]
/
altosui
/
Makefile.am
diff --git
a/altosui/Makefile.am
b/altosui/Makefile.am
index 32a3df97ba9187d9704feebca4b22c9b20066742..4e527bda74d0ed36efc555928bff999958716e9e 100644
(file)
--- a/
altosui/Makefile.am
+++ b/
altosui/Makefile.am
@@
-103,6
+103,10
@@
LIBALTOS= \
libaltos.dylib \
altos.dll
libaltos.dylib \
altos.dll
+desktopdir = $(datadir)/applications
+desktop_file = altos.desktop
+desktop_DATA = $(desktop_file)
+
JAR=altosui.jar
FATJAR=altosui-fat.jar
JAR=altosui.jar
FATJAR=altosui-fat.jar
@@
-171,6
+175,7
@@
DOC=$(ALTUSMETRUM_DOC) $(ALTOS_DOC) $(TELEMETRY_DOC) $(TEMPLATE_DOC)
# Distribution targets
LINUX_DIST=Altos-Linux-$(VERSION).tar.bz2
# Distribution targets
LINUX_DIST=Altos-Linux-$(VERSION).tar.bz2
+LINUX_SH=Altos-Linux-$(VERSION).sh
MACOSX_DIST=Altos-Mac-$(VERSION).dmg
WINDOWS_DIST=Altos-Windows-$(VERSION_DASH).exe
MACOSX_DIST=Altos-Mac-$(VERSION).dmg
WINDOWS_DIST=Altos-Windows-$(VERSION_DASH).exe
@@
-178,7
+183,7
@@
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_FILES=$(FAT_FILES) $(LINUX_LIBS) $(FIRMWARE) $(DOC)
altos.desktop.in ../icon/altusmetrum.svg
LINUX_EXTRA=altosui-fat
MACOSX_INFO_PLIST=Info.plist
LINUX_EXTRA=altosui-fat
MACOSX_INFO_PLIST=Info.plist
@@
-191,24
+196,35
@@
all-local: classes/altosui $(JAR) altosui altosui-test altosui-jdb
clean-local:
-rm -rf classes $(JAR) $(FATJAR) \
clean-local:
-rm -rf classes $(JAR) $(FATJAR) \
- $(LINUX_DIST) $(MACOSX_DIST) windows $(WINDOWS_DIST) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) \
+ $(LINUX_DIST) $(
LINUX_SH) $(
MACOSX_DIST) windows $(WINDOWS_DIST) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) \
$(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)
LINUX_DIST_TARGET=$(FATTARGET)/$(LINUX_DIST)
if FATINSTALL
FATTARGET=$(FATDIR)/$(VERSION)
LINUX_DIST_TARGET=$(FATTARGET)/$(LINUX_DIST)
+LINUX_SH_TARGET=$(FATTARGET)/$(LINUX_SH)
MACOSX_DIST_TARGET=$(FATTARGET)/$(MACOSX_DIST)
WINDOWS_DIST_TARGET=$(FATTARGET)/$(WINDOWS_DIST)
MACOSX_DIST_TARGET=$(FATTARGET)/$(MACOSX_DIST)
WINDOWS_DIST_TARGET=$(FATTARGET)/$(WINDOWS_DIST)
-fat: $(LINUX_DIST_TARGET) $(MACOSX_DIST_TARGET) $(WINDOWS_DIST_TARGET)
+fat: $(LINUX_DIST_TARGET) $(
LINUX_SH_TARGET) $(
MACOSX_DIST_TARGET) $(WINDOWS_DIST_TARGET)
$(LINUX_DIST_TARGET): $(LINUX_DIST)
mkdir -p $(FATTARGET)
cp -p $< $@
$(LINUX_DIST_TARGET): $(LINUX_DIST)
mkdir -p $(FATTARGET)
cp -p $< $@
+$(LINUX_SH_TARGET): $(LINUX_SH)
+ mkdir -p $(FATTARGET)
+ cp -p $< $@
+
$(MACOSX_DIST_TARGET): $(MACOSX_DIST)
mkdir -p $(FATTARGET)
cp -p $< $@
$(MACOSX_DIST_TARGET): $(MACOSX_DIST)
mkdir -p $(FATTARGET)
cp -p $< $@
@@
-218,7
+234,7
@@
$(WINDOWS_DIST_TARGET): $(WINDOWS_DIST)
cp -p $< $@
else
cp -p $< $@
else
-fat: $(LINUX_DIST) $(MACOSX_DIST) $(WINDOWS_DIST)
+fat: $(LINUX_DIST) $(
LINUX_SH) $(
MACOSX_DIST) $(WINDOWS_DIST)
endif
endif
@@
-333,6
+349,10
@@
$(LINUX_DIST): $(LINUX_FILES) $(LINUX_EXTRA)
chmod +x linux/AltOS/altosui
tar cjf $@ -C linux AltOS
chmod +x linux/AltOS/altosui
tar cjf $@ -C linux AltOS
+$(LINUX_SH): $(LINUX_DIST) linux-install.sh
+ cat linux-install.sh $(LINUX_DIST) > $@
+ chmod +x $@
+
$(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA) Makefile
-rm -f $@
-rm -rf macosx
$(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA) Makefile
-rm -f $@
-rm -rf macosx