projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
micropeak: Use altosuilib
[fw/altos]
/
micropeak
/
Makefile.am
diff --git
a/micropeak/Makefile.am
b/micropeak/Makefile.am
index 2cfd2ad3ff05b063a6af1ba5f3d3ca340f759a72..fde981a6c6bbe975f111388684feb6725736e4a5 100644
(file)
--- a/
micropeak/Makefile.am
+++ b/
micropeak/Makefile.am
@@
-1,7
+1,7
@@
JAVAROOT=classes
AM_JAVACFLAGS=-encoding UTF-8 -Xlint:deprecation
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
bin_SCRIPTS=micropeak
@@
-14,10
+14,6
@@
micropeak_JAVA= \
MicroGraph.java \
MicroSerial.java \
MicroFileChooser.java \
MicroGraph.java \
MicroSerial.java \
MicroFileChooser.java \
- MicroPreferences.java \
- MicroPreferencesBackend.java \
- MicroFontListener.java \
- MicroUIListener.java \
MicroUSB.java
JFREECHART_CLASS= \
MicroUSB.java
JFREECHART_CLASS= \
@@
-38,6
+34,9
@@
LIBALTOS= \
ALTOSLIB_CLASS=\
AltosLib.jar
ALTOSLIB_CLASS=\
AltosLib.jar
+ALTOSUILIB_CLASS=\
+ AltosUILib.jar
+
# Icons
ICONDIR=$(top_srcdir)/icon
# Icons
ICONDIR=$(top_srcdir)/icon
@@
-62,6
+61,7
@@
all-local: micropeak-test $(JAR)
clean-local:
-rm -rf classes $(JAR) $(FATJAR) \
$(ALTOSLIB_CLASS) \
clean-local:
-rm -rf classes $(JAR) $(FATJAR) \
$(ALTOSLIB_CLASS) \
+ $(ALTOSUILIB_CLASS) \
$(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt \
micropeak micropeak-test macosx linux windows
$(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt \
micropeak micropeak-test macosx linux windows
@@
-75,13
+75,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 $@
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
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 \
jar cfm $@ Manifest-fat.txt \
$(ICONJAR) \
-C classes org \
@@
-122,6
+122,10
@@
$(ALTOSLIB_CLASS):
-rm -f "$@"
$(LN_S) ../altoslib/"$@" .
-rm -f "$@"
$(LN_S) ../altoslib/"$@" .
+$(ALTOSUILIB_CLASS):
+ -rm -f "$@"
+ $(LN_S) ../altosuilib/"$@" .
+
$(JFREECHART_CLASS):
-rm -f "$@"
$(LN_S) "$(JFREECHART)"/"$@" .
$(JFREECHART_CLASS):
-rm -f "$@"
$(LN_S) "$(JFREECHART)"/"$@" .
@@
-132,9
+136,9
@@
$(JCOMMON_CLASS):
Manifest.txt: Makefile
echo 'Main-Class: org.altusmetrum.micropeak.MicroPeak' > $@
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' > $@
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" >> $@