projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Remove ability to graph data in .csv files
[fw/altos]
/
ao-tools
/
altosui
/
Makefile.am
diff --git
a/ao-tools/altosui/Makefile.am
b/ao-tools/altosui/Makefile.am
index 7070af22e7fda87a0786a7e5d818b08a793f266a..58c1517fdbe4ad307f2039843fb7b73ae6822fac 100644
(file)
--- a/
ao-tools/altosui/Makefile.am
+++ b/
ao-tools/altosui/Makefile.am
@@
-35,6
+35,7
@@
altosui_JAVA = \
AltosHexfile.java \
Altos.java \
AltosInfoTable.java \
AltosHexfile.java \
Altos.java \
AltosInfoTable.java \
+ AltosKML.java \
AltosLine.java \
AltosLogfileChooser.java \
AltosLog.java \
AltosLine.java \
AltosLogfileChooser.java \
AltosLog.java \
@@
-53,8
+54,20
@@
altosui_JAVA = \
AltosTelemetry.java \
AltosTelemetryIterable.java \
AltosUI.java \
AltosTelemetry.java \
AltosTelemetryIterable.java \
AltosUI.java \
+ AltosWriter.java \
+ AltosDataPointReader.java \
+ AltosDataPoint.java \
+ AltosGraph.java \
+ AltosGraphTime.java \
+ AltosGraphUI.java \
+ AltosGraphDataChooser.java \
AltosVoice.java
AltosVoice.java
+JFREECHART_CLASS= \
+ jfreechart.jar \
+ jcommon.jar \
+ csv.jar
+
FREETTS_CLASS= \
cmudict04.jar \
cmulex.jar \
FREETTS_CLASS= \
cmudict04.jar \
cmulex.jar \
@@
-87,7
+100,7
@@
LINUX_DIST=Altos-Linux-$(VERSION).tar.bz2
MACOSX_DIST=Altos-Mac-$(VERSION).zip
WINDOWS_DIST=Altos-Windows-$(VERSION_DASH).exe
MACOSX_DIST=Altos-Mac-$(VERSION).zip
WINDOWS_DIST=Altos-Windows-$(VERSION_DASH).exe
-FAT_FILES=$(FATJAR) $(FREETTS_CLASS)
+FAT_FILES=$(FATJAR) $(FREETTS_CLASS)
$(JFREECHART_CLASS)
LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE)
LINUX_EXTRA=altosui-fat
LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE)
LINUX_EXTRA=altosui-fat
@@
-97,13
+110,13
@@
MACOSX_EXTRA=$(FIRMWARE)
WINDOWS_FILES=$(FAT_FILES) altos.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON)
WINDOWS_FILES=$(FAT_FILES) altos.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON)
-all-local: classes/altosui $(JAR) altosui altosui-test
+all-local: classes/altosui $(JAR) altosui altosui-test
altosui-jdb
clean-local:
-rm -rf classes $(JAR) $(FATJAR) \
$(LINUX_DIST) $(MACOSX_DIST) windows $(WINDOWS_DIST) $(FREETTS_CLASS) \
clean-local:
-rm -rf classes $(JAR) $(FATJAR) \
$(LINUX_DIST) $(MACOSX_DIST) windows $(WINDOWS_DIST) $(FREETTS_CLASS) \
- $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log \
- altosui altosui-test macosx linux
+ $(
JFREECHART_CLASS) $(
LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log \
+ altosui altosui-test
altosui-jdb
macosx linux
if FATINSTALL
if FATINSTALL
@@
-149,7
+162,7
@@
$(JAR): classaltosui.stamp Manifest.txt $(JAVA_ICON)
-C classes altosui \
-C ../libaltos libaltosJNI
-C classes altosui \
-C ../libaltos libaltosJNI
-$(FATJAR): classaltosui.stamp Manifest-fat.txt $(FREETTS_CLASS) $(LIBALTOS) $(JAVA_ICON)
+$(FATJAR): classaltosui.stamp Manifest-fat.txt $(FREETTS_CLASS) $(
JFREECHART_CLASS) $(
LIBALTOS) $(JAVA_ICON)
jar cfm $@ Manifest-fat.txt \
-C $(top_srcdir)/icon altus-metrum-16x16.jpg \
-C classes altosui \
jar cfm $@ Manifest-fat.txt \
-C $(top_srcdir)/icon altus-metrum-16x16.jpg \
-C classes altosui \
@@
-157,11
+170,11
@@
$(FATJAR): classaltosui.stamp Manifest-fat.txt $(FREETTS_CLASS) $(LIBALTOS) $(JA
Manifest.txt: Makefile
echo 'Main-Class: altosui.AltosUI' > $@
Manifest.txt: Makefile
echo 'Main-Class: altosui.AltosUI' > $@
- echo "Class-Path: $(FREETTS)/freetts.jar" >> $@
+ echo "Class-Path: $(FREETTS)/freetts.jar
$(FREETTS)/jfreechart.jar $(FREETTS)/jcommon.jar $(FREETTS)/csv.jar
" >> $@
Manifest-fat.txt:
echo 'Main-Class: altosui.AltosUI' > $@
Manifest-fat.txt:
echo 'Main-Class: altosui.AltosUI' > $@
- echo "Class-Path: freetts.jar" >> $@
+ echo "Class-Path: freetts.jar
jfreechart.jar jcommon.jar csv.jar
" >> $@
altosui: Makefile
echo "#!/bin/sh" > $@
altosui: Makefile
echo "#!/bin/sh" > $@
@@
-173,6
+186,11
@@
altosui-test: Makefile
echo 'exec java -cp "$(FREETTS)/*" -Djava.library.path="../libaltos/.libs" -jar altosui.jar "$$@"' >> $@
chmod +x $@
echo 'exec java -cp "$(FREETTS)/*" -Djava.library.path="../libaltos/.libs" -jar altosui.jar "$$@"' >> $@
chmod +x $@
+altosui-jdb: Makefile
+ echo "#!/bin/sh" > $@
+ echo 'exec jdb -classpath "classes:../libaltos:$(FREETTS)/*" -Djava.library.path="../libaltos/.libs" altosui/AltosUI "$$@"' >> $@
+ chmod +x $@
+
libaltos.so:
-rm -f "$@"
$(LN_S) ../libaltos/.libs/"$@" .
libaltos.so:
-rm -f "$@"
$(LN_S) ../libaltos/.libs/"$@" .