X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=ao-tools%2Faltosui%2FMakefile.am;h=2322b93f109335fbbdc0b5210e7297e214632363;hb=16916be51d746b1e1057b3219e5bec8f8814259e;hp=0a91f939db0a51fe6f4828c5dfa23473e069ab98;hpb=eb74866e919e8c661153847871f5a79e66d37296;p=fw%2Faltos

diff --git a/ao-tools/altosui/Makefile.am b/ao-tools/altosui/Makefile.am
index 0a91f939..2322b93f 100644
--- a/ao-tools/altosui/Makefile.am
+++ b/ao-tools/altosui/Makefile.am
@@ -5,7 +5,7 @@ man_MANS=altosui.1
 
 altoslibdir=$(libdir)/altos
 
-CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../libaltos:$(JFREECHART)/*:$(FREETTS)/*:/usr/share/java/*"
+CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../libaltos:$(FREETTS)/*:/usr/share/java/*"
 
 bin_SCRIPTS=altosui
 
@@ -20,19 +20,24 @@ altosui_JAVA = \
 	AltosDebug.java \
 	AltosDeviceDialog.java \
 	AltosDevice.java \
+	AltosDisplayThread.java \
 	AltosEepromDownload.java \
 	AltosEepromMonitor.java \
-	AltosEepromReader.java \
+	AltosEepromIterable.java \
 	AltosEepromRecord.java \
 	AltosFile.java \
 	AltosFlash.java \
 	AltosFlashUI.java \
 	AltosFlightInfoTableModel.java \
+	AltosFlightReader.java \
 	AltosFlightStatusTableModel.java \
+	AltosFlightUI.java \
 	AltosGPS.java \
 	AltosGreatCircle.java \
 	AltosHexfile.java \
 	Altos.java \
+	AltosInfoTable.java \
+	AltosKML.java \
 	AltosLine.java \
 	AltosLogfileChooser.java \
 	AltosLog.java \
@@ -40,26 +45,32 @@ altosui_JAVA = \
 	AltosPreferences.java \
 	AltosReader.java \
 	AltosRecord.java \
+	AltosRecordIterable.java \
+	AltosTelemetryReader.java \
+	AltosReplayReader.java \
 	AltosRomconfig.java \
 	AltosRomconfigUI.java \
 	AltosSerial.java \
 	AltosSerialMonitor.java \
 	AltosState.java \
+	AltosStatusTable.java \
 	AltosTelemetry.java \
-	AltosTelemetryReader.java \
+	AltosTelemetryIterable.java \
 	AltosUI.java \
-    AltosCsvReader.java \
-    AltosDataPoint.java \
-    AltosGraph.java \
-    AltosGraphTime.java \
-    AltosGraphUI.java \
-    AltosGraphDataChooser.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
+    jfreechart.jar
+
+JCOMMON_CLASS=\
+    jcommon.jar
 
 FREETTS_CLASS= \
 	cmudict04.jar \
@@ -93,7 +104,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) $(JFREECHART_CLASS)
+FAT_FILES=$(FATJAR) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS)
 
 LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE)
 LINUX_EXTRA=altosui-fat
@@ -103,15 +114,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) \
-		$(JFREECHART_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) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log \
+		altosui altosui-test altosui-jdb macosx linux
 
 if FATINSTALL
 
@@ -135,8 +144,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
@@ -154,7 +166,7 @@ $(JAR): classaltosui.stamp Manifest.txt $(JAVA_ICON)
 		-C classes altosui \
 		-C ../libaltos libaltosJNI
 
-$(FATJAR): classaltosui.stamp Manifest-fat.txt $(FREETTS_CLASS) $(JFREECHART_CLASS) $(LIBALTOS) $(JAVA_ICON)
+$(FATJAR): classaltosui.stamp Manifest-fat.txt $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) $(JAVA_ICON)
 	jar cfm $@ Manifest-fat.txt \
 		-C $(top_srcdir)/icon altus-metrum-16x16.jpg \
 		-C classes altosui \
@@ -162,20 +174,25 @@ $(FATJAR): classaltosui.stamp Manifest-fat.txt $(FREETTS_CLASS) $(JFREECHART_CLA
 
 Manifest.txt: Makefile
 	echo 'Main-Class: altosui.AltosUI' > $@
-	echo "Class-Path: $(FREETTS)/freetts.jar $(JFREECHART)/jfreechart.jar $(JFREECHAR)/jcommon.jar $(JFREECHART)/csv.jar" >> $@
+	echo "Class-Path: $(FREETTS)/freetts.jar $(JFREECHART)/jfreechart.jar $(JCOMMON)/jcommon.jar" >> $@
 
 Manifest-fat.txt:
 	echo 'Main-Class: altosui.AltosUI' > $@
-	echo "Class-Path: freetts.jar jfreechart.jar jcommon.jar csv.jar" >> $@
+	echo "Class-Path: freetts.jar jfreechart.jar jcommon.jar" >> $@
 
 altosui: Makefile
 	echo "#!/bin/sh" > $@
-	echo 'exec java  -cp "$(FREETTS)/*" -Djava.library.path="$(altoslibdir)" -jar "$(altosuidir)/altosui.jar" "$$@"' >> $@
+	echo 'exec java  -cp "$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="$(altoslibdir)" -jar "$(altosuidir)/altosui.jar" "$$@"' >> $@
 	chmod +x $@
 
 altosui-test: Makefile
 	echo "#!/bin/sh" > $@
-	echo 'exec java -cp "$(FREETTS)/*" -Djava.library.path="../libaltos/.libs" -jar altosui.jar "$$@"' >> $@
+	echo 'exec java -cp "$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="../libaltos/.libs" -jar altosui.jar "$$@"' >> $@
+	chmod +x $@
+
+altosui-jdb: Makefile
+	echo "#!/bin/sh" > $@
+	echo 'exec jdb -classpath "classes:../libaltos:$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="../libaltos/.libs" altosui/AltosUI "$$@"' >> $@
 	chmod +x $@
 
 libaltos.so:
@@ -194,6 +211,14 @@ $(FREETTS_CLASS):
 	-rm -f "$@"
 	$(LN_S) "$(FREETTS)"/"$@" .
 
+$(JFREECHART_CLASS):
+	-rm -f "$@"
+	$(LN_S) "$(JFREECHART)"/"$@" .
+
+$(JCOMMON_CLASS):
+	-rm -f "$@"
+	$(LN_S) "$(JCOMMON)"/"$@" .
+
 $(LINUX_DIST): $(LINUX_FILES) $(LINUX_EXTRA)
 	-rm -f $@
 	-rm -rf linux
@@ -211,6 +236,7 @@ $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA)
 	mkdir -p macosx/AltOS macosx/AltosUI.app/Contents/Resources/Java
 	cp -p $(FATJAR) macosx/AltosUI.app/Contents/Resources/Java/altosui.jar
 	cp -p $(FREETTS_CLASS) libaltos.dylib macosx/AltosUI.app/Contents/Resources/Java
+	cp -p $(JFREECHART_CLASS) libaltos.dylib macosx/AltosUI.app/Contents/Resources/Java
 	cp -p $(MACOSX_EXTRA) macosx/AltOS
 	cd macosx && zip -r ../$@ AltosUI.app AltOS