micropeak: Add flight stats pane

[fw/altos] / micropeak / Makefile.am

diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am
index a3ecac7288b1173e5e8acec5ce0a4087f9a6bf14..e0de690c05270beb0453c60f0fd0be62758bd49d 100644 (file)
--- a/micropeak/Makefile.am
+++ b/micropeak/Makefile.am
@@ -1,7 +1,7 @@
 JAVAROOT=classes
 AM_JAVACFLAGS=-encoding UTF-8 -Xlint:deprecation
 
-CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../altoslib/*:../libaltos:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar"
+CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../altoslib/*:../altosuilib/*:../libaltos:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar"
 
 bin_SCRIPTS=micropeak
 
@@ -10,8 +10,12 @@ micropeakdir=$(datadir)/java
 micropeak_JAVA= \
        MicroPeak.java \
        MicroData.java \
+       MicroFrame.java \
        MicroGraph.java \
        MicroSerial.java \
+       MicroStats.java \
+       MicroStatsTable.java \
+       MicroFileChooser.java \
        MicroUSB.java
 
 JFREECHART_CLASS= \
@@ -32,11 +36,34 @@ LIBALTOS= \
 ALTOSLIB_CLASS=\
        AltosLib.jar
 
+ALTOSUILIB_CLASS=\
+       AltosUILib.jar
+
+# Icons
+ICONDIR=$(top_srcdir)/icon
+
+JAVA_ICONS=\
+       $(ICONDIR)/micropeak-16.png \
+       $(ICONDIR)/micropeak-32.png \
+       $(ICONDIR)/micropeak-48.png \
+       $(ICONDIR)/micropeak-64.png \
+       $(ICONDIR)/micropeak-128.png \
+       $(ICONDIR)/micropeak-256.png
+
+# icon base names for jar
+ICONJAR= -C $(ICONDIR) micropeak-16.png \
+       -C $(ICONDIR) micropeak-32.png \
+       -C $(ICONDIR) micropeak-48.png \
+       -C $(ICONDIR) micropeak-64.png \
+       -C $(ICONDIR) micropeak-128.png \
+       -C $(ICONDIR) micropeak-256.png
+
 all-local: micropeak-test $(JAR)
 
 clean-local:
        -rm -rf classes $(JAR) $(FATJAR) \
                $(ALTOSLIB_CLASS) \
+               $(ALTOSUILIB_CLASS) \
                $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt \
                micropeak micropeak-test macosx linux windows
 
@@ -50,13 +77,13 @@ micropeak-test: Makefile
        echo 'exec java -cp "./*:../libaltos/*:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar" -Djava.library.path="../libaltos/.libs" -jar micropeak.jar "$$@"' >> $@
        chmod +x $@
 
-$(JAR): classmicropeak.stamp Manifest.txt $(JAVA_ICONS) $(ALTOSLIB_CLASS)
+$(JAR): classmicropeak.stamp Manifest.txt $(JAVA_ICONS) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS)
        jar cfm $@ Manifest.txt \
                $(ICONJAR) \
                -C classes org \
                -C ../libaltos libaltosJNI
 
-$(FATJAR): classmicropeak.stamp Manifest-fat.txt $(ALTOSLIB_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(JAVA_ICONS)
+$(FATJAR): classmicropeak.stamp Manifest-fat.txt $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(JAVA_ICONS)
        jar cfm $@ Manifest-fat.txt \
                $(ICONJAR) \
                -C classes org \
@@ -97,6 +124,10 @@ $(ALTOSLIB_CLASS):
        -rm -f "$@"
        $(LN_S) ../altoslib/"$@" .
 
+$(ALTOSUILIB_CLASS):
+       -rm -f "$@"
+       $(LN_S) ../altosuilib/"$@" .
+
 $(JFREECHART_CLASS):
        -rm -f "$@"
        $(LN_S) "$(JFREECHART)"/"$@" .
@@ -107,9 +138,9 @@ $(JCOMMON_CLASS):
 
 Manifest.txt: Makefile
        echo 'Main-Class: org.altusmetrum.micropeak.MicroPeak' > $@
-       echo "Class-Path: AltosLib.jar $(JCOMMON)/jcommon.jar $(JFREECHART)/jfreechart.jar" >> $@
+       echo "Class-Path: AltosLib.jar AltosUILib.jar $(JCOMMON)/jcommon.jar $(JFREECHART)/jfreechart.jar" >> $@
 
 Manifest-fat.txt:
        echo 'Main-Class: org.altusmetrum.micropeak.MicroPeak' > $@
-       echo "Class-Path: AltosLib.jar jcommon.jar jfreechart.jar" >> $@
+       echo "Class-Path: AltosLib.jar AltosUILib.jar jcommon.jar jfreechart.jar" >> $@