projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
micropeak: Make statistics entries un-editable
[fw/altos]
/
telegps
/
Makefile.am
diff --git
a/telegps/Makefile.am
b/telegps/Makefile.am
index f140512dd86a125c6efb1d6a10a21880b5a145fd..b64397c82292d21dd53918a1fd8a3ae23ed9ecda 100644
(file)
--- a/
telegps/Makefile.am
+++ b/
telegps/Makefile.am
@@
-16,10
+16,12
@@
telegps_JAVA= \
TeleGPSStatus.java \
TeleGPSStatusUpdate.java \
TeleGPSInfo.java \
TeleGPSStatus.java \
TeleGPSStatusUpdate.java \
TeleGPSInfo.java \
+ TeleGPSState.java \
TeleGPSConfig.java \
TeleGPSConfigUI.java \
TeleGPSPreferences.java \
TeleGPSConfig.java \
TeleGPSConfigUI.java \
TeleGPSPreferences.java \
- TeleGPSGraphUI.java
+ TeleGPSGraphUI.java \
+ TeleGPSDisplayThread.java
JFREECHART_CLASS= \
jfreechart.jar
JFREECHART_CLASS= \
jfreechart.jar
@@
-80,8
+82,8
@@
FIRMWARE_TD=$(FIRMWARE_TD_0_2)
FIRMWARE_TBT_1_0=$(top_srcdir)/src/telebt-v1.0/telebt-v1.0-$(VERSION).ihx
FIRMWARE_TBT=$(FIRMWARE_TBT_1_0)
FIRMWARE_TBT_1_0=$(top_srcdir)/src/telebt-v1.0/telebt-v1.0-$(VERSION).ihx
FIRMWARE_TBT=$(FIRMWARE_TBT_1_0)
-
#
FIRMWARE_TG_1_0=$(top_srcdir)/src/telegps-v1.0/telegps-v1.0-$(VERSION).ihx
-
#
FIRMWARE_TG=$(FIRMWARE_TG_1_0)
+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)
FIRMWARE=$(FIRMWARE_TG) $(FIRMWARE_TD) $(FIRMWARE_TBT)
@@
-277,7
+279,7
@@
$(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA) Makefile
$(WINDOWS_DIST): $(WINDOWS_FILES) telegps-windows.nsi
-rm -f $@
$(WINDOWS_DIST): $(WINDOWS_FILES) telegps-windows.nsi
-rm -f $@
- makensis -Otelegps-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" telegps-windows.nsi ||
cat telegps-windows.log && exit 1
+ makensis -Otelegps-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" telegps-windows.nsi ||
(cat telegps-windows.log && exit 1)
Manifest.txt: Makefile
echo 'Main-Class: org.altusmetrum.telegps.TeleGPS' > $@
Manifest.txt: Makefile
echo 'Main-Class: org.altusmetrum.telegps.TeleGPS' > $@