X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FMakefile.am;h=7510c88aeaf296161502c23cf5b41c75fc0eedef;hp=7070af22e7fda87a0786a7e5d818b08a793f266a;hb=ce7f59fbfb5a94a67a4ceced3cc371b4c6b6e5d1;hpb=c89a34d1eb25155405b0036baeadc7bbfeade1c2 diff --git a/ao-tools/altosui/Makefile.am b/ao-tools/altosui/Makefile.am index 7070af22..7510c88a 100644 --- a/ao-tools/altosui/Makefile.am +++ b/ao-tools/altosui/Makefile.am @@ -53,8 +53,20 @@ altosui_JAVA = \ AltosTelemetry.java \ AltosTelemetryIterable.java \ AltosUI.java \ + AltosDataPointReader.java \ + AltosCsvReader.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 \ @@ -87,7 +99,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 @@ -102,7 +114,7 @@ all-local: classes/altosui $(JAR) altosui altosui-test 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 if FATINSTALL @@ -149,7 +161,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 \ @@ -157,11 +169,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" > $@