projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/telelco: Make the RSSI led turn red when no packet is received
[fw/altos]
/
altosui
/
Makefile.am
diff --git
a/altosui/Makefile.am
b/altosui/Makefile.am
index aca2e8fceef936967e045004a31d412ee2f652d9..9f03ceb6b5cdec3250110c6318772e77f22b9921 100644
(file)
--- a/
altosui/Makefile.am
+++ b/
altosui/Makefile.am
@@
-6,9
+6,7
@@
man_MANS=altosui.1
altoslibdir=$(libdir)/altos
altoslibdir=$(libdir)/altos
-# tmarble: attempt to use specific build deps
-# CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../altoslib/*:libaltos:$(FREETTS)/*:/usr/share/java/*"
-CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../altoslib/*:libaltos:/usr/share/java/jcommon.jar:/usr/share/java/jfreechart.jar:/usr/share/java/freetts.jar"
+CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../altoslib/*:libaltos:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar:$(FREETTS)/freetts.jar"
bin_SCRIPTS=altosui
bin_SCRIPTS=altosui
@@
-67,6
+65,7
@@
altosui_JAVA = \
AltosLights.java \
AltosPad.java \
AltosUIPreferences.java \
AltosLights.java \
AltosPad.java \
AltosUIPreferences.java \
+ AltosUIPreferencesBackend.java \
AltosRomconfig.java \
AltosRomconfigUI.java \
AltosScanUI.java \
AltosRomconfig.java \
AltosRomconfigUI.java \
AltosScanUI.java \
@@
-114,21
+113,32
@@
LIBALTOS= \
libaltos.dylib \
altos.dll
libaltos.dylib \
altos.dll
-JAR=
AltosUI
.jar
+JAR=
altosui
.jar
-FATJAR=
AltosUI
-fat.jar
+FATJAR=
altosui
-fat.jar
# Icons
ICONDIR=$(top_srcdir)/icon
# Icons
ICONDIR=$(top_srcdir)/icon
-JAVA_ICON=$(ICONDIR)/altus-metrum-16x16.jpg
+JAVA_ICONS=\
+ $(ICONDIR)/altus-metrum-16.png \
+ $(ICONDIR)/altus-metrum-32.png \
+ $(ICONDIR)/altus-metrum-48.png \
+ $(ICONDIR)/altus-metrum-64.png \
+ $(ICONDIR)/altus-metrum-128.png \
+ $(ICONDIR)/altus-metrum-256.png
ICONS= $(ICONDIR)/redled.png $(ICONDIR)/redoff.png \
$(ICONDIR)/greenled.png $(ICONDIR)/greenoff.png \
$(ICONDIR)/grayled.png $(ICONDIR)/grayoff.png
# icon base names for jar
ICONS= $(ICONDIR)/redled.png $(ICONDIR)/redoff.png \
$(ICONDIR)/greenled.png $(ICONDIR)/greenoff.png \
$(ICONDIR)/grayled.png $(ICONDIR)/grayoff.png
# icon base names for jar
-ICONJAR= -C $(ICONDIR) altus-metrum-16x16.jpg \
+ICONJAR= -C $(ICONDIR) altus-metrum-16.png \
+ -C $(ICONDIR) altus-metrum-32.png \
+ -C $(ICONDIR) altus-metrum-48.png \
+ -C $(ICONDIR) altus-metrum-64.png \
+ -C $(ICONDIR) altus-metrum-128.png \
+ -C $(ICONDIR) altus-metrum-256.png \
-C $(ICONDIR) redled.png -C $(ICONDIR) redoff.png \
-C $(ICONDIR) greenled.png -C $(ICONDIR) greenoff.png \
-C $(ICONDIR) grayon.png -C $(ICONDIR) grayled.png
-C $(ICONDIR) redled.png -C $(ICONDIR) redoff.png \
-C $(ICONDIR) greenled.png -C $(ICONDIR) greenoff.png \
-C $(ICONDIR) grayon.png -C $(ICONDIR) grayled.png
@@
-172,7
+182,7
@@
MACOSX_EXTRA=$(FIRMWARE)
WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON)
WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON)
-all-local: classes/
AltosUI
$(JAR) altosui altosui-test altosui-jdb
+all-local: classes/
altosui
$(JAR) altosui altosui-test altosui-jdb
clean-local:
-rm -rf classes $(JAR) $(FATJAR) \
clean-local:
-rm -rf classes $(JAR) $(FATJAR) \
@@
-209,48
+219,48
@@
endif
altosuidir=$(datadir)/java
altosuidir=$(datadir)/java
-install-altosuiJAVA:
AltosUI
.jar
+install-altosuiJAVA:
altosui
.jar
@$(NORMAL_INSTALL)
test -z "$(altosuidir)" || $(MKDIR_P) "$(DESTDIR)$(altosuidir)"
@$(NORMAL_INSTALL)
test -z "$(altosuidir)" || $(MKDIR_P) "$(DESTDIR)$(altosuidir)"
- echo " $(INSTALL_DATA)" "$<" "'$(DESTDIR)$(altosuidir)/
AltosUI
.jar'"; \
+ echo " $(INSTALL_DATA)" "$<" "'$(DESTDIR)$(altosuidir)/
altosui
.jar'"; \
$(INSTALL_DATA) "$<" "$(DESTDIR)$(altosuidir)"
$(INSTALL_DATA) "$<" "$(DESTDIR)$(altosuidir)"
-classes/
AltosUI
:
- mkdir -p classes/
AltosUI
+classes/
altosui
:
+ mkdir -p classes/
altosui
-$(JAR): classaltosui.stamp Manifest.txt $(JAVA_ICON) $(ALTOSLIB_CLASS)
+$(JAR): classaltosui.stamp Manifest.txt $(JAVA_ICON
S
) $(ALTOSLIB_CLASS)
jar cfm $@ Manifest.txt \
$(ICONJAR) \
jar cfm $@ Manifest.txt \
$(ICONJAR) \
- -C classes
AltosUI
\
+ -C classes
altosui
\
-C libaltos libaltosJNI
-C libaltos libaltosJNI
-$(FATJAR): classaltosui.stamp Manifest-fat.txt $(ALTOSLIB_CLASS) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) $(JAVA_ICON)
+$(FATJAR): classaltosui.stamp Manifest-fat.txt $(ALTOSLIB_CLASS) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) $(JAVA_ICON
S
)
jar cfm $@ Manifest-fat.txt \
$(ICONJAR) \
jar cfm $@ Manifest-fat.txt \
$(ICONJAR) \
- -C classes
AltosUI
\
+ -C classes
altosui
\
-C libaltos libaltosJNI
Manifest.txt: Makefile
-C libaltos libaltosJNI
Manifest.txt: Makefile
- echo 'Main-Class:
AltosUI
.AltosUI' > $@
- echo "Class-Path: AltosLib.jar $(FREETTS)/freetts.jar $(J
FREECHART)/jfreechart.jar $(JCOMMON)/jcommon
.jar" >> $@
+ echo 'Main-Class:
altosui
.AltosUI' > $@
+ echo "Class-Path: AltosLib.jar $(FREETTS)/freetts.jar $(J
COMMON)/jcommon.jar $(JFREECHART)/jfreechart
.jar" >> $@
Manifest-fat.txt:
Manifest-fat.txt:
- echo 'Main-Class:
AltosUI
.AltosUI' > $@
- echo "Class-Path: AltosLib.jar freetts.jar j
freechart.jar jcommon
.jar" >> $@
+ echo 'Main-Class:
altosui
.AltosUI' > $@
+ echo "Class-Path: AltosLib.jar freetts.jar j
common.jar jfreechart
.jar" >> $@
altosui: Makefile
echo "#!/bin/sh" > $@
altosui: Makefile
echo "#!/bin/sh" > $@
- echo 'exec java -cp "$(FREETTS)/
*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="$(altoslibdir)" -jar "$(altosuidir)/AltosUI
.jar" "$$@"' >> $@
+ echo 'exec java -cp "$(FREETTS)/
freetts.jar:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar" -Djava.library.path="$(altoslibdir)" -jar "$(altosuidir)/altosui
.jar" "$$@"' >> $@
chmod +x $@
altosui-test: Makefile
echo "#!/bin/sh" > $@
chmod +x $@
altosui-test: Makefile
echo "#!/bin/sh" > $@
- echo 'exec java -cp "./*:$(FREETTS)/
*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="libaltos/.libs" -jar AltosUI
.jar "$$@"' >> $@
+ echo 'exec java -cp "./*:$(FREETTS)/
freetts.jar:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar" -Djava.library.path="libaltos/.libs" -jar altosui
.jar "$$@"' >> $@
chmod +x $@
altosui-jdb: Makefile
echo "#!/bin/sh" > $@
chmod +x $@
altosui-jdb: Makefile
echo "#!/bin/sh" > $@
- echo 'exec jdb -classpath "classes:libaltos:$(FREETTS)/
*:$(JFREECHART)/*:$(JCOMMON)/*
" -Djava.library.path="libaltos/.libs" altosui/AltosUI "$$@"' >> $@
+ echo 'exec jdb -classpath "classes:libaltos:$(FREETTS)/
freetts.jar:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar
" -Djava.library.path="libaltos/.libs" altosui/AltosUI "$$@"' >> $@
chmod +x $@
libaltos.so: build-libaltos
chmod +x $@
libaltos.so: build-libaltos
@@
-329,4
+339,4
@@
$(WINDOWS_DIST): $(WINDOWS_FILES) altos-windows.nsi
makensis -Oaltos-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" altos-windows.nsi
publish:
makensis -Oaltos-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" altos-windows.nsi
publish:
- scp launch-sites.txt gag.com:public_html
\ No newline at end of file
+ scp launch-sites.txt gag.com:public_html