projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: libaltos.so is built with libtool -- it's in ../libaltos/.libs
[fw/altos]
/
ao-tools
/
altosui
/
Makefile.am
diff --git
a/ao-tools/altosui/Makefile.am
b/ao-tools/altosui/Makefile.am
index f224dace68130555119d553537be4a15c54a6a62..56e6d7ae91ecec62f97bd47a2dc0bc8983c1e1e0 100644
(file)
--- a/
ao-tools/altosui/Makefile.am
+++ b/
ao-tools/altosui/Makefile.am
@@
-1,6
+1,10
@@
JAVAROOT=classes
AM_JAVACFLAGS=-encoding UTF-8
JAVAROOT=classes
AM_JAVACFLAGS=-encoding UTF-8
+man_MANS=altosui.1
+
+altoslibdir=$(libdir)/altos
+
CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../libaltos:$(FREETTS)/*:/usr/share/java/*"
bin_SCRIPTS=altosui
CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../libaltos:$(FREETTS)/*:/usr/share/java/*"
bin_SCRIPTS=altosui
@@
-88,7
+92,7
@@
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:
-rm -rf classes $(JAR) $(FATJAR) \
clean-local:
-rm -rf classes $(JAR) $(FATJAR) \
@@
-131,15
+135,23
@@
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 $@
chmod +x $@
-$(LIBALTOS):
+libaltos.so:
+ -rm -f "$@"
+ $(LN_S) ../libaltos/.libs/"$@" .
+
+libaltos.dylib:
+ -rm -f "$@"
+ $(LN_S) ../libaltos/"$@" .
+
+altos.dll:
-rm -f "$@"
$(LN_S) ../libaltos/"$@" .
-rm -f "$@"
$(LN_S) ../libaltos/"$@" .
@@
-169,4
+181,4
@@
$(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA)
$(WINDOWS_DIST): $(WINDOWS_FILES) altos-windows.nsi
-rm -f $@
$(WINDOWS_DIST): $(WINDOWS_FILES) altos-windows.nsi
-rm -f $@
- makensis -Oaltos-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" altos-windows.nsi
\ No newline at end of file
+ makensis -Oaltos-windows.log "-XOutFile $@" "-DVERSION=$(VERSION)" altos-windows.nsi