projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
micropeak: Watch serial data during download
[fw/altos]
/
micropeak
/
Makefile.am
diff --git
a/micropeak/Makefile.am
b/micropeak/Makefile.am
index d221de38ba05ec1c3d0e59a1f08a45e079a1f36e..1a614cbdcac694719d9678d284572ecc2cb24e10 100644
(file)
--- a/
micropeak/Makefile.am
+++ b/
micropeak/Makefile.am
@@
-1,5
+1,7
@@
JAVAROOT=classes
JAVAROOT=classes
-AM_JAVACFLAGS=-encoding UTF-8 -Xlint:deprecation
+AM_JAVACFLAGS=-target 1.6 -encoding UTF-8 -Xlint:deprecation -source 6
+
+man_MANS=micropeak.1
altoslibdir=$(libdir)/altos
altoslibdir=$(libdir)/altos
@@
-21,6
+23,7
@@
micropeak_JAVA= \
MicroRaw.java \
MicroSave.java \
MicroSerial.java \
MicroRaw.java \
MicroSave.java \
MicroSerial.java \
+ MicroSerialLog.java \
MicroStats.java \
MicroStatsTable.java \
MicroFileChooser.java \
MicroStats.java \
MicroStatsTable.java \
MicroFileChooser.java \
@@
-44,10
+47,10
@@
LIBALTOS= \
altos.dll
ALTOSLIB_CLASS=\
altos.dll
ALTOSLIB_CLASS=\
-
AltosLib
.jar
+
altoslib_$(ALTOSLIB_VERSION)
.jar
ALTOSUILIB_CLASS=\
ALTOSUILIB_CLASS=\
- altosuilib.jar
+ altosuilib
_$(ALTOSUILIB_VERSION)
.jar
# Icons
ICONDIR=$(top_srcdir)/icon
# Icons
ICONDIR=$(top_srcdir)/icon
@@
-78,7
+81,8
@@
clean-local:
$(ALTOSLIB_CLASS) \
$(ALTOSUILIB_CLASS) \
$(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt \
$(ALTOSLIB_CLASS) \
$(ALTOSUILIB_CLASS) \
$(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt \
- micropeak micropeak-test micropeak-jdb macosx linux windows micropeak-windows.log
+ micropeak micropeak-test micropeak-jdb macosx linux windows micropeak-windows.log \
+ micropeak-windows.nsi
LINUX_DIST=MicroPeak-Linux-$(VERSION).tar.bz2
MACOSX_DIST=MicroPeak-Mac-$(VERSION).dmg
LINUX_DIST=MicroPeak-Linux-$(VERSION).tar.bz2
MACOSX_DIST=MicroPeak-Mac-$(VERSION).dmg