telegps: Add graph display

[fw/altos] / telegps / Makefile.am

diff --git a/telegps/Makefile.am b/telegps/Makefile.am
index 9091aaae9da0420fbfc631f73d3d17b21eeb2786..87d8a66ae9dc70ba46fb47b1088a4f0182c3e26b 100644 (file)
--- a/telegps/Makefile.am
+++ b/telegps/Makefile.am
@@ -5,7 +5,7 @@ man_MANS=telegps.1
 
 altoslibdir=$(libdir)/altos
 
-CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../altoslib/*:../altosuilib/*:../libaltos:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar $(FREETTS)/freetts.jar"
+CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../altoslib/*:../altosuilib/*:../libaltos:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar:$(FREETTS)/freetts.jar"
 
 bin_SCRIPTS=telegps
 
@@ -14,7 +14,12 @@ telegpsdir=$(datadir)/java
 telegps_JAVA= \
        TeleGPS.java \
        TeleGPSStatus.java \
-       TeleGPSStatusUpdate.java
+       TeleGPSStatusUpdate.java \
+       TeleGPSInfo.java \
+       TeleGPSConfig.java \
+       TeleGPSConfigUI.java \
+       TeleGPSPreferences.java \
+       TeleGPSGraphUI.java
 
 JFREECHART_CLASS= \
     jfreechart.jar
@@ -72,10 +77,13 @@ WINDOWS_ICON=$(ICONDIR)/telegps.ico
 FIRMWARE_TD_0_2=$(top_srcdir)/src/teledongle-v0.2/teledongle-v0.2-$(VERSION).ihx
 FIRMWARE_TD=$(FIRMWARE_TD_0_2)
 
-FIRMWARE_TG_1_0=$(top_srcdir)/src/telegps-v1.0/telegps-v1.0-$(VERSION).ihx
-FIRMWARE_TG=$(FIRMWARE_TG_1_0)
+FIRMWARE_TBT_1_0=$(top_srcdir)/src/telebt-v1.0/telebt-v1.0-$(VERSION).ihx
+FIRMWARE_TBT=$(FIRMWARE_TBT_1_0)
 
-FIRMWARE=$(FIRMWARE_TG)
+#FIRMWARE_TG_1_0=$(top_srcdir)/src/telegps-v1.0/telegps-v1.0-$(VERSION).ihx
+#FIRMWARE_TG=$(FIRMWARE_TG_1_0)
+
+FIRMWARE=$(FIRMWARE_TG) $(FIRMWARE_TD) $(FIRMWARE_TBT)
 
 desktopdir = $(datadir)/applications
 desktop_file = telegps.desktop
@@ -256,7 +264,7 @@ $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA) Makefile
        cp -a $(MACOSX_README) macosx/ReadMe.rtf
        cp -a $(DOC) macosx
        cp -p Info.plist macosx/TeleGPS.app/Contents
-       mkdir -p macosx/TeleGPS.app/Contents/Resources/Java
+       mkdir -p macosx/AltOS-$(VERSION) macosx/TeleGPS.app/Contents/Resources/Java
        cp -p $(FATJAR) macosx/TeleGPS.app/Contents/Resources/Java/telegps.jar
        cp -p libaltos.dylib macosx/TeleGPS.app/Contents/Resources/Java
        cp -p $(ALTOSLIB_CLASS) macosx/TeleGPS.app/Contents/Resources/Java