altoslib: Move CSV/KML output code to altoslib

[fw/altos] / altosui / Makefile.am

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 20b234ab967cab803c99fb603df10c574815a07b..76fe9961fb15c170f5e4d6289b8ace43bf9f6bd2 100644 (file)
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -28,7 +28,6 @@ altosui_JAVA = \
        AltosConfigureUI.java \
        AltosConfigTD.java \
        AltosConfigTDUI.java \
-       AltosCSV.java \
        AltosCSVUI.java \
        AltosDescent.java \
        AltosDeviceUIDialog.java \
@@ -49,10 +48,10 @@ altosui_JAVA = \
        Altos.java \
        AltosIdleMonitorUI.java \
        AltosIgniteUI.java \
+       AltosIgnitor.java \
        AltosLaunch.java \
        AltosLaunchUI.java \
        AltosInfoTable.java \
-       AltosKML.java \
        AltosLanded.java \
        AltosLed.java \
        AltosLights.java \
@@ -67,7 +66,6 @@ altosui_JAVA = \
        AltosSiteMapCache.java \
        AltosSiteMapTile.java \
        AltosUI.java \
-       AltosWriter.java \
        AltosGraph.java \
        AltosGraphDataPoint.java \
        AltosGraphDataSet.java \
@@ -103,6 +101,10 @@ LIBALTOS= \
        libaltos.dylib \
        altos.dll
 
+desktopdir = $(datadir)/applications
+desktop_file = altos.desktop
+desktop_SCRIPTS = $(desktop_file)
+
 JAR=altosui.jar
 
 FATJAR=altosui-fat.jar
@@ -179,8 +181,8 @@ FAT_FILES=$(FATJAR) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) $(JFR
 
 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
@@ -196,6 +198,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
 
+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)
@@ -335,8 +343,6 @@ $(LINUX_DIST): $(LINUX_FILES) $(LINUX_EXTRA)
        -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