projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into micropeak-logging
[fw/altos]
/
altosui
/
Makefile.am
diff --git
a/altosui/Makefile.am
b/altosui/Makefile.am
index 19db66980cb8f2f8a94665e0133936325c1882c0..a42426cdef0a1e3ab1542923a4c2a613f6928be2 100644
(file)
--- a/
altosui/Makefile.am
+++ b/
altosui/Makefile.am
@@
-1,4
+1,4
@@
-SUBDIRS=libaltos
+
JAVAROOT=classes
AM_JAVACFLAGS=-encoding UTF-8 -Xlint:deprecation
JAVAROOT=classes
AM_JAVACFLAGS=-encoding UTF-8 -Xlint:deprecation
@@
-6,7
+6,7
@@
man_MANS=altosui.1
altoslibdir=$(libdir)/altos
altoslibdir=$(libdir)/altos
-CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../altoslib/*:
libaltos:$(FREETTS)/*:/usr/share/java/*
"
+CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../altoslib/*:
../libaltos:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar:$(FREETTS)/freetts.jar
"
bin_SCRIPTS=altosui
bin_SCRIPTS=altosui
@@
-24,6
+24,7
@@
altosui_JAVA = \
AltosConfig.java \
AltosConfigFreqUI.java \
AltosConfigUI.java \
AltosConfig.java \
AltosConfigFreqUI.java \
AltosConfigUI.java \
+ AltosConfigPyroUI.java \
AltosConfigureUI.java \
AltosConfigTD.java \
AltosConfigTDUI.java \
AltosConfigureUI.java \
AltosConfigTD.java \
AltosConfigTDUI.java \
@@
-65,6
+66,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 \
@@
-119,14
+121,25
@@
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
@@
-216,70
+229,70
@@
install-altosuiJAVA: altosui.jar
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) \
-C classes altosui \
jar cfm $@ Manifest.txt \
$(ICONJAR) \
-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) \
-C classes altosui \
jar cfm $@ Manifest-fat.txt \
$(ICONJAR) \
-C classes altosui \
- -C libaltos libaltosJNI
+ -C
../
libaltos libaltosJNI
Manifest.txt: Makefile
echo 'Main-Class: altosui.AltosUI' > $@
Manifest.txt: Makefile
echo 'Main-Class: altosui.AltosUI' > $@
- echo "Class-Path: AltosLib.jar $(FREETTS)/freetts.jar $(J
FREECHART)/jfreechart.jar $(JCOMMON)/jcommon
.jar" >> $@
+ echo "Class-Path: AltosLib.jar $(FREETTS)/freetts.jar $(J
COMMON)/jcommon.jar $(JFREECHART)/jfreechart
.jar" >> $@
Manifest-fat.txt:
echo 'Main-Class: altosui.AltosUI' > $@
Manifest-fat.txt:
echo 'Main-Class: altosui.AltosUI' > $@
- echo "Class-Path: AltosLib.jar freetts.jar j
freechart.jar jcommon
.jar" >> $@
+ 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 "./*:
../libaltos:$(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
-rm -f "$@"
chmod +x $@
libaltos.so: build-libaltos
-rm -f "$@"
- $(LN_S) libaltos/.libs/"$@" .
+ $(LN_S)
../
libaltos/.libs/"$@" .
libaltos.dylib:
-rm -f "$@"
libaltos.dylib:
-rm -f "$@"
- $(LN_S) libaltos/"$@" .
+ $(LN_S)
../
libaltos/"$@" .
-altos.dll: libaltos/altos.dll
+altos.dll:
../
libaltos/altos.dll
-rm -f "$@"
-rm -f "$@"
- $(LN_S) libaltos/"$@" .
+ $(LN_S)
../
libaltos/"$@" .
-altos64.dll: libaltos/altos64.dll
+altos64.dll:
../
libaltos/altos64.dll
-rm -f "$@"
-rm -f "$@"
- $(LN_S) libaltos/"$@" .
+ $(LN_S)
../
libaltos/"$@" .
-libaltos/.libs/libaltos.so: build-libaltos
+
../
libaltos/.libs/libaltos.so: build-libaltos
-libaltos/altos.dll: build-altos-dll
+
../
libaltos/altos.dll: build-altos-dll
-libaltos/altos64.dll: build-altos64-dll
+
../
libaltos/altos64.dll: build-altos64-dll
build-libaltos:
build-libaltos:
- +cd libaltos && make libaltos.la
+ +cd
../
libaltos && make libaltos.la
build-altos-dll:
build-altos-dll:
- +cd libaltos && make altos.dll
+ +cd
../
libaltos && make altos.dll
build-altos64-dll:
build-altos64-dll:
- +cd libaltos && make altos64.dll
+ +cd
../
libaltos && make altos64.dll
$(ALTOSLIB_CLASS):
-rm -f "$@"
$(ALTOSLIB_CLASS):
-rm -f "$@"
@@
-326,5
+339,3
@@
$(WINDOWS_DIST): $(WINDOWS_FILES) altos-windows.nsi
-rm -f $@
makensis -Oaltos-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" altos-windows.nsi
-rm -f $@
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