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

diff --git a/ao-tools/altosui/Makefile.am b/ao-tools/altosui/Makefile.am
index 58c1517f..fc532863 100644
--- a/ao-tools/altosui/Makefile.am
+++ b/ao-tools/altosui/Makefile.am
@@ -10,6 +10,7 @@ CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../libaltos:$(FREETTS)/
 bin_SCRIPTS=altosui
 
 altosui_JAVA = \
+	AltosAscent.java \
 	AltosChannelMenu.java \
 	AltosConfig.java \
 	AltosConfigUI.java \
@@ -18,6 +19,7 @@ altosui_JAVA = \
 	AltosCSV.java \
 	AltosCSVUI.java \
 	AltosDebug.java \
+	AltosDescent.java \
 	AltosDeviceDialog.java \
 	AltosDevice.java \
 	AltosDisplayThread.java \
@@ -28,27 +30,36 @@ altosui_JAVA = \
 	AltosFile.java \
 	AltosFlash.java \
 	AltosFlashUI.java \
+	AltosFlightDisplay.java \
 	AltosFlightInfoTableModel.java \
+	AltosFlightReader.java \
 	AltosFlightStatusTableModel.java \
+	AltosFlightUI.java \
 	AltosGPS.java \
 	AltosGreatCircle.java \
 	AltosHexfile.java \
 	Altos.java \
 	AltosInfoTable.java \
 	AltosKML.java \
+	AltosLanded.java \
+	AltosLed.java \
+	AltosLights.java \
 	AltosLine.java \
 	AltosLogfileChooser.java \
 	AltosLog.java \
+	AltosPad.java \
 	AltosParse.java \
 	AltosPreferences.java \
 	AltosReader.java \
 	AltosRecord.java \
 	AltosRecordIterable.java \
-	AltosReplayThread.java \
+	AltosTelemetryReader.java \
+	AltosReplayReader.java \
 	AltosRomconfig.java \
 	AltosRomconfigUI.java \
 	AltosSerial.java \
 	AltosSerialMonitor.java \
+	AltosSiteMap.java \
 	AltosState.java \
 	AltosStatusTable.java \
 	AltosTelemetry.java \
@@ -64,9 +75,10 @@ altosui_JAVA = \
 	AltosVoice.java
 
 JFREECHART_CLASS= \
-    jfreechart.jar \
-    jcommon.jar \
-    csv.jar
+    jfreechart.jar
+
+JCOMMON_CLASS=\
+    jcommon.jar
 
 FREETTS_CLASS= \
 	cmudict04.jar \
@@ -87,8 +99,21 @@ JAR=altosui.jar
 FATJAR=altosui-fat.jar
 
 # Icons
-JAVA_ICON=$(top_srcdir)/icon/altus-metrum-16x16.jpg
-WINDOWS_ICON=$(top_srcdir)/icon/altus-metrum.ico
+ICONDIR=$(top_srcdir)/icon
+
+JAVA_ICON=$(ICONDIR)/altus-metrum-16x16.jpg
+
+ICONS=	$(ICONDIR)/redled.png $(ICONDIR)/redoff.png \
+	$(ICONDIR)/greenled.png $(ICONDIR)/greenoff.png \
+	$(ICONDIR)/grayled.png $(ICONDIR)/grayoff.png
+
+# icon base names for jar
+ICONJAR= -C $(ICONDIR) altus-metrum-16x16.jpg \
+	-C $(ICONDIR) redled.png -C $(ICONDIR) redoff.png \
+	-C $(ICONDIR) greenled.png -C $(ICONDIR) greenoff.png \
+	-C $(ICONDIR) grayon.png -C $(ICONDIR) grayled.png
+
+WINDOWS_ICON=$(ICONDIR)/altus-metrum.ico
 
 # Firmware
 FIRMWARE_TD=$(top_srcdir)/src/teledongle-v0.2-$(VERSION).ihx
@@ -100,7 +125,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
@@ -115,7 +140,7 @@ 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 \
+		$(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log \
 		altosui altosui-test altosui-jdb macosx linux
 
 if FATINSTALL
@@ -158,37 +183,37 @@ classes/altosui:
 
 $(JAR): classaltosui.stamp Manifest.txt $(JAVA_ICON)
 	jar cfm $@ Manifest.txt \
-		-C $(top_srcdir)/icon altus-metrum-16x16.jpg \
+		$(ICONJAR) \
 		-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 \
+		$(ICONJAR) \
 		-C classes altosui \
 		-C ../libaltos libaltosJNI
 
 Manifest.txt: Makefile
 	echo 'Main-Class: altosui.AltosUI' > $@
-	echo "Class-Path: $(FREETTS)/freetts.jar $(FREETTS)/jfreechart.jar $(FREETTS)/jcommon.jar $(FREETTS)/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)/*" -Djava.library.path="../libaltos/.libs" altosui/AltosUI "$$@"' >> $@
+	echo 'exec jdb -classpath "classes:../libaltos:$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="../libaltos/.libs" altosui/AltosUI "$$@"' >> $@
 	chmod +x $@
 
 libaltos.so:
@@ -207,6 +232,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
@@ -224,6 +257,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