projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.gag.com/fw/altos
[fw/altos]
/
ao-tools
/
altosui
/
Makefile.am
diff --git
a/ao-tools/altosui/Makefile.am
b/ao-tools/altosui/Makefile.am
index fa391889a40ccddbc71e05078bc713945b851b86..ab8ca7d4a80163b4ed385a64ac65c12702a136b8 100644
(file)
--- a/
ao-tools/altosui/Makefile.am
+++ b/
ao-tools/altosui/Makefile.am
@@
-5,7
+5,7
@@
man_MANS=altosui.1
altoslibdir=$(libdir)/altos
altoslibdir=$(libdir)/altos
-CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../libaltos:$(FREETTS)/*:/usr/share/java/*"
+CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../libaltos:$(
JFREECHART)/*:$(
FREETTS)/*:/usr/share/java/*"
bin_SCRIPTS=altosui
bin_SCRIPTS=altosui
@@
-20,9
+20,10
@@
altosui_JAVA = \
AltosDebug.java \
AltosDeviceDialog.java \
AltosDevice.java \
AltosDebug.java \
AltosDeviceDialog.java \
AltosDevice.java \
+ AltosDisplayThread.java \
AltosEepromDownload.java \
AltosEepromMonitor.java \
AltosEepromDownload.java \
AltosEepromMonitor.java \
- AltosEeprom
Reader
.java \
+ AltosEeprom
Iterable
.java \
AltosEepromRecord.java \
AltosFile.java \
AltosFlash.java \
AltosEepromRecord.java \
AltosFile.java \
AltosFlash.java \
@@
-33,6
+34,7
@@
altosui_JAVA = \
AltosGreatCircle.java \
AltosHexfile.java \
Altos.java \
AltosGreatCircle.java \
AltosHexfile.java \
Altos.java \
+ AltosInfoTable.java \
AltosLine.java \
AltosLogfileChooser.java \
AltosLog.java \
AltosLine.java \
AltosLogfileChooser.java \
AltosLog.java \
@@
-40,16
+42,30
@@
altosui_JAVA = \
AltosPreferences.java \
AltosReader.java \
AltosRecord.java \
AltosPreferences.java \
AltosReader.java \
AltosRecord.java \
+ AltosRecordIterable.java \
+ AltosReplayThread.java \
AltosRomconfig.java \
AltosRomconfigUI.java \
AltosSerial.java \
AltosSerialMonitor.java \
AltosState.java \
AltosRomconfig.java \
AltosRomconfigUI.java \
AltosSerial.java \
AltosSerialMonitor.java \
AltosState.java \
+ AltosStatusTable.java \
AltosTelemetry.java \
AltosTelemetry.java \
- AltosTelemetry
Reader
.java \
+ AltosTelemetry
Iterable
.java \
AltosUI.java \
AltosUI.java \
+ AltosCsvReader.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 \
@@
-82,7
+98,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,11
+113,9
@@
all-local: classes/altosui $(JAR) altosui altosui-test
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 \
+ $(
JFREECHART_CLASS) $(
LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log \
altosui altosui-test macosx linux
altosui altosui-test macosx linux
-fat: $(FATJAR) $(LINUX_DIST) $(MACOSX_DIST) $(WINDOWS_DIST)
-
if FATINSTALL
FATTARGET=$(FATDIR)/$(VERSION)
if FATINSTALL
FATTARGET=$(FATDIR)/$(VERSION)
@@
-124,8
+138,11
@@
$(WINDOWS_DIST_TARGET): $(WINDOWS_DIST)
mkdir -p $(FATTARGET)
cp -p $< $@
mkdir -p $(FATTARGET)
cp -p $< $@
+else
+fat: $(LINUX_DIST) $(MACOSX_DIST) $(WINDOWS_DIST)
endif
endif
+
altosuidir=$(datadir)/java
install-altosuiJAVA: altosui.jar
altosuidir=$(datadir)/java
install-altosuiJAVA: altosui.jar
@@
-143,7
+160,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 \
@@
-151,11
+168,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
$(JFREECHART)/jfreechart.jar $(JFREECHAR)/jcommon.jar $(JFREECHART)/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" > $@