X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FMakefile.am;h=58c1517fdbe4ad307f2039843fb7b73ae6822fac;hp=fa391889a40ccddbc71e05078bc713945b851b86;hb=c2c4d515ef9cc2cae8a8f2803e9498bb0794c4ed;hpb=2d5e48c5dc0e822fdf430f43804c1e5e79fdbf84

diff --git a/ao-tools/altosui/Makefile.am b/ao-tools/altosui/Makefile.am
index fa391889..58c1517f 100644
--- a/ao-tools/altosui/Makefile.am
+++ b/ao-tools/altosui/Makefile.am
@@ -20,9 +20,10 @@ altosui_JAVA = \
 	AltosDebug.java \
 	AltosDeviceDialog.java \
 	AltosDevice.java \
+	AltosDisplayThread.java \
 	AltosEepromDownload.java \
 	AltosEepromMonitor.java \
-	AltosEepromReader.java \
+	AltosEepromIterable.java \
 	AltosEepromRecord.java \
 	AltosFile.java \
 	AltosFlash.java \
@@ -33,6 +34,8 @@ altosui_JAVA = \
 	AltosGreatCircle.java \
 	AltosHexfile.java \
 	Altos.java \
+	AltosInfoTable.java \
+	AltosKML.java \
 	AltosLine.java \
 	AltosLogfileChooser.java \
 	AltosLog.java \
@@ -40,16 +43,31 @@ altosui_JAVA = \
 	AltosPreferences.java \
 	AltosReader.java \
 	AltosRecord.java \
+	AltosRecordIterable.java \
+	AltosReplayThread.java \
 	AltosRomconfig.java \
 	AltosRomconfigUI.java \
 	AltosSerial.java \
 	AltosSerialMonitor.java \
 	AltosState.java \
+	AltosStatusTable.java \
 	AltosTelemetry.java \
-	AltosTelemetryReader.java \
+	AltosTelemetryIterable.java \
 	AltosUI.java \
+	AltosWriter.java \
+	AltosDataPointReader.java \
+	AltosDataPoint.java \
+	AltosGraph.java \
+	AltosGraphTime.java \
+	AltosGraphUI.java \
+	AltosGraphDataChooser.java \
 	AltosVoice.java
 
+JFREECHART_CLASS= \
+    jfreechart.jar \
+    jcommon.jar \
+    csv.jar
+
 FREETTS_CLASS= \
 	cmudict04.jar \
 	cmulex.jar \
@@ -82,7 +100,7 @@ LINUX_DIST=Altos-Linux-$(VERSION).tar.bz2
 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
@@ -92,15 +110,13 @@ MACOSX_EXTRA=$(FIRMWARE)
 
 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) \
-		$(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log \
-		altosui altosui-test macosx linux
-
-fat: $(FATJAR) $(LINUX_DIST) $(MACOSX_DIST) $(WINDOWS_DIST)
+		$(JFREECHART_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log \
+		altosui altosui-test altosui-jdb macosx linux
 
 if FATINSTALL
 
@@ -124,8 +140,11 @@ $(WINDOWS_DIST_TARGET): $(WINDOWS_DIST)
 	mkdir -p $(FATTARGET)
 	cp -p $< $@
 
+else
+fat: $(LINUX_DIST) $(MACOSX_DIST) $(WINDOWS_DIST)
 endif
 
+
 altosuidir=$(datadir)/java
 
 install-altosuiJAVA: altosui.jar
@@ -143,7 +162,7 @@ $(JAR): classaltosui.stamp Manifest.txt $(JAVA_ICON)
 		-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 \
@@ -151,11 +170,11 @@ $(FATJAR): classaltosui.stamp Manifest-fat.txt $(FREETTS_CLASS) $(LIBALTOS) $(JA
 
 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' > $@
-	echo "Class-Path: freetts.jar" >> $@
+	echo "Class-Path: freetts.jar jfreechart.jar jcommon.jar csv.jar" >> $@
 
 altosui: Makefile
 	echo "#!/bin/sh" > $@
@@ -167,6 +186,11 @@ altosui-test: Makefile
 	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/"$@" .