projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Store libaltos.so in $(libdir)/altos
[fw/altos]
/
ao-tools
/
altosui
/
Makefile.am
diff --git
a/ao-tools/altosui/Makefile.am
b/ao-tools/altosui/Makefile.am
index dd4b31e64778c9ddb49e03da97eca941c70d9ed6..804e0c740cf4b6d909cfd118e3cb0f99fad4f10d 100644
(file)
--- a/
ao-tools/altosui/Makefile.am
+++ b/
ao-tools/altosui/Makefile.am
@@
-1,7
+1,9
@@
JAVAROOT=classes
AM_JAVACFLAGS=-encoding UTF-8
JAVAROOT=classes
AM_JAVACFLAGS=-encoding UTF-8
-CLASSPATH_ENV=CLASSPATH=".:classes:../libaltos:$(FREETTS)/*:/usr/share/java/*"
+altoslibdir=$(libdir)/altos
+
+CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../libaltos:$(FREETTS)/*:/usr/share/java/*"
bin_SCRIPTS=altosui
bin_SCRIPTS=altosui
@@
-88,11
+90,11
@@
MACOSX_EXTRA=$(FIRMWARE)
WINDOWS_FILES=$(FAT_FILES) altos.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON)
WINDOWS_FILES=$(FAT_FILES) altos.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON)
-all-local: classes/altosui $(JAR)
$(FATJAR)
altosui altosui-test
+all-local: classes/altosui $(JAR) altosui altosui-test
clean-local:
clean-local:
- -rm -rf classes
/altosui
$(JAR) $(FATJAR) \
- $(LINUX_DIST) $(MACOSX_DIST) $(WINDOWS_DIST) $(FREETTS_CLASS) \
+ -rm -rf classes $(JAR) $(FATJAR) \
+ $(LINUX_DIST) $(MACOSX_DIST)
windows
$(WINDOWS_DIST) $(FREETTS_CLASS) \
$(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log \
altosui altosui-test macosx linux
$(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log \
altosui altosui-test macosx linux
@@
-131,12
+133,12
@@
Manifest-fat.txt:
altosui: Makefile
echo "#!/bin/sh" > $@
altosui: Makefile
echo "#!/bin/sh" > $@
- echo 'exec java -cp "$(FREETTS)/*" -Djava.library.path="$(libdir)" -jar "$(altosuidir)/altosui.jar" "$$@"' >> $@
+ echo 'exec java -cp "$(FREETTS)/*" -Djava.library.path="$(
altos
libdir)" -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)/*" -Djava.library.path="../libaltos
" -jar altosui.jar "$$*
"' >> $@
+ echo 'exec java -cp "$(FREETTS)/*" -Djava.library.path="../libaltos
/.libs" -jar altosui.jar "$$@
"' >> $@
chmod +x $@
$(LIBALTOS):
chmod +x $@
$(LIBALTOS):